[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ArcTool.java,1.6,1.7 SelectTool.java,1.56,1.57

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9058/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	ArcTool.java SelectTool.java 
Log Message:
- Finished ArcTool
- Chekpoint after delete

Index: ArcTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ArcTool.java	16 Mar 2006 20:01:47 -0000	1.6
--- ArcTool.java	22 Mar 2006 10:53:23 -0000	1.7
***************
*** 49,53 ****
          edges.add(e2);
          
!         feedback(createArc(start.vertex(), current.vertex(), end.vertex(), true));
        } else {
          Edge edge = new Edge(start.vertex(), current.vertex());
--- 49,53 ----
          edges.add(e2);
          
!         feedback(createArc(start.vertex(), current.vertex(), end.vertex(), false));
        } else {
          Edge edge = new Edge(start.vertex(), current.vertex());
***************
*** 92,96 ****
        v1.setY(x);
        v1.scale(10 / v1.length());
!       Edge l1 = new Edge(system.unTranslate(m1.minus(v1)), system.unTranslate(m1.add(v1)));
        
        Vertex v2 = m.minus(q);
--- 92,96 ----
        v1.setY(x);
        v1.scale(10 / v1.length());
!       Edge l1 = new Edge(m1.minus(v1), m1.add(v1));
        
        Vertex v2 = m.minus(q);
***************
*** 103,107 ****
        v2.setY(x);
        v2.scale(10 / v2.length());
!       Edge l2 = new Edge(system.unTranslate(m2.minus(v2)), system.unTranslate(m2.add(v2)));
        l1.setConstructor(true);
        l2.setConstructor(true);
--- 103,107 ----
        v2.setY(x);
        v2.scale(10 / v2.length());
!       Edge l2 = new Edge(m2.minus(v2), m2.add(v2));
        l1.setConstructor(true);
        l2.setConstructor(true);
***************
*** 110,120 ****
        if (inter != null) {
          Vertex center = inter.getFrom();
!         Edge side1 = new Edge(center, start);
!         Edge side2 = new Edge(center, end);
!         Edge side3 = new Edge(center, mid);
!         side1.setConstructor(true);
!         side2.setConstructor(true);
!         side3.setConstructor(true);
          if (debug) {
            edges.add(side1);
            edges.add(side2);
--- 110,153 ----
        if (inter != null) {
          Vertex center = inter.getFrom();
!         double radius = 0;
!         double tetra1 = 0;
!         double tetra2 = 0;
!         
!         Vertex u1 = p.minus(center);
!         radius = u1.length();
!         u1.scale(1 / radius);
!         tetra1 = Math.acos(u1.getX());
!         if (u1.getY() < 0) {
!           tetra1 = -tetra1;
!         }
!         Vertex u2 = q.minus(center);
!         u2.scale(1 / radius);
!         tetra2 = Math.acos(u2.getX());
!         if (u2.getY() < 0) {
!           tetra2 = -tetra2;
!         }
!         
!         {
!           int n = 6;
!           double angle = tetra1;
!           double step = (tetra2 - tetra1) / n;
!           Vertex current = p;
!           for (int i = 0; i < n; i++) {
!             angle += step;
!             double xx = radius * Math.cos(angle);
!             double yy = radius * Math.sin(angle);
!             Vertex next = new Vertex(center.getX() + xx, center.getY() + yy, 0);
!             Edge edge = new Edge(system.unTranslate(current), system.unTranslate(next));
!             edges.add(edge);
!             current = next;
!           }          
!         }
          if (debug) {
+           Edge side1 = new Edge(system.unTranslate(center), start);
+           Edge side2 = new Edge(system.unTranslate(center), end);
+           Edge side3 = new Edge(system.unTranslate(center), mid);
+           side1.setConstructor(true);
+           side2.setConstructor(true);
+           side3.setConstructor(true);
            edges.add(side1);
            edges.add(side2);
***************
*** 123,132 ****
        }
        
-     
-       edges.add(e1);
-       edges.add(e2);
        if (debug) {
!         edges.add(l1);
!         edges.add(l2);
        }
      }
--- 156,162 ----
        }
        
        if (debug) {
!         edges.add(system.unTranslate(l1));
!         edges.add(system.unTranslate(l2));
        }
      }

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** SelectTool.java	12 Mar 2006 12:33:01 -0000	1.56
--- SelectTool.java	22 Mar 2006 10:53:23 -0000	1.57
***************
*** 208,211 ****
--- 208,212 ----
        Project.getInstance().delete(edges);
        Project.getInstance().delete(vertices);
+       Project.getInstance().checkpoint();
      } else {
        super.keyPressed(e);