Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9547/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
PencilTool.java
Log Message:
Fix of edge-splitting in PencilTool
Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** PencilTool.java 6 Dec 2005 16:51:25 -0000 1.45
--- PencilTool.java 8 Dec 2005 10:33:36 -0000 1.46
***************
*** 344,360 ****
}
if (active == null) {
edges = new ArrayList();
intern(vertex);
- if (splitE1 != null) {
- if (!splitE1.getConstructor()) {
- splitE1.split(vertex);
- }
- }
- if (splitE2 != null) {
- if (!splitE2.getConstructor()) {
- splitE2.split(vertex);
- }
- }
from = vertex;
to = new Vertex("Mouse", vertex.getX(), vertex.getY(), vertex.getZ());
--- 344,362 ----
}
+ {
+ Set es = Project.getInstance().findEdge(vertex);
+ if (es.size() > 0) {
+ intern(vertex);
+ Iterator iter = es.iterator();
+ while (iter.hasNext()) {
+ Edge e = (Edge) iter.next();
+ e.split(vertex);
+ }
+ }
+ }
+
if (active == null) {
edges = new ArrayList();
intern(vertex);
from = vertex;
to = new Vertex("Mouse", vertex.getX(), vertex.getY(), vertex.getZ());
***************
*** 362,379 ****
glv.getView().setActiveEdge(active);
} else {
- // The following lines of code are there to make sure
- // that a Surface is finished when clicking an edge..
- if (splitE1 != null) {
- if (!splitE1.getConstructor()) {
- intern(vertex);
- splitE1.split(vertex);
- }
- }
- if (splitE2 != null) {
- if (!splitE2.getConstructor()) {
- intern(vertex);
- splitE2.split(vertex);
- }
- }
if (vertex.getId() == null) {
intern(vertex);
--- 364,367 ----
|