[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Item.java, 1.2, 1.3 Grid.java, 1.9, 1.10 Persistence.java, 1.83, 1.84

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9185/src/net/sourceforge/bprocessor/model

Modified Files:
	Item.java Grid.java Persistence.java 
Log Message:
Grid

Index: Item.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Item.java	29 Jun 2009 10:57:45 -0000	1.2
--- Item.java	18 Sep 2009 09:09:06 -0000	1.3
***************
*** 532,535 ****
--- 532,536 ----
          setName((String)a.getValue());
        } else  if (a.getName().equals("Classification")) {
+         System.out.println("setting classification:");
          setClassification(((Classification)a.getValue()));
        } else  if (a.getName().equals("Type")) {
***************
*** 615,619 ****
      }
      res.add(new Attribute("Material", new Reference(material(), materials)));
-     res.add(new Attribute("Euler", Double.valueOf(eulerCharacteristic())));
      res.add(new Attribute("Closed", Boolean.valueOf(closed())));
      res.add(new Attribute("Description", getDescription()));
--- 616,619 ----

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** Persistence.java	9 Sep 2009 10:31:00 -0000	1.83
--- Persistence.java	18 Sep 2009 09:09:06 -0000	1.84
***************
*** 577,581 ****
      res.setActive(xml.isActive());
      res.setDistance(xml.getDistance());
!     res.setWidth(xml.getSize());
      res.setId(xml.getProgid());
      mapper.put(xml.getId(), res);
--- 577,591 ----
      res.setActive(xml.isActive());
      res.setDistance(xml.getDistance());
!     
!     double size = xml.getSize();
!     if (size > 0.0) {
!       res.setWidth(size);
!       res.setHeight(size);
!     } else {
!       double width = xml.getWidth();
!       double height = xml.getHeight();
!       res.setWidth(width);
!       res.setHeight(height);
!     }
      res.setId(xml.getProgid());
      mapper.put(xml.getId(), res);
***************
*** 1269,1274 ****
      xml.setActive(grid.isActive());
      xml.setDistance((float) grid.getDistance());
!     xml.setSize((float) grid.getWidth());
!     
      xml.setVertex(externalizeVertex(grid.getOrigin(), new HashMap()));
      
--- 1279,1284 ----
      xml.setActive(grid.isActive());
      xml.setDistance((float) grid.getDistance());
!     xml.setWidth((float) grid.getWidth());
!     xml.setHeight((float) grid.getHeight());
      xml.setVertex(externalizeVertex(grid.getOrigin(), new HashMap()));
      

Index: Grid.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Grid.java	9 Sep 2009 12:51:32 -0000	1.9
--- Grid.java	18 Sep 2009 09:09:06 -0000	1.10
***************
*** 173,178 ****
        double h = getHeight();
        double d = getDistance();
!       int n = (int) Math.round((w + d) / d);
!       int m = (int) Math.round((h + d) / d);
        Vertex from = origin.copy();
        for (int k = 0; k < n; k++) {
--- 173,178 ----
        double h = getHeight();
        double d = getDistance();
!       int n = (int) Math.round((w / d) + 0.5);
!       int m = (int) Math.round((h / d) + 0.5);
        Vertex from = origin.copy();
        for (int k = 0; k < n; k++) {