[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.98, 1.99 OffsetTool.java, 1.5, 1.6 ExtrudeTool.java, 1.21, 1.22 TapeMeasureTool.java, 1.19, 1.20 SpaceTool.java, 1.29, 1.30 ArcTool.java, 1.12, 1.13 MultiExtrudeTool.java, 1.22, 1.23 RectTool.java, 1.15, 1.16 AbstractPencil.java, 1.63, 1.64

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

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

Modified Files:
	AbstractTool.java OffsetTool.java ExtrudeTool.java 
	TapeMeasureTool.java SpaceTool.java ArcTool.java 
	MultiExtrudeTool.java RectTool.java AbstractPencil.java 
Log Message:
Refactoring of length-field

Index: ExtrudeTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ExtrudeTool.java	3 Jul 2006 14:25:02 -0000	1.21
--- ExtrudeTool.java	11 Sep 2006 12:47:32 -0000	1.22
***************
*** 155,159 ****
      move(delta);
      t = to;
!     glv.setLength(Math.abs(t));
    }
    
--- 155,159 ----
      move(delta);
      t = to;
!     setLength(Math.abs(t));
    }
    
***************
*** 514,517 ****
--- 514,535 ----
    
    /**
+    * Delete
+    */
+   public void delete() {
+     int length = number.length();
+     if (length > 1) {
+       number = number.substring(0, length - 1);
+     } else {
+       number = String.valueOf(0);
+     }
+     try {
+       double d = Double.parseDouble(number);
+       glv.setLength(d / 1000);
+     } catch (NumberFormatException exp) {
+       Project.info(exp);
+     }
+   }
+   
+   /**
     * Called when a key is released
     * @param e The KeyEvent object

Index: OffsetTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OffsetTool.java	7 Sep 2006 15:54:47 -0000	1.5
--- OffsetTool.java	11 Sep 2006 12:47:32 -0000	1.6
***************
*** 280,284 ****
        Vertex projection = outNormal.copy();
        projection.scale((lastOffsetPoint.minus(start.vertex())).dot(projection));
!       glv.setLength(projection.length());
      } else {
        super.updateLength();
--- 280,284 ----
        Vertex projection = outNormal.copy();
        projection.scale((lastOffsetPoint.minus(start.vertex())).dot(projection));
!       setLength(projection.length());
      } else {
        super.updateLength();

Index: ArcTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ArcTool.java	7 Sep 2006 11:38:41 -0000	1.12
--- ArcTool.java	11 Sep 2006 12:47:32 -0000	1.13
***************
*** 234,238 ****
        super.updateLength();
      } else {
!       glv.setLength(radius);
      }
    }
--- 234,238 ----
        super.updateLength();
      } else {
!       setLength(radius);
      }
    }

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** AbstractPencil.java	11 Sep 2006 06:33:01 -0000	1.63
--- AbstractPencil.java	11 Sep 2006 12:47:32 -0000	1.64
***************
*** 458,464 ****
      }
      if (edge != null) {
!       glv.setLength(edge.getLength());
      } else {
!       glv.setLength(0);
      }
    }
--- 458,464 ----
      }
      if (edge != null) {
!       setLength(edge.getLength());
      } else {
!       setLength(0);
      }
    }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** AbstractTool.java	11 Sep 2006 06:33:01 -0000	1.98
--- AbstractTool.java	11 Sep 2006 12:47:32 -0000	1.99
***************
*** 93,96 ****
--- 93,99 ----
    protected boolean showConstructors;
    
+   /** Are user typing in length-field */
+   protected boolean typing;
+   
    /** The cursor for drag */
    private Cursor dragCursor;
***************
*** 99,102 ****
--- 102,107 ----
    private Cursor orbitCursor;
    
+   
+   
  
    /**
***************
*** 172,175 ****
--- 177,190 ----
      return center;
    }
+    
+   /**
+    * Set the length-field
+    * @param value Douelb
+    */
+   public void setLength(double value) {
+     int mm = (int) (value * 1000.0);
+     glv.setLengthValue(Integer.toString(mm));
+     typing = false;
+   }
    
    /**
***************
*** 507,511 ****
     */
    public void cleanUp() {
!     Project.info("cleanup " + this.getClass().getName());
    }
  }
--- 522,527 ----
     */
    public void cleanUp() {
!     glv.setLengthValue("");
!     typing = false;
    }
  }

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** SpaceTool.java	8 Sep 2006 13:08:20 -0000	1.29
--- SpaceTool.java	11 Sep 2006 12:47:32 -0000	1.30
***************
*** 61,64 ****
--- 61,67 ----
     */
    protected void pressed(MouseEvent e) {   
+     glv.setLengthValue("");
+     typing = false;
+     
      findTarget(e);
      boolean done = false;
***************
*** 534,544 ****
    
    /**
     * @param event KeyEvent
     */
    public void key(KeyEvent event) {
      {
!       String value = glv.getLengthValue();
!       value = value + event.getKeyChar();
!       glv.setLengthValue(value);
      }
    }
--- 537,570 ----
    
    /**
+    * Evaluate the string
+    * @param value String
+    * @return Result
+    */
+   public Object evaluate(String value) {
+     Project.info("evaluate '" + value + "'");
+     return null;
+   }
+   
+   /**
     * @param event KeyEvent
     */
    public void key(KeyEvent event) {
      {
!       String value;
!       if (typing) {
!         value = glv.getLengthValue();
!       } else {
!         value = "";
!       }
!       char ch = event.getKeyChar();
!       if (ch > 32 && ch < 128) {
!         value = value + ch;
!         glv.setLengthValue(value);
!         typing = true;
!       } else {
!         if (event.getKeyCode() == KeyEvent.VK_ENTER) {
!           evaluate(value);
!         }
!       }
      }
    }
***************
*** 548,551 ****
--- 574,587 ----
     */
    public void delete() {
+     if (typing) {
+       String value = glv.getLengthValue();
+       int length = value.length();
+       if (length > 0) {
+         value = value.substring(0, length - 1);
+         glv.setLengthValue(value);
+       }
+       return;
+     }
+     
      Iterator it = Selection.primary().iterator();
      List edges = new ArrayList();

Index: TapeMeasureTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TapeMeasureTool.java	7 Sep 2006 11:38:41 -0000	1.19
--- TapeMeasureTool.java	11 Sep 2006 12:47:32 -0000	1.20
***************
*** 124,128 ****
        Edge edge = new Edge(start.vertex(), constructionPoint);
        edge.setStrippled(true);
!       glv.setLength(edge.getLength());
        consts.add(edge);
        constructors(consts);
--- 124,128 ----
        Edge edge = new Edge(start.vertex(), constructionPoint);
        edge.setStrippled(true);
!       setLength(edge.getLength());
        consts.add(edge);
        constructors(consts);

Index: RectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RectTool.java	7 Sep 2006 11:38:41 -0000	1.15
--- RectTool.java	11 Sep 2006 12:47:32 -0000	1.16
***************
*** 129,133 ****
        super.updateLength();      
      } else {
!       glv.setLength(baseEdge.getFrom().minus(movingEdge.getTo()).length());
      }
    }
--- 129,133 ----
        super.updateLength();      
      } else {
!       setLength(baseEdge.getFrom().minus(movingEdge.getTo()).length());
      }
    }

Index: MultiExtrudeTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MultiExtrudeTool.java	7 Sep 2006 13:35:19 -0000	1.22
--- MultiExtrudeTool.java	11 Sep 2006 12:47:32 -0000	1.23
***************
*** 226,230 ****
        d.getVertex().move(v.getX(), v.getY(), v.getZ());
      }
!     glv.setLength(t);
    }
    
--- 226,230 ----
        d.getVertex().move(v.getX(), v.getY(), v.getZ());
      }
!     setLength(t);
    }
    
***************
*** 244,248 ****
      v.scale(delta);
      which.getVertex().move(v.getX(), v.getY(), v.getZ());
!     glv.setLength(t);
    }
  
--- 244,248 ----
      v.scale(delta);
      which.getVertex().move(v.getX(), v.getY(), v.getZ());
!     setLength(t);
    }