[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model CoordinateSystem.java, 1.51, 1.52

[rimestad <rim...@us...>]

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

Modified Files:
	CoordinateSystem.java 
Log Message:
made untranslate take a boolean telling if it should alter the given geometry or copy it

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** CoordinateSystem.java	7 May 2007 13:32:05 -0000	1.51
--- CoordinateSystem.java	30 May 2007 17:27:22 -0000	1.52
***************
*** 11,15 ****
  import java.util.Collection;
  import java.util.HashMap;
- import java.util.Iterator;
  import java.util.LinkedList;
  import java.util.List;
--- 11,14 ----
***************
*** 431,437 ****
     * the global coordinate system
     * @param vertex The vertex to un-translate
     * @return The un-translated vertex
     */
!   public Vertex unTranslate(Vertex vertex) {
      Vertex ii = i.copy();
      ii.scale(vertex.getX());
--- 430,437 ----
     * the global coordinate system
     * @param vertex The vertex to un-translate
+    * @param modify True if the existing vertex should be modified false otherwise
     * @return The un-translated vertex
     */
!   public Vertex unTranslate(Vertex vertex, boolean modify) {
      Vertex ii = i.copy();
      ii.scale(vertex.getX());
***************
*** 440,444 ****
      Vertex nn = n.copy();
      nn.scale(vertex.getZ());
!     return getOrigin().add(ii).add(jj).add(nn);
    }
    
--- 440,461 ----
      Vertex nn = n.copy();
      nn.scale(vertex.getZ());
!     Vertex tmp = getOrigin().add(ii).add(jj).add(nn);
!     if (modify) {
!       vertex.setX(tmp.getX());
!       vertex.setY(tmp.getY());
!       vertex.setZ(tmp.getZ());
!       tmp = vertex;
!     }
!     return tmp;
!   }
!   
!   /**
!    * Return the vertex translated from the CoordinateSystem to
!    * the global coordinate system
!    * @param vertex The vertex to un-translate
!    * @return The un-translated vertex
!    */
!   public Vertex unTranslate(Vertex vertex) {
!     return unTranslate(vertex, false);
    }
    
***************
*** 448,456 ****
     * @return The translated list
     */
!   public List translate(List vertices) {
!     List result = new ArrayList();
!     Iterator iter = vertices.iterator();
!     while (iter.hasNext()) {
!       Vertex current = (Vertex) iter.next();
        result.add(translate(current));
      }
--- 465,471 ----
     * @return The translated list
     */
!   public List<Vertex> translate(List<Vertex> vertices) {
!     List<Vertex> result = new ArrayList<Vertex>();
!     for (Vertex current : vertices) {
        result.add(translate(current));
      }
***************
*** 461,470 ****
     * 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) {
!       result.add(unTranslate(current));
      }
      return result;
--- 476,486 ----
     * Untranslate all vertices in the list
     * @param vertices The list of vertices
+    * @param modify true if the existing vertexes should be kept false if they should be copied
     * @return The untranslated list
     */
!   public List<Vertex> unTranslate(Collection<Vertex> vertices, boolean modify) {
      List<Vertex> result = new ArrayList<Vertex>();
      for (Vertex current : vertices) {
!       result.add(unTranslate(current, modify));
      }
      return result;