bprocessor-commit Mailing List for B-processor (Page 44)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2007-11-05 15:05:15
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31284/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: New group experiment started Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** PopupMenu.java 5 Nov 2007 10:18:58 -0000 1.63 --- PopupMenu.java 5 Nov 2007 15:05:16 -0000 1.64 *************** *** 9,12 **** --- 9,13 ---- import java.awt.event.ActionEvent; import java.util.Collection; + import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; *************** *** 33,36 **** --- 34,38 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; + import net.sourceforge.bprocessor.model.Mesh; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Rotate; *************** *** 56,59 **** --- 58,62 ---- private static final boolean CHECKS = false; + private static final boolean GROUPS = false; /** * make a popup menu for a surface *************** *** 408,412 **** menu.add(simplify); ! AbstractAction makeUnion = new GeometricMenuAction(arguments, "Make My Union") { public void actionPerformed(ActionEvent e) { Collection<Space> interior = new HashSet<Space>(); --- 411,415 ---- menu.add(simplify); ! AbstractAction makeUnion = new GeometricMenuAction(arguments, "Make Union") { public void actionPerformed(ActionEvent e) { Collection<Space> interior = new HashSet<Space>(); *************** *** 425,428 **** --- 428,450 ---- }; menu.add(makeUnion); + if (GROUPS) { + AbstractAction action = new GeometricMenuAction(arguments, "Group") { + public void actionPerformed(ActionEvent event) { + System.out.println("-- selection --"); + for (Geometric current : entities) { + System.out.println(" " + current); + } + Mesh mesh = new Mesh(entities); + HashMap map = new HashMap(); + Mesh copy = mesh.copy(map); + copy.identify(); + System.out.println("-- copy --"); + for (Geometric current : copy.geometrics()) { + System.out.println(" " + current); + } + } + }; + menu.add(action); + } { AbstractAction action = new GeometricMenuAction(arguments, "Scale...") { |
|
From: Michael L. <he...@us...> - 2007-11-05 12:26:20
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1427/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: Level Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Persistence.java 2 Nov 2007 13:17:11 -0000 1.51 --- Persistence.java 5 Nov 2007 12:26:22 -0000 1.52 *************** *** 268,272 **** String name = xml.getName(); int type = xml.getType(); - int level = xml.getLevel(); long empty = xml.getVoidref(); boolean container = (empty != 0); --- 268,271 ---- *************** *** 274,278 **** space.setName(name); space.setType(type); - space.setLevel(level); space.setContainer(container); space.setTransparent(xml.isTransparent()); --- 273,276 ---- |
|
From: Michael L. <he...@us...> - 2007-11-05 12:02:28
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23263/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: small changes to space constructor Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.198 retrieving revision 1.199 diff -C2 -d -r1.198 -r1.199 *** Space.java 5 Nov 2007 10:33:31 -0000 1.198 --- Space.java 5 Nov 2007 12:02:29 -0000 1.199 *************** *** 179,183 **** envelope = new HashSet<Surface>(); transform = new TransformStack(); - modellor = null; initializeContainers(); } --- 179,182 ---- *************** *** 207,216 **** public Space(String name, int type, boolean container) { super(); ! setName(name); ! setType(type); if (type == FUNCTIONAL) { ! setTransparent(true); } else { ! setTransparent(false); } this.container = container; --- 206,215 ---- public Space(String name, int type, boolean container) { super(); ! this.name = name; ! this.type = type; if (type == FUNCTIONAL) { ! this.transparent = true; } else { ! this.transparent = false; } this.container = container; *************** *** 218,222 **** envelope = new HashSet<Surface>(); transform = new TransformStack(); - modellor = null; if (container) { initializeContainers(); --- 217,220 ---- |
|
From: Michael L. <he...@us...> - 2007-11-05 10:33:29
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15845/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: further cleaning of space construction Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.197 retrieving revision 1.198 diff -C2 -d -r1.197 -r1.198 *** Space.java 5 Nov 2007 10:18:50 -0000 1.197 --- Space.java 5 Nov 2007 10:33:31 -0000 1.198 *************** *** 170,183 **** } ! /** ! * Net ! * @param name String ! * @return space ! */ ! public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, true); ! net.setNet(true); ! return net; ! } /** --- 170,174 ---- } ! /** *************** *** 247,294 **** /** ! * Create a Union Space * @param name The name * @return The space */ ! public Space createUnion(String name) { ! Space s = createConstructionSpace(name); ! s.add(new CoordinateSystem(new Vertex(0, 0, 0))); ! s.setUnion(true); ! return s; } - /** - * Create a Construction Space - * @param cl The classification - * @return The space - */ - public Space createConstructionSpace(Classification cl) { - Space cur = createConstructionSpace(""); - if (cur != null) { - cur.setClassification(cl); - } - return cur; - } /** ! * Create a Functional Space * @param name The name * @return The space */ ! public Space createFunctionalSpace(String name) { ! return new Space(name, Space.FUNCTIONAL, false); } /** ! * Create a Functional Space ! * @param cl The classification ! * @return The space */ ! public Space createFunctionalSpace(Classification cl) { ! Space cur = createFunctionalSpace(""); ! if (cur != null) { ! cur.setClassification(cl); ! } ! return cur; } --- 238,271 ---- /** ! * Create a Functional Space * @param name The name * @return The space */ ! public Space createFunctionalSpace(String name) { ! return new Space(name, Space.FUNCTIONAL, false); } /** ! * Create a Union Space * @param name The name * @return The space */ ! public Space createUnion(String name) { ! Space s = createConstructionSpace(name); ! s.add(new CoordinateSystem(new Vertex(0, 0, 0))); ! s.setUnion(true); ! return s; } /** ! * Net ! * @param name String ! * @return space */ ! public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, true); ! net.setNet(true); ! return net; } |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:55
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8070/src/net/sourceforge/bprocessor/gui/actions Modified Files: ImportFileReader.java Log Message: simplification of level Index: ImportFileReader.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ImportFileReader.java 31 Oct 2007 11:35:17 -0000 1.11 --- ImportFileReader.java 5 Nov 2007 10:18:58 -0000 1.12 *************** *** 404,408 **** if (spaceid != previousSpaceId) { currentSpace = new Space("Space with id " + spaceid, ! Space.CONSTRUCTION, Space.SPACE_LEVEL, true); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); --- 404,408 ---- if (spaceid != previousSpaceId) { currentSpace = new Space("Space with id " + spaceid, ! Space.CONSTRUCTION, true); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:55
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8070/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: simplification of level Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** PopupMenu.java 2 Nov 2007 10:50:04 -0000 1.62 --- PopupMenu.java 5 Nov 2007 10:18:58 -0000 1.63 *************** *** 252,256 **** Space space = (Space)iter.next(); Space instance = new Space("Instance of " + space.getName(), ! Space.CONSTRUCTION, space.getLevel(), false); instance.setProto(space); space.getOwner().add(instance); --- 252,256 ---- Space space = (Space)iter.next(); Space instance = new Space("Instance of " + space.getName(), ! Space.CONSTRUCTION, false); instance.setProto(space); space.getOwner().add(instance); |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:54
|
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(); |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:53
|
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) || |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:49
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8014/src/net/sourceforge/bprocessor/model Modified Files: Space.java Project.java Log Message: simplification of level Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.196 retrieving revision 1.197 diff -C2 -d -r1.196 -r1.197 *** Space.java 5 Nov 2007 09:45:05 -0000 1.196 --- Space.java 5 Nov 2007 10:18:50 -0000 1.197 *************** *** 41,51 **** public static final int FUNCTIONAL = 1; /** project level */ ! public static final int PROJECT_LEVEL = 2; /** Space level */ ! public static final int SPACE_LEVEL = 3; /** Element level */ ! public static final int ELEMENT_LEVEL = 4; /** part level */ ! public static final int PART_LEVEL = 5; /** union flag */ --- 41,51 ---- public static final int FUNCTIONAL = 1; /** project level */ ! public static final int PROJECT_LEVEL = 0; /** Space level */ ! public static final int SPACE_LEVEL = 1; /** Element level */ ! public static final int ELEMENT_LEVEL = 2; /** part level */ ! public static final int PART_LEVEL = 3; /** union flag */ *************** *** 65,71 **** private int type; - /** level Space element or part */ - private int level; - /** Tell if the space is finished and therefore cannot be edited */ private boolean locked = false; --- 65,68 ---- *************** *** 179,183 **** */ public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, 0, true); net.setNet(true); return net; --- 176,180 ---- */ public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, true); net.setNet(true); return net; *************** *** 215,226 **** * @param name The name * @param type The type - * @param level The level * @param container The container flag */ ! public Space(String name, int type, int level, boolean container) { super(); setName(name); setType(type); - this.level = level; if (type == FUNCTIONAL) { setTransparent(true); --- 212,221 ---- * @param name The name * @param type The type * @param container The container flag */ ! public Space(String name, int type, boolean container) { super(); setName(name); setType(type); if (type == FUNCTIONAL) { setTransparent(true); *************** *** 235,239 **** if (container) { initializeContainers(); ! empty = new Space("Void", FUNCTIONAL, level + 1, false); this.add(empty); } --- 230,234 ---- if (container) { initializeContainers(); ! empty = new Space("Void", FUNCTIONAL, false); this.add(empty); } *************** *** 248,253 **** */ public Space createConstructionSpace(String name) { ! int lvl = this.level + 1; ! return new Space(name, Space.CONSTRUCTION, lvl, true); } --- 243,247 ---- */ public Space createConstructionSpace(String name) { ! return new Space(name, Space.CONSTRUCTION, true); } *************** *** 261,265 **** s.add(new CoordinateSystem(new Vertex(0, 0, 0))); s.setUnion(true); - s.setLevel(level); return s; } --- 255,258 ---- *************** *** 284,292 **** */ public Space createFunctionalSpace(String name) { ! int lvl = this.level + 1; ! if (isUnion()) { ! lvl--; ! } ! return new Space(name, Space.FUNCTIONAL, lvl, false); } --- 277,281 ---- */ public Space createFunctionalSpace(String name) { ! return new Space(name, Space.FUNCTIONAL, false); } *************** *** 1398,1402 **** break; } ! int lvl = level - (isUnion() ? 1 : 0); return res.concat(Space.levelToString(lvl)); } --- 1387,1391 ---- break; } ! int lvl = getLevel(); return res.concat(Space.levelToString(lvl)); } *************** *** 1409,1416 **** public String getLevelName() { String res; ! int lvl = level; ! if (isUnion()) { ! lvl++; ! } switch (lvl) { case ELEMENT_LEVEL: --- 1398,1402 ---- public String getLevelName() { String res; ! int lvl = getLevel(); switch (lvl) { case ELEMENT_LEVEL: *************** *** 1584,1588 **** copy.container = container; copy.description = description; - copy.level = level; copy.name = name; return copy; --- 1570,1573 ---- *************** *** 1616,1620 **** Space copy = new Space("", this.getType(), - this.getLevel(), this.isContainer()); copy.setName(this.getName()); --- 1601,1604 ---- *************** *** 2446,2449 **** --- 2430,2440 ---- */ public int getLevel() { + int level = 0; + if (getOwner() != null) { + level = getOwner().getLevel(); + if (!isUnion()) { + level++; + } + } return level; } *************** *** 2462,2466 **** */ protected void setLevel(int level) { - this.level = level; } --- 2453,2456 ---- Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** Project.java 22 Oct 2007 06:55:09 -0000 1.136 --- Project.java 5 Nov 2007 10:18:50 -0000 1.137 *************** *** 156,160 **** staticObservers = new LinkedList(); scheduledObservers = new LinkedList(); ! world = new Space("World", Space.FUNCTIONAL, Space.PROJECT_LEVEL, true); world.setId(new Long(0)); materials = new HashMap<Long, Material>(); --- 156,160 ---- staticObservers = new LinkedList(); scheduledObservers = new LinkedList(); ! world = new Space("World", Space.FUNCTIONAL, true); world.setId(new Long(0)); materials = new HashMap<Long, Material>(); |
|
From: Michael L. <he...@us...> - 2007-11-05 10:18:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7985/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java SpaceTool.java Log Message: simplification of level Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** SpaceTool.java 29 Oct 2007 18:13:50 -0000 1.89 --- SpaceTool.java 5 Nov 2007 10:18:46 -0000 1.90 *************** *** 197,200 **** --- 197,202 ---- Space owner = space.getOwner(); + + if (space.getLevel() == Space.PROJECT_LEVEL) { domains = Project.getInstance().getSpaces(); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** AbstractTool.java 15 Oct 2007 11:36:07 -0000 1.133 --- AbstractTool.java 5 Nov 2007 10:18:46 -0000 1.134 *************** *** 792,796 **** public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = new Space(name, Space.CONSTRUCTION, Space.SPACE_LEVEL, true); stack.push(result); } --- 792,796 ---- public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = new Space(name, Space.CONSTRUCTION, true); stack.push(result); } |
|
From: Michael L. <he...@us...> - 2007-11-05 09:45:08
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25355/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: NET_LEVEL elliminated Ð isNet flag instead Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.195 retrieving revision 1.196 diff -C2 -d -r1.195 -r1.196 *** Space.java 2 Nov 2007 12:51:33 -0000 1.195 --- Space.java 5 Nov 2007 09:45:05 -0000 1.196 *************** *** 48,57 **** /** part level */ public static final int PART_LEVEL = 5; - /** B-net level */ - public static final int NET_LEVEL = 6; /** union flag */ private boolean isUnion = false; /** The name */ private String name; --- 48,58 ---- /** part level */ public static final int PART_LEVEL = 5; /** union flag */ private boolean isUnion = false; + /** net flag */ + private boolean isNet; + /** The name */ private String name; *************** *** 178,182 **** */ public static Space createNet(String name) { ! return new Space(name, Space.FUNCTIONAL, Space.NET_LEVEL, true); } --- 179,185 ---- */ public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, 0, true); ! net.setNet(true); ! return net; } *************** *** 1420,1426 **** res = "Spc"; break; - case NET_LEVEL: - res = "Net"; - break; case PROJECT_LEVEL: res = "Proj"; --- 1423,1426 ---- *************** *** 2429,2433 **** */ public boolean isNet() { ! return level == NET_LEVEL; } --- 2429,2441 ---- */ public boolean isNet() { ! return isNet; ! } ! ! /** ! * Sets the net flag ! * @param value net flag ! */ ! public void setNet(boolean value) { ! isNet = value; } *************** *** 2869,2879 **** res += "Part"; break; - case NET_LEVEL: - res += "Net"; - break; - case NET_LEVEL + 1: - res += "Net-void"; - break; default: break; } --- 2877,2882 ---- res += "Part"; break; default: + res += "Object"; break; } |
|
From: Michael L. <he...@us...> - 2007-11-05 09:45:04
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25181/src/net/sourceforge/bprocessor/gl/tool Modified Files: SelectStrategy.java Log Message: NET_LEVEL elliminated Ð isNet flag instead Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** SelectStrategy.java 24 Sep 2007 13:02:17 -0000 1.19 --- SelectStrategy.java 5 Nov 2007 09:45:00 -0000 1.20 *************** *** 187,191 **** //Move out one space/union level if possible Space sp = Project.getInstance().getActiveSpace(); ! if (sp.getLevel() > Space.PROJECT_LEVEL) { sp.getOwner().edit(); } --- 187,191 ---- //Move out one space/union level if possible Space sp = Project.getInstance().getActiveSpace(); ! if (sp.getOwner() != null) { sp.getOwner().edit(); } |
|
From: Michael L. <he...@us...> - 2007-11-02 13:22:05
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2322/src/etc Modified Files: bprocessor.xsd Log Message: Removed reference to NetType from schema Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** bprocessor.xsd 15 Oct 2007 12:41:24 -0000 1.33 --- bprocessor.xsd 2 Nov 2007 13:22:07 -0000 1.34 *************** *** 80,90 **** </xsd:complexContent> </xsd:complexType> - - <xsd:complexType name="NetType"> - <xsd:complexContent> - <xsd:extension base="SpaceType"> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> <xsd:complexType name="SpaceType"> --- 80,83 ---- |
|
From: Michael L. <he...@us...> - 2007-11-02 13:19:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1166/src/net/sourceforge/bprocessor/model Removed Files: Net.java Log Message: Removed net class --- Net.java DELETED --- |
|
From: Michael L. <he...@us...> - 2007-11-02 13:17:08
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv365/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: Ellimated usage of net for real Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Persistence.java 2 Nov 2007 13:14:17 -0000 1.50 --- Persistence.java 2 Nov 2007 13:17:11 -0000 1.51 *************** *** 218,227 **** } - private static Net internalizeNet(Space owner, SpaceType xml, - Map mapper, Collection xmls) { - Net n = new Net(); - return (Net)internalizeSpace(owner, n, xml, mapper, xmls); - } - private static Space internalizeSpace(Space owner, SpaceType xml, Map mapper, Collection xmls) { --- 218,221 ---- |
|
From: Michael L. <he...@us...> - 2007-11-02 13:14:14
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31661/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: Elliminated usage of Net Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Persistence.java 15 Oct 2007 12:41:24 -0000 1.49 --- Persistence.java 2 Nov 2007 13:14:17 -0000 1.50 *************** *** 31,35 **** import net.sourceforge.bprocessor.model.xml.ScaleType; import net.sourceforge.bprocessor.model.xml.SpaceType; - import net.sourceforge.bprocessor.model.xml.NetType; import net.sourceforge.bprocessor.model.xml.StringType; import net.sourceforge.bprocessor.model.xml.SurfaceType; --- 31,34 ---- *************** *** 64,68 **** import net.sourceforge.bprocessor.model.xml.impl.ScaleTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.SpaceImpl; - import net.sourceforge.bprocessor.model.xml.impl.NetTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.StringTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.SurfaceImpl; --- 63,66 ---- *************** *** 262,270 **** Map mapper, Collection xmls) { SpaceType type = xml.getValueObject(); ! if (type instanceof NetType) { ! return internalizeNet(owner, type, mapper, xmls); ! } else { ! return internalizeSpace(owner, type, mapper, xmls); ! } } --- 260,264 ---- Map mapper, Collection xmls) { SpaceType type = xml.getValueObject(); ! return internalizeSpace(owner, type, mapper, xmls); } *************** *** 917,931 **** /** * Create an xml SpaceImpl and place it in the map - * @param n The Net - * @param map The map - * @return The NetTypeImpl - */ - private static NetType externalizeNet(Net n, Map map) { - NetType xml = new NetTypeImpl(); - return (NetType)externalizeSpace(xml, n, map); - } - - /** - * Create an xml SpaceImpl and place it in the map * @param space The space * @param map The map --- 911,914 ---- *************** *** 971,981 **** while (iter.hasNext()) { Object current = iter.next(); ! if (current instanceof Net) { ! xml.getSpace().add(externalizeNet((Net)current, map)); ! } else if (current instanceof Space) { ! xml.getSpace().add(externalizeSpace((Space)current, map)); ! } else { ! log.error("trying to externalize unsupported spacetype"); ! } } } --- 954,958 ---- while (iter.hasNext()) { Object current = iter.next(); ! xml.getSpace().add(externalizeSpace((Space)current, map)); } } |
|
From: Michael L. <he...@us...> - 2007-11-02 12:51:33
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22684/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Next to final step in getting rid of Net Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Display.java 2 Nov 2007 11:05:39 -0000 1.45 --- Display.java 2 Nov 2007 12:51:29 -0000 1.46 *************** *** 986,990 **** Collection<Edge> stippled = new LinkedList(); Collection<Edge> normal = new LinkedList(); ! split(edges, normal, stippled); float size; --- 986,995 ---- Collection<Edge> stippled = new LinkedList(); Collection<Edge> normal = new LinkedList(); ! ! if (space.isNet()) { ! stippled.addAll(edges); ! } else { ! split(edges, normal, stippled); ! } float size; |
|
From: Michael L. <he...@us...> - 2007-11-02 12:51:31
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22694/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: Next to final step in getting rid of Net Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.194 retrieving revision 1.195 diff -C2 -d -r1.194 -r1.195 *** Space.java 2 Nov 2007 12:11:17 -0000 1.194 --- Space.java 2 Nov 2007 12:51:33 -0000 1.195 *************** *** 178,182 **** */ public static Space createNet(String name) { ! return new Net(name); } --- 178,182 ---- */ public static Space createNet(String name) { ! return new Space(name, Space.FUNCTIONAL, Space.NET_LEVEL, true); } |
|
From: Michael L. <he...@us...> - 2007-11-02 12:11:21
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6696/src/net/sourceforge/bprocessor/gui/actions Modified Files: CreateNetActionListener.java Log Message: Another step in elliminating Net Index: CreateNetActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateNetActionListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CreateNetActionListener.java 17 Oct 2007 09:08:11 -0000 1.5 --- CreateNetActionListener.java 2 Nov 2007 12:11:22 -0000 1.6 *************** *** 10,14 **** import java.awt.event.ActionListener; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; --- 10,13 ---- *************** *** 24,28 **** */ public void actionPerformed(ActionEvent event) { ! Space net = new Net("B-net"); Space active = Project.getInstance().getActiveSpace(); active.add(net); --- 23,27 ---- */ public void actionPerformed(ActionEvent event) { ! Space net = Space.createNet("B-net"); Space active = Project.getInstance().getActiveSpace(); active.add(net); |
|
From: Michael L. <he...@us...> - 2007-11-02 12:11:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6677/src/net/sourceforge/bprocessor/model/modellor Modified Files: TileModellor.java WallPartingModellor.java InnerWallModellor.java ModelBathModellor2.java Log Message: Another step in elliminating Net Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TileModellor.java 2 Nov 2007 11:17:28 -0000 1.20 --- TileModellor.java 2 Nov 2007 12:11:17 -0000 1.21 *************** *** 24,28 **** import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Material; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; --- 24,27 ---- *************** *** 210,214 **** private void updateOutline() { if (outline == null) { ! outline = new Net("Tile-outline"); } outline.clear(); --- 209,213 ---- private void updateOutline() { if (outline == null) { ! outline = Space.createNet("Tile-outline"); } outline.clear(); *************** *** 239,243 **** private void updateNet(CoordinateSystem cs) { if (net == null) { ! net = new Net("strip"); } net.clear(); --- 238,242 ---- private void updateNet(CoordinateSystem cs) { if (net == null) { ! net = Space.createNet("strip"); } net.clear(); Index: WallPartingModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WallPartingModellor.java 2 Nov 2007 11:17:28 -0000 1.2 --- WallPartingModellor.java 2 Nov 2007 12:11:17 -0000 1.3 *************** *** 17,21 **** import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; --- 17,20 ---- *************** *** 53,57 **** private Space calcNet() { //find bottom surface and copy outer contour from it into a new net ! Space tmpNet = new Net("Contour"); space.getSurfaces().iterator().next().copy(tmpNet); return tmpNet; --- 52,56 ---- private Space calcNet() { //find bottom surface and copy outer contour from it into a new net ! Space tmpNet = Space.createNet("Contour"); space.getSurfaces().iterator().next().copy(tmpNet); return tmpNet; Index: InnerWallModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** InnerWallModellor.java 2 Nov 2007 11:17:28 -0000 1.8 --- InnerWallModellor.java 2 Nov 2007 12:11:17 -0000 1.9 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Plane; import net.sourceforge.bprocessor.model.Project; --- 20,23 ---- *************** *** 351,355 **** private Space buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Space net = new Net("net"); space.add(net); surface = findSurface(); --- 350,354 ---- private Space buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Space net = Space.createNet("net"); space.add(net); surface = findSurface(); Index: ModelBathModellor2.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ModelBathModellor2.java 2 Nov 2007 11:17:28 -0000 1.8 --- ModelBathModellor2.java 2 Nov 2007 12:11:17 -0000 1.9 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; --- 20,23 ---- *************** *** 118,122 **** Surface s = new Surface(edges); ! net = new Net("Boundary"); net.add(v1); net.add(v2); --- 117,121 ---- Surface s = new Surface(edges); ! net = Space.createNet("Boundary"); net.add(v1); net.add(v2); |
|
From: Michael L. <he...@us...> - 2007-11-02 12:11:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6677/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: Another step in elliminating Net Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.193 retrieving revision 1.194 diff -C2 -d -r1.193 -r1.194 *** Space.java 2 Nov 2007 11:05:34 -0000 1.193 --- Space.java 2 Nov 2007 12:11:17 -0000 1.194 *************** *** 173,176 **** --- 173,185 ---- /** + * Net + * @param name String + * @return space + */ + public static Space createNet(String name) { + return new Net(name); + } + + /** * Constructor for persistence layer */ |
|
From: Michael L. <he...@us...> - 2007-11-02 12:11:14
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6667/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java Log Message: Another step in elliminating Net Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** NetFacadeModellor.java 2 Nov 2007 11:17:22 -0000 1.38 --- NetFacadeModellor.java 2 Nov 2007 12:11:13 -0000 1.39 *************** *** 23,27 **** import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.ParameterBlock; import net.sourceforge.bprocessor.model.Plane; --- 23,26 ---- *************** *** 624,628 **** */ private Space createNet(Surface front) { ! Space n = new Net("Facade net"); if (front != null) { front.copy(n); --- 623,627 ---- */ private Space createNet(Surface front) { ! Space n = Space.createNet("Facade net"); if (front != null) { front.copy(n); |
|
From: Michael L. <he...@us...> - 2007-11-02 11:17:26
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18097/src/net/sourceforge/bprocessor/model/modellor Modified Files: TileModellor.java WallPartingModellor.java InnerWallModellor.java ModelBathModellor2.java Log Message: Another step in ellimination Net Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** TileModellor.java 15 Oct 2007 12:41:24 -0000 1.19 --- TileModellor.java 2 Nov 2007 11:17:28 -0000 1.20 *************** *** 63,69 **** private int tileThickness = 8; ! private Net net; ! private Net outline; private Set<Surface> ignoredSurfaces = new HashSet<Surface>(); --- 63,69 ---- private int tileThickness = 8; ! private Space net; ! private Space outline; private Set<Surface> ignoredSurfaces = new HashSet<Surface>(); Index: WallPartingModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WallPartingModellor.java 24 May 2007 21:41:50 -0000 1.1 --- WallPartingModellor.java 2 Nov 2007 11:17:28 -0000 1.2 *************** *** 32,36 **** private Space space; ! private Net net; private double minZ; private double maxZ; --- 32,36 ---- private Space space; ! private Space net; private double minZ; private double maxZ; *************** *** 42,46 **** * @param net the net outlining the walls (can be auto calculated by sending null object) */ ! public WallPartingModellor(Space walls, Net net) { this.space = walls; if (net != null) { --- 42,46 ---- * @param net the net outlining the walls (can be auto calculated by sending null object) */ ! public WallPartingModellor(Space walls, Space net) { this.space = walls; if (net != null) { *************** *** 51,57 **** } ! private Net calcNet() { //find bottom surface and copy outer contour from it into a new net ! Net tmpNet = new Net("Contour"); space.getSurfaces().iterator().next().copy(tmpNet); return tmpNet; --- 51,57 ---- } ! private Space calcNet() { //find bottom surface and copy outer contour from it into a new net ! Space tmpNet = new Net("Contour"); space.getSurfaces().iterator().next().copy(tmpNet); return tmpNet; Index: InnerWallModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** InnerWallModellor.java 23 Jul 2007 13:58:13 -0000 1.7 --- InnerWallModellor.java 2 Nov 2007 11:17:28 -0000 1.8 *************** *** 82,86 **** /** The net of the modellor */ ! private Net net; /** --- 82,86 ---- /** The net of the modellor */ ! private Space net; /** *************** *** 159,165 **** if (build) { if (net == null) { ! for (Space net : space.getElements()) { ! if (net instanceof Net) { ! net = (Net)net; break; } --- 159,165 ---- if (build) { if (net == null) { ! for (Space current : space.getElements()) { ! if (current.isNet()) { ! net = current; break; } *************** *** 185,189 **** * @param net a net to build the framework from */ ! private void buildFramework(Net net) { Map<Edge, Edge> edge2Run = getRuns(net.getEdges()); Set<Edge> runs = new HashSet<Edge>(edge2Run.values()); --- 185,189 ---- * @param net a net to build the framework from */ ! private void buildFramework(Space net) { Map<Edge, Edge> edge2Run = getRuns(net.getEdges()); Set<Edge> runs = new HashSet<Edge>(edge2Run.values()); *************** *** 258,262 **** } ! private void buildWoodSheets(Net net) { List<Edge> outline = netOutline(net); if (!outline.isEmpty()) { --- 258,262 ---- } ! private void buildWoodSheets(Space net) { List<Edge> outline = netOutline(net); if (!outline.isEmpty()) { *************** *** 349,355 **** * @return a net for building the framework */ ! private Net buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Net net = new Net("net"); space.add(net); surface = findSurface(); --- 349,355 ---- * @return a net for building the framework */ ! private Space buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Space net = new Net("net"); space.add(net); surface = findSurface(); *************** *** 624,628 **** * @return true if all geometry in the net is in the plane, false otherwise */ ! private boolean getPlaneCheck(Net net, Plane p) { for (Edge e : net.getEdges()) { if (!p.contains(e)) { --- 624,628 ---- * @return true if all geometry in the net is in the plane, false otherwise */ ! private boolean getPlaneCheck(Space net, Plane p) { for (Edge e : net.getEdges()) { if (!p.contains(e)) { *************** *** 688,692 **** * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Net net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); --- 688,692 ---- * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Space net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); *************** *** 741,745 **** * @return the net of this modellor */ ! public Net getNet() { return net; } --- 741,745 ---- * @return the net of this modellor */ ! public Space getNet() { return net; } Index: ModelBathModellor2.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ModelBathModellor2.java 10 Aug 2007 11:23:06 -0000 1.7 --- ModelBathModellor2.java 2 Nov 2007 11:17:28 -0000 1.8 *************** *** 61,65 **** private CoordinateSystem coord; ! private Net net; private double doorHeight = 2.2; --- 61,65 ---- private CoordinateSystem coord; ! private Space net; private double doorHeight = 2.2; *************** *** 770,774 **** public void setSubContent(Map<String, Object> m) { space = (Space)m.get("Space"); ! net = (Net)m.get("Net"); wallThickness = (Double)m.get("wallThickness"); floorThickness = (Double)m.get("floorThickness"); --- 770,774 ---- public void setSubContent(Map<String, Object> m) { space = (Space)m.get("Space"); ! net = (Space)m.get("Net"); wallThickness = (Double)m.get("wallThickness"); floorThickness = (Double)m.get("floorThickness"); |
|
From: Michael L. <he...@us...> - 2007-11-02 11:17:21
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18085/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java Log Message: Another step in ellimination Net Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** NetFacadeModellor.java 22 Oct 2007 06:55:15 -0000 1.37 --- NetFacadeModellor.java 2 Nov 2007 11:17:22 -0000 1.38 *************** *** 71,75 **** /** The net for this facade */ ! private Net net; /** The framewidth of the facade */ --- 71,75 ---- /** The net for this facade */ ! private Space net; /** The framewidth of the facade */ *************** *** 114,118 **** public void setSubContent(Map<String, Object> m) { space = (Space)m.get("space"); ! net = (Net)m.get("net"); depth = ((Double)m.get("depth")).doubleValue(); frameWidth = ((Double)m.get("frameWidth")).doubleValue(); --- 114,118 ---- public void setSubContent(Map<String, Object> m) { space = (Space)m.get("space"); ! net = (Space)m.get("net"); depth = ((Double)m.get("depth")).doubleValue(); frameWidth = ((Double)m.get("frameWidth")).doubleValue(); *************** *** 287,291 **** * @return the net of this modellor */ ! public Net getNet() { return this.net; } --- 287,291 ---- * @return the net of this modellor */ ! public Space getNet() { return this.net; } *************** *** 296,304 **** */ public void setNet(Space net) { ! if (net instanceof Net) { if (this.net != null) { space.remove(this.net); } ! this.net = (Net)net; space.add(net); } --- 296,304 ---- */ public void setNet(Space net) { ! if (net.isNet()) { if (this.net != null) { space.remove(this.net); } ! this.net = net; space.add(net); } *************** *** 346,350 **** * @param n the net */ ! private void prepareNet(Net n) { Collection<Edge> edges = n.getEdges(); for (Edge e : edges) { --- 346,350 ---- * @param n the net */ ! private void prepareNet(Space n) { Collection<Edge> edges = n.getEdges(); for (Edge e : edges) { *************** *** 390,394 **** * @param net the net */ ! private void createDoubleFacade(Net net) { if (frame == null) { frame = new Space("Frame", --- 390,394 ---- * @param net the net */ ! private void createDoubleFacade(Space net) { if (frame == null) { frame = new Space("Frame", *************** *** 440,444 **** * @param net the net */ ! private void createSingleFacade(Net net) { if (frame == null) { frame = new Space("Frame", --- 440,444 ---- * @param net the net */ ! private void createSingleFacade(Space net) { if (frame == null) { frame = new Space("Frame", *************** *** 571,575 **** * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Net net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); --- 571,575 ---- * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Space net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); *************** *** 623,628 **** * @return a new net */ ! private Net createNet(Surface front) { ! Net n = new Net("Facade net"); if (front != null) { front.copy(n); --- 623,628 ---- * @return a new net */ ! private Space createNet(Surface front) { ! Space n = new Net("Facade net"); if (front != null) { front.copy(n); |
|
From: Michael L. <he...@us...> - 2007-11-02 11:05:37
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13436/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: a step in elliminating Net Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Display.java 31 Oct 2007 07:33:32 -0000 1.44 --- Display.java 2 Nov 2007 11:05:39 -0000 1.45 *************** *** 36,40 **** import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Line; - import net.sourceforge.bprocessor.model.Net; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; --- 36,39 ---- *************** *** 843,847 **** } } else { ! if (space instanceof Net) { if (space == active) { interior = true; --- 842,846 ---- } } else { ! if (space.isNet()) { if (space == active) { interior = true; *************** *** 911,915 **** { ! if (selecting() || (space instanceof Net && space == active)) { Set<Vertex> visible = new HashSet(); for (Edge current : edges) { --- 910,914 ---- { ! if (selecting() || (space.isNet() && space == active)) { Set<Vertex> visible = new HashSet(); for (Edge current : edges) { *************** *** 960,964 **** } } ! if (inside || (intersecting() && !(active instanceof Net))) { selectEdges(edges); } --- 959,963 ---- } } ! if (inside || (intersecting() && !(active.isNet()))) { selectEdges(edges); } *************** *** 992,996 **** float[] color; ! if (space instanceof Net) { size = 2.0f; } else { --- 991,995 ---- float[] color; ! if (space.isNet()) { size = 2.0f; } else { *************** *** 1014,1018 **** } else { float[] color; ! if (space instanceof Net) { color = middleblue; } else { --- 1013,1017 ---- } else { float[] color; ! if (space.isNet()) { color = middleblue; } else { |
