[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Pencil.java,1.3,1.4 AbstractPencil.java,1.11,1.12

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

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

Modified Files:
	Pencil.java AbstractPencil.java 
Log Message:
Fixes to pencil

Index: Pencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Pencil.java	26 Mar 2006 21:40:32 -0000	1.3
--- Pencil.java	27 Mar 2006 07:08:26 -0000	1.4
***************
*** 14,17 ****
--- 14,18 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
+ import net.sourceforge.bprocessor.gl.model.Intersection;
  import net.sourceforge.bprocessor.model.Edge;
  
***************
*** 41,44 ****
--- 42,46 ----
        edges.add(edge);
        feedback(edges);
+       glv.setLength(edge.getLength());
      } else {
        constructors(new LinkedList());
***************
*** 77,85 ****
        edges.add(edge);
        insertEdges(edges);
!       start = null;
!       incident = null;
      }
      updateConstructors();
      updateFeedback();
    }
  
--- 79,95 ----
        edges.add(edge);
        insertEdges(edges);
!       
!       if (current.type() == Intersection.VERTEX 
!           || current.type() == Intersection.EDGE_MIDPOINT) {
!         start = null;
!         incident = null;
!       } else {
!         start = current;
!         incident = null;
!       }
      }
      updateConstructors();
      updateFeedback();
+     glv.repaint();
    }
  

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractPencil.java	26 Mar 2006 21:40:32 -0000	1.11
--- AbstractPencil.java	27 Mar 2006 07:08:26 -0000	1.12
***************
*** 248,251 ****
--- 248,252 ----
      } else {
        List constructors = new LinkedList();
+       
        if (incident != null && current != null) {
          Edge e1 = new Edge(incident.vertex(), current.vertex());
***************
*** 270,274 ****
--- 271,277 ----
            constructors(constructors);
          }
+         constructors.addAll(xyz(incident.vertex()));
        }
+       
        constructors.addAll(xyz(start.vertex()));
        constructors(constructors);
***************
*** 367,371 ****
        number = "";
      }
!     if (e.getKeyCode() == KeyEvent.VK_1) {
        number += "1";
        changed = true;
--- 370,376 ----
        number = "";
      }
!     if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
!       cleanUp();
!     } else if (e.getKeyCode() == KeyEvent.VK_1) {
        number += "1";
        changed = true;
***************
*** 450,453 ****
--- 455,459 ----
      feedback(new LinkedList());
      number = "";
+     glv.repaint();
    }
  }