Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17768
Modified Files:
AbstractTool.java SelectTool.java
Log Message:
You can now delete edges even if they are part of surfaces. If you do the surfaces will be deleted aswell.
Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** SelectTool.java 12 Dec 2005 10:05:52 -0000 1.47
--- SelectTool.java 29 Dec 2005 15:06:48 -0000 1.48
***************
*** 372,379 ****
} else if (selected instanceof Edge) {
Edge selectedEdge = (Edge)selected;
! if (selectedEdge.getSurfaces().size() < 1) {
! selection.remove(selectedEdge);
! deleteEdge(selectedEdge);
! }
} else if (selected instanceof Vertex) {
selection.remove(selected);
--- 372,377 ----
} else if (selected instanceof Edge) {
Edge selectedEdge = (Edge)selected;
! selection.remove(selectedEdge);
! deleteEdge(selectedEdge);
} else if (selected instanceof Vertex) {
selection.remove(selected);
Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** AbstractTool.java 29 Dec 2005 14:21:58 -0000 1.44
--- AbstractTool.java 29 Dec 2005 15:06:48 -0000 1.45
***************
*** 519,523 ****
while (it.hasNext()) {
Edge edge = (Edge)it.next();
! deleteEdge(edge);
}
glv.repaint();
--- 519,525 ----
while (it.hasNext()) {
Edge edge = (Edge)it.next();
! if (edge.getSurfaces().size() < 1) {
! deleteEdge(edge);
! }
}
glv.repaint();
***************
*** 531,546 ****
if (edge.getId() != null) {
Set surfaces = edge.getSurfaces();
! if (surfaces.size() < 1) {
! removeEdge(edge);
! glv.repaint();
! deleteVertex(edge.getTo());
! deleteVertex(edge.getFrom());
}
- } else {
deleteVertex(edge.getTo());
deleteVertex(edge.getFrom());
}
}
!
/**
* Deletes a vertex if it is safe to do so.
--- 533,548 ----
if (edge.getId() != null) {
Set surfaces = edge.getSurfaces();
! removeEdge(edge);
! Iterator it = surfaces.iterator();
! while (it.hasNext()) {
! Surface surf = (Surface)it.next();
! deleteSurface(surf);
}
deleteVertex(edge.getTo());
deleteVertex(edge.getFrom());
+ glv.repaint();
}
}
!
/**
* Deletes a vertex if it is safe to do so.
|
