[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool FinalMoveTool.java, 1.2, 1.3

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

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

Modified Files:
	FinalMoveTool.java 
Log Message:
Progress on move

Index: FinalMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FinalMoveTool.java	9 May 2007 08:33:27 -0000	1.2
--- FinalMoveTool.java	9 May 2007 09:21:43 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometric;
+ import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 27,31 ****
    private Collection<Geometric> geometrics;
    private Collection<Vertex> vertices;
!   
    
    /**
--- 28,35 ----
    private Collection<Geometric> geometrics;
    private Collection<Vertex> vertices;
!   private Collection<Geometric> affected;
!   private Vertex from;
!   private Vertex last;
!   private Vertex to;
    
    /**
***************
*** 48,52 ****
      } else {
        if (current != null) {
!         Edge edge = new Edge(start.vertex(), current.vertex());
          edge.setStrippled(true);
          Collection feedback = new LinkedList();
--- 52,56 ----
      } else {
        if (current != null) {
!         Edge edge = new Edge(from, to);
          edge.setStrippled(true);
          Collection feedback = new LinkedList();
***************
*** 59,62 ****
--- 63,81 ----
    }
    
+   private void move() {
+     current = current.copy();
+     to = current.vertex();
+     move(vertices, to.minus(last));
+     last = to;
+     updateFeedback();
+   }
+   
+   
+   private void move(Collection<Vertex> vertices, Vertex delta) {
+     for (Vertex current : vertices) {
+       current.move(delta.getX(), delta.getY(), delta.getZ());
+     }
+   }
+   
    /** {@inheritDoc} */
    @Override
***************
*** 81,86 ****
        }
      } else {
        current = findIntersection(e);
!       updateFeedback();
      }
    }
--- 100,106 ----
        }
      } else {
+       excluded(affected);
        current = findIntersection(e);
!       move();
      }
    }
***************
*** 96,101 ****
--- 116,125 ----
          geometrics.addAll(Selection.primary());
        }
+       vertices = Geometry.collect(geometrics);
+       affected = getAffected(geometrics);
        current = findIntersection(e);
        start = current.copy();
+       from = current.vertex();
+       last = from;
        updateFeedback();
      } else {