Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26677/src/net/sourceforge/bprocessor/model
Modified Files:
Surface.java
Log Message:
Center of gravity checks for duplicate first and last point
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Surface.java 28 Oct 2005 13:30:11 -0000 1.43
--- Surface.java 13 Nov 2005 11:43:07 -0000 1.44
***************
*** 242,259 ****
List vertices = this.getVertices();
if (vertices.size() > 0) {
! double x = 0;
! double y = 0;
! double z = 0;
! Iterator iter = vertices.iterator();
! while (iter.hasNext()) {
! Vertex current = (Vertex) iter.next();
! x += current.getX();
! y += current.getY();
! z += current.getZ();
}
- x = x / (double) vertices.size();
- y = y / (double) vertices.size();
- z = z / (double) vertices.size();
- return new Vertex("center of " + getName(), x, y, z);
} else {
return null;
--- 242,266 ----
List vertices = this.getVertices();
if (vertices.size() > 0) {
! if (vertices.get(0) == vertices.get(vertices.size() - 1)) {
! vertices.remove(vertices.size() - 1);
! }
! if (vertices.size() > 0) {
! double x = 0;
! double y = 0;
! double z = 0;
! Iterator iter = vertices.iterator();
! while (iter.hasNext()) {
! Vertex current = (Vertex) iter.next();
! x += current.getX();
! y += current.getY();
! z += current.getZ();
! }
! x = x / (double) vertices.size();
! y = y / (double) vertices.size();
! z = z / (double) vertices.size();
! return new Vertex("center of " + getName(), x, y, z);
! } else {
! return null;
}
} else {
return null;
|
