[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Protractor.java, 1.4, 1.5 AbstractToo
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool Protractor.java, 1.4, 1.5 AbstractTool.java, 1.94, 1.95 OffsetTool.java, 1.3, 1.4 MoveTool.java, 1.67, 1.68 TapeMeasureTool.java, 1.18, 1.19 SpaceTool.java, 1.27, 1.28 ArcTool.java, 1.11, 1.12 RectTool.java, 1.14, 1.15 Pencil.java, 1.11, 1.12 OrbitStrategy.java, 1.1, 1.2 AbstractPencil.java, 1.60, 1.61
|
From: Nordholt <nor...@us...> - 2006-09-07 11:38:51
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15717/src/net/sourceforge/bprocessor/gl/tool Modified Files: Protractor.java AbstractTool.java OffsetTool.java MoveTool.java TapeMeasureTool.java SpaceTool.java ArcTool.java RectTool.java Pencil.java OrbitStrategy.java AbstractPencil.java Log Message: Moved methods from abstractpencil to geometry Index: ArcTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ArcTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ArcTool.java 3 Aug 2006 14:35:29 -0000 1.11 --- ArcTool.java 7 Sep 2006 11:38:41 -0000 1.12 *************** *** 18,21 **** --- 18,22 ---- import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Vertex; *************** *** 194,198 **** end = current; } else { ! insertEdges(createArc(start.vertex(), current.vertex(), end.vertex(), false)); start = null; end = null; --- 195,199 ---- end = current; } else { ! Geometry.insertEdges(createArc(start.vertex(), current.vertex(), end.vertex(), false)); start = null; end = null; Index: Protractor.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Protractor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Protractor.java 3 Aug 2006 14:27:52 -0000 1.4 --- Protractor.java 7 Sep 2006 11:38:41 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- import net.sourceforge.bprocessor.gl.GLView; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Line; import net.sourceforge.bprocessor.model.Vertex; *************** *** 78,82 **** } else { Line l = createConstructor(start.vertex(), current.vertex()); ! insertConstructor(l); start = null; } --- 79,83 ---- } else { Line l = createConstructor(start.vertex(), current.vertex()); ! Geometry.insertConstructor(l); start = null; } Index: OffsetTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OffsetTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OffsetTool.java 8 Aug 2006 15:11:32 -0000 1.3 --- OffsetTool.java 7 Sep 2006 11:38:41 -0000 1.4 *************** *** 20,23 **** --- 20,24 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 164,168 **** */ private void endOffset() { ! insertEdges(contour); directionMap = new HashMap(); contour = new LinkedList(); --- 165,169 ---- */ private void endOffset() { ! Geometry.insertEdges(contour); directionMap = new HashMap(); contour = new LinkedList(); Index: OrbitStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OrbitStrategy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OrbitStrategy.java 3 Jul 2006 14:25:02 -0000 1.1 --- OrbitStrategy.java 7 Sep 2006 11:38:41 -0000 1.2 *************** *** 93,97 **** Camera.rotateVertically(c, angleY, pivot); } ! Project.getInstance().changed(c); x = e.getX(); y = e.getY(); --- 93,97 ---- Camera.rotateVertically(c, angleY, pivot); } ! //Project.getInstance().changed(c); x = e.getX(); y = e.getY(); Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** AbstractPencil.java 24 Aug 2006 09:19:09 -0000 1.60 --- AbstractPencil.java 7 Sep 2006 11:38:41 -0000 1.61 *************** *** 29,33 **** import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometric; - import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Line; import net.sourceforge.bprocessor.model.Plane; --- 29,32 ---- *************** *** 216,358 **** /** - * Insert a Constructor into model - * @param c the constructor - * @return The model Constructor - */ - public Constructor insertConstructor(Constructor c) { - Space space = mesh(); - - return space.insert(c); - } - - /** - * Insert a vertex into model - * @param vertex Vertex - * @param split Split - * @return Vertex from model - */ - public Vertex insertVertex(Vertex vertex, boolean split) { - - Space space = mesh(); - - if (vertex.getOwner() != space) { - vertex = vertex.copy(); - } - - Vertex actual = null; - { - Set vertices = mesh().findByLocation - (vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001); - if (!vertices.isEmpty()) { - actual = (Vertex) vertices.iterator().next(); - } - } - - if (actual == null) { - actual = vertex; - if (actual.getOwner() == null) { - mesh().add(actual); - if (split) { - Set es = mesh().findEdge(actual); - if (es.size() > 0) { - Iterator iter = es.iterator(); - while (iter.hasNext()) { - Edge e = (Edge) iter.next(); - if (!e.getStrippled()) { - e.split(actual); - } - } - } - } - } - } - return actual; - } - - /** - * Insert an edge into model - * @param edge Edge - * @param split Split - * @return Edge from model null if to and from were the same - */ - public Edge insertEdge(Edge edge, boolean split) { - Edge actual = edge; - if (edge.getLength() == 0) { - return null; - } - Vertex from = insertVertex(edge.getFrom(), split); - Vertex to = insertVertex(edge.getTo(), split); - edge.setFrom(from); - edge.setTo(to); - if (edge.getLength() == 0.0) { - return null; - } - { - Collection edges = mesh().getEdges(); - Iterator iter = edges.iterator(); - while (iter.hasNext()) { - Edge current = (Edge) iter.next(); - if (current.getFrom() == edge.getFrom() && current.getTo() == edge.getTo()) { - actual = current; - break; - } - if (current.getFrom() == edge.getTo() && current.getTo() == edge.getFrom()) { - actual = current; - break; - } - } - } - if (actual == edge) { - mesh().add(edge); - } - return actual; - } - - /** - * Insert a number edges into the model - * @param edges List of edges - * @return Boolean indicating whether the edges are closed - */ - public boolean insertEdges(List edges) { - boolean closed = false; - if (!edges.isEmpty()) { - Vertex from = ((Edge) edges.get(0)).getFrom(); - Vertex to = ((Edge) edges.get(edges.size() - 1)).getTo(); - - if (from == to) { - List actual = new LinkedList(); - Iterator iter = edges.iterator(); - while (iter.hasNext()) { - Edge current = (Edge) iter.next(); - Edge edge = insertEdge(current, false); - if (edge != null) { - actual.add(edge); - } - } - if (actual.size() > 3) { - Surface surface = new Surface(actual); - mesh().insert(surface); - holeAnalysis(surface); - closed = true; - } - } else { - List actual = new LinkedList(); - Iterator iter = edges.iterator(); - while (iter.hasNext()) { - Edge current = (Edge) iter.next(); - Edge edge = insertEdge(current, true); - if (edge != null) { - actual.add(edge); - } - } - closed = Geometry.insert(actual); - } - } - Project.getInstance().changed(Project.getInstance()); - Project.getInstance().checkpoint(); - return closed; - } - - /** * Show feedback */ --- 215,218 ---- Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** AbstractTool.java 28 Aug 2006 07:27:15 -0000 1.94 --- AbstractTool.java 7 Sep 2006 11:38:41 -0000 1.95 *************** *** 132,147 **** } } - - /** - * Get the mesh - * @return The mesh - */ - public Space mesh() { - if (Project.getInstance().getActiveSpace() != null) { - return Project.getInstance().getActiveSpace(); - } else { - return Project.getInstance().world(); - } - } /** --- 132,135 ---- *************** *** 192,196 **** * @param surface The surface */ ! protected void holeAnalysis(Surface surface) { Geometry.holeAnalysis(surface); } --- 180,184 ---- * @param surface The surface */ ! protected static void holeAnalysis(Surface surface) { Geometry.holeAnalysis(surface); } *************** *** 402,434 **** glv.repaint(true); } ! ! /** ! * Make and register a new vertex ! * @param coord The coordinates to create with ! * @return The new Vertex ! */ ! protected Vertex createVertex(double[] coord) { ! if (coord.length == 3) { ! Vertex vertex = new Vertex(coord[0], coord[1], coord[2]); ! Project.getInstance().add(vertex); ! return vertex; ! } else { ! log.error("[createVertex] wrong argument length was: " + coord.length); ! return null; ! } ! } ! ! /** ! * Make and register a new edge ! * @param to the to vertex ! * @param from the from vertex ! * @return The new Edge ! */ ! protected Edge createEdge(Vertex from, Vertex to) { ! Edge edge = new Edge(from, to); ! Project.getInstance().add(edge); ! return edge; ! } ! /** * Makes a set of constructors be displayed. --- 390,394 ---- glv.repaint(true); } ! /** * Makes a set of constructors be displayed. Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** SpaceTool.java 29 Aug 2006 08:07:07 -0000 1.27 --- SpaceTool.java 7 Sep 2006 11:38:41 -0000 1.28 *************** *** 416,420 **** JMenuItem voidItem = new JMenuItem("Void"); ! Space sp = mesh(); ActionListener voidListener = new DomainPopupListener(sp.getEmpty(), --- 416,420 ---- JMenuItem voidItem = new JMenuItem("Void"); ! Space sp = Project.getInstance().getActiveSpace(); ActionListener voidListener = new DomainPopupListener(sp.getEmpty(), Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Pencil.java 31 Jul 2006 13:03:43 -0000 1.11 --- Pencil.java 7 Sep 2006 11:38:41 -0000 1.12 *************** *** 16,19 **** --- 16,20 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.gl.model.Intersection; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Edge; *************** *** 97,101 **** (current.type() == Intersection.EDGE && eColl.contains(current.object()))); ! if (insertEdges(edges) || exsGeometry) { cleanUp(); return; --- 98,102 ---- (current.type() == Intersection.EDGE && eColl.contains(current.object()))); ! if (Geometry.insertEdges(edges) || exsGeometry) { cleanUp(); return; Index: TapeMeasureTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TapeMeasureTool.java 18 Aug 2006 08:24:16 -0000 1.18 --- TapeMeasureTool.java 7 Sep 2006 11:38:41 -0000 1.19 *************** *** 14,17 **** --- 14,18 ---- import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Line; import net.sourceforge.bprocessor.model.Project; *************** *** 146,150 **** if (currentConstruction != null) { // currentConstruction.setEditable(true); ! insertConstructor(currentConstruction); constructors(new LinkedList()); excluded(new LinkedList()); --- 147,151 ---- if (currentConstruction != null) { // currentConstruction.setEditable(true); ! Geometry.insertConstructor(currentConstruction); constructors(new LinkedList()); excluded(new LinkedList()); Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** MoveTool.java 5 Sep 2006 11:01:43 -0000 1.67 --- MoveTool.java 7 Sep 2006 11:38:41 -0000 1.68 *************** *** 203,206 **** --- 203,207 ---- holeAnalysis(current); } + Project.getInstance().changed(vertices); Project.getInstance().checkpoint(); cleanUp(); Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RectTool.java 10 Aug 2006 13:14:21 -0000 1.14 --- RectTool.java 7 Sep 2006 11:38:41 -0000 1.15 *************** *** 18,21 **** --- 18,22 ---- import net.sourceforge.bprocessor.gl.GLView; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Vertex; *************** *** 93,97 **** direction.scale((length - direction.length()) / direction.length()); movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); ! insertEdges(rectangle); cleanUp(); feedback(rectangle); --- 94,98 ---- direction.scale((length - direction.length()) / direction.length()); movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); ! Geometry.insertEdges(rectangle); cleanUp(); feedback(rectangle); *************** *** 155,159 **** } else { if (baseEdge.getLength() > 0.0 && movingEdge.getLength() > 0.0) { ! insertEdges(rectangle); } cleanUp(); --- 156,160 ---- } else { if (baseEdge.getLength() > 0.0 && movingEdge.getLength() > 0.0) { ! Geometry.insertEdges(rectangle); } cleanUp(); |
