[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AlternateMoveTool.java, 1.4, 1.5

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

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

Modified Files:
	AlternateMoveTool.java 
Log Message:
Improved feedback in move

Index: AlternateMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AlternateMoveTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AlternateMoveTool.java	11 Aug 2006 08:23:26 -0000	1.4
--- AlternateMoveTool.java	11 Aug 2006 09:04:07 -0000	1.5
***************
*** 17,23 ****
--- 17,26 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
+ import net.sourceforge.bprocessor.gl.model.Intersection;
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.ClippingPlane;
+ import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 165,185 ****
            entities = new HashSet();
            entities.add(target);
          }
        } else {
          entities = new HashSet();
          entities.addAll(selection);
        }     
        if (!entities.isEmpty()) {
          affected = getAffected(entities);
!         vertices = collect(entities); 
!         current = findIntersection(e).copy();
!         
!         if (current != null) {
!           from = current.vertex();
!           to = from;
!           last = from;
!           start = current;
!           updateFeedback();
!         }
        }
      } else {
--- 168,195 ----
            entities = new HashSet();
            entities.add(target);
+           if (((Geometric) target).parent() instanceof Constructor) {
+             Constructor constructor = (Constructor) ((Geometric) target).parent();
+             from = constructor.getOrigin();
+             last = ((Vertex) target).copy();
+             current = new Intersection(last, Intersection.VERTEX, last);
+           } else {
+             current = findIntersection(e).copy();
+             from = current.vertex();
+             last = from;
+           }
          }
        } else {
          entities = new HashSet();
          entities.addAll(selection);
+         current = findIntersection(e).copy();
+         from = current.vertex();
+         last = from;
        }     
        if (!entities.isEmpty()) {
+         start = current;
+         to = last;
+         updateFeedback();
          affected = getAffected(entities);
!         vertices = collect(entities);
        }
      } else {