[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.21, 1.22 WindowModellor.java, 1.2, 1.3 WallPartingModellor.java, 1.3, 1.4 InnerWallModellor.java, 1.9, 1.10 ModelBathModellor2.java, 1.9, 1.10 ModelBathModellor.java, 1.6, 1.7 Box.java, 1.3, 1.4

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

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

Modified Files:
	TileModellor.java WindowModellor.java WallPartingModellor.java 
	InnerWallModellor.java ModelBathModellor2.java 
	ModelBathModellor.java Box.java 
Log Message:
simplification of level

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ModelBathModellor2.java	2 Nov 2007 12:11:17 -0000	1.9
--- ModelBathModellor2.java	5 Nov 2007 10:18:50 -0000	1.10
***************
*** 155,165 ****
     */
    private void generateBath() {
!     floor = new Space("Floor", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      space.add(floor);
!     bath = new Space("Bath cabin", Space.FUNCTIONAL, Space.SPACE_LEVEL, true);
      space.add(bath);
!     walls = new Space("Walls", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      space.add(walls);
!     ceiling = new Space("Ceiling", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      space.add(ceiling);
      makeFloor();
--- 155,165 ----
     */
    private void generateBath() {
!     floor = new Space("Floor", Space.CONSTRUCTION, true);
      space.add(floor);
!     bath = new Space("Bath cabin", Space.FUNCTIONAL, true);
      space.add(bath);
!     walls = new Space("Walls", Space.CONSTRUCTION, true);
      space.add(walls);
!     ceiling = new Space("Ceiling", Space.CONSTRUCTION, true);
      space.add(ceiling);
      makeFloor();
***************
*** 290,294 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 290,294 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, true);
        walls.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 309,313 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 309,313 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION, true);
        walls.add(tile);
        if (s.normal().getZ() == 1.0) {
***************
*** 394,398 ****
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = new Space("Door", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
--- 394,398 ----
          if (s.getCurrentValue().equals("Door")) {
            // make a door
!           Space doorSpc = new Space("Door", Space.CONSTRUCTION, true);
            doorAndWindows.add(doorSpc);
            space.add(doorSpc);
***************
*** 437,441 ****
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Space winSpc = new Space("Window", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
            doorAndWindows.add(winSpc);
            space.add(winSpc);
--- 437,441 ----
          } else if (s.getCurrentValue().equals("Window")) {
            //make a window
!           Space winSpc = new Space("Window", Space.CONSTRUCTION, true);
            doorAndWindows.add(winSpc);
            space.add(winSpc);
***************
*** 665,669 ****
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-union", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
        bath.setUnion(true);
        s.add(bath);
--- 665,669 ----
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-union", Space.CONSTRUCTION, true);
        bath.setUnion(true);
        s.add(bath);

Index: ModelBathModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ModelBathModellor.java	10 Aug 2007 11:23:06 -0000	1.6
--- ModelBathModellor.java	5 Nov 2007 10:18:50 -0000	1.7
***************
*** 119,123 ****
      space.setUnion(true);
      Surface making = makeFloor();
!     Space wallSystem = new Space("Vægsystem", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      space.add(wallSystem);
      making.setBackDomain(wallSystem);
--- 119,123 ----
      space.setUnion(true);
      Surface making = makeFloor();
!     Space wallSystem = new Space("Vægsystem", Space.CONSTRUCTION, true);
      space.add(wallSystem);
      making.setBackDomain(wallSystem);
***************
*** 135,139 ****
        
        Geometry.holeAnalysis(room);
!       Space badkabine = new Space("Bathcabin", Space.FUNCTIONAL, Space.SPACE_LEVEL, true);
        space.add(badkabine);
        room.setBackDomain(badkabine);
--- 135,139 ----
        
        Geometry.holeAnalysis(room);
!       Space badkabine = new Space("Bathcabin", Space.FUNCTIONAL, true);
        space.add(badkabine);
        room.setBackDomain(badkabine);
***************
*** 145,149 ****
        space.addAll(sides);
        space.addAll(tops);
!       Space ceiling = new Space("Ceiling", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
        space.add(ceiling);
        for (Surface s : tops) {
--- 145,149 ----
        space.addAll(sides);
        space.addAll(tops);
!       Space ceiling = new Space("Ceiling", Space.CONSTRUCTION, true);
        space.add(ceiling);
        for (Surface s : tops) {
***************
*** 179,183 ****
     */
    private Surface makeFloor() {
!     Space floor = new Space("Floor", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      space.add(floor);
      bottom = bottom.copy(space);
--- 179,183 ----
     */
    private Surface makeFloor() {
!     Space floor = new Space("Floor", Space.CONSTRUCTION, true);
      space.add(floor);
      bottom = bottom.copy(space);
***************
*** 199,203 ****
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-unio", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
        bath.setUnion(true);
        s.add(bath);
--- 199,203 ----
    public Modellor newInstance(Space s) {
      if (s.getLevel() == Space.PROJECT_LEVEL) {
!       Space bath = new Space("Bath-unio", Space.CONSTRUCTION, true);
        bath.setUnion(true);
        s.add(bath);

Index: WindowModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WindowModellor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WindowModellor.java	16 Apr 2007 15:54:42 -0000	1.2
--- WindowModellor.java	5 Nov 2007 10:18:50 -0000	1.3
***************
*** 136,141 ****
    /** Draw the window */
    public void drawWindow() {
!     Space frame = new Space("Frame", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
!     Space glass = new Space("Glass", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
      glass.setTransparent(true);
      Surface inner = surface.copy(space);
--- 136,141 ----
    /** Draw the window */
    public void drawWindow() {
!     Space frame = new Space("Frame", Space.CONSTRUCTION, true);
!     Space glass = new Space("Glass", Space.CONSTRUCTION, true);
      glass.setTransparent(true);
      Surface inner = surface.copy(space);

Index: Box.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Box.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Box.java	19 Jun 2007 13:42:28 -0000	1.3
--- Box.java	5 Nov 2007 10:18:50 -0000	1.4
***************
*** 47,51 ****
      this.union = union;
      union.setModellor(this);
!     space = new Space("Interior", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      union.add(space);
      width = 1.0;
--- 47,51 ----
      this.union = union;
      union.setModellor(this);
!     space = new Space("Interior", Space.CONSTRUCTION, true);
      union.add(space);
      width = 1.0;
***************
*** 160,164 ****
     */
    public Space createSpace() {
!     Space union = new Space("Box", Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
      union.setUnion(true);
      Modellor modellor = new Box(union);
--- 160,164 ----
     */
    public Space createSpace() {
!     Space union = new Space("Box", Space.CONSTRUCTION, true);
      union.setUnion(true);
      Modellor modellor = new Box(union);

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TileModellor.java	2 Nov 2007 12:11:17 -0000	1.21
--- TileModellor.java	5 Nov 2007 10:18:50 -0000	1.22
***************
*** 177,181 ****
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = new Space("Tile", Space.CONSTRUCTION, lvl, true);
          if (sign == -1) {
            newS.setBackDomain(sp);
--- 177,181 ----
          outer.addHole(newS);
          space.addAll(newS);
!         Space sp = new Space("Tile", Space.CONSTRUCTION,  true);
          if (sign == -1) {
            newS.setBackDomain(sp);
***************
*** 189,193 ****
      }
  
!     Space joint = new Space("Tile", Space.CONSTRUCTION, lvl, true);
      if (sign == -1) {
        outer.setBackDomain(joint);
--- 189,193 ----
      }
  
!     Space joint = new Space("Tile", Space.CONSTRUCTION, true);
      if (sign == -1) {
        outer.setBackDomain(joint);

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WallPartingModellor.java	2 Nov 2007 12:11:17 -0000	1.3
--- WallPartingModellor.java	5 Nov 2007 10:18:50 -0000	1.4
***************
*** 162,166 ****
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
--- 162,166 ----
        Edge between2 = new Edge(inner.getTo(), outerCopy.getTo());
        Surface s = new Surface(inner, between1, outerCopy, between2);
!       Space concrete = new Space("Concrete", Space.CONSTRUCTION, true);
        space.add(concrete);
        if (s.normal().getZ() == 1.0) {
***************
*** 181,185 ****
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
        space.add(tile);
        if (s.normal().getZ() == 1.0) {
--- 181,185 ----
        between2 = new Edge(inner2.getTo(), tileCopy.getTo());
        s = new Surface(inner2, between1, tileCopy, between2);
!       Space tile = new Space("Tile", Space.CONSTRUCTION,  true);
        space.add(tile);
        if (s.normal().getZ() == 1.0) {

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InnerWallModellor.java	2 Nov 2007 12:11:17 -0000	1.9
--- InnerWallModellor.java	5 Nov 2007 10:18:50 -0000	1.10
***************
*** 216,220 ****
        Surface base = joistBase();
        space.add(base);
!       Space joist = new Space("joist", Space.CONSTRUCTION, space.getLevel() + 1, true);
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
--- 216,220 ----
        Surface base = joistBase();
        space.add(base);
!       Space joist = new Space("joist", Space.CONSTRUCTION, true);
        Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0);
        joist.setClassificationType(c.getPossibleTypes().getChildren().get(0));
***************
*** 268,274 ****
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Space sheetSpace1 = new Space("sheet1", Space.CONSTRUCTION, space.getLevel() + 1, true);
        sheetSpace1.setClassification(woodSheet());
!       Space sheetSpace2 = new Space("sheet2", Space.CONSTRUCTION, space.getLevel() + 1, true);
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();
--- 268,274 ----
        Surface sheet1 = new Surface(outlineCopy1);
        Surface sheet2 = new Surface(outlineCopy2);
!       Space sheetSpace1 = new Space("sheet1", Space.CONSTRUCTION, true);
        sheetSpace1.setClassification(woodSheet());
!       Space sheetSpace2 = new Space("sheet2", Space.CONSTRUCTION, true);
        sheetSpace2.setClassification(woodSheet());
        Vertex j = cs.getJ().copy();