[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.67, 1.68 Command.java, 1.51, 1.52 Project.java, 1.148, 1.149 CoordinateSystem.java, 1.69, 1.70

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

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

Modified Files:
	Geometry.java Command.java Project.java CoordinateSystem.java 
Log Message:
CoordinateSystem.translateIt/unTranslateIt translates in place

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Command.java	11 Dec 2007 14:49:01 -0000	1.51
--- Command.java	11 Dec 2007 15:14:13 -0000	1.52
***************
*** 965,983 ****
      @Override
      public void evaluate() {
!       List<Vertex> locals = system.translate(vertices);
        double sx = parameters.getDouble("scale x");
        double sy = parameters.getDouble("scale y");
        double sz = parameters.getDouble("scale z");
!       for (Vertex current : locals) {
          current.setX(current.getX() * sx);
          current.setY(current.getY() * sy);
          current.setZ(current.getZ() * sz);
        }
!       locals = system.unTranslate(locals);
!       for (int i = 0; i < locals.size(); i++) {
!         Vertex v1 = vertices.get(i);
!         Vertex v2 = locals.get(i);
!         v1.set(v2);
!         v1.update();
        }
      }
--- 965,980 ----
      @Override
      public void evaluate() {
!       system.translateIt(vertices);
        double sx = parameters.getDouble("scale x");
        double sy = parameters.getDouble("scale y");
        double sz = parameters.getDouble("scale z");
!       for (Vertex current : vertices) {
          current.setX(current.getX() * sx);
          current.setY(current.getY() * sy);
          current.setZ(current.getZ() * sz);
        }
!       system.unTranslateIt(vertices);
!       for (Vertex current : vertices) {
!         current.update();
        }
      }
***************
*** 1009,1030 ****
      @Override
      public void evaluate() {
!       
!       List<Vertex> locals = system.translate(vertices);
        double sx = parameters.getDouble("translate x");
        double sy = parameters.getDouble("translate y");
        double sz = parameters.getDouble("translate z");
        
!       System.out.println("translate " + sx + ", " + sy + ", " + sz);
!       for (Vertex current : locals) {
          current.setX(current.getX() + sx);
          current.setY(current.getY() + sy);
          current.setZ(current.getZ() + sz);
        }
!       locals = system.unTranslate(locals);
!       for (int i = 0; i < locals.size(); i++) {
!         Vertex v1 = vertices.get(i);
!         Vertex v2 = locals.get(i);
!         v1.set(v2);
!         v1.update();
        }
        Project.getInstance().changed(Project.getInstance());
--- 1006,1022 ----
      @Override
      public void evaluate() {
!       system.translateIt(vertices);
        double sx = parameters.getDouble("translate x");
        double sy = parameters.getDouble("translate y");
        double sz = parameters.getDouble("translate z");
        
!       for (Vertex current : vertices) {
          current.setX(current.getX() + sx);
          current.setY(current.getY() + sy);
          current.setZ(current.getZ() + sz);
        }
!       system.unTranslateIt(vertices);
!       for (Vertex current : vertices) {
!         current.update();
        }
        Project.getInstance().changed(Project.getInstance());
***************
*** 1055,1072 ****
      @Override
      public void evaluate() {
!       List<Vertex> locals = system.translate(vertices);
        double angle = parameters.getDouble("angle");
        AxisRotate rotate = new AxisRotate();
        rotate.angle(angle);
!       for (Vertex current : locals) {
          Vertex rotated = rotate.transform(current);
          current.set(rotated);
        }
!       locals = system.unTranslate(locals);
!       for (int i = 0; i < locals.size(); i++) {
!         Vertex v1 = vertices.get(i);
!         Vertex v2 = locals.get(i);
!         v1.set(v2);
!         v1.update();
        }
        Project.getInstance().changed(Project.getInstance());
--- 1047,1061 ----
      @Override
      public void evaluate() {
!       system.translateIt(vertices);
        double angle = parameters.getDouble("angle");
        AxisRotate rotate = new AxisRotate();
        rotate.angle(angle);
!       for (Vertex current : vertices) {
          Vertex rotated = rotate.transform(current);
          current.set(rotated);
        }
!       system.unTranslateIt(vertices);
!       for (Vertex current : vertices) {
!         current.update();
        }
        Project.getInstance().changed(Project.getInstance());
***************
*** 1664,1673 ****
        
        List<Vertex> vertices = new LinkedList(Edge.vertices(contour));
!       List<Vertex> locals = system.translate(vertices);
!       for (int i = 0; i < vertices.size(); i++) {
!         Vertex current = vertices.get(i);
!         Vertex local = locals.get(i);
!         current.set(local);
!       }
        
        double xmin = Double.MAX_VALUE;
--- 1653,1657 ----
        
        List<Vertex> vertices = new LinkedList(Edge.vertices(contour));
!       system.translateIt(vertices);
        
        double xmin = Double.MAX_VALUE;
***************
*** 1675,1679 ****
        double ymin = Double.MAX_VALUE;
        double ymax = Double.MIN_VALUE;
!       for (Vertex current : locals) {
          if (current.getX() < xmin) {
            xmin = current.getX();
--- 1659,1663 ----
        double ymin = Double.MAX_VALUE;
        double ymax = Double.MIN_VALUE;
!       for (Vertex current : vertices) {
          if (current.getX() < xmin) {
            xmin = current.getX();
***************
*** 1742,1763 ****
        }
        
!       {
!         List<Vertex> verts = new ArrayList(Edge.vertices(verticals));
!         List<Vertex> globals = system.unTranslate(verts);
!         for (int i = 0; i < verts.size(); i++) {
!           Vertex current = verts.get(i);
!           Vertex global = globals.get(i);
!           current.set(global);
!         }
!       }
!       {
!         List<Vertex> verts = new ArrayList(Edge.vertices(contour));
!         List<Vertex> globals = system.unTranslate(verts);
!         for (int i = 0; i < verts.size(); i++) {
!           Vertex current = verts.get(i);
!           Vertex global = globals.get(i);
!           current.set(global);
!         }
!       }
        Geometry.insertEdges(net, contour);
        Geometry.insertEdges(net, verticals);
--- 1726,1731 ----
        }
        
!       system.unTranslateIt(Edge.vertices(verticals));
!       system.unTranslateIt(Edge.vertices(contour));
        Geometry.insertEdges(net, contour);
        Geometry.insertEdges(net, verticals);

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** Geometry.java	11 Dec 2007 14:49:01 -0000	1.67
--- Geometry.java	11 Dec 2007 15:14:13 -0000	1.68
***************
*** 991,1005 ****
    public static void unTranslateGeometry(Collection<? extends Geometric> geometry, 
        CoordinateSystem system) {
!     List<Vertex> vertices = new LinkedList<Vertex>(collect(geometry));
!     List<Vertex> unTranslatedVertices = system.unTranslate(vertices);
!     Iterator it = vertices.iterator();
!     Iterator unTranslatedIt = unTranslatedVertices.iterator();
!     while (it.hasNext() && unTranslatedIt.hasNext()) {
!       Vertex v = (Vertex)it.next();
!       Vertex vUnTranslated = (Vertex)unTranslatedIt.next();
!       v.setX(vUnTranslated.getX());
!       v.setY(vUnTranslated.getY());
!       v.setZ(vUnTranslated.getZ());     
!     }
    }
    
--- 991,995 ----
    public static void unTranslateGeometry(Collection<? extends Geometric> geometry, 
        CoordinateSystem system) {
!     system.unTranslateIt(collect(geometry));
    }
    

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** CoordinateSystem.java	11 Dec 2007 14:49:01 -0000	1.69
--- CoordinateSystem.java	11 Dec 2007 15:14:13 -0000	1.70
***************
*** 527,535 ****
    
    /**
     * Untranslate all vertices in the list
     * @param vertices The list of vertices
     * @return The untranslated list
     */
!   public List<Vertex> unTranslate(Collection<Vertex> vertices) {
      List<Vertex> result = new ArrayList<Vertex>();
      for (Vertex current : vertices) {
--- 527,545 ----
    
    /**
+    * Translates a collection of vertices in place
+    * @param vertices list of vertices
+    */
+   public void translateIt(Collection<Vertex> vertices) {
+     for (Vertex current : vertices) {
+       current.set(translate(current));
+     }
+   }
+   
+   /**
     * Untranslate all vertices in the list
     * @param vertices The list of vertices
     * @return The untranslated list
     */
!   public List<Vertex> unTranslate(List<Vertex> vertices) {
      List<Vertex> result = new ArrayList<Vertex>();
      for (Vertex current : vertices) {
***************
*** 540,543 ****
--- 550,564 ----
    
    /**
+    * Untranslates a collection of vertices in place
+    * @param vertices collection of vertices
+    */
+   public void unTranslateIt(Collection<Vertex> vertices) {
+     for (Vertex current : vertices) {
+       current.set(unTranslate(current));
+     }
+   }
+   
+   
+   /**
     * Untranslate a surface
     * @param surface the surface

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** Project.java	10 Dec 2007 23:10:04 -0000	1.148
--- Project.java	11 Dec 2007 15:14:13 -0000	1.149
***************
*** 211,215 ****
      currentCamera = new Camera("(Current)", 
          new double[]{6, 3, 2}, 
!         new double[]{7, -12, 16},
          new double[]{0, 0, 1}, Camera.PERSPECTIVE);
    }
--- 211,215 ----
      currentCamera = new Camera("(Current)", 
          new double[]{6, 3, 2}, 
!         new double[]{7, -21, 24},
          new double[]{0, 0, 1}, Camera.PERSPECTIVE);
    }