[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Space.java, 1.188, 1.189

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

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

Modified Files:
	Space.java 
Log Message:
changed unions in the model to be on same level as their owner

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -d -r1.188 -r1.189
*** Space.java	29 Oct 2007 18:10:15 -0000	1.188
--- Space.java	31 Oct 2007 11:33:23 -0000	1.189
***************
*** 248,252 ****
      s.add(new CoordinateSystem(new Vertex(0, 0, 0)));
      s.setUnion(true);
!     s.setLevel(level--);
      return s;
    }
--- 248,252 ----
      s.add(new CoordinateSystem(new Vertex(0, 0, 0)));
      s.setUnion(true);
!     s.setLevel(level);
      return s;
    }
***************
*** 1299,1302 ****
--- 1299,1303 ----
      ArrayList<Attribute> res = new ArrayList<Attribute>();
      res.add(new Attribute("Name", getName()));
+     res.add(new Attribute("Level", "" + getLevel()));
      if (getOwner() == Project.getInstance().world()) {
        if (isConstructionSpace()) { 
***************
*** 1384,1388 ****
        break;
      }
!     return res.concat(Space.levelToString(level));
    }
    
--- 1385,1390 ----
        break;
      }
!     int lvl = level - (isUnion() ? 1 : 0);
!     return res.concat(Space.levelToString(lvl));
    }
    
***************
*** 1873,1876 ****
--- 1875,1887 ----
      Vertex p2 = new Vertex(xmax, ymax, zmin);
      Vertex p1 = new Vertex(xmax, ymin, zmin);
+     if (isUnion()) {
+       CoordinateSystem cs = getCoordinateSystems().iterator().next();
+       if (cs != null) {
+         p4 = cs.translate(p4);
+         p3 = cs.translate(p3);
+         p2 = cs.translate(p2);
+         p1 = cs.translate(p1);
+       }
+     }
      getOwner().add(p1);
      getOwner().add(p2);