Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29796/src/net/sourceforge/bprocessor/model
Modified Files:
Command.java Geometric.java
Log Message:
improved selection logic
Index: Geometric.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometric.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Geometric.java 21 Jan 2008 13:37:25 -0000 1.22
--- Geometric.java 21 Jan 2008 15:12:16 -0000 1.23
***************
*** 41,45 ****
Command.Inverse inv = null;
if (owner != null) {
! inv = new Command.Inverse(new LinkedList(owner.getSurfaces()));
}
--- 41,45 ----
Command.Inverse inv = null;
if (owner != null) {
! inv = new Command.Inverse(owner.mesh());
}
Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Command.java 14 Jan 2008 14:00:27 -0000 1.63
--- Command.java 21 Jan 2008 15:12:16 -0000 1.64
***************
*** 292,295 ****
--- 292,308 ----
/**
+ * Construcs an inverse mapping
+ *
+ * @param surfaces Collection of surfaces
+ * @param edges Collection of edges
+ * @param vertices Collection of vertices
+ */
+ public Inverse(Collection<Surface> surfaces,
+ Collection<Edge> edges,
+ Collection<Vertex> vertices) {
+ initialize(surfaces, edges, vertices);
+ }
+
+ /**
* Constructs an Inverse object, which makes
* it possible to navigate geometry in reverse.
***************
*** 297,304 ****
* @param surfaces Collection of surfaces
*/
! public Inverse(List<Surface> surfaces) {
this.surfaces = surfaces;
! edges = Surface.edges(surfaces);
! vertices = Edge.vertices(edges);
v2e = new HashMap();
--- 310,343 ----
* @param surfaces Collection of surfaces
*/
! public Inverse(Collection<Surface> surfaces) {
! Collection<Edge> edges = Surface.edges(surfaces);
! Collection<Vertex> vertices = Edge.vertices(edges);
! initialize(surfaces, edges, vertices);
! }
!
! /**
! * Constructs this Inverse using objects in the mesh
! * @param mesh Mesh
! */
! public Inverse(Mesh mesh) {
! Collection<Surface> surfaces = mesh.surfaces();
! Collection<Edge> edges = mesh.edges();
! Collection<Vertex> vertices = mesh.vertices();
! initialize(surfaces, edges, vertices);
! }
!
!
! /**
! * Initializes this Inverse
! * @param surfaces Collection of surfaces
! * @param edges Collection of edges
! * @param vertices Collection of vertices
! */
! public void initialize(Collection<Surface> surfaces,
! Collection<Edge> edges,
! Collection<Vertex> vertices) {
this.surfaces = surfaces;
! this.edges = edges;
! this.vertices = vertices;
v2e = new HashMap();
***************
*** 331,335 ****
}
}
-
/**
* Returns the vertices
--- 370,373 ----
|
