Thread: [Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.14,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	TileModellor.java ModelBathModellor2.java 
Log Message:
better tile modellor and bathcabin

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TileModellor.java	24 May 2007 21:41:49 -0000	1.14
--- TileModellor.java	30 May 2007 11:28:48 -0000	1.15
***************
*** 103,107 ****
    private Surface pickSurface() {
      Surface res = null;
!     for (Surface s : space.getSurfaces()) {
        Surface ext = s.getExterior();
        if (ext != null && ext.getOwner().getLevel() < space.getLevel()) {
--- 103,107 ----
    private Surface pickSurface() {
      Surface res = null;
!     for (Surface s : space.getEnvelope()) {
        Surface ext = s.getExterior();
        if (ext != null && ext.getOwner().getLevel() < space.getLevel()) {
***************
*** 116,120 ****
        } else {
          //look for a surface with a funktional space assign that is vertical
!         if (s.getFrontDomain().getType() == Space.FUNCTIONAL &&
              Math.abs(s.normal().getZ()) < 0.0001) {
            res = s;
--- 116,121 ----
        } else {
          //look for a surface with a funktional space assign that is vertical
!         if (res == null && (s.getFrontDomain().getType() == Space.FUNCTIONAL ||
!             s.getBackDomain().getType() == Space.FUNCTIONAL) &&
              Math.abs(s.normal().getZ()) < 0.0001) {
            res = s;
***************
*** 215,223 ****
      Collection<Edge> vertEdges = new LinkedList<Edge>();
      Collection<Vertex> horVerts = new LinkedList<Vertex>();
!     Collection<Vertex> otherVerts = new LinkedList<Vertex>();
      
      long before = System.currentTimeMillis();
      
!     // insert horizontal edges
      if (height > 0) {
        maxY = height / 1000.0;
--- 216,224 ----
      Collection<Edge> vertEdges = new LinkedList<Edge>();
      Collection<Vertex> horVerts = new LinkedList<Vertex>();
!     Collection<Vertex> vertVerts = new LinkedList<Vertex>();
      
      long before = System.currentTimeMillis();
      
!     // find horizontal edges
      if (height > 0) {
        maxY = height / 1000.0;
***************
*** 229,233 ****
      findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, 
          edges, horEdges, horVerts, horizontalAdd);
!     //insert vertical edges
      Vertex localVertical = new Vertex(tileSize.getWidth() / 1000.0 + jointSize / 1000.0, 0, 0);
      Vertex verticalAdd = cs.unTranslate(localVertical).minus(cs.center());
--- 230,234 ----
      findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, 
          edges, horEdges, horVerts, horizontalAdd);
!     //find vertical edges
      Vertex localVertical = new Vertex(tileSize.getWidth() / 1000.0 + jointSize / 1000.0, 0, 0);
      Vertex verticalAdd = cs.unTranslate(localVertical).minus(cs.center());
***************
*** 235,246 ****
                        cs.unTranslate(new Vertex(0, maxY, 0)).minus(verticalAdd));
      findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, 
!         edges, vertEdges, otherVerts, verticalAdd);
      
-     //insert edges and vertices into the model
      List<Vertex> extras = new LinkedList<Vertex>();
      for (Edge e1 : vertEdges) {
        for (Edge e2 : horEdges) {
          Edge inter = e1.intersection(e2);
!         if (inter.getLength() < 0.00001 && 
              e2.coincides(inter.getFrom()) && 
              e1.coincides(inter.getFrom())) {
--- 236,247 ----
                        cs.unTranslate(new Vertex(0, maxY, 0)).minus(verticalAdd));
      findIntersectingEdges(cs, slider, maxX, maxY, minX, minY, 
!         edges, vertEdges, vertVerts, verticalAdd);
      
      List<Vertex> extras = new LinkedList<Vertex>();
      for (Edge e1 : vertEdges) {
        for (Edge e2 : horEdges) {
          Edge inter = e1.intersection(e2);
!         if (inter != null &&
!             inter.getLength() < 0.00001 && 
              e2.coincides(inter.getFrom()) && 
              e1.coincides(inter.getFrom())) {
***************
*** 249,261 ****
        }
      }
-     for (Vertex v : horVerts) {
-       v = net.insert(v);
-     }
      for (Edge e : horEdges) {
        e = net.insert(e);
      }
-     for (Vertex v : otherVerts) {
-       v = net.insert(v);
-     }
      for (Edge e : vertEdges) {
        e = net.insert(e);
--- 250,256 ----
***************
*** 264,267 ****
--- 259,263 ----
        v = net.insert(v);
      }
+     
      long time1 = System.currentTimeMillis();
      log.info("Edge insertsion time : " + (time1 - before));
***************
*** 345,354 ****
    @Override
    public void getAttributes(List<Attribute> l) {
!     l.add(new Attribute("Tilewidth", new Double(tileSize.width)));
!     l.add(new Attribute("Tileheight", new Double(tileSize.height)));
!     l.add(new Attribute("Joint width", new Double(jointSize)));
      l.add(new Attribute("Material", tileColor));
      l.add(new Attribute("Surface", surface));
!     l.add(new Attribute("Setting height", new Double(height)));
    }
    
--- 341,350 ----
    @Override
    public void getAttributes(List<Attribute> l) {
!     l.add(new Attribute("Tilewidth", new Double(tileSize.width / 1000.0)));
!     l.add(new Attribute("Tileheight", new Double(tileSize.height / 1000.0)));
!     l.add(new Attribute("Joint width", new Double(jointSize / 1000.0)));
      l.add(new Attribute("Material", tileColor));
      l.add(new Attribute("Surface", surface));
!     l.add(new Attribute("Setting height", new Double(height / 1000.0)));
    }
    
***************
*** 359,363 ****
      boolean updateNet = false;
      if (a != null) {
!       int width = ((Double)a.getValue()).intValue();
        if (width != tileSize.width) {
          updateNet = true;
--- 355,359 ----
      boolean updateNet = false;
      if (a != null) {
!       int width = (int)(1000 * ((Double)a.getValue()).doubleValue());
        if (width != tileSize.width) {
          updateNet = true;
***************
*** 367,372 ****
      a = attributes.get("Tileheight");
      if (a != null) {
!       int height = ((Double)a.getValue()).intValue();
!       if (height != tileSize.width) {
          updateNet = true;
          tileSize.height = height;
--- 363,368 ----
      a = attributes.get("Tileheight");
      if (a != null) {
!       int height = (int)(1000 * ((Double)a.getValue()).doubleValue());
!       if (height != tileSize.height) {
          updateNet = true;
          tileSize.height = height;
***************
*** 375,379 ****
      a = attributes.get("Joint width");
      if (a != null) {
!       int joint = ((Double)a.getValue()).intValue();
        if (joint != jointSize) {
          updateNet = true;
--- 371,375 ----
      a = attributes.get("Joint width");
      if (a != null) {
!       int joint = (int)(1000 * ((Double)a.getValue()).doubleValue());
        if (joint != jointSize) {
          updateNet = true;
***************
*** 487,492 ****
    @Override
    public void delete() {
!     // TODO Auto-generated method stub
! 
    }
  
--- 483,487 ----
    @Override
    public void delete() {
!     Project.getInstance().removeObserver(this);
    }
  

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ModelBathModellor2.java	24 May 2007 21:41:50 -0000	1.4
--- ModelBathModellor2.java	30 May 2007 11:28:48 -0000	1.5
***************
*** 71,74 ****
--- 71,76 ----
    private Collection<Space> doorAndWindows = new ArrayList<Space>();
  
+   private Collection<Modellor> insideModellors = new LinkedList<Modellor>();
+ 
    /**
     * the constructor
***************
*** 87,97 ****
      space.setUnion(true);
      coord = Project.getInstance().getActiveCoordinateSystem();
!     width = 2.800;
!     length = 3.200;
!     height = 2.800;
      generateNet();
      space.add(net);
      net.edit();
-     Project.getInstance().addObserver(this);
    }
  
--- 89,98 ----
      space.setUnion(true);
      coord = Project.getInstance().getActiveCoordinateSystem();
!     width = 1.500;
!     length = 1.500;
!     height = 2.600;
      generateNet();
      space.add(net);
      net.edit();
    }
  
***************
*** 169,178 ****
      
      elementWalls();
!     //addTileModellors();
    }
    
    private void addTileModellors() {
      for (Space elem : walls.getElements()) {
!       elem.setModellor(new TileModellor(elem));
      }
    }
--- 170,186 ----
      
      elementWalls();
!     addTileModellors();
    }
    
    private void addTileModellors() {
      for (Space elem : walls.getElements()) {
!       String name = elem.getName();
!       if (elem.getType() == Space.CONSTRUCTION && 
!           elem.isContainer() && 
!           elem.getName().equals("Tile")) {
!         TileModellor tm = new TileModellor(elem);
!         insideModellors .add(tm);
!         elem.setModellor(tm);
!       }
      }
    }
***************
*** 677,680 ****
--- 685,691 ----
        bath.clear();
        ceiling.clear();
+       for (Modellor m : insideModellors) {
+         m.delete();
+       }
      }
      doorAndWindows.clear();

Thread: [Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.14,

bprocessor-commit