[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java,1.41,1.42 Mesh.java,1.9,1.10

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22657/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java Mesh.java 
Log Message:
Moved findEdge and findByLocation to mesh

Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Mesh.java	3 Feb 2006 13:01:49 -0000	1.9
--- Mesh.java	17 Mar 2006 09:04:53 -0000	1.10
***************
*** 11,14 ****
--- 11,15 ----
  import java.util.Collections;
  import java.util.HashMap;
+ import java.util.HashSet;
  import java.util.Iterator;
  import java.util.LinkedList;
***************
*** 375,377 ****
--- 376,419 ----
    }
  
+   /**
+    * Find vertex based upon location and delta
+    * @param x The x coordinate
+    * @param y The y coordinate
+    * @param z The z coordinate
+    * @param delta The delta value
+    * @return The vertexs
+    */
+   public Set findByLocation(double x, double y, double z, double delta) {
+     Set result = new HashSet();
+     Collection vertices = getVertices();
+     Iterator iter = vertices.iterator();
+     double limit = delta;
+     Vertex tester = new Vertex(x, y, z);
+     while (iter.hasNext()) {
+       Vertex current = (Vertex) iter.next();
+       double distance = current.distance(tester);
+       if (distance <= limit) {
+         result.add(current);
+       }
+     }
+     return result;
+   }
+   
+   /**
+    * Find set of edges that coincides with the vertex
+    * @param vertex The vertex
+    * @return The set of edges
+    */
+   public Set findEdge(Vertex vertex) {
+     Set result = new HashSet();
+     Collection edges = getEdges();
+     Iterator iter = edges.iterator();
+     while (iter.hasNext()) {
+       Edge current = (Edge) iter.next();
+       if (current.coincides(vertex)) {
+         result.add(current);
+       }
+     }
+     return result;
+   }
  }

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Project.java	8 Mar 2006 14:22:51 -0000	1.41
--- Project.java	17 Mar 2006 09:04:53 -0000	1.42
***************
*** 503,519 ****
     */
    public Set findByLocation(double x, double y, double z, double delta) {
!     Set result = new HashSet();
!     Collection vertices = getVertices();
!     Iterator iter = vertices.iterator();
!     double limit = delta;
!     Vertex tester = new Vertex(x, y, z);
!     while (iter.hasNext()) {
!       Vertex current = (Vertex) iter.next();
!       double distance = current.distance(tester);
!       if (distance <= limit) {
!         result.add(current);
!       }
!     }
!     return result;
    }
    
--- 503,507 ----
     */
    public Set findByLocation(double x, double y, double z, double delta) {
!     return mesh.findByLocation(x, y, z, delta);
    }
    
***************
*** 524,537 ****
     */
    public Set findEdge(Vertex vertex) {
!     Set result = new HashSet();
!     Collection edges = getEdges();
!     Iterator iter = edges.iterator();
!     while (iter.hasNext()) {
!       Edge current = (Edge) iter.next();
!       if (current.coincides(vertex)) {
!         result.add(current);
!       }
!     }
!     return result;
    }
    
--- 512,516 ----
     */
    public Set findEdge(Vertex vertex) {
!     return mesh.findEdge(vertex);
    }