Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8054/src/net/sourceforge/bprocessor/facade/modellor
Modified Files:
NetFacadeModellor.java FacadeModellor.java
Log Message:
simplification of level
Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** NetFacadeModellor.java 2 Nov 2007 12:11:13 -0000 1.39
--- NetFacadeModellor.java 5 Nov 2007 10:18:54 -0000 1.40
***************
*** 134,138 ****
frame = new Space("Frame",
Space.CONSTRUCTION,
- Space.ELEMENT_LEVEL,
true);
Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
--- 134,137 ----
***************
*** 392,397 ****
if (frame == null) {
frame = new Space("Frame",
! Space.CONSTRUCTION,
! Space.ELEMENT_LEVEL,
true);
Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
--- 391,395 ----
if (frame == null) {
frame = new Space("Frame",
! Space.CONSTRUCTION,
true);
Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
***************
*** 442,447 ****
if (frame == null) {
frame = new Space("Frame",
! Space.CONSTRUCTION,
! Space.ELEMENT_LEVEL,
true);
space.add(frame);
--- 440,444 ----
if (frame == null) {
frame = new Space("Frame",
! Space.CONSTRUCTION,
true);
space.add(frame);
***************
*** 478,483 ****
hole = space.insert(hole);
Space holeSpace = new Space("Facade Hole",
! Space.FUNCTIONAL,
! space.getLevel() + 1,
true);
space.add(holeSpace);
--- 475,479 ----
hole = space.insert(hole);
Space holeSpace = new Space("Facade Hole",
! Space.FUNCTIONAL,
true);
space.add(holeSpace);
***************
*** 525,529 ****
Space f = new Space(type + " Frame",
Space.CONSTRUCTION,
- Space.ELEMENT_LEVEL,
true);
Classification frameClass = Project.getInstance().getClassification(FRAME, 0);
--- 521,524 ----
***************
*** 531,535 ****
Space g = new Space("Glass",
Space.CONSTRUCTION,
- Space.ELEMENT_LEVEL,
true);
Classification glassClass = Project.getInstance().getClassification(GLASS, 0);
--- 526,529 ----
Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** FacadeModellor.java 16 Apr 2007 15:54:36 -0000 1.33
--- FacadeModellor.java 5 Nov 2007 10:18:54 -0000 1.34
***************
*** 365,369 ****
if (front != null &&
depth > 0) {
! Space frame = new Space("Frame", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
space.add(frame);
Surface eFront = front.copy(space);
--- 365,369 ----
if (front != null &&
depth > 0) {
! Space frame = new Space("Frame", Space.CONSTRUCTION, true);
space.add(frame);
Surface eFront = front.copy(space);
***************
*** 690,694 ****
Surface s = (Surface)it.next();
Set sides = new HashSet();
! Space w = new Space("Window", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
double u = s.normal().dot(front.normal());
if ((u > 0 && front.getBackDomain() == space) ||
--- 690,694 ----
Surface s = (Surface)it.next();
Set sides = new HashSet();
! Space w = new Space("Window", Space.CONSTRUCTION, true);
double u = s.normal().dot(front.normal());
if ((u > 0 && front.getBackDomain() == space) ||
|
