[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool TapeMeasureTool.java, 1.17, 1.18 ConstructorTool.java, 1.10, 1.11 AbstractPencil.java, 1.58, 1.59

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

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

Modified Files:
	TapeMeasureTool.java ConstructorTool.java AbstractPencil.java 
Log Message:
Minor changes to appearance in tools

Index: TapeMeasureTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TapeMeasureTool.java	3 Aug 2006 14:27:52 -0000	1.17
--- TapeMeasureTool.java	18 Aug 2006 08:24:16 -0000	1.18
***************
*** 145,149 ****
    private void endTapeMeasure() {
      if (currentConstruction != null) {
!       currentConstruction.setEditable(true);
        insertConstructor(currentConstruction);
        constructors(new LinkedList());
--- 145,149 ----
    private void endTapeMeasure() {
      if (currentConstruction != null) {
!       // currentConstruction.setEditable(true);
        insertConstructor(currentConstruction);
        constructors(new LinkedList());

Index: ConstructorTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ConstructorTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ConstructorTool.java	11 Aug 2006 12:44:25 -0000	1.10
--- ConstructorTool.java	18 Aug 2006 08:24:16 -0000	1.11
***************
*** 147,150 ****
--- 147,151 ----
          insertPoint(current.vertex().copy());
          cleanUp();
+         moved(e);
          return;
        } else if (p2 == null) {
***************
*** 154,161 ****
--- 155,164 ----
            insertLine(p1.vertex().copy(),  p2.vertex().copy());
            cleanUp();
+           moved(e);
            return;
          } else {
            insertPlane(p1.vertex().copy(), p2.vertex().copy(), current.vertex().copy());
            cleanUp();
+           moved(e);
            return;
          }

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** AbstractPencil.java	15 Aug 2006 13:31:48 -0000	1.58
--- AbstractPencil.java	18 Aug 2006 08:24:16 -0000	1.59
***************
*** 82,85 ****
--- 82,87 ----
    protected Plane lockingPlane;
    
+   /** Original vertex when snapping */
+   protected Vertex original;
    
    /** Whether or not the tool is locked */
***************
*** 175,178 ****
--- 177,181 ----
        (Intersection) glv.getView().getObjectAtPoint(e.getX(), e.getY(),
                                                    unwanted, View.INTERSECTIONS, work);
+     
      if (intersection != null) {
        Space space = Project.getInstance().getActiveSpace();
***************
*** 184,189 ****
        }
      }
!     
      if (constrain) {
        if (lockingEdge != null) {
          Vertex vertex = lockingEdge.intersection(intersection.vertex());
--- 187,193 ----
        }
      }
!     original = null;
      if (constrain) {
+       original = intersection.vertex();
        if (lockingEdge != null) {
          Vertex vertex = lockingEdge.intersection(intersection.vertex());
***************
*** 896,899 ****
--- 900,904 ----
      feedback(new LinkedList());
      excluded(new LinkedList());
+     points(new LinkedList());
      number = "";
      glv.repaint();