bprocessor-commit

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

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

Modified Files:
	ArcTool.java AbstractPencil.java 
Log Message:
More work on arc and abstractpencil

Index: ArcTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ArcTool.java	15 Mar 2006 10:36:29 -0000	1.4
--- ArcTool.java	16 Mar 2006 09:43:50 -0000	1.5
***************
*** 50,54 ****
          edges.add(e2);
          
!         feedback(createArc(start.vertex(), current.vertex(), end.vertex()));
        } else {
          Edge edge = new Edge(start.vertex(), current.vertex());
--- 50,54 ----
          edges.add(e2);
          
!         feedback(createArc(start.vertex(), current.vertex(), end.vertex(), true));
        } else {
          Edge edge = new Edge(start.vertex(), current.vertex());
***************
*** 68,74 ****
     * @param mid Mid point
     * @param end End point
     * @return Edges
     */
!   protected List createArc(Vertex start, Vertex mid, Vertex end) {
      List edges = new LinkedList();
      Edge e1 = new Edge(start, mid);
--- 68,75 ----
     * @param mid Mid point
     * @param end End point
+    * @param debug Show construction lines
     * @return Edges
     */
!   protected List createArc(Vertex start, Vertex mid, Vertex end, boolean debug) {
      List edges = new LinkedList();
      Edge e1 = new Edge(start, mid);
***************
*** 116,122 ****
          side2.setConstructor(true);
          side3.setConstructor(true);
!         edges.add(side1);
!         edges.add(side2);
!         edges.add(side3);
        }
        
--- 117,125 ----
          side2.setConstructor(true);
          side3.setConstructor(true);
!         if (debug) {
!           edges.add(side1);
!           edges.add(side2);
!           edges.add(side3);
!         }
        }
        
***************
*** 124,129 ****
        edges.add(e1);
        edges.add(e2);
!       edges.add(l1);
!       edges.add(l2);
      }
      return edges;
--- 127,134 ----
        edges.add(e1);
        edges.add(e2);
!       if (debug) {
!         edges.add(l1);
!         edges.add(l2);
!       }
      }
      return edges;
***************
*** 161,164 ****
--- 166,170 ----
            end = current;
          } else {
+           insertEdges(createArc(start.vertex(), current.vertex(), end.vertex(), false));
            start = null;
            end = null;

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractPencil.java	15 Mar 2006 10:36:29 -0000	1.2
--- AbstractPencil.java	16 Mar 2006 09:43:50 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  import java.util.HashSet;
  import java.util.Iterator;
+ import java.util.List;
  
  import net.sourceforge.bprocessor.gl.GLView;
***************
*** 34,37 ****
--- 35,47 ----
    }
  
+   
+   /**
+    * Insert a number edges into the model
+    * @param edges List of edges
+    */
+   public void insertEdges(List edges) {
+       
+   }
+   
    /**
     * Show feedback