bprocessor-commit

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

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

Modified Files:
	Command.java 
Log Message:
scale

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Command.java	22 Oct 2007 06:55:09 -0000	1.8
--- Command.java	22 Oct 2007 11:02:59 -0000	1.9
***************
*** 228,234 ****
     */
    public static class Scale extends Command {
!     private Collection<Vertex> vertices;
!     private Vertex origin;
!     private Vertex normal;
      
      /**
--- 228,233 ----
     */
    public static class Scale extends Command {
!     private List<Vertex> vertices;
!     private CoordinateSystem system;
      
      /**
***************
*** 238,248 ****
       * @param normal vertex
       */
!     public Scale(Collection<Vertex> vertices, Vertex origin, Vertex normal) {
!       this.vertices = vertices;
!       this.origin = origin;
!       this.normal = normal;
        parameters.put("vertices", vertices);
!       parameters.put("origin", origin);
!       parameters.put("normal", normal);
        parameters.put("scale", 1.0);
      }
--- 237,245 ----
       * @param normal vertex
       */
!     public Scale(Collection<Vertex> vertices, CoordinateSystem system) {
!       this.vertices = new LinkedList(vertices);
!       this.system = system;
        parameters.put("vertices", vertices);
!       parameters.put("system", system);
        parameters.put("scale", 1.0);
      }
***************
*** 251,256 ****
      @Override
      public void evaluate() {
!       // TODO Auto-generated method stub
!       
      }
    }
--- 248,263 ----
      @Override
      public void evaluate() {
!       List<Vertex> locals = system.translate(vertices);
!       double scale = parameters.getDouble("scale");
!       for (Vertex current : locals) {
!         current.scale(scale);
!       }
!       locals = system.unTranslate(locals, false);
!       for (int i = 0; i < locals.size(); i++) {
!         Vertex v1 = vertices.get(i);
!         Vertex v2 = locals.get(i);
!         v1.set(v2);
!       }
!       Project.getInstance().changed(Project.getInstance());
      }
    }