Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29701/src/net/sourceforge/bprocessor/facade/modellor
Modified Files:
NetFacadeModellor.java
Log Message:
some ajustments of the net facade
Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NetFacadeModellor.java 16 Feb 2007 09:57:55 -0000 1.17
--- NetFacadeModellor.java 16 Feb 2007 13:33:42 -0000 1.18
***************
*** 255,259 ****
*/
public Net getNet() {
! return net;
}
--- 255,259 ----
*/
public Net getNet() {
! return this.net;
}
***************
*** 264,268 ****
public void setNet(Space net) {
if (this.net != null) {
! space.remove(net);
}
this.net = (Net)net;
--- 264,268 ----
public void setNet(Space net) {
if (this.net != null) {
! space.remove(this.net);
}
this.net = (Net)net;
***************
*** 297,306 ****
space.clear();
frame = null;
! space.add(net);
! prepareNet(net);
if (single) {
! createSingleFacade(net);
} else {
! createDoubleFacade(net);
}
}
--- 297,306 ----
space.clear();
frame = null;
! space.add(getNet());
! prepareNet(getNet());
if (single) {
! createSingleFacade(getNet());
} else {
! createDoubleFacade(getNet());
}
}
***************
*** 434,442 ****
private void detailField(Map envF, Surface hole) {
double frameSize = 0.0;
if (envF.get("type") instanceof Selector) {
Selector sel = (Selector)envF.get("type");
! if (sel.getCurrentValue().equals("Window")) {
frameSize = WINDOW_FRAME;
! } else if (sel.getCurrentValue().equals("Door")) {
frameSize = DOOR_FRAME;
}
--- 434,444 ----
private void detailField(Map envF, Surface hole) {
double frameSize = 0.0;
+ String type = "";
if (envF.get("type") instanceof Selector) {
Selector sel = (Selector)envF.get("type");
! type = sel.getCurrentValue().toString();
! if (type.equals("Window")) {
frameSize = WINDOW_FRAME;
! } else if (type.equals("Door")) {
frameSize = DOOR_FRAME;
}
***************
*** 460,464 ****
Geometry.holeAnalysis(out);
! Space f = new Space(envF.get("type") + " Frame",
Space.CONSTRUCTION,
Space.ELEMENT_LEVEL,
--- 462,466 ----
Geometry.holeAnalysis(out);
! Space f = new Space(type + " Frame",
Space.CONSTRUCTION,
Space.ELEMENT_LEVEL,
***************
*** 479,490 ****
assignSame(front, inEx, space, frame);
Geometry.holeAnalysis(inEx);
!
! sides = new HashSet();
! Surface outEx = extrudeIntoSpace(out, FRAME_DEPTH, sides);
! //outEx = space.insert(outEx);
! assignOpposite(front, outEx, space, g);
assignOpposite(front, hole, space, f);
-
- Geometry.holeAnalysis(outEx);
Geometry.holeAnalysis(hole);
}
--- 481,486 ----
assignSame(front, inEx, space, frame);
Geometry.holeAnalysis(inEx);
!
assignOpposite(front, hole, space, f);
Geometry.holeAnalysis(hole);
}
***************
*** 526,530 ****
next = (Edge)e;
done = true;
! }
}
if (next != null) {
--- 522,526 ----
next = (Edge)e;
done = true;
! }
}
if (next != null) {
***************
*** 543,547 ****
return outline;
} else {
! log.warn("Outline not well defined");
}
}
--- 539,545 ----
return outline;
} else {
! log.warn("Outline not well defined, " +
! " all outer edges in outline: " + outer.size() +
! " outline connected: " + first.getFrom().getEdges().contains(outline.getLast()));
}
}
***************
*** 557,561 ****
Net n = new Net("Facade net");
if (front != null) {
! front.copyall(n);
}
return n;
--- 555,559 ----
Net n = new Net("Facade net");
if (front != null) {
! front.copy(n);
}
return n;
***************
*** 576,579 ****
--- 574,578 ----
public void setFront(Surface front) {
this.front = front;
+ setNet(createNet(front));
}
***************
*** 608,612 ****
space.add(surface);
}
- space.add(top);
return top;
}
--- 607,610 ----
|
