[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.8, 1.9

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

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

Modified Files:
	TileModellor.java 
Log Message:
now with surface analysis

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TileModellor.java	21 Apr 2007 13:37:12 -0000	1.8
--- TileModellor.java	23 Apr 2007 11:16:53 -0000	1.9
***************
*** 19,22 ****
--- 19,23 ----
  
  import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 25,28 ****
--- 26,30 ----
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
+ import net.sourceforge.bprocessor.model.SurfaceAnalysis;
  import net.sourceforge.bprocessor.model.Vertex;
  
***************
*** 107,113 ****
  
    /**
!    * @param cs
     */
    private void updateNet(CoordinateSystem cs) {
      double maxX = Double.MIN_VALUE, maxY = Double.MIN_VALUE, 
          minX = Double.MAX_VALUE, minY = Double.MAX_VALUE;
--- 109,119 ----
  
    /**
!    * @param cs the coordinatesystem to use as origin
     */
    private void updateNet(CoordinateSystem cs) {
+     if (net == null) {
+       net = new Net("strip");
+     }
+     net.clear();
      double maxX = Double.MIN_VALUE, maxY = Double.MIN_VALUE, 
          minX = Double.MAX_VALUE, minY = Double.MAX_VALUE;
***************
*** 127,133 ****
        }
      }
-     
-     net = new Net("strip");
-     space.add(net);
      surface.copyall(net);
      Collection<Edge> edges = new ArrayList<Edge>(net.getEdges());
--- 133,136 ----
***************
*** 178,182 ****
        net.insert(v);
      }
!     //new SurfaceAnalysis().surfaceAnalysis(net);
    }
  
--- 181,190 ----
        net.insert(v);
      }
!     SurfaceAnalysis sa = new SurfaceAnalysis();
!     Collection<CoordinateSystem> cons = sa.planeAnalysis(net);
!     for (CoordinateSystem coors : cons) {
!       net.add(coors);
!     }
!     sa.surfaceAnalysis(net);
    }