[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.99, 1.100

[Nikolaj B. <nbr...@us...>]

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

Modified Files:
	Surface.java 
Log Message:
Area calculations now with and with out holes

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** Surface.java	9 Jun 2006 09:49:56 -0000	1.99
--- Surface.java	20 Jun 2006 08:14:55 -0000	1.100
***************
*** 1396,1408 ****
        }
      }
-     res.add(new Attribute("Area", new Double(getArea()), false));
      if (isInner()) {
        res.add(new Attribute("Exterior", getExterior(), false));     
      } 
      if (holes != null) {
        Iterator iterElems = holes.iterator(); 
        while (iterElems.hasNext()) {
!         res.add(new Attribute("Hole", iterElems.next(), false));
        }
      }
      return res;
--- 1396,1413 ----
        }
      }
      if (isInner()) {
        res.add(new Attribute("Exterior", getExterior(), false));     
      } 
      if (holes != null) {
+       double holeArea = 0;
        Iterator iterElems = holes.iterator(); 
        while (iterElems.hasNext()) {
!         Surface s = (Surface) iterElems.next();
!         res.add(new Attribute("Hole", s, false));
!         holeArea = holeArea + s.getArea();
        }
+ 
+       res.add(new Attribute("Total area", new Double(getArea()), false));
+       res.add(new Attribute("Area", new Double(getArea() - holeArea), false));
      }
      return res;