[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java,1.50,1.51

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

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

Modified Files:
	PencilTool.java 
Log Message:
Minor adjustments

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** PencilTool.java	19 Dec 2005 07:51:30 -0000	1.50
--- PencilTool.java	20 Dec 2005 22:01:36 -0000	1.51
***************
*** 114,117 ****
--- 114,118 ----
      View view = glv.getView();
      List selection = view.getObjectAtPoint(x, y);
+     Vertex intersection = null;
      if (selection.isEmpty()) {
        target = null;
***************
*** 119,135 ****
        if (selection.size() > 1) {
          Edge e1 = (Edge) selection.get(0);
!         Edge e2 = (Edge) selection.get(1);
!         Edge intersect = e1.intersection(e2);
!         if (intersect == null) {
!           target = e1;
!         } else {
!           if (intersect.getLength() > 0.0000001) {
!             target = e1;
!           } else {
!             target = intersect.getFrom();
!             splitE1 = e1;
!             splitE2 = e2;
            }
          }
        } else {
          target = selection.get(0);
--- 120,141 ----
        if (selection.size() > 1) {
          Edge e1 = (Edge) selection.get(0);
!         
!         for (int i = 1; (i < selection.size()) && intersection == null; i++) {
!           Edge e2 = (Edge) selection.get(i);
!           Edge intersect = e1.intersection(e2);
!         
!           if (intersect != null) {
!             if (intersect.getLength() < 0.0000001) {
!               intersection = intersect.getFrom();
!               splitE1 = e1;
!               splitE2 = e2;
!             }
            }
          }
+         if (intersection != null) {
+           target = intersection;
+         } else {
+           target = e1;
+         }
        } else {
          target = selection.get(0);