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

[Nordholt <nor...@us...>]

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

Modified Files:
	TapeMeasureTool.java 
Log Message:
fixed problem with axis aligned edges

Index: TapeMeasureTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TapeMeasureTool.java	19 Dec 2005 07:51:30 -0000	1.5
--- TapeMeasureTool.java	26 Dec 2005 15:09:04 -0000	1.6
***************
*** 123,126 ****
--- 123,127 ----
    private void move(MouseEvent e) {
      edgeNormal.scale(1 / edgeNormal.length());
+     Vertex moveVertex = edgeNormal.copy();
      double x = e.getX();
      double y = View.getHeight() - e.getY();
***************
*** 133,139 ****
      Vertex intersect = movePlane.intersection(ray);
      Vertex delta = intersect.minus(constructionPoint);
!     edgeNormal.scale(edgeNormal.dot(delta) / (edgeNormal.length() * edgeNormal.length()));
!     currentConstruction.move(edgeNormal.getX(), edgeNormal.getY(), edgeNormal.getZ());
!     constructionPoint.move(edgeNormal.getX(), edgeNormal.getY(), edgeNormal.getZ());
      number = "";
      glv.setLength(edgeToConstruction.getLength());
--- 134,141 ----
      Vertex intersect = movePlane.intersection(ray);
      Vertex delta = intersect.minus(constructionPoint);
!     moveVertex.scale(moveVertex.dot(delta) / (moveVertex.length() * 
!                                               moveVertex.length()));
!     currentConstruction.move(moveVertex.getX(), moveVertex.getY(), moveVertex.getZ());
!     constructionPoint.move(moveVertex.getX(), moveVertex.getY(), moveVertex.getZ());
      number = "";
      glv.setLength(edgeToConstruction.getLength());
***************
*** 200,204 ****
      v.removeTempEdge(yAxis);
      v.removeTempEdge(zAxis);
- 
    }
    
--- 202,205 ----