[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Translate.java, NONE, 1.1 Rotate.java, NONE, 1.1 Scale.java, NONE, 1.1 Space.java, 1.64, 1.65 Transform.java, 1.2, 1.3

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

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

Modified Files:
	Space.java Transform.java 
Added Files:
	Translate.java Rotate.java Scale.java 
Log Message:
Refactored transform into scale, translate and rotate

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Space.java	19 Sep 2006 09:17:44 -0000	1.64
--- Space.java	19 Sep 2006 10:00:09 -0000	1.65
***************
*** 1211,1215 ****
      Iterator iter = getTransformations().iterator();
      while (iter.hasNext()) {
!       res.add(new Attribute("Transform", iter.next()));
      }
      return res;
--- 1211,1216 ----
      Iterator iter = getTransformations().iterator();
      while (iter.hasNext()) {
!       Transform current = (Transform) iter.next();
!       res.add(new Attribute(current.getGeneralName(), current));
      }
      return res;

Index: Transform.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Transform.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Transform.java	15 Sep 2006 12:06:38 -0000	1.2
--- Transform.java	19 Sep 2006 10:00:09 -0000	1.3
***************
*** 8,46 ****
  package net.sourceforge.bprocessor.model;
  
- import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.List;
- 
  /**
   * Transform
   */
! public class Transform implements Parametric {
!   /** translate x */
!   private double tx;
!   
!   /** translate y */
!   private double ty;
!   
!   /** translate z */
!   private double tz;
!   
!   /** rotate x */
!   private double rx;
!   
!   /** rotate y */
!   private double ry;
!   
!   /** rotate z */
!   private double rz;
!   
!   /** scale x */
!   private double sx;
!   
!   /** scale y */
!   private double sy;
!   
!   /** scale z */
!   private double sz;
!   
    /**
     * Constructor
--- 8,15 ----
  package net.sourceforge.bprocessor.model;
  
  /**
   * Transform
   */
! public abstract class Transform implements Parametric {
    /**
     * Constructor
***************
*** 48,245 ****
    public Transform() {
      super();
-     tx = 0;
-     ty = 0;
-     tz = 0;
-     rx = 0;
-     ry = 0;
-     rz = 0;
-     sx = 1;
-     sy = 1;
-     sz = 1;
    }
! 
!   /**
!    * @param value new value
!    */
!   public void tx(double value) {
!     tx = value;
!   }
!   /**
!    * 
!    * @return tx
!    */
!   public double tx() {
!     return tx;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void ty(double value) {
!     ty = value;
!   }
!   /**
!    * 
!    * @return ty
!    */
!   public double ty() {
!     return ty;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void tz(double value) {
!     tz = value;
!   }
!   /**
!    * 
!    * @return tz
!    */
!   public double tz() {
!     return tz;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void rx(double value) {
!     rx = value;
!   }
!   /**
!    * 
!    * @return rx
!    */
!   public double rx() {
!     return rx;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void ry(double value) {
!     ry = value;
!   }
!   /**
!    * 
!    * @return ry
!    */
!   public double ry() {
!     return ry;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void rz(double value) {
!     rz = value;
!   }
!   /**
!    * 
!    * @return rz
!    */
!   public double rz() {
!     return rz;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void sx(double value) {
!     sx = value;
!   }
!   /**
!    * 
!    * @return sx
!    */
!   public double sx() {
!     return sx;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void sy(double value) {
!     sy = value;
!   }
!   /**
!    * 
!    * @return sy
!    */
!   public double sy() {
!     return sy;
!   }
!   
!   /**
!    * @param value new value
!    */
!   public void sz(double value) {
!     sz = value;
!   }
!   /**
!    * 
!    * @return sz
!    */
!   public double sz() {
!     return sz;
!   }
!   
!   
!   /**
!    * Set attributes
!    * @param attributes List
!    */
!   public void setAttributes(List attributes) {
!     Iterator iter = attributes.iterator();
!     while (iter.hasNext()) {
!       Attribute a = (Attribute)iter.next();
!       if (a.getName().equals("Translate X")) {
!         tx(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Translate Y")) {
!         ty(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Translate Z")) {
!         tz(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Rotate X")) {
!         rx(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Rotate Y")) {
!         ry(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Rotate Z")) {
!         rz(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Scale X")) {
!         sx(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Scale Y")) {
!         sy(((Double)a.getValue()).doubleValue());
!       } else if (a.getName().equals("Scale Z")) {
!         sz(((Double)a.getValue()).doubleValue());
!       }
!     }
!     Project.getInstance().changed(Project.getInstance());
!   }
! 
!   /**
!    * Get attributes
!    * @return List
!    */
!   public List getAttributes() {
!     ArrayList res = new ArrayList();
!     res.add(new Attribute("Translate X", new Double(tx())));
!     res.add(new Attribute("Translate Y", new Double(ty())));
!     res.add(new Attribute("Translate Z", new Double(tz())));
!     res.add(new Attribute("Rotate X", new Double(rx())));
!     res.add(new Attribute("Rotate Y", new Double(ry())));
!     res.add(new Attribute("Rotate Z", new Double(rz())));
!     res.add(new Attribute("Scale X", new Double(sx())));
!     res.add(new Attribute("Scale Y", new Double(sy())));
!     res.add(new Attribute("Scale Z", new Double(sz())));
!     return res;
!   }
! 
    /**
!    * Get display name
!    * @return name
     */
!   public String getGeneralName() {
!     return "Transform";
!   }
! 
  }
--- 17,26 ----
    public Transform() {
      super();
    }
!  
    /**
!    * @param vertex Vertex
!    * @return Vertex
     */
!   public abstract Vertex transform(Vertex vertex);
  }

--- NEW FILE: Scale.java ---
//---------------------------------------------------------------------------------
// $Id: Scale.java,v 1.1 2006/09/19 10:00:09 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * Scale
 */
public class Scale extends Transform {

  /** scale x */
  private double sx;
  
  /** scale y */
  private double sy;
  
  /** scale z */
  private double sz;
  
  /**
   * Constructor
   */
  public Scale() {
    super();
    sx = 1;
    sy = 1;
    sz = 1;
  }
  
  /**
   * @param value new value
   */
  public void sx(double value) {
    sx = value;
  }
  /**
   * 
   * @return sx
   */
  public double sx() {
    return sx;
  }
  
  /**
   * @param value new value
   */
  public void sy(double value) {
    sy = value;
  }
  /**
   * 
   * @return sy
   */
  public double sy() {
    return sy;
  }
  
  /**
   * @param value new value
   */
  public void sz(double value) {
    sz = value;
  }
  /**
   * 
   * @return sz
   */
  public double sz() {
    return sz;
  }
  
  /**
   * Set attributes
   * @param attributes List
   */
  public void setAttributes(List attributes) {
    Iterator iter = attributes.iterator();
    while (iter.hasNext()) {
      Attribute a = (Attribute)iter.next();
      if (a.getName().equals("Scale X")) {
        sx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Scale Y")) {
        sy(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Scale Z")) {
        sz(((Double)a.getValue()).doubleValue());
      }
    }
    Project.getInstance().changed(Project.getInstance());
  }

  /**
   * Get attributes
   * @return List
   */
  public List getAttributes() {
    ArrayList res = new ArrayList();
    res.add(new Attribute("Scale X", new Double(sx())));
    res.add(new Attribute("Scale Y", new Double(sy())));
    res.add(new Attribute("Scale Z", new Double(sz())));
    return res;
  }

  /**
   * @param vertex Vertex
   * @return Vertex
   */
  public Vertex transform(Vertex vertex) {
    return vertex;
  }
  
  /**
   * Get display name
   * @return name
   */
  public String getGeneralName() {
    return "Scale";
  }
}

--- NEW FILE: Translate.java ---
//---------------------------------------------------------------------------------
// $Id: Translate.java,v 1.1 2006/09/19 10:00:09 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * Translate
 */
public class Translate extends Transform {

  /** translate x */
  private double tx;
  
  /** translate y */
  private double ty;
  
  /** translate z */
  private double tz;
  
  /**
   * Constructor
   */
  public Translate() {
    super();
    tx = 0;
    ty = 0;
    tz = 0;
  }

  /**
   * @param value new value
   */
  public void tx(double value) {
    tx = value;
  }
  /**
   * 
   * @return tx
   */
  public double tx() {
    return tx;
  }
  
  /**
   * @param value new value
   */
  public void ty(double value) {
    ty = value;
  }
  /**
   * 
   * @return ty
   */
  public double ty() {
    return ty;
  }
  
  /**
   * @param value new value
   */
  public void tz(double value) {
    tz = value;
  }
  /**
   * 
   * @return tz
   */
  public double tz() {
    return tz;
  }
  
  /**
   * Set attributes
   * @param attributes List
   */
  public void setAttributes(List attributes) {
    Iterator iter = attributes.iterator();
    while (iter.hasNext()) {
      Attribute a = (Attribute)iter.next();
      if (a.getName().equals("Translate X")) {
        tx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Translate Y")) {
        ty(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Translate Z")) {
        tz(((Double)a.getValue()).doubleValue());
      }
    }
    Project.getInstance().changed(Project.getInstance());
  }

  /**
   * Get attributes
   * @return List
   */
  public List getAttributes() {
    ArrayList res = new ArrayList();
    res.add(new Attribute("Translate X", new Double(tx())));
    res.add(new Attribute("Translate Y", new Double(ty())));
    res.add(new Attribute("Translate Z", new Double(tz())));
    return res;
  }
  
  /**
   * @param vertex Vertex
   * @return Vertex
   */
  public Vertex transform(Vertex vertex) {
    return vertex;
  }
  
  /**
   * Get display name
   * @return name
   */
  public String getGeneralName() {
    return "Translate";
  }
}

--- NEW FILE: Rotate.java ---
//---------------------------------------------------------------------------------
// $Id: Rotate.java,v 1.1 2006/09/19 10:00:09 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * Rotate
 */
public class Rotate extends Transform {

  /** rotate x */
  private double rx;
  
  /** rotate y */
  private double ry;
  
  /** rotate z */
  private double rz;

  /**
   * Constructor
   */
  public Rotate() {
    super();
    rx = 0;
    ry = 0;
    rz = 0;
  }
  
  /**
   * @param value new value
   */
  public void rx(double value) {
    rx = value;
  }
  /**
   * 
   * @return rx
   */
  public double rx() {
    return rx;
  }
  
  /**
   * @param value new value
   */
  public void ry(double value) {
    ry = value;
  }
  /**
   * 
   * @return ry
   */
  public double ry() {
    return ry;
  }
  
  /**
   * @param value new value
   */
  public void rz(double value) {
    rz = value;
  }
  /**
   * 
   * @return rz
   */
  public double rz() {
    return rz;
  }
  
  /**
   * Set attributes
   * @param attributes List
   */
  public void setAttributes(List attributes) {
    Iterator iter = attributes.iterator();
    while (iter.hasNext()) {
      Attribute a = (Attribute)iter.next();
      if (a.getName().equals("Rotate X")) {
        rx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Rotate Y")) {
        ry(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Rotate Z")) {
        rz(((Double)a.getValue()).doubleValue());
      }
    }
    Project.getInstance().changed(Project.getInstance());
  }

  /**
   * Get attributes
   * @return List
   */
  public List getAttributes() {
    ArrayList res = new ArrayList();
    res.add(new Attribute("Rotate X", new Double(rx())));
    res.add(new Attribute("Rotate Y", new Double(ry())));
    res.add(new Attribute("Rotate Z", new Double(rz())));
    return res;
  }
  

  /**
   * @param vertex Vertex
   * @return Vertex
   */
  public Vertex transform(Vertex vertex) {
    return vertex;
  }
  
  /**
   * Get display name
   * @return name
   */
  public String getGeneralName() {
    return "Rotate";
  }
}