Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12714/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
AbstractTool.java AbstractPencil.java
Log Message:
Pencil, Arc and Rect now edits the active space
- Problem: cannot hit vertices in activespace
Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractPencil.java 16 Mar 2006 20:01:47 -0000 1.6
--- AbstractPencil.java 17 Mar 2006 09:55:20 -0000 1.7
***************
*** 20,23 ****
--- 20,24 ----
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Geometry;
+ import net.sourceforge.bprocessor.model.Mesh;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Project;
***************
*** 43,46 ****
--- 44,59 ----
/**
+ * Get the mesh
+ * @return The mesh
+ */
+ public Mesh mesh() {
+ if (Project.getInstance().getActiveSpace() != null) {
+ return Project.getInstance().getActiveSpace().getInterior();
+ } else {
+ return Project.getInstance().mesh();
+ }
+ }
+
+ /**
* Find an intersection
* @param e MouseEvent
***************
*** 60,64 ****
Vertex actual = vertex;
{
! Set vertices = Project.getInstance().findByLocation
(vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
if (!vertices.isEmpty()) {
--- 73,77 ----
Vertex actual = vertex;
{
! Set vertices = mesh().findByLocation
(vertex.getX(), vertex.getY(), vertex.getZ(), 0.0000001);
if (!vertices.isEmpty()) {
***************
*** 67,72 ****
}
if (actual == vertex) {
! Project.getInstance().add(actual);
! Set es = Project.getInstance().findEdge(actual);
if (es.size() > 0) {
Iterator iter = es.iterator();
--- 80,85 ----
}
if (actual == vertex) {
! mesh().add(actual);
! Set es = mesh().findEdge(actual);
if (es.size() > 0) {
Iterator iter = es.iterator();
***************
*** 92,96 ****
edge.setTo(insertVertex(edge.getTo()));
{
! Collection edges = Project.getInstance().getEdges();
Iterator iter = edges.iterator();
while (iter.hasNext()) {
--- 105,109 ----
edge.setTo(insertVertex(edge.getTo()));
{
! Collection edges = mesh().getEdges();
Iterator iter = edges.iterator();
while (iter.hasNext()) {
***************
*** 107,111 ****
}
if (actual == edge) {
! Project.getInstance().add(edge);
}
return actual;
--- 120,124 ----
}
if (actual == edge) {
! mesh().add(edge);
}
return actual;
***************
*** 129,133 ****
if (from == to) {
Surface surface = new Surface(actual);
! Project.getInstance().add(surface);
holeAnalysis(surface);
} else {
--- 142,146 ----
if (from == to) {
Surface surface = new Surface(actual);
! mesh().add(surface);
holeAnalysis(surface);
} else {
Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** AbstractTool.java 12 Mar 2006 12:33:00 -0000 1.62
--- AbstractTool.java 17 Mar 2006 09:55:20 -0000 1.63
***************
*** 155,159 ****
*/
protected void holeAnalysis(Surface surface) {
! Collection surfaces = Project.getInstance().getSurfaces();
Iterator iter = surfaces.iterator();
while (iter.hasNext()) {
--- 155,159 ----
*/
protected void holeAnalysis(Surface surface) {
! Collection surfaces = surface.getMesh().getSurfaces();
Iterator iter = surfaces.iterator();
while (iter.hasNext()) {
|
