[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.55, 1.56 Space.java, 1.222, 1.223

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

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

Modified Files:
	Command.java Space.java 
Log Message:
more cleanup

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.222
retrieving revision 1.223
diff -C2 -d -r1.222 -r1.223
*** Space.java	12 Dec 2007 15:06:55 -0000	1.222
--- Space.java	12 Dec 2007 16:11:49 -0000	1.223
***************
*** 1443,1477 ****
    public void computeEnvelope() {
      Collection vertices = collectInterior();
!     double xmin = Double.MAX_VALUE;
!     double xmax = Double.MIN_VALUE;
!     double ymin = Double.MAX_VALUE;
!     double ymax = Double.MIN_VALUE;
!     double zmin = Double.MAX_VALUE;
!     double zmax = Double.MIN_VALUE;
!     Iterator iter = vertices.iterator();
!     while (iter.hasNext()) {
!       Vertex current = (Vertex) iter.next();
!       double x = current.getX();
!       double y = current.getY();
!       double z = current.getZ();
!       if (x < xmin) {
!         xmin = x;
!       }
!       if (x > xmax) {
!         xmax = x;
!       }
!       if (y < ymin) {
!         ymin = y;
!       }
!       if (y > ymax) {
!         ymax = y;
!       }
!       if (z < zmin) {
!         zmin = z;
!       }
!       if (z > zmax) {
!         zmax = z;
!       }
!     }
      Vertex p4 = new Vertex(xmin, ymin, zmin);
      Vertex p3 = new Vertex (xmin, ymax, zmin);
--- 1443,1455 ----
    public void computeEnvelope() {
      Collection vertices = collectInterior();
!     Command.BoundingBox box = new Command.BoundingBox(vertices);
!     
!     double xmin = box.xmin().getX();
!     double xmax = box.xmax().getX();
!     double ymin = box.ymin().getY();
!     double ymax = box.ymax().getY();
!     double zmin = box.zmin().getZ();
!     double zmax = box.zmax().getZ();
!     
      Vertex p4 = new Vertex(xmin, ymin, zmin);
      Vertex p3 = new Vertex (xmin, ymax, zmin);

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Command.java	12 Dec 2007 15:06:55 -0000	1.55
--- Command.java	12 Dec 2007 16:11:49 -0000	1.56
***************
*** 1636,1657 ****
        system.translateIt(vertices);
        
!       double xmin = Double.MAX_VALUE;
!       double xmax = Double.MIN_VALUE;
!       double ymin = Double.MAX_VALUE;
!       double ymax = Double.MIN_VALUE;
!       for (Vertex current : vertices) {
!         if (current.getX() < xmin) {
!           xmin = current.getX();
!         }
!         if (current.getX() > xmax) {
!           xmax = current.getX();
!         }
!         if (current.getY() < ymin) {
!           ymin = current.getY();
!         }
!         if (current.getY() > ymax) {
!           ymax = current.getY();
!         }
!       }
        
        double width = xmax - xmin;
--- 1636,1644 ----
        system.translateIt(vertices);
        
!       BoundingBox box = new BoundingBox(vertices);
!       double xmin = box.xmin().getX();
!       double xmax = box.xmax().getX();
!       double ymin = box.ymin().getY();
!       double ymax = box.ymax().getY();
        
        double width = xmax - xmin;
***************
*** 1737,1760 ****
        
        List<Vertex> vertices = Offset.vertices(contour);
!       List<Vertex> locals = system.translate(vertices);
        
!       double xmin = Double.MAX_VALUE;
!       double xmax = Double.MIN_VALUE;
!       double ymin = Double.MAX_VALUE;
!       double ymax = Double.MIN_VALUE;
!       for (Vertex current : locals) {
!         if (current.getX() < xmin) {
!           xmin = current.getX();
!         }
!         if (current.getX() > xmax) {
!           xmax = current.getX();
!         }
!         if (current.getY() < ymin) {
!           ymin = current.getY();
!         }
!         if (current.getY() > ymax) {
!           ymax = current.getY();
!         }
!       }
        
        double width = xmax - xmin;
--- 1724,1734 ----
        
        List<Vertex> vertices = Offset.vertices(contour);
!       system.translateIt(vertices);
        
!       BoundingBox box = new BoundingBox(vertices);
!       double xmin = box.xmin().getX();
!       double xmax = box.xmax().getX();
!       double ymin = box.ymin().getY();
!       double ymax = box.ymax().getY();
        
        double width = xmax - xmin;