[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor InnerWallModellor.java, 1.18, 1.19 ModelBathModellor2.java, 1.18, 1.19 TileModellor.java, 1.30, 1.31 WallPartingModellor.java, 1.9, 1.10

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

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

Modified Files:
	InnerWallModellor.java ModelBathModellor2.java 
	TileModellor.java WallPartingModellor.java 
Log Message:
New files

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** TileModellor.java	3 Nov 2008 13:14:09 -0000	1.30
--- TileModellor.java	25 Jun 2009 20:29:33 -0000	1.31
***************
*** 171,175 ****
      Surface outer = surface.copyall(space);
      Collection<Surface> surs = net.getSurfaces();
-     int lvl = space.getLevel() + 1;
      double offset = -(double)jointSize / 2000;
      for (Surface s : surs) {
--- 171,174 ----

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WallPartingModellor.java	3 Nov 2008 13:14:09 -0000	1.9
--- WallPartingModellor.java	25 Jun 2009 20:29:33 -0000	1.10
***************
*** 58,66 ****
    }
  
-   private Map<Vertex, Vertex> findDirection() {
-     
-     return null;
-   }
-   
    /**
     * {@inheritDoc}
--- 58,61 ----

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** InnerWallModellor.java	3 Nov 2008 13:14:09 -0000	1.18
--- InnerWallModellor.java	25 Jun 2009 20:29:33 -0000	1.19
***************
*** 21,25 ****
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
- import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
--- 21,24 ----
***************
*** 619,637 ****
    
    /**
-    * Checks if all of a net is in a given plane.
-    * @param net the net
-    * @param p the plane
-    * @return true if all geometry in the net is in the plane, false otherwise
-    */
-   private boolean getPlaneCheck(Container net, Plane p) {
-     for (Edge e : net.getEdges()) {
-       if (!p.contains(e)) {
-         return false;
-       }
-     }
-     return true;
-   }
- 
-   /**
     * For setting attributes. If the candidate is different from the current
     * the space is cleared, the build flag is set and the candidate is returned. Otherwise
--- 618,621 ----

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ModelBathModellor2.java	3 Nov 2008 14:26:18 -0000	1.18
--- ModelBathModellor2.java	25 Jun 2009 20:29:33 -0000	1.19
***************
*** 175,197 ****
    }
    
-   private void addTileModellors() {
-     for (Space elem : walls.getElements()) {
-       if (elem.getType() == Container.CONSTRUCTION && 
-           elem.isContainer() && 
-           elem.getName().equals("Tile")) {
-         TileModellor tm = new TileModellor((Container) elem);
-         insideModellors .add(tm);
-         elem.setModellor(tm);
-       }
-     }
-   }
- 
-   private void elementWalls2() {
-     WallPartingModellor wpm = new WallPartingModellor(walls, net);
-     
-     walls.setModellor(wpm);
-     wpm.update(walls);
-   }
-   
    /**
     * Part the walls space into elements
--- 175,178 ----
***************
*** 365,369 ****
      // copy doors and windows in
      for (Container spc : doorAndWindows) {
-       double maxDist = 0;
        Surface inner = null;
        for (Surface s : spc.getEnvelope()) {
--- 346,349 ----
***************
*** 518,522 ****
      bathcabin.setBackDomain(bath);
      
-     Vertex center = s.center();  
      Collection<Edge> remain = new ArrayList<Edge>(net.getEdges());
      remain.removeAll(s.getEdges());
--- 498,501 ----