bprocessor-commit Mailing List for B-processor (Page 17)
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...> - 2009-06-26 20:42:05
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15065/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: duplicate Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** FinalMoveTool.java 26 Jun 2009 15:39:13 -0000 1.53 --- FinalMoveTool.java 26 Jun 2009 20:41:55 -0000 1.54 *************** *** 631,635 **** */ public void activate(Space space) { ! Vertex center = space.center(); Intersection intersection = new Intersection(center, Intersection.VERTEX, space); LinkedList<Geometric> geometrics = new LinkedList(); --- 631,635 ---- */ public void activate(Space space) { ! Vertex center = new Vertex(0, 0, 0); Intersection intersection = new Intersection(center, Intersection.VERTEX, space); LinkedList<Geometric> geometrics = new LinkedList(); |
|
From: Michael L. <he...@us...> - 2009-06-26 15:39:17
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2515/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java PopupMenu.java Log Message: Instances etc. Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** Display.java 25 Jun 2009 22:17:40 -0000 1.94 --- Display.java 26 Jun 2009 15:39:13 -0000 1.95 *************** *** 1146,1152 **** disableClipplanes(); if (grid != null) { ! gl.glDepthMask(false); ! draw(grid); ! gl.glDepthMask(true); } paintConstructors(constructors); --- 1146,1154 ---- disableClipplanes(); if (grid != null) { ! if (!hidden.contains(grid)) { ! gl.glDepthMask(false); ! draw(grid); ! gl.glDepthMask(true); ! } } paintConstructors(constructors); Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** PopupMenu.java 26 Jun 2009 12:39:54 -0000 1.33 --- PopupMenu.java 26 Jun 2009 15:39:13 -0000 1.34 *************** *** 1008,1011 **** --- 1008,1028 ---- }; }); + menu.add(new CollectionMenuAction(components, "Make Duplicate") { + public void actionPerformed(ActionEvent e) { + Project project = Project.getInstance(); + Space world = project.getActiveSpace(); + List<Component> components = new LinkedList(col); + for (Component component : components) { + project.addCalalogObject(component); + Space space = component.makeDuplicate(); + world.add(space); + Selection.primary().set(space); + FinalMoveTool tool = (FinalMoveTool)editor.changeTool(Tool.FINAL_MOVE_TOOL); + tool.activate(space); + } + project.changed(world); + project.checkpoint(); + }; + }); return menu; } |
|
From: Michael L. <he...@us...> - 2009-06-26 15:39:16
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2515/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: Instances etc. Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** FinalMoveTool.java 26 Jun 2009 12:39:54 -0000 1.52 --- FinalMoveTool.java 26 Jun 2009 15:39:13 -0000 1.53 *************** *** 617,621 **** * @param instance Instance to move */ ! public void activate (Instance instance) { CoordinateSystem anchor = instance.getInstanceAnchor(); Vertex center = anchor.unTranslate(anchor.getOrigin()); --- 617,621 ---- * @param instance Instance to move */ ! public void activate(Instance instance) { CoordinateSystem anchor = instance.getInstanceAnchor(); Vertex center = anchor.unTranslate(anchor.getOrigin()); *************** *** 626,629 **** --- 626,641 ---- } + /** + * Activate this move tool on a space + * @param space Space to move + */ + public void activate(Space space) { + Vertex center = space.center(); + Intersection intersection = new Intersection(center, Intersection.VERTEX, space); + LinkedList<Geometric> geometrics = new LinkedList(); + geometrics.add(space); + activate(geometrics, intersection); + } + /*** |
|
From: Michael L. <he...@us...> - 2009-06-26 15:39:14
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2502/src/net/sourceforge/bprocessor/model Modified Files: Component.java Space.java Log Message: Instances etc. Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.240 retrieving revision 1.241 diff -C2 -d -r1.240 -r1.241 *** Space.java 25 Jun 2009 22:17:30 -0000 1.240 --- Space.java 26 Jun 2009 15:39:10 -0000 1.241 *************** *** 1523,1526 **** --- 1523,1536 ---- /** + * {@inheritDoc} + */ + public Space copy(Map map) { + Space copy = (Space) shallowCopy(); + copyInterior(new HashMap(), copy); + return copy; + } + + + /** * */ Index: Component.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Component.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Component.java 26 Jun 2009 12:39:50 -0000 1.8 --- Component.java 26 Jun 2009 15:39:10 -0000 1.9 *************** *** 8,11 **** --- 8,12 ---- import java.io.File; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; *************** *** 117,120 **** --- 118,130 ---- /** + * Return a duplicate of this component + * @return duplicate + */ + public Space makeDuplicate() { + Space duplicate = (Space) space.copy(new HashMap()); + return duplicate; + } + + /** * {@inheritDoc} */ |
|
From: Michael L. <he...@us...> - 2009-06-26 14:06:22
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9672/src/net/sourceforge/bprocessor/model Modified Files: Instance.java Component.java Log Message: Instance work Index: Instance.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Instance.java 25 Jun 2009 22:17:29 -0000 1.9 --- Instance.java 26 Jun 2009 12:39:50 -0000 1.10 *************** *** 56,66 **** */ public void setProto(Space space) { ! this.proto = space; ! if (proto != null) { ! if (anchor == null) { ! this.anchor = Project.getInstance().getActiveCoordinateSystem().copy(); ! } ! } else { ! this.anchor = null; } } --- 56,62 ---- */ public void setProto(Space space) { ! proto = space; ! if (anchor == null) { ! this.anchor = Project.getInstance().getActiveCoordinateSystem().copy(); } } *************** *** 71,82 **** */ public CoordinateSystem getInstanceAnchor() { ! if (isInstance()) { ! if (anchor == null) { ! anchor = Project.getInstance().getActiveCoordinateSystem().copy(); ! } ! return anchor; ! } else { ! return null; ! } } --- 67,71 ---- */ public CoordinateSystem getInstanceAnchor() { ! return anchor; } Index: Component.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Component.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Component.java 25 Jun 2009 22:17:30 -0000 1.7 --- Component.java 26 Jun 2009 12:39:50 -0000 1.8 *************** *** 105,108 **** --- 105,118 ---- this.isLocked = isLocked; } + + /** + * Create an instance of this component + * @return new instance + */ + public Instance makeInstance() { + Instance instance = new Instance(space.getName() + " instance "); + instance.setProto(space); + return instance; + } /** *************** *** 202,205 **** --- 212,218 ---- public void setName(String name) { this.name = name; + if (space != null) { + space.setName(name); + } } |
|
From: Michael L. <he...@us...> - 2009-06-26 14:05:52
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9689/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: Instance work Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** FinalMoveTool.java 25 Jun 2009 22:17:40 -0000 1.51 --- FinalMoveTool.java 26 Jun 2009 12:39:54 -0000 1.52 *************** *** 612,615 **** --- 612,630 ---- } + + /** + * Activate this move tool on an instance + * @param instance Instance to move + */ + public void activate (Instance instance) { + CoordinateSystem anchor = instance.getInstanceAnchor(); + Vertex center = anchor.unTranslate(anchor.getOrigin()); + Intersection intersection = new Intersection(center, Intersection.VERTEX, instance); + LinkedList<Geometric> geometrics = new LinkedList(); + geometrics.add(instance); + activate(geometrics, intersection); + } + + /*** * Activate the tool on this collection of geometric |
|
From: Michael L. <he...@us...> - 2009-06-26 14:05:42
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9689/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Instance work Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** PopupMenu.java 25 Jun 2009 23:28:49 -0000 1.32 --- PopupMenu.java 26 Jun 2009 12:39:54 -0000 1.33 *************** *** 22,26 **** import net.sourceforge.bprocessor.gl.Editor; - import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.tool.FinalMoveTool; import net.sourceforge.bprocessor.gl.tool.Tool; --- 22,25 ---- *************** *** 994,1023 **** menu.add(new CollectionMenuAction(components, "Make Instance") { public void actionPerformed(ActionEvent e) { ! Project proj = Project.getInstance(); ! Space world = proj.getActiveSpace(); ! for (Object o : col) { ! Component lo = (Component)o; ! Space space = lo.getSpace(); ! Instance instance = new Instance(space.getName() + " instance "); ! proj.addCalalogObject(lo); ! instance.setProto(space); world.add(instance); Selection.primary().set(instance); FinalMoveTool tool = (FinalMoveTool)editor.changeTool(Tool.FINAL_MOVE_TOOL); ! CoordinateSystem cs = null; ! if (!instance.getProto().getCoordinateSystems().isEmpty()) { ! cs = instance.getProto().getCoordinateSystems().iterator().next(); ! } ! if (cs == null) { ! cs = instance.getInstanceAnchor(); ! } ! Vertex center = instance.getInstanceAnchor().unTranslate(cs.center()); ! Intersection i = new Intersection(center, Intersection.VERTEX, instance); ! Collection<Instance> insts = new LinkedList<Instance>(); ! insts.add(instance); ! tool.activate(insts, i); } ! proj.changed(world); ! proj.checkpoint(); }; }); --- 993,1009 ---- menu.add(new CollectionMenuAction(components, "Make Instance") { public void actionPerformed(ActionEvent e) { ! Project project = Project.getInstance(); ! Space world = project.getActiveSpace(); ! List<Component> components = new LinkedList(col); ! for (Component component : components) { ! project.addCalalogObject(component); ! Instance instance = component.makeInstance(); world.add(instance); Selection.primary().set(instance); FinalMoveTool tool = (FinalMoveTool)editor.changeTool(Tool.FINAL_MOVE_TOOL); ! tool.activate(instance); } ! project.changed(world); ! project.checkpoint(); }; }); |
|
From: Michael L. <he...@us...> - 2009-06-25 23:31:24
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25644/src/net/sourceforge/bprocessor/gui/actions Modified Files: ImportFileReader.java FileImportActionListener.java Log Message: item to space Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FileImportActionListener.java 25 Jun 2009 22:17:33 -0000 1.25 --- FileImportActionListener.java 25 Jun 2009 23:28:46 -0000 1.26 *************** *** 28,33 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Item; - import org.apache.log4j.Logger; --- 28,31 ---- *************** *** 121,125 **** } else if (lfile.getName().endsWith(".obj")) { try { ! Space s = Item.createUnion(lfile.getName()); //Component lo = new Component(Byte.MAX_VALUE, lfile, s); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), --- 119,123 ---- } else if (lfile.getName().endsWith(".obj")) { try { ! Space s = Space.createUnion(lfile.getName()); //Component lo = new Component(Byte.MAX_VALUE, lfile, s); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), Index: ImportFileReader.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ImportFileReader.java 25 Jun 2009 22:17:33 -0000 1.21 --- ImportFileReader.java 25 Jun 2009 23:28:46 -0000 1.22 *************** *** 31,35 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 31,34 ---- *************** *** 406,410 **** } if (spaceid != previousSpaceId) { ! currentSpace = Item.createConstructionSpace("Space with id " + spaceid); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); --- 405,409 ---- } if (spaceid != previousSpaceId) { ! currentSpace = Space.createConstructionSpace("Space with id " + spaceid); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); *************** *** 602,606 **** */ public Space readFile() throws IOException { ! output = Item.createConstructionSpace("Design"); while (input.available() > 0) { readElement(); --- 601,605 ---- */ public Space readFile() throws IOException { ! output = Space.createConstructionSpace("Design"); while (input.available() > 0) { readElement(); |
|
From: Michael L. <he...@us...> - 2009-06-25 23:29:51
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25623/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java FacadeModellor.java Log Message: item to space Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** NetFacadeModellor.java 25 Jun 2009 22:17:23 -0000 1.48 --- NetFacadeModellor.java 25 Jun 2009 23:28:38 -0000 1.49 *************** *** 28,32 **** import net.sourceforge.bprocessor.model.Selector; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 28,31 ---- *************** *** 133,137 **** Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = Item.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); --- 132,136 ---- Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = Space.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); *************** *** 389,393 **** private void createDoubleFacade(Space net) { if (frame == null) { ! frame = Item.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); --- 388,392 ---- private void createDoubleFacade(Space net) { if (frame == null) { ! frame = Space.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); *************** *** 436,440 **** private void createSingleFacade(Space net) { if (frame == null) { ! frame = Item.createConstructionSpace("Frame"); space.add(frame); } --- 435,439 ---- private void createSingleFacade(Space net) { if (frame == null) { ! frame = Space.createConstructionSpace("Frame"); space.add(frame); } *************** *** 469,473 **** Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Space holeSpace = Item.createFunctionalSpace("Facade Hole"); space.add(holeSpace); Geometry.assignSame(front, hole, space, holeSpace); --- 468,472 ---- Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Space holeSpace = Space.createFunctionalSpace("Facade Hole"); space.add(holeSpace); Geometry.assignSame(front, hole, space, holeSpace); *************** *** 512,519 **** Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Space f = Item.createConstructionSpace(type + " Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Space g = Item.createConstructionSpace("Glass"); Classification glassClass = Project.getInstance().getClassification(GLASS, 0); g.setClassification(glassClass); --- 511,518 ---- Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Space f = Space.createConstructionSpace(type + " Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Space g = Space.createConstructionSpace("Glass"); Classification glassClass = Project.getInstance().getClassification(GLASS, 0); g.setClassification(glassClass); Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** FacadeModellor.java 25 Jun 2009 22:17:23 -0000 1.43 --- FacadeModellor.java 25 Jun 2009 23:28:38 -0000 1.44 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Attribute; - import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Project; --- 20,23 ---- *************** *** 366,370 **** if (front != null && depth > 0) { ! Space frame = Item.createConstructionSpace("Frame"); space.add(frame); Surface eFront = front.copy(space); --- 365,369 ---- if (front != null && depth > 0) { ! Space frame = Space.createConstructionSpace("Frame"); space.add(frame); Surface eFront = front.copy(space); *************** *** 691,695 **** Surface s = (Surface)it.next(); Set sides = new HashSet(); ! Space w = Item.createConstructionSpace("Window"); 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 = Space.createConstructionSpace("Window"); double u = s.normal().dot(front.normal()); if ((u > 0 && front.getBackDomain() == space) || |
|
From: Michael L. <he...@us...> - 2009-06-25 23:29:34
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25666/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceSelectTool.java AbstractTool.java SelectStrategy.java Log Message: item to space Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** SelectStrategy.java 25 Jun 2009 22:17:40 -0000 1.33 --- SelectStrategy.java 25 Jun 2009 23:28:49 -0000 1.34 *************** *** 26,30 **** import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 26,29 ---- *************** *** 145,149 **** ! Set<Item> spaces = Surface.spaces(surfaces); edges.addAll(Surface.edges(surfaces)); --- 144,148 ---- ! Set<Space> spaces = Surface.spaces(surfaces); edges.addAll(Surface.edges(surfaces)); *************** *** 180,184 **** } ! Set<Item> spaces = Surface.spaces(surfaces); if (spaces.size() > 0) { --- 179,183 ---- } ! Set<Space> spaces = Surface.spaces(surfaces); if (spaces.size() > 0) { Index: SpaceSelectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SpaceSelectTool.java 25 Jun 2009 22:17:40 -0000 1.3 --- SpaceSelectTool.java 25 Jun 2009 23:28:49 -0000 1.4 *************** *** 11,15 **** import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; --- 11,15 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 58,63 **** if (target instanceof Surface) { Surface surface = (Surface) target; ! Item front = surface.getFrontDomain(); ! Item back = surface.getBackDomain(); if (front.isConstructionSpace()) { Selection.primary().set(front); --- 58,63 ---- if (target instanceof Surface) { Surface surface = (Surface) target; ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); if (front.isConstructionSpace()) { Selection.primary().set(front); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.149 retrieving revision 1.150 diff -C2 -d -r1.149 -r1.150 *** AbstractTool.java 25 Jun 2009 22:17:40 -0000 1.149 --- AbstractTool.java 25 Jun 2009 23:28:49 -0000 1.150 *************** *** 18,22 **** import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Transform; --- 18,21 ---- *************** *** 797,801 **** public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = Item.createConstructionSpace(name); stack.push(result); } --- 796,800 ---- public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = Space.createConstructionSpace(name); stack.push(result); } |
|
From: Michael L. <he...@us...> - 2009-06-25 23:29:19
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25633/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Log Message: item to space Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.226 retrieving revision 1.227 diff -C2 -d -r1.226 -r1.227 *** Surface.java 25 Jun 2009 22:17:30 -0000 1.226 --- Surface.java 25 Jun 2009 23:28:42 -0000 1.227 *************** *** 213,222 **** * @return set of spaces */ ! public static Set<Item> spaces(Collection<Surface> surfaces) { ! Set<Item> spaces = new HashSet(); for (Surface surface : surfaces) { ! List<Item> incident = new LinkedList(); ! Item front = surface.getFrontDomain(); ! Item back = surface.getBackDomain(); if (!front.isVoid()) { incident.add(front); --- 213,222 ---- * @return set of spaces */ ! public static Set<Space> spaces(Collection<Surface> surfaces) { ! Set<Space> spaces = new HashSet(); for (Surface surface : surfaces) { ! List<Space> incident = new LinkedList(); ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); if (!front.isVoid()) { incident.add(front); *************** *** 226,230 **** } ! for (Item space : incident) { if (surfaces.containsAll(space.getEnvelope())) { spaces.add(space); --- 226,230 ---- } ! for (Space space : incident) { if (surfaces.containsAll(space.getEnvelope())) { spaces.add(space); |
|
From: Michael L. <he...@us...> - 2009-06-25 23:29:17
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25666/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: item to space Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** PopupMenu.java 25 Jun 2009 22:17:40 -0000 1.31 --- PopupMenu.java 25 Jun 2009 23:28:49 -0000 1.32 *************** *** 364,368 **** AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Space union = Item.createConstructionSpace("Normals"); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); --- 364,368 ---- AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Space union = Space.createConstructionSpace("Normals"); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); *************** *** 619,623 **** HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = Item.createUnion("Union"); for (Vertex current : copy.vertices()) { union.add(current); --- 619,623 ---- HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = Space.createUnion("Union"); for (Vertex current : copy.vertices()) { union.add(current); *************** *** 847,851 **** AbstractAction action = new AbstractAction("Bounding Sphere") { private Space circle(Vertex i, Vertex j, Vertex origin, double radius) { ! Space union = Item.createUnion("Circle"); LinkedList<Vertex> vertices = new LinkedList(); int n = 64; --- 847,851 ---- AbstractAction action = new AbstractAction("Bounding Sphere") { private Space circle(Vertex i, Vertex j, Vertex origin, double radius) { ! Space union = Space.createUnion("Circle"); LinkedList<Vertex> vertices = new LinkedList(); int n = 64; *************** *** 878,890 **** double radius = sphere.radius(); { ! Item circle = circle(i, j, origin, radius); Project.getInstance().world().add(circle); } { ! Item circle = circle(j, k, origin, radius); Project.getInstance().world().add(circle); } { ! Item circle = circle(k, i, origin, radius); Project.getInstance().world().add(circle); } --- 878,890 ---- double radius = sphere.radius(); { ! Space circle = circle(i, j, origin, radius); Project.getInstance().world().add(circle); } { ! Space circle = circle(j, k, origin, radius); Project.getInstance().world().add(circle); } { ! Space circle = circle(k, i, origin, radius); Project.getInstance().world().add(circle); } |
|
From: Michael L. <he...@us...> - 2009-06-25 23:29:13
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25644/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: item to space Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** GUI.java 25 Jun 2009 22:17:33 -0000 1.111 --- GUI.java 25 Jun 2009 23:28:46 -0000 1.112 *************** *** 270,274 **** Space owner = Project.getInstance().getActiveSpace(); Space space; ! space = Item.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); --- 270,274 ---- Space owner = Project.getInstance().getActiveSpace(); Space space; ! space = Space.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); *************** *** 284,288 **** Space owner = Project.getInstance().getActiveSpace(); Space space; ! space = Item.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); --- 284,288 ---- Space owner = Project.getInstance().getActiveSpace(); Space space; ! space = Space.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); |
|
From: Michael L. <he...@us...> - 2009-06-25 22:18:09
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17492/src/net/sourceforge/bprocessor/gui/actions Modified Files: SpaceMenuAction.java ModellorMenuAction.java ImportFileReader.java FileImportActionListener.java Log Message: Renamed Space to Item and Container to Space Index: SpaceMenuAction.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/SpaceMenuAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SpaceMenuAction.java 13 Dec 2007 12:00:55 -0000 1.2 --- SpaceMenuAction.java 25 Jun 2009 22:17:33 -0000 1.3 *************** *** 9,13 **** import javax.swing.AbstractAction; ! import net.sourceforge.bprocessor.model.Container; --- 9,13 ---- import javax.swing.AbstractAction; ! import net.sourceforge.bprocessor.model.Space; *************** *** 17,21 **** public abstract class SpaceMenuAction extends AbstractAction { /** The entity */ ! protected Container space; /** --- 17,21 ---- public abstract class SpaceMenuAction extends AbstractAction { /** The entity */ ! protected Space space; /** *************** *** 24,28 **** * @param name the name of the action */ ! public SpaceMenuAction(Container s, String name) { super(name); this.space = s; --- 24,28 ---- * @param name the name of the action */ ! public SpaceMenuAction(Space s, String name) { super(name); this.space = s; Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** FileImportActionListener.java 19 Jun 2009 13:32:32 -0000 1.24 --- FileImportActionListener.java 25 Jun 2009 22:17:33 -0000 1.25 *************** *** 27,32 **** import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import org.apache.log4j.Logger; --- 27,32 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import org.apache.log4j.Logger; *************** *** 121,125 **** } else if (lfile.getName().endsWith(".obj")) { try { ! Container s = Space.createUnion(lfile.getName()); //Component lo = new Component(Byte.MAX_VALUE, lfile, s); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), --- 121,125 ---- } else if (lfile.getName().endsWith(".obj")) { try { ! Space s = Item.createUnion(lfile.getName()); //Component lo = new Component(Byte.MAX_VALUE, lfile, s); ImportFileReader.importObjFile(lfile, s, info.objPanel.getScale(), *************** *** 135,139 **** } else if (lfile.getName().endsWith(".dgn")) { try { ! Container result = ImportFileReader.importDgnFormat(lfile); Project.getInstance().world().add(result); Project.getInstance().changed(Project.getInstance()); --- 135,139 ---- } else if (lfile.getName().endsWith(".dgn")) { try { ! Space result = ImportFileReader.importDgnFormat(lfile); Project.getInstance().world().add(result); Project.getInstance().changed(Project.getInstance()); Index: ModellorMenuAction.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ModellorMenuAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ModellorMenuAction.java 17 Dec 2007 13:09:35 -0000 1.4 --- ModellorMenuAction.java 25 Jun 2009 22:17:33 -0000 1.5 *************** *** 14,18 **** import net.sourceforge.bprocessor.gui.attrview.AttributeView; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.modellor.Modellor; --- 14,18 ---- import net.sourceforge.bprocessor.gui.attrview.AttributeView; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.modellor.Modellor; *************** *** 26,30 **** /** The space */ ! protected Container space; /** The modellor */ --- 26,30 ---- /** The space */ ! protected Space space; /** The modellor */ *************** *** 36,40 **** * @param m the modellor */ ! public ModellorMenuAction(Container s, Modellor m) { super(m.title()); this.space = s; --- 36,40 ---- * @param m the modellor */ ! public ModellorMenuAction(Space s, Modellor m) { super(m.title()); this.space = s; Index: ImportFileReader.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ImportFileReader.java 19 Jun 2009 13:32:32 -0000 1.20 --- ImportFileReader.java 25 Jun 2009 22:17:33 -0000 1.21 *************** *** 30,35 **** import net.sourceforge.bprocessor.model.Material; import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 30,35 ---- import net.sourceforge.bprocessor.model.Material; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 73,77 **** * @throws IOException a possible file read error */ ! public static void importObjFile(File f, Container into, double scale, int basisPlane, boolean calcNormals) throws IOException { --- 73,77 ---- * @throws IOException a possible file read error */ ! public static void importObjFile(File f, Space into, double scale, int basisPlane, boolean calcNormals) throws IOException { *************** *** 86,92 **** Set<Surface> surfaces = new HashSet<Surface>(); Map<Vertex, Set<Edge>> v2es = new HashMap<Vertex, Set<Edge>>(); ! List<Container> groups = new LinkedList<Container>(); Map<String, Material> materialMap = new HashMap<String, Material>(); ! Container currentGroup = into.createConstructionSpace("Object"); Material currentMaterial = null; boolean missNormals = false; --- 86,92 ---- Set<Surface> surfaces = new HashSet<Surface>(); Map<Vertex, Set<Edge>> v2es = new HashMap<Vertex, Set<Edge>>(); ! List<Space> groups = new LinkedList<Space>(); Map<String, Material> materialMap = new HashMap<String, Material>(); ! Space currentGroup = into.createConstructionSpace("Object"); Material currentMaterial = null; boolean missNormals = false; *************** *** 201,205 **** } } ! for (Container s : groups) { if (!s.collect().isEmpty()) { into.add(s); --- 201,205 ---- } } ! for (Space s : groups) { if (!s.collect().isEmpty()) { into.add(s); *************** *** 344,348 **** * @throws IOException A possible file read exception */ ! public static void importCsvFile(File file, Container where, int chosenFloor) throws IOException { if (file.exists()) { BufferedReader bf; --- 344,348 ---- * @throws IOException A possible file read exception */ ! public static void importCsvFile(File file, Space where, int chosenFloor) throws IOException { if (file.exists()) { BufferedReader bf; *************** *** 361,365 **** int previousSpaceId = spaceid; int classification = 0; ! Container currentSpace = null; Surface outerSurface = null; List<Vertex> verts = new ArrayList<Vertex>(); --- 361,365 ---- int previousSpaceId = spaceid; int classification = 0; ! Space currentSpace = null; Surface outerSurface = null; List<Vertex> verts = new ArrayList<Vertex>(); *************** *** 406,410 **** } if (spaceid != previousSpaceId) { ! currentSpace = Space.createConstructionSpace("Space with id " + spaceid); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); --- 406,410 ---- } if (spaceid != previousSpaceId) { ! currentSpace = Item.createConstructionSpace("Space with id " + spaceid); where.add(currentSpace); currentSpace.setClassification(new Classification("Type " + classification, -1)); *************** *** 480,484 **** * @return the generated surface */ ! private static Surface addToRead(List<Vertex> verts, Container currentSpace, Container where, Surface outer) { List<Edge> es = makeEdgesFromVertexes(verts); --- 480,484 ---- * @return the generated surface */ ! private static Surface addToRead(List<Vertex> verts, Space currentSpace, Space where, Surface outer) { List<Edge> es = makeEdgesFromVertexes(verts); *************** *** 535,539 **** private static class DgnReader { private InputStream input; ! private Container output; public DgnReader(InputStream input) { this.input = input; --- 535,539 ---- private static class DgnReader { private InputStream input; ! private Space output; public DgnReader(InputStream input) { this.input = input; *************** *** 601,606 **** * @throws IOException */ ! public Container readFile() throws IOException { ! output = Space.createConstructionSpace("Design"); while (input.available() > 0) { readElement(); --- 601,606 ---- * @throws IOException */ ! public Space readFile() throws IOException { ! output = Item.createConstructionSpace("Design"); while (input.available() > 0) { readElement(); *************** *** 615,622 **** * @throws IOException IOException */ ! public static Container importDgnFormat(File file) throws IOException { InputStream stream = new FileInputStream(file); DgnReader reader = new DgnReader(stream); ! Container result = reader.readFile(); return result; } --- 615,622 ---- * @throws IOException IOException */ ! public static Space importDgnFormat(File file) throws IOException { InputStream stream = new FileInputStream(file); DgnReader reader = new DgnReader(stream); ! Space result = reader.readFile(); return result; } |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:59
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17492/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: Renamed Space to Item and Container to Space Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** GenericTreeView.java 4 Feb 2009 15:09:44 -0000 1.144 --- GenericTreeView.java 25 Jun 2009 22:17:33 -0000 1.145 *************** *** 38,42 **** import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Camera; --- 38,42 ---- import org.apache.log4j.Logger; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Camera; *************** *** 55,59 **** import net.sourceforge.bprocessor.model.Relation; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 55,59 ---- import net.sourceforge.bprocessor.model.Relation; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 633,637 **** * @param space Space */ ! public SpaceNode(Space space) { super(space); } --- 633,637 ---- * @param space Space */ ! public SpaceNode(Item space) { super(space); } *************** *** 642,646 **** */ public String toString() { ! String nid = ((Space)userObject).getDisplayName(); return nid; } --- 642,646 ---- */ public String toString() { ! String nid = ((Item)userObject).getDisplayName(); return nid; } *************** *** 651,655 **** */ public ImageIcon icon() { ! if (((Space)userObject).isConstructionSpace()) { return constructionspaceicon; } else { --- 651,655 ---- */ public ImageIcon icon() { ! if (((Item)userObject).isConstructionSpace()) { return constructionspaceicon; } else { *************** *** 717,721 **** * @param container Container */ ! public ContainerNode(Container container) { super(container); makeContainerContent(container); --- 717,721 ---- * @param container Container */ ! public ContainerNode(Space container) { super(container); makeContainerContent(container); *************** *** 726,732 **** * @param space the space */ ! protected void makeContainerContent(Container space) { add(new EnvelopeContainer("Envelope", space)); ! String lvlstr = Container.levelToString(space.getLevel() + 1); add(new ElementContainer(lvlstr + "s", space.getElements())); CompositeNode cn = new ConstructorContainer("Constructors", space.getConstructors()); --- 726,732 ---- * @param space the space */ ! protected void makeContainerContent(Space space) { add(new EnvelopeContainer("Envelope", space)); ! String lvlstr = Space.levelToString(space.getLevel() + 1); add(new ElementContainer(lvlstr + "s", space.getElements())); CompositeNode cn = new ConstructorContainer("Constructors", space.getConstructors()); *************** *** 745,750 **** */ public void update(Object o) { ! if (o instanceof Container) { ! Container space = (Container)o; int inx = 0; ((GenericNode)getChildAt(inx++)).update(space.getEnvelope()); --- 745,750 ---- */ public void update(Object o) { ! if (o instanceof Space) { ! Space space = (Space)o; int inx = 0; ((GenericNode)getChildAt(inx++)).update(space.getEnvelope()); *************** *** 783,787 **** * @param space Space */ ! public VoidNode(Space space) { super(space); add(new SurfaceContainer("Envelope", space.getEnvelope(), false)); --- 783,787 ---- * @param space Space */ ! public VoidNode(Item space) { super(space); add(new SurfaceContainer("Envelope", space.getEnvelope(), false)); *************** *** 793,798 **** */ public void update(Object o) { ! if (o instanceof Space) { ! Space s = (Space)o; if (this.getChildCount() == 1) { ((GenericNode)getChildAt(0)).update(s.getEnvelope()); --- 793,798 ---- */ public void update(Object o) { ! if (o instanceof Item) { ! Item s = (Item)o; if (this.getChildCount() == 1) { ((GenericNode)getChildAt(0)).update(s.getEnvelope()); *************** *** 844,848 **** */ public class EnvelopeNode extends EntityNode { ! private Container space; /** --- 844,848 ---- */ public class EnvelopeNode extends EntityNode { ! private Space space; /** *************** *** 851,855 **** * @param space Space */ ! public EnvelopeNode(Surface surface, Container space) { super(surface); this.space = space; --- 851,855 ---- * @param space Space */ ! public EnvelopeNode(Surface surface, Space space) { super(surface); this.space = space; *************** *** 861,865 **** public String toString() { Surface surface = (Surface) userObject; ! Container other; if (surface.getBackDomain() == space) { other = surface.getFrontDomain(); --- 861,865 ---- public String toString() { Surface surface = (Surface) userObject; ! Space other; if (surface.getBackDomain() == space) { other = surface.getFrontDomain(); *************** *** 1016,1020 **** */ public class EnvelopeContainer extends CompositeNode { ! private Container space; /** * Constructor for SurfaceContainer --- 1016,1020 ---- */ public class EnvelopeContainer extends CompositeNode { ! private Space space; /** * Constructor for SurfaceContainer *************** *** 1022,1026 **** * @param space Space */ ! public EnvelopeContainer(String name, Container space) { super(name); this.space = space; --- 1022,1026 ---- * @param space Space */ ! public EnvelopeContainer(String name, Space space) { super(name); this.space = space; *************** *** 1058,1066 **** /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! Space space = (Space) entity; if (space.isVoid()) { return new VoidNode(space); ! } else if (space instanceof Container) { ! return new ContainerNode((Container) space); } else if (space instanceof Instance) { return new InstanceNode((Instance) space); --- 1058,1066 ---- /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! Item space = (Item) entity; if (space.isVoid()) { return new VoidNode(space); ! } else if (space instanceof Space) { ! return new ContainerNode((Space) space); } else if (space instanceof Instance) { return new InstanceNode((Instance) space); *************** *** 1088,1092 **** * @param space The space */ ! public GeometryNode(String name, Container space) { super(name); add(new SurfaceContainer("Surfaces", space.getSurfaces(), true)); --- 1088,1092 ---- * @param space The space */ ! public GeometryNode(String name, Space space) { super(name); add(new SurfaceContainer("Surfaces", space.getSurfaces(), true)); *************** *** 1099,1103 **** */ public void update(Object o) { ! Container space = (Container)o; updateChild(0, space.getSurfaces()); updateChild(1, space.getEdges()); --- 1099,1103 ---- */ public void update(Object o) { ! Space space = (Space)o; updateChild(0, space.getSurfaces()); updateChild(1, space.getEdges()); *************** *** 1240,1248 **** /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! Space space = (Space) entity; if (space.isVoid()) { return new VoidNode(space); ! } else if (space instanceof Container) { ! return new ContainerNode((Container) space); } else if (space instanceof Instance) { return new InstanceNode((Instance) space); --- 1240,1248 ---- /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! Item space = (Item) entity; if (space.isVoid()) { return new VoidNode(space); ! } else if (space instanceof Space) { ! return new ContainerNode((Space) space); } else if (space instanceof Instance) { return new InstanceNode((Instance) space); |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:47
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17529/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Display.java PopupMenu.java Log Message: Renamed Space to Item and Container to Space Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** Display.java 22 Jun 2009 13:30:19 -0000 1.93 --- Display.java 25 Jun 2009 22:17:40 -0000 1.94 *************** *** 30,34 **** import net.sourceforge.bprocessor.model.Grid; import net.sourceforge.bprocessor.model.Material; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.ClippingPlane; --- 30,34 ---- import net.sourceforge.bprocessor.model.Grid; import net.sourceforge.bprocessor.model.Material; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.ClippingPlane; *************** *** 42,46 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 42,46 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 77,81 **** private static Project project; private static Camera camera; ! private static Space active; --- 77,81 ---- private static Project project; private static Camera camera; ! private static Item active; *************** *** 847,856 **** } ! private static boolean hidden(Container space) { Collection<Geometric> hidden = camera.getHiddenGeometrics(); return hidden.contains(space); } ! private static boolean transparent(Container space) { if (hidden(space)) { return true; --- 847,856 ---- } ! private static boolean hidden(Space space) { Collection<Geometric> hidden = camera.getHiddenGeometrics(); return hidden.contains(space); } ! private static boolean transparent(Space space) { if (hidden(space)) { return true; *************** *** 870,875 **** private static boolean transparent(Surface surface) { ! Container front = surface.getFrontDomain(); ! Container back = surface.getBackDomain(); return transparent(front) && transparent(back); } --- 870,875 ---- private static boolean transparent(Surface surface) { ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); return transparent(front) && transparent(back); } *************** *** 898,902 **** ! private static boolean active(Container space) { if (space == null) { return false; --- 898,902 ---- ! private static boolean active(Space space) { if (space == null) { return false; *************** *** 910,918 **** } ! private static void draw(Space space, boolean inside) { if (space.isInstance()) { drawInstance((Instance) space, inside); } else { ! drawSpace((Container) space, inside); } } --- 910,918 ---- } ! private static void draw(Item space, boolean inside) { if (space.isInstance()) { drawInstance((Instance) space, inside); } else { ! drawSpace((Space) space, inside); } } *************** *** 925,929 **** translateToCoordinatesystem(space); if (USEDL && inside) { ! Container work = space.getProto(); Integer index = displayLists.get(work); if (index != null) { --- 925,929 ---- translateToCoordinatesystem(space); if (USEDL && inside) { ! Space work = space.getProto(); Integer index = displayLists.get(work); if (index != null) { *************** *** 970,978 **** } ! private static void drawSpace(Container space, boolean inside) { Set<Geometric> hidden = new HashSet(); hidden.addAll(camera.getHiddenGeometrics()); ! Collection<Space> elements = new LinkedList(); Collection<Surface> surfaces = new LinkedList(); Collection<Edge> edges = new LinkedList(); --- 970,978 ---- } ! private static void drawSpace(Space space, boolean inside) { Set<Geometric> hidden = new HashSet(); hidden.addAll(camera.getHiddenGeometrics()); ! Collection<Item> elements = new LinkedList(); Collection<Surface> surfaces = new LinkedList(); Collection<Edge> edges = new LinkedList(); *************** *** 1009,1013 **** // Geometry collection ! for (Space current : space.getElements()) { if (!hidden.contains(current)) { elements.add(current); --- 1009,1013 ---- // Geometry collection ! for (Item current : space.getElements()) { if (!hidden.contains(current)) { elements.add(current); *************** *** 1016,1020 **** { Set<Surface> visible = new HashSet(); ! for (Space current : elements) { visible.addAll(current.getEnvelope()); } --- 1016,1020 ---- { Set<Surface> visible = new HashSet(); ! for (Item current : elements) { visible.addAll(current.getEnvelope()); } *************** *** 1097,1101 **** } } ! Container work = space; while (work != null) { for (Constructor current : work.getConstructors()) { --- 1097,1101 ---- } } ! Space work = space; while (work != null) { for (Constructor current : work.getConstructors()) { *************** *** 1104,1108 **** } } ! work = (Container)work.parent(); } } --- 1104,1108 ---- } } ! work = (Space)work.parent(); } } *************** *** 1212,1216 **** System.out.println("c: " + ctime + " s: " + stime + " e: " + etime); } ! for (Space current : elements) { draw(current, inside || (current == active)); } --- 1212,1216 ---- System.out.println("c: " + ctime + " s: " + stime + " e: " + etime); } ! for (Item current : elements) { draw(current, inside || (current == active)); } *************** *** 1224,1228 **** List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! Space current = space; while (current != null) { --- 1224,1228 ---- List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! Item current = space; while (current != null) { *************** *** 1268,1273 **** for (Geometric current : geometrics) { ! if (current instanceof Space) { ! Space space = (Space) current; Collection<Edge> edges = space.hiliteEdges(); paintEdges(edges, View.SELECTED_COLOR, 2.0f); --- 1268,1273 ---- for (Geometric current : geometrics) { ! if (current instanceof Item) { ! Item space = (Item) current; Collection<Edge> edges = space.hiliteEdges(); paintEdges(edges, View.SELECTED_COLOR, 2.0f); *************** *** 1333,1338 **** Display.camera = camera; Display.active = Project.getInstance().world(); ! if (geometric instanceof Container) { ! Display.draw((Container)geometric, true); } else if (geometric instanceof Surface) { Display.draw((Surface)geometric, true); --- 1333,1338 ---- Display.camera = camera; Display.active = Project.getInstance().world(); ! if (geometric instanceof Space) { ! Display.draw((Space)geometric, true); } else if (geometric instanceof Surface) { Display.draw((Surface)geometric, true); *************** *** 1357,1361 **** camera = project.getCurrentCamera(); active = project.getActiveSpace(); ! Container world = project.world(); grid = world.getGrid(); draw(world, world == active); --- 1357,1361 ---- camera = project.getCurrentCamera(); active = project.getActiveSpace(); ! Space world = project.world(); grid = world.getGrid(); draw(world, world == active); Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** PopupMenu.java 19 Jun 2009 13:32:29 -0000 1.30 --- PopupMenu.java 25 Jun 2009 22:17:40 -0000 1.31 *************** *** 42,46 **** import net.sourceforge.bprocessor.model.Component; import net.sourceforge.bprocessor.model.Constructor; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; --- 42,46 ---- import net.sourceforge.bprocessor.model.Component; import net.sourceforge.bprocessor.model.Constructor; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 52,56 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.SpaceAnalysis; import net.sourceforge.bprocessor.model.Surface; --- 52,56 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.SpaceAnalysis; import net.sourceforge.bprocessor.model.Surface; *************** *** 246,252 **** private abstract class ModellorAction extends AbstractAction { protected Modellor modellor; ! protected Container space; ! public ModellorAction(Modellor modellor, Container space) { super(modellor.title()); this.modellor = modellor; --- 246,252 ---- private abstract class ModellorAction extends AbstractAction { protected Modellor modellor; ! protected Space space; ! public ModellorAction(Modellor modellor, Space space) { super(modellor.title()); this.modellor = modellor; *************** *** 268,273 **** AbstractAction action = new CollectionMenuAction(s, "Explode") { public void actionPerformed(ActionEvent event) { ! List<Container> spaces = new LinkedList(col); ! for (Container space : spaces) { Collection<Vertex> vertices = new LinkedList(space.getVertices()); Collection<Edge> edges = new LinkedList(space.getEdges()); --- 268,273 ---- AbstractAction action = new CollectionMenuAction(s, "Explode") { public void actionPerformed(ActionEvent event) { ! List<Space> spaces = new LinkedList(col); ! for (Space space : spaces) { Collection<Vertex> vertices = new LinkedList(space.getVertices()); Collection<Edge> edges = new LinkedList(space.getEdges()); *************** *** 303,307 **** if (s.size() == 1) { // Some options do only apply to one space ! Container sp = (Container)s.iterator().next(); AbstractAction edit = new SpaceMenuAction(sp, "Edit") { --- 303,307 ---- if (s.size() == 1) { // Some options do only apply to one space ! Space sp = (Space)s.iterator().next(); AbstractAction edit = new SpaceMenuAction(sp, "Edit") { *************** *** 364,373 **** AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Container union = Space.createConstructionSpace("Normals"); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); Vertex origin = surface.center(); CoordinateSystem system = CoordinateSystem.systemFor(origin, normal); ! Container pyramid = Command.Pyramid.pyramid(0.05, 0.05, 0.2); for (Vertex current : pyramid.getVertices()) { current.set(system.unTranslate(current)); --- 364,373 ---- AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Space union = Item.createConstructionSpace("Normals"); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); Vertex origin = surface.center(); CoordinateSystem system = CoordinateSystem.systemFor(origin, normal); ! Space pyramid = Command.Pyramid.pyramid(0.05, 0.05, 0.2); for (Vertex current : pyramid.getVertices()) { current.set(system.unTranslate(current)); *************** *** 588,592 **** Collection<Geometric> geometrics = new LinkedList(); { ! Set<Space> spaces = new HashSet(); Set<Surface> surfaces = new HashSet(); Set<Edge> edges = new HashSet(); --- 588,592 ---- Collection<Geometric> geometrics = new LinkedList(); { ! Set<Item> spaces = new HashSet(); Set<Surface> surfaces = new HashSet(); Set<Edge> edges = new HashSet(); *************** *** 594,599 **** for (Geometric current : entities) { ! if (current instanceof Space) { ! spaces.add((Space) current); } else if (current instanceof Surface) { surfaces.add((Surface) current); --- 594,599 ---- for (Geometric current : entities) { ! if (current instanceof Item) { ! spaces.add((Item) current); } else if (current instanceof Surface) { surfaces.add((Surface) current); *************** *** 605,609 **** } spaces.addAll(Surface.spaces(surfaces)); ! for (Space current : spaces) { surfaces.addAll(current.getEnvelope()); } --- 605,609 ---- } spaces.addAll(Surface.spaces(surfaces)); ! for (Item current : spaces) { surfaces.addAll(current.getEnvelope()); } *************** *** 619,623 **** HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Container union = Space.createUnion("Union"); for (Vertex current : copy.vertices()) { union.add(current); --- 619,623 ---- HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = Item.createUnion("Union"); for (Vertex current : copy.vertices()) { union.add(current); *************** *** 629,633 **** union.add(current); } ! for (Space current : copy.elements()) { union.add(current); } --- 629,633 ---- union.add(current); } ! for (Item current : copy.elements()) { union.add(current); } *************** *** 846,851 **** { AbstractAction action = new AbstractAction("Bounding Sphere") { ! private Container circle(Vertex i, Vertex j, Vertex origin, double radius) { ! Container union = Space.createUnion("Circle"); LinkedList<Vertex> vertices = new LinkedList(); int n = 64; --- 846,851 ---- { AbstractAction action = new AbstractAction("Bounding Sphere") { ! private Space circle(Vertex i, Vertex j, Vertex origin, double radius) { ! Space union = Item.createUnion("Circle"); LinkedList<Vertex> vertices = new LinkedList(); int n = 64; *************** *** 878,890 **** double radius = sphere.radius(); { ! Space circle = circle(i, j, origin, radius); Project.getInstance().world().add(circle); } { ! Space circle = circle(j, k, origin, radius); Project.getInstance().world().add(circle); } { ! Space circle = circle(k, i, origin, radius); Project.getInstance().world().add(circle); } --- 878,890 ---- double radius = sphere.radius(); { ! Item circle = circle(i, j, origin, radius); Project.getInstance().world().add(circle); } { ! Item circle = circle(j, k, origin, radius); Project.getInstance().world().add(circle); } { ! Item circle = circle(k, i, origin, radius); Project.getInstance().world().add(circle); } *************** *** 907,911 **** } ! private JMenu getFrameMenu(Container net) { JMenu menu = new JMenu("Frame"); { --- 907,911 ---- } ! private JMenu getFrameMenu(Space net) { JMenu menu = new JMenu("Frame"); { *************** *** 938,942 **** AbstractAction planeanalysis = new AbstractAction("Plane Analysis") { public void actionPerformed(ActionEvent arg0) { ! Container space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearPlanes(space); --- 938,942 ---- AbstractAction planeanalysis = new AbstractAction("Plane Analysis") { public void actionPerformed(ActionEvent arg0) { ! Space space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearPlanes(space); *************** *** 954,958 **** AbstractAction clearplanes = new AbstractAction("Delete Planes") { public void actionPerformed(ActionEvent arg0) { ! Container space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearPlanes(space); --- 954,958 ---- AbstractAction clearplanes = new AbstractAction("Delete Planes") { public void actionPerformed(ActionEvent arg0) { ! Space space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearPlanes(space); *************** *** 964,968 **** AbstractAction surfaceanalysis = new AbstractAction("Surface Analysis") { public void actionPerformed(ActionEvent arg0) { ! Container space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.surfaceAnalysis(space); --- 964,968 ---- AbstractAction surfaceanalysis = new AbstractAction("Surface Analysis") { public void actionPerformed(ActionEvent arg0) { ! Space space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.surfaceAnalysis(space); *************** *** 974,978 **** AbstractAction clearsurfaces = new AbstractAction("Delete Surfaces") { public void actionPerformed(ActionEvent arg0) { ! Container space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearSurfaces(space); --- 974,978 ---- AbstractAction clearsurfaces = new AbstractAction("Delete Surfaces") { public void actionPerformed(ActionEvent arg0) { ! Space space = Project.getInstance().getActiveSpace(); SurfaceAnalysis analysis = new SurfaceAnalysis(); analysis.clearSurfaces(space); *************** *** 995,1002 **** public void actionPerformed(ActionEvent e) { Project proj = Project.getInstance(); ! Container world = proj.getActiveSpace(); for (Object o : col) { Component lo = (Component)o; ! Container space = lo.getSpace(); Instance instance = new Instance(space.getName() + " instance "); proj.addCalalogObject(lo); --- 995,1002 ---- public void actionPerformed(ActionEvent e) { Project proj = Project.getInstance(); ! Space world = proj.getActiveSpace(); for (Object o : col) { Component lo = (Component)o; ! Space space = lo.getSpace(); Instance instance = new Instance(space.getName() + " instance "); proj.addCalalogObject(lo); *************** *** 1037,1041 **** for (Geometric geomeric : entities) { ClippingPlane clip = (ClippingPlane) geomeric; ! Container silhouette = clip.getSilhouette(); Project.getInstance().getActiveSpace().add(silhouette); } --- 1037,1041 ---- for (Geometric geomeric : entities) { ClippingPlane clip = (ClippingPlane) geomeric; ! Space silhouette = clip.getSilhouette(); Project.getInstance().getActiveSpace().add(silhouette); } *************** *** 1062,1067 **** if (type instanceof ClippingPlane) { return getClippingPlaneMenu(new LinkedList(geometrics)); ! } else if (type instanceof Container) { ! return getSpaceMenu(new LinkedList<Container>((Collection<Container>)geometrics)); } else if (type instanceof Surface) { return getSurfaceMenu(new LinkedList<Surface>((Collection<Surface>)geometrics)); --- 1062,1067 ---- if (type instanceof ClippingPlane) { return getClippingPlaneMenu(new LinkedList(geometrics)); ! } else if (type instanceof Space) { ! return getSpaceMenu(new LinkedList<Space>((Collection<Space>)geometrics)); } else if (type instanceof Surface) { return getSurfaceMenu(new LinkedList<Surface>((Collection<Surface>)geometrics)); Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.289 retrieving revision 1.290 diff -C2 -d -r1.289 -r1.290 *** View.java 19 Jun 2009 13:32:29 -0000 1.289 --- View.java 25 Jun 2009 22:17:40 -0000 1.290 *************** *** 29,34 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.model.Surface; --- 29,34 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.model.Surface; *************** *** 571,578 **** List<Surface> surfaces = tesselator.tesselate(surface); Vertex normal = surface.normal(); ! Container front = surface.getFrontDomain(); ! Container back = surface.getBackDomain(); ! Container owner = surface.getOwner(); Collection<Surface> holes = new LinkedList(surface.getHoles()); for (Surface hole : holes) { --- 571,578 ---- List<Surface> surfaces = tesselator.tesselate(surface); Vertex normal = surface.normal(); ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); ! Space owner = surface.getOwner(); Collection<Surface> holes = new LinkedList(surface.getHoles()); for (Surface hole : holes) { *************** *** 755,761 **** drawSelectionWidget((Surface) candidate, hitdetection); } ! } else if (candidate instanceof Space) { if (editor.getTool() instanceof SpaceSelectTool) { ! drawSpeechBubble((Space) candidate, hitdetection); } } --- 755,761 ---- drawSelectionWidget((Surface) candidate, hitdetection); } ! } else if (candidate instanceof Item) { if (editor.getTool() instanceof SpaceSelectTool) { ! drawSpeechBubble((Item) candidate, hitdetection); } } *************** *** 941,948 **** } ! private void drawPath(LinkedList<Container> path, boolean selecting) { LinkedList<Label> labels = new LinkedList<Label>(); boolean first = true; ! for (Container space : path) { labels.add(new SpaceBox(space)); labels.add(new Label("/")); --- 941,948 ---- } ! private void drawPath(LinkedList<Space> path, boolean selecting) { LinkedList<Label> labels = new LinkedList<Label>(); boolean first = true; ! for (Space space : path) { labels.add(new SpaceBox(space)); labels.add(new Label("/")); *************** *** 953,958 **** if (selection.size() == 1) { Geometric geometric = selection.iterator().next(); ! if (geometric instanceof Container) { ! Container container = (Container) geometric; labels.add(new SpaceBox(container)); labels.add(new Label(">>")); --- 953,958 ---- if (selection.size() == 1) { Geometric geometric = selection.iterator().next(); ! if (geometric instanceof Space) { ! Space container = (Space) geometric; labels.add(new SpaceBox(container)); labels.add(new Label(">>")); *************** *** 1000,1006 **** */ private void drawSpacePath(boolean selection) { ! Container active = Project.getInstance().getActiveSpace(); ! Container world = Project.getInstance().world(); ! LinkedList<Container> path = new LinkedList<Container>(); path.add(active); while (active != world) { --- 1000,1006 ---- */ private void drawSpacePath(boolean selection) { ! Space active = Project.getInstance().getActiveSpace(); ! Space world = Project.getInstance().world(); ! LinkedList<Space> path = new LinkedList<Space>(); path.add(active); while (active != world) { *************** *** 1091,1096 **** Vertex front = transformation.project(from); front.setZ(1); ! Container frontDomain = surface.getFrontDomain(); ! Container backDomain = surface.getBackDomain(); String frontName; String backName; --- 1091,1096 ---- Vertex front = transformation.project(from); front.setZ(1); ! Space frontDomain = surface.getFrontDomain(); ! Space backDomain = surface.getBackDomain(); String frontName; String backName; *************** *** 1183,1187 **** } ! private void drawSpeechBubble(Space space, boolean clickable) { Transformation transformation = transformation(); double width = 240; --- 1183,1187 ---- } ! private void drawSpeechBubble(Item space, boolean clickable) { Transformation transformation = transformation(); double width = 240; *************** *** 1259,1264 **** Vertex front = transformation.project(from); front.setZ(1); ! Container frontDomain = surface.getFrontDomain(); ! Container backDomain = surface.getBackDomain(); String frontName; String backName; --- 1259,1264 ---- Vertex front = transformation.project(from); front.setZ(1); ! Space frontDomain = surface.getFrontDomain(); ! Space backDomain = surface.getBackDomain(); String frontName; String backName; *************** *** 1822,1826 **** if (object instanceof Geometric) { Geometric current = (Geometric) object; ! Container active = Project.getInstance().getActiveSpace(); while (current != null && current.getOwner() != active) { current = current.getOwner(); --- 1822,1826 ---- if (object instanceof Geometric) { Geometric current = (Geometric) object; ! Space active = Project.getInstance().getActiveSpace(); while (current != null && current.getOwner() != active) { current = current.getOwner(); *************** *** 2230,2235 **** */ public void update(Object entity) { ! if (entity instanceof Container) { ! for (Surface s : ((Container)entity).getSurfaces()) { if (DISP) { Integer which = displayLists.remove(s); --- 2230,2235 ---- */ public void update(Object entity) { ! if (entity instanceof Space) { ! for (Surface s : ((Space)entity).getSurfaces()) { if (DISP) { Integer which = displayLists.remove(s); *************** *** 2249,2253 **** if (DISP) { Geometric g = (Geometric)entity; ! Container sp = g.getOwner(); for (Surface s : sp.getSurfaces()) { Integer which = displayLists.remove(s); --- 2249,2253 ---- if (DISP) { Geometric g = (Geometric)entity; ! Space sp = g.getOwner(); for (Surface s : sp.getSurfaces()) { Integer which = displayLists.remove(s); |
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17529/src/net/sourceforge/bprocessor/gl/tool Modified Files: PasteActionListener.java ExtrusionTool.java SpaceTool.java EdgeMoveTool.java FinalMoveTool.java AbstractPencil.java ExtendTool.java SpaceSelectTool.java AbstractTool.java ShiftActionListener.java SelectStrategy.java CopyActionListener.java DomainPopupListener.java SelectTool.java AltMoveTool.java ClickBox.java CreateSpaceActionListener.java Log Message: Renamed Space to Item and Container to Space Index: CreateSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CreateSpaceActionListener.java 13 Dec 2007 12:00:49 -0000 1.24 --- CreateSpaceActionListener.java 25 Jun 2009 22:17:40 -0000 1.25 *************** *** 14,18 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; ! import net.sourceforge.bprocessor.model.Container; /** --- 14,18 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 46,51 **** */ public void actionPerformed(ActionEvent event) { ! Container owner = surface.getOwner(); ! Container space; if (functional) { space = owner.createFunctionalSpace(""); --- 46,51 ---- */ public void actionPerformed(ActionEvent event) { ! Space owner = surface.getOwner(); ! Space space; if (functional) { space = owner.createFunctionalSpace(""); Index: EdgeMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EdgeMoveTool.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EdgeMoveTool.java 30 Dec 2007 23:29:10 -0000 1.9 --- EdgeMoveTool.java 25 Jun 2009 22:17:40 -0000 1.10 *************** *** 30,34 **** import net.sourceforge.bprocessor.model.Relation; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 30,34 ---- import net.sourceforge.bprocessor.model.Relation; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 133,137 **** coordMap = new HashMap<Surface, CoordinateSystem>(); swiwel = new HashMap<Surface, Line>(); ! Container space = edge.getOwner(); // find relations Collection<CoordinateSystem> systems = space.getCoordinateSystems(); --- 133,137 ---- coordMap = new HashMap<Surface, CoordinateSystem>(); swiwel = new HashMap<Surface, Line>(); ! Space space = edge.getOwner(); // find relations Collection<CoordinateSystem> systems = space.getCoordinateSystems(); Index: PasteActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PasteActionListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PasteActionListener.java 13 Dec 2007 12:00:49 -0000 1.5 --- PasteActionListener.java 25 Jun 2009 22:17:39 -0000 1.6 *************** *** 10,14 **** import java.awt.event.ActionListener; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; --- 10,14 ---- import java.awt.event.ActionListener; import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 46,51 **** */ public void actionPerformed(ActionEvent e) { ! Container facing = CopyActionListener.getFacing(); ! Container nonFacing = CopyActionListener.getNonFacing(); if (view.facingFront(surface)) { surface.setFrontDomain(facing); --- 46,51 ---- */ public void actionPerformed(ActionEvent e) { ! Space facing = CopyActionListener.getFacing(); ! Space nonFacing = CopyActionListener.getNonFacing(); if (view.facingFront(surface)) { surface.setFrontDomain(facing); Index: DomainPopupListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DomainPopupListener.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DomainPopupListener.java 13 Dec 2007 12:00:49 -0000 1.9 --- DomainPopupListener.java 25 Jun 2009 22:17:40 -0000 1.10 *************** *** 12,16 **** import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; --- 12,16 ---- import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 21,25 **** public class DomainPopupListener implements ActionListener { /** The domain */ ! private Container domain; /** The Surface */ --- 21,25 ---- public class DomainPopupListener implements ActionListener { /** The domain */ ! private Space domain; /** The Surface */ *************** *** 36,40 **** * @param front werther or not this popup for the front of the back of the surface */ ! public DomainPopupListener(Container domain, Surface surface, boolean front) { this.domain = domain; this.surface = surface; --- 36,40 ---- * @param front werther or not this popup for the front of the back of the surface */ ! public DomainPopupListener(Space domain, Surface surface, boolean front) { this.domain = domain; this.surface = surface; *************** *** 48,52 **** public void actionPerformed(ActionEvent arg0) { if (front) { ! Container oldFront = surface.getFrontDomain(); surface.assignFront(domain, Editor.isMulti()); if (oldFront != null) { --- 48,52 ---- public void actionPerformed(ActionEvent arg0) { if (front) { ! Space oldFront = surface.getFrontDomain(); surface.assignFront(domain, Editor.isMulti()); if (oldFront != null) { *************** *** 54,58 **** } } else { ! Container oldBack = surface.getBackDomain(); surface.assignBack(domain, Editor.isMulti()); if (oldBack != null) { --- 54,58 ---- } } else { ! Space oldBack = surface.getBackDomain(); surface.assignBack(domain, Editor.isMulti()); if (oldBack != null) { Index: CopyActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CopyActionListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CopyActionListener.java 13 Dec 2007 12:00:49 -0000 1.4 --- CopyActionListener.java 25 Jun 2009 22:17:40 -0000 1.5 *************** *** 11,15 **** import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; --- 11,15 ---- import net.sourceforge.bprocessor.gl.view.View; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 27,35 **** * The copied domain facing the camera */ ! private static Container facing = null; /** * The copied domain not facing the camera */ ! private static Container nonFacing = null; /** * The surface this listener shifts spaces on --- 27,35 ---- * The copied domain facing the camera */ ! private static Space facing = null; /** * The copied domain not facing the camera */ ! private static Space nonFacing = null; /** * The surface this listener shifts spaces on *************** *** 66,70 **** * @return the domain */ ! public static Container getFacing() { return facing; } --- 66,70 ---- * @return the domain */ ! public static Space getFacing() { return facing; } *************** *** 73,77 **** * @return the domain */ ! public static Container getNonFacing() { return nonFacing; } --- 73,77 ---- * @return the domain */ ! public static Space getNonFacing() { return nonFacing; } Index: SelectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** SelectTool.java 22 Jul 2008 13:19:52 -0000 1.73 --- SelectTool.java 25 Jun 2009 22:17:40 -0000 1.74 *************** *** 9,13 **** import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gui.GUI; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; --- 9,13 ---- import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gui.GUI; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; *************** *** 54,58 **** String side = (String)target; Surface surface = null; ! Container space = null; { --- 54,58 ---- String side = (String)target; Surface surface = null; ! Space space = null; { Index: ExtendTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtendTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExtendTool.java 4 Feb 2009 15:09:41 -0000 1.4 --- ExtendTool.java 25 Jun 2009 22:17:40 -0000 1.5 *************** *** 27,31 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 27,31 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 213,217 **** private void finishTool() { ! Container owner = Project.getInstance().getActiveSpace(); owner.removeProtected(extrusion); if (pressedSurface != null && --- 213,217 ---- private void finishTool() { ! Space owner = Project.getInstance().getActiveSpace(); owner.removeProtected(extrusion); if (pressedSurface != null && Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** ExtrusionTool.java 13 Dec 2007 12:00:49 -0000 1.75 --- ExtrusionTool.java 25 Jun 2009 22:17:40 -0000 1.76 *************** *** 31,35 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 31,35 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 88,92 **** * @param extrusion Collection of surfaces */ ! protected static void insert(Container space, Collection<Surface> extrusion) { Collection<Edge> edges = Surface.edges(extrusion); Collection<Vertex> vertices = Edge.vertices(edges); --- 88,92 ---- * @param extrusion Collection of surfaces */ ! protected static void insert(Space space, Collection<Surface> extrusion) { Collection<Edge> edges = Surface.edges(extrusion); Collection<Vertex> vertices = Edge.vertices(edges); *************** *** 103,107 **** */ private void extrudeOnto(Plane plane, boolean all, boolean finish) { ! Container space = Project.getInstance().getActiveSpace(); if (extrusion != null) { space.removeProtected(extrusion); --- 103,107 ---- */ private void extrudeOnto(Plane plane, boolean all, boolean finish) { ! Space space = Project.getInstance().getActiveSpace(); if (extrusion != null) { space.removeProtected(extrusion); *************** *** 142,146 **** */ private void extrudeEdgesOnto(Plane plane, boolean finish) { ! Container space = Project.getInstance().getActiveSpace(); if (extrusion != null) { space.removeProtected(extrusion); --- 142,146 ---- */ private void extrudeEdgesOnto(Plane plane, boolean finish) { ! Space space = Project.getInstance().getActiveSpace(); if (extrusion != null) { space.removeProtected(extrusion); Index: ClickBox.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClickBox.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClickBox.java 13 Dec 2007 12:00:49 -0000 1.2 --- ClickBox.java 25 Jun 2009 22:17:40 -0000 1.3 *************** *** 7,11 **** package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.model.Container; /** --- 7,11 ---- package net.sourceforge.bprocessor.gl.tool; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 14,23 **** */ public class ClickBox { ! private Container space; /** * @param space Space */ ! public ClickBox(Container space) { this.space = space; } --- 14,23 ---- */ public class ClickBox { ! private Space space; /** * @param space Space */ ! public ClickBox(Space space) { this.space = space; } *************** *** 26,30 **** * @return space */ ! public Container space() { return space; } --- 26,30 ---- * @return space */ ! public Space space() { return space; } Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** AbstractTool.java 3 Nov 2008 13:14:06 -0000 1.148 --- AbstractTool.java 25 Jun 2009 22:17:40 -0000 1.149 *************** *** 17,22 **** import net.sourceforge.bprocessor.model.Scale; import net.sourceforge.bprocessor.model.Selection; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Transform; --- 17,22 ---- import net.sourceforge.bprocessor.model.Scale; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Transform; *************** *** 783,787 **** public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); ! Container space = (Container) env.get(1); surface.setFrontDomain(space); } --- 783,787 ---- public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); ! Space space = (Space) env.get(1); surface.setFrontDomain(space); } *************** *** 790,794 **** public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); ! Container space = (Container) env.get(1); surface.setBackDomain(space); } --- 790,794 ---- public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); ! Space space = (Space) env.get(1); surface.setBackDomain(space); } *************** *** 797,801 **** public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Container result = Space.createConstructionSpace(name); stack.push(result); } --- 797,801 ---- public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = Item.createConstructionSpace(name); stack.push(result); } Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** SpaceTool.java 13 Dec 2007 12:00:49 -0000 1.101 --- SpaceTool.java 25 Jun 2009 22:17:40 -0000 1.102 *************** *** 37,41 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 37,41 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 154,158 **** Surface surface = null; ! Container space = null; { --- 154,158 ---- Surface surface = null; ! Space space = null; { *************** *** 182,186 **** JMenuItem voidItem = new JMenuItem("Void"); ! Container sp = Project.getInstance().getActiveSpace(); ActionListener voidListener = new DomainPopupListener(sp.getEmpty(), --- 182,186 ---- JMenuItem voidItem = new JMenuItem("Void"); ! Space sp = Project.getInstance().getActiveSpace(); ActionListener voidListener = new DomainPopupListener(sp.getEmpty(), *************** *** 191,208 **** Collection domains = null; String category = null; ! Container owner = space.getOwner(); ! if (space.getLevel() == Container.PROJECT_LEVEL) { domains = Project.getInstance().getSpaces(); category = "Project"; ! } else if (space.getLevel() == Container.SPACE_LEVEL) { domains = owner.getElements(); category = "Space"; ! } else if (space.getLevel() == Container.ELEMENT_LEVEL) { domains = owner.getElements(); category = "Element"; ! } else if (space.getLevel() == Container.PART_LEVEL) { domains = owner.getElements(); category = "Part"; --- 191,208 ---- Collection domains = null; String category = null; ! Space owner = space.getOwner(); ! if (space.getLevel() == Space.PROJECT_LEVEL) { domains = Project.getInstance().getSpaces(); category = "Project"; ! } else if (space.getLevel() == Space.SPACE_LEVEL) { domains = owner.getElements(); category = "Space"; ! } else if (space.getLevel() == Space.ELEMENT_LEVEL) { domains = owner.getElements(); category = "Element"; ! } else if (space.getLevel() == Space.PART_LEVEL) { domains = owner.getElements(); category = "Part"; *************** *** 259,263 **** Iterator domIt = domains.iterator(); while (domIt.hasNext()) { ! Container domain = (Container)domIt.next(); JMenuItem domainItem = new JMenuItem(domain.getDisplayName()); ActionListener ml = new DomainPopupListener(domain, --- 259,263 ---- Iterator domIt = domains.iterator(); while (domIt.hasNext()) { ! Space domain = (Space)domIt.next(); JMenuItem domainItem = new JMenuItem(domain.getDisplayName()); ActionListener ml = new DomainPopupListener(domain, *************** *** 296,304 **** Stack stack = evaluateString(value); if (stack != null) { ! Container space = Project.getInstance().getActiveSpace(); Collection<Vertex> vertices = new LinkedList<Vertex>(); Collection<Edge> edges = new LinkedList<Edge>(); Collection<Surface> surfaces = new LinkedList<Surface>(); ! Collection<Container> spaces = new LinkedList<Container>(); while (!stack.empty()) { --- 296,304 ---- Stack stack = evaluateString(value); if (stack != null) { ! Space space = Project.getInstance().getActiveSpace(); Collection<Vertex> vertices = new LinkedList<Vertex>(); Collection<Edge> edges = new LinkedList<Edge>(); Collection<Surface> surfaces = new LinkedList<Surface>(); ! Collection<Space> spaces = new LinkedList<Space>(); while (!stack.empty()) { *************** *** 310,315 **** } else if (result instanceof Surface) { surfaces.add((Surface)result); ! } else if (result instanceof Container) { ! Container s = (Container) result; spaces.add(s); space.add(s); --- 310,315 ---- } else if (result instanceof Surface) { surfaces.add((Surface)result); ! } else if (result instanceof Space) { ! Space s = (Space) result; spaces.add(s); space.add(s); Index: SpaceSelectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SpaceSelectTool.java 22 Jun 2009 12:39:12 -0000 1.2 --- SpaceSelectTool.java 25 Jun 2009 22:17:40 -0000 1.3 *************** *** 11,15 **** import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; --- 11,15 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; *************** *** 58,63 **** if (target instanceof Surface) { Surface surface = (Surface) target; ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); if (front.isConstructionSpace()) { Selection.primary().set(front); --- 58,63 ---- if (target instanceof Surface) { Surface surface = (Surface) target; ! Item front = surface.getFrontDomain(); ! Item back = surface.getBackDomain(); if (front.isConstructionSpace()) { Selection.primary().set(front); Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** FinalMoveTool.java 28 Dec 2007 11:17:05 -0000 1.50 --- FinalMoveTool.java 25 Jun 2009 22:17:40 -0000 1.51 *************** *** 37,41 **** import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; ! import net.sourceforge.bprocessor.model.Container; /** --- 37,41 ---- import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 45,49 **** private Collection<Geometric> geometrics; ! private Container owner; private Collection<Geometric> affected; --- 45,49 ---- private Collection<Geometric> geometrics; ! private Space owner; private Collection<Geometric> affected; Index: ShiftActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ShiftActionListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ShiftActionListener.java 13 Dec 2007 12:00:49 -0000 1.5 --- ShiftActionListener.java 25 Jun 2009 22:17:40 -0000 1.6 *************** *** 10,14 **** import java.awt.event.ActionListener; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; --- 10,14 ---- import java.awt.event.ActionListener; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; *************** *** 42,47 **** */ public void actionPerformed(ActionEvent e) { ! Container back = surface.getBackDomain(); ! Container front = surface.getFrontDomain(); surface.setFrontDomain(back); --- 42,47 ---- */ public void actionPerformed(ActionEvent e) { ! Space back = surface.getBackDomain(); ! Space front = surface.getFrontDomain(); surface.setFrontDomain(back); Index: AbstractPencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** AbstractPencil.java 18 Jan 2008 13:37:10 -0000 1.107 --- AbstractPencil.java 25 Jun 2009 22:17:40 -0000 1.108 *************** *** 37,41 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 37,41 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 230,234 **** unwanted, View.INTERSECTIONS, work); if (intersection != null) { ! Container space = Project.getInstance().getActiveSpace(); Vertex v = intersection.vertex(); if (intersection.type() == Intersection.VERTEX) { --- 230,234 ---- unwanted, View.INTERSECTIONS, work); if (intersection != null) { ! Space space = Project.getInstance().getActiveSpace(); Vertex v = intersection.vertex(); if (intersection.type() == Intersection.VERTEX) { Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** SelectStrategy.java 25 Feb 2008 13:02:52 -0000 1.32 --- SelectStrategy.java 25 Jun 2009 22:17:40 -0000 1.33 *************** *** 25,30 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 25,30 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 145,149 **** ! Set<Space> spaces = Surface.spaces(surfaces); edges.addAll(Surface.edges(surfaces)); --- 145,149 ---- ! Set<Item> spaces = Surface.spaces(surfaces); edges.addAll(Surface.edges(surfaces)); *************** *** 180,184 **** } ! Set<Space> spaces = Surface.spaces(surfaces); if (spaces.size() > 0) { --- 180,184 ---- } ! Set<Item> spaces = Surface.spaces(surfaces); if (spaces.size() > 0) { *************** *** 223,227 **** ! Container owner = Project.getInstance().getActiveSpace(); Command.Inverse inv = new Command.Inverse(owner.mesh()); Collection<Geometric> objects; --- 223,227 ---- ! Space owner = Project.getInstance().getActiveSpace(); Command.Inverse inv = new Command.Inverse(owner.mesh()); Collection<Geometric> objects; *************** *** 288,292 **** if (e.getClickCount() == 2) { if (selection.isEmpty()) { ! Container sp = Project.getInstance().getActiveSpace(); if (sp.getOwner() != null) { sp.getOwner().edit(); --- 288,292 ---- if (e.getClickCount() == 2) { if (selection.isEmpty()) { ! Space sp = Project.getInstance().getActiveSpace(); if (sp.getOwner() != null) { sp.getOwner().edit(); *************** *** 298,303 **** if (Selection.primary().size() == 1) { Geometric leader = Selection.primary().iterator().next(); ! if (leader instanceof Container) { ! Container space = (Container) leader; if (space.isUnion() || space.isNet()) { space.edit(); --- 298,303 ---- if (Selection.primary().size() == 1) { Geometric leader = Selection.primary().iterator().next(); ! if (leader instanceof Space) { ! Space space = (Space) leader; if (space.isUnion() || space.isNet()) { space.edit(); Index: AltMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AltMoveTool.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AltMoveTool.java 30 Dec 2007 23:29:10 -0000 1.18 --- AltMoveTool.java 25 Jun 2009 22:17:40 -0000 1.19 *************** *** 26,30 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 26,30 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 111,115 **** if (target instanceof Surface) { surface = (Surface) target; ! Container space = surface.getOwner(); system = CoordinateSystem.systemOf(surface); --- 111,115 ---- if (target instanceof Surface) { surface = (Surface) target; ! Space space = surface.getOwner(); system = CoordinateSystem.systemOf(surface); |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:46
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17529/src/net/sourceforge/bprocessor/gl/model Modified Files: SpaceBox.java Log Message: Renamed Space to Item and Container to Space Index: SpaceBox.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model/SpaceBox.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SpaceBox.java 13 Dec 2007 12:00:49 -0000 1.3 --- SpaceBox.java 25 Jun 2009 22:17:39 -0000 1.4 *************** *** 9,13 **** import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Container; /** --- 9,13 ---- import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 15,19 **** */ public class SpaceBox extends Label { ! private Container space; /** --- 15,19 ---- */ public class SpaceBox extends Label { ! private Space space; /** *************** *** 21,25 **** * @param space Space */ ! public SpaceBox(Container space) { super(space.getDisplayName()); this.space = space; --- 21,25 ---- * @param space Space */ ! public SpaceBox(Space space) { super(space.getDisplayName()); this.space = space; *************** *** 30,34 **** * @return the space. */ ! public Container space() { return space; } --- 30,34 ---- * @return the space. */ ! public Space space() { return space; } |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:44
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17492/src/net/sourceforge/bprocessor/gui/attrview Modified Files: ReferenceAttribute.java ClassificationTextAttribute.java LinkAttribute.java Log Message: Renamed Space to Item and Container to Space Index: ClassificationTextAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ClassificationTextAttribute.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ClassificationTextAttribute.java 13 Dec 2007 12:00:55 -0000 1.11 --- ClassificationTextAttribute.java 25 Jun 2009 22:17:33 -0000 1.12 *************** *** 40,44 **** import net.sourceforge.bprocessor.model.Classification; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Structure; --- 40,44 ---- import net.sourceforge.bprocessor.model.Classification; import net.sourceforge.bprocessor.model.Project; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Structure; *************** *** 318,327 **** Vector cur = ((Structure) attribute.getValue()).getChildren(); if (attribute.getValue() instanceof Classification) { ! if (((Classification) attribute.getValue()).getType() == Container.CONSTRUCTION) { cur.addAll(Project.getInstance().getClassification("-99", ! Container.CONSTRUCTION).getChildren()); ! } else if (((Classification) attribute.getValue()).getType() == Container.FUNCTIONAL) { cur.addAll(Project.getInstance().getClassification("-99", ! Container.FUNCTIONAL).getChildren()); } else { log.warn(((Classification) attribute.getValue()).getType() + " is a unknown type"); --- 318,327 ---- Vector cur = ((Structure) attribute.getValue()).getChildren(); if (attribute.getValue() instanceof Classification) { ! if (((Classification) attribute.getValue()).getType() == Space.CONSTRUCTION) { cur.addAll(Project.getInstance().getClassification("-99", ! Space.CONSTRUCTION).getChildren()); ! } else if (((Classification) attribute.getValue()).getType() == Space.FUNCTIONAL) { cur.addAll(Project.getInstance().getClassification("-99", ! Space.FUNCTIONAL).getChildren()); } else { log.warn(((Classification) attribute.getValue()).getType() + " is a unknown type"); Index: LinkAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/LinkAttribute.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** LinkAttribute.java 19 Dec 2007 09:03:31 -0000 1.20 --- LinkAttribute.java 25 Jun 2009 22:17:33 -0000 1.21 *************** *** 37,41 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; /** --- 37,41 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 174,179 **** JLabel valueLabel; if (value instanceof Entity) { ! if (value instanceof Container) { ! s = ((Container)value).getDisplayName(); } else { s = ((Entity)value).getName(); --- 174,179 ---- JLabel valueLabel; if (value instanceof Entity) { ! if (value instanceof Space) { ! s = ((Space)value).getDisplayName(); } else { s = ((Entity)value).getName(); *************** *** 410,414 **** new Comparator() { public int compare(Object s1, Object s2) { ! return ((Container) s1).getName().compareToIgnoreCase(((Container) s2).getName()); } }; --- 410,414 ---- new Comparator() { public int compare(Object s1, Object s2) { ! return ((Space) s1).getName().compareToIgnoreCase(((Space) s2).getName()); } }; *************** *** 417,421 **** new Comparator() { public int compare(Object s1, Object s2) { ! return ((Container) s1).getId().compareTo(((Container) s2).getId()); } }; --- 417,421 ---- new Comparator() { public int compare(Object s1, Object s2) { ! return ((Space) s1).getId().compareTo(((Space) s2).getId()); } }; *************** *** 427,431 **** Iterator it = sort.iterator(); while (it.hasNext()) { ! Container current = (Container) it.next(); String name = current.getName() + "-" + current.getId().toString(); if (name.startsWith(string) && !name.equalsIgnoreCase(string)) { --- 427,431 ---- Iterator it = sort.iterator(); while (it.hasNext()) { ! Space current = (Space) it.next(); String name = current.getName() + "-" + current.getId().toString(); if (name.startsWith(string) && !name.equalsIgnoreCase(string)) { Index: ReferenceAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ReferenceAttribute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReferenceAttribute.java 19 Dec 2007 09:03:31 -0000 1.2 --- ReferenceAttribute.java 25 Jun 2009 22:17:33 -0000 1.3 *************** *** 43,47 **** import net.sourceforge.bprocessor.model.Reference; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Container; /** --- 43,47 ---- import net.sourceforge.bprocessor.model.Reference; import net.sourceforge.bprocessor.model.Selection; ! import net.sourceforge.bprocessor.model.Space; /** *************** *** 196,201 **** JLabel valueLabel; if (value instanceof Entity) { ! if (value instanceof Container) { ! s = ((Container)value).getDisplayName(); } else { s = ((Entity)value).getName(); --- 196,201 ---- JLabel valueLabel; if (value instanceof Entity) { ! if (value instanceof Space) { ! s = ((Space)value).getDisplayName(); } else { s = ((Entity)value).getName(); *************** *** 471,475 **** new Comparator() { public int compare(Object s1, Object s2) { ! return ((Container) s1).getName().compareToIgnoreCase(((Container) s2).getName()); } }; --- 471,475 ---- new Comparator() { public int compare(Object s1, Object s2) { ! return ((Space) s1).getName().compareToIgnoreCase(((Space) s2).getName()); } }; *************** *** 478,482 **** new Comparator() { public int compare(Object s1, Object s2) { ! return ((Container) s1).getId().compareTo(((Container) s2).getId()); } }; --- 478,482 ---- new Comparator() { public int compare(Object s1, Object s2) { ! return ((Space) s1).getId().compareTo(((Space) s2).getId()); } }; *************** *** 488,492 **** Iterator it = sort.iterator(); while (it.hasNext()) { ! Container current = (Container) it.next(); String name = current.getName() + "-" + current.getId().toString(); if (name.startsWith(string) && !name.equalsIgnoreCase(string)) { --- 488,492 ---- Iterator it = sort.iterator(); while (it.hasNext()) { ! Space current = (Space) it.next(); String name = current.getName() + "-" + current.getId().toString(); if (name.startsWith(string) && !name.equalsIgnoreCase(string)) { |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:43
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17492/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: Renamed Space to Item and Container to Space Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** GUI.java 25 Jun 2009 20:29:36 -0000 1.110 --- GUI.java 25 Jun 2009 22:17:33 -0000 1.111 *************** *** 29,34 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.modellor.Modellor; --- 29,34 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.modellor.Modellor; *************** *** 111,115 **** /** closed spaces */ ! private Set<Container> closedSpaces = new HashSet<Container>(); /** The browsing tree */ --- 111,115 ---- /** closed spaces */ ! private Set<Space> closedSpaces = new HashSet<Space>(); /** The browsing tree */ *************** *** 263,274 **** create.removeAll(); int lvl = Project.getInstance().getActiveSpace().getLevel(); ! if (lvl < Container.PART_LEVEL) { ! String append = Container.levelToString(lvl + 1); { AbstractAction action = new AbstractAction("Functional " + append) { public void actionPerformed(ActionEvent e) { ! Container owner = Project.getInstance().getActiveSpace(); ! Container space; ! space = Space.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); --- 263,274 ---- create.removeAll(); int lvl = Project.getInstance().getActiveSpace().getLevel(); ! if (lvl < Space.PART_LEVEL) { ! String append = Space.levelToString(lvl + 1); { AbstractAction action = new AbstractAction("Functional " + append) { public void actionPerformed(ActionEvent e) { ! Space owner = Project.getInstance().getActiveSpace(); ! Space space; ! space = Item.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); *************** *** 282,288 **** AbstractAction action = new AbstractAction("Construction " + append) { public void actionPerformed(ActionEvent e) { ! Container owner = Project.getInstance().getActiveSpace(); ! Container space; ! space = Space.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); --- 282,288 ---- AbstractAction action = new AbstractAction("Construction " + append) { public void actionPerformed(ActionEvent e) { ! Space owner = Project.getInstance().getActiveSpace(); ! Space space; ! space = Item.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); *************** *** 297,302 **** AbstractAction action = new AbstractAction("B-net") { public void actionPerformed(ActionEvent e) { ! Container net = Container.createNet("B-net"); ! Container active = Project.getInstance().getActiveSpace(); active.add(net); net.edit(); --- 297,302 ---- AbstractAction action = new AbstractAction("B-net") { public void actionPerformed(ActionEvent e) { ! Space net = Space.createNet("B-net"); ! Space active = Project.getInstance().getActiveSpace(); active.add(net); net.edit(); *************** *** 311,316 **** AbstractAction action = new AbstractAction("Union") { public void actionPerformed(ActionEvent e) { ! Container union = Space.createUnion("Union"); ! Container active = Project.getInstance().getActiveSpace(); active.add(union); union.edit(); --- 311,316 ---- AbstractAction action = new AbstractAction("Union") { public void actionPerformed(ActionEvent e) { ! Space union = Item.createUnion("Union"); ! Space active = Project.getInstance().getActiveSpace(); active.add(union); union.edit(); *************** *** 328,332 **** public void actionPerformed(ActionEvent e) { System.out.println("actionate " + modellor); ! Container space = modellor.createSpace(); Project.getInstance().world().add(space); Project.getInstance().changed(Project.getInstance()); --- 328,332 ---- public void actionPerformed(ActionEvent e) { System.out.println("actionate " + modellor); ! Space space = modellor.createSpace(); Project.getInstance().world().add(space); Project.getInstance().changed(Project.getInstance()); *************** *** 351,355 **** JMenu jm = (JMenu)e.getSource(); jm.removeAll(); ! Container s = Project.getInstance().getActiveSpace(); int level = s.getLevel(); for (Modellor m : Modellor.getRegisteredModellors()) { --- 351,355 ---- JMenu jm = (JMenu)e.getSource(); jm.removeAll(); ! Space s = Project.getInstance().getActiveSpace(); int level = s.getLevel(); for (Modellor m : Modellor.getRegisteredModellors()) { *************** *** 823,827 **** * @return wherther or not the space is closed. */ ! public boolean isClosed(Container sp) { boolean closed = closedSpaces.contains(sp); return closed; --- 823,827 ---- * @return wherther or not the space is closed. */ ! public boolean isClosed(Space sp) { boolean closed = closedSpaces.contains(sp); return closed; |
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17452/src/net/sourceforge/bprocessor/model/modellor Modified Files: ModelBathModellor2.java WallPartingModellor.java InnerWallModellor.java TileModellor.java Modellor.java Log Message: Renamed Space to Item and Container to Space Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** TileModellor.java 25 Jun 2009 20:29:33 -0000 1.31 --- TileModellor.java 25 Jun 2009 22:17:30 -0000 1.32 *************** *** 21,25 **** import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; --- 21,25 ---- import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 28,32 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.SurfaceAnalysis; --- 28,32 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.SurfaceAnalysis; *************** *** 59,70 **** private CoordinateSystem startPoint; ! private Container space; /** tile thickness in mm */ private int tileThickness = 8; ! private Container net; ! private Container outline; private Set<Surface> ignoredSurfaces = new HashSet<Surface>(); --- 59,70 ---- private CoordinateSystem startPoint; ! private Space space; /** tile thickness in mm */ private int tileThickness = 8; ! private Space net; ! private Space outline; private Set<Surface> ignoredSurfaces = new HashSet<Surface>(); *************** *** 80,84 **** * @param s The space */ ! public TileModellor(Container s) { if (s == null) { return; --- 80,84 ---- * @param s The space */ ! public TileModellor(Space s) { if (s == null) { return; *************** *** 104,108 **** */ @Override ! public Modellor newInstance(Container s) { return new TileModellor(s); } --- 104,108 ---- */ @Override ! public Modellor newInstance(Space s) { return new TileModellor(s); } *************** *** 114,120 **** if (ext != null && ext.getOwner().getLevel() < space.getLevel()) { // exterior were on a higher level look at the spaces of it ! if ((ext.getFrontDomain().getType() == Container.FUNCTIONAL && ext.getFrontDomain().isContainer()) || ! (ext.getBackDomain().getType() == Container.FUNCTIONAL && ext.getBackDomain().isContainer())) { //the surface is assigned to a --- 114,120 ---- if (ext != null && ext.getOwner().getLevel() < space.getLevel()) { // exterior were on a higher level look at the spaces of it ! if ((ext.getFrontDomain().getType() == Space.FUNCTIONAL && ext.getFrontDomain().isContainer()) || ! (ext.getBackDomain().getType() == Space.FUNCTIONAL && ext.getBackDomain().isContainer())) { //the surface is assigned to a *************** *** 123,128 **** } else { //look for a surface with a funktional space assign that is vertical ! if (res == null && (s.getFrontDomain().getType() == Container.FUNCTIONAL || ! s.getBackDomain().getType() == Container.FUNCTIONAL) && Math.abs(s.normal().getZ()) < 0.0001) { res = s; --- 123,128 ---- } 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; *************** *** 178,182 **** outer.addHole(newS); space.addAll(newS); ! Container sp = Space.createConstructionSpace("Tile"); if (sign == -1) { newS.setBackDomain(sp); --- 178,182 ---- outer.addHole(newS); space.addAll(newS); ! Space sp = Item.createConstructionSpace("Tile"); if (sign == -1) { newS.setBackDomain(sp); *************** *** 190,194 **** } ! Container joint = Space.createConstructionSpace("Tile"); if (sign == -1) { outer.setBackDomain(joint); --- 190,194 ---- } ! Space joint = Item.createConstructionSpace("Tile"); if (sign == -1) { outer.setBackDomain(joint); *************** *** 210,214 **** private void updateOutline() { if (outline == null) { ! outline = Container.createNet("Tile-outline"); } outline.clear(); --- 210,214 ---- private void updateOutline() { if (outline == null) { ! outline = Space.createNet("Tile-outline"); } outline.clear(); *************** *** 243,247 **** private void updateNet(CoordinateSystem cs) { if (net == null) { ! net = Container.createNet("strip"); } net.clear(); --- 243,247 ---- private void updateNet(CoordinateSystem cs) { if (net == null) { ! net = Space.createNet("strip"); } net.clear(); *************** *** 513,517 **** Object o = m.get("Space"); if (o != null) { ! space = (Container)o; } o = m.get("Surface"); --- 513,517 ---- Object o = m.get("Space"); if (o != null) { ! space = (Space)o; } o = m.get("Surface"); *************** *** 559,563 **** @Override public int getUseableLevel() { ! return Container.SPACE_LEVEL; } --- 559,563 ---- @Override public int getUseableLevel() { ! return Space.SPACE_LEVEL; } Index: WallPartingModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WallPartingModellor.java 25 Jun 2009 20:29:33 -0000 1.10 --- WallPartingModellor.java 25 Jun 2009 22:17:30 -0000 1.11 *************** *** 14,18 **** import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; --- 14,18 ---- import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 20,24 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 31,36 **** public class WallPartingModellor extends Modellor { ! private Container space; ! private Container net; private double minZ; private double maxZ; --- 31,36 ---- public class WallPartingModellor extends Modellor { ! 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(Container walls, Container 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 Container calcNet() { //find bottom surface and copy outer contour from it into a new net ! Container tmpNet = Container.createNet("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 = Space.createNet("Contour"); space.getSurfaces().iterator().next().copy(tmpNet); return tmpNet; *************** *** 158,162 **** Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Container concrete = Space.createConstructionSpace("Concrete"); space.add(concrete); if (s.normal().getZ() == 1.0) { --- 158,162 ---- Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = Item.createConstructionSpace("Concrete"); space.add(concrete); if (s.normal().getZ() == 1.0) { *************** *** 177,181 **** between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Container tile = Space.createConstructionSpace("Tile"); space.add(tile); if (s.normal().getZ() == 1.0) { --- 177,181 ---- between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = Item.createConstructionSpace("Tile"); space.add(tile); if (s.normal().getZ() == 1.0) { *************** *** 274,278 **** @Override public int getUseableLevel() { ! return Container.ELEMENT_LEVEL; } --- 274,278 ---- @Override public int getUseableLevel() { ! return Space.ELEMENT_LEVEL; } *************** *** 281,285 **** */ @Override ! public Modellor newInstance(Container s) { return new WallPartingModellor(s, null); } --- 281,285 ---- */ @Override ! public Modellor newInstance(Space s) { return new WallPartingModellor(s, null); } Index: InnerWallModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** InnerWallModellor.java 25 Jun 2009 20:29:33 -0000 1.19 --- InnerWallModellor.java 25 Jun 2009 22:17:30 -0000 1.20 *************** *** 17,21 **** import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Classification; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; --- 17,21 ---- import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Classification; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 24,28 **** import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; ! import net.sourceforge.bprocessor.model.Space; import org.apache.log4j.Logger; --- 24,28 ---- import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; ! import net.sourceforge.bprocessor.model.Item; import org.apache.log4j.Logger; *************** *** 61,65 **** /** The space of this modellor */ ! private Container space; /** A surface in the space to start the modellor */ --- 61,65 ---- /** The space of this modellor */ ! private Space space; /** A surface in the space to start the modellor */ *************** *** 81,85 **** /** The net of the modellor */ ! private Container net; /** --- 81,85 ---- /** The net of the modellor */ ! private Space net; /** *************** *** 95,99 **** * @param s the space of the modellor */ ! public InnerWallModellor(Container s) { this.space = s; } --- 95,99 ---- * @param s the space of the modellor */ ! public InnerWallModellor(Space s) { this.space = s; } *************** *** 119,123 **** */ public int getUseableLevel() { ! return Container.SPACE_LEVEL; } --- 119,123 ---- */ public int getUseableLevel() { ! return Space.SPACE_LEVEL; } *************** *** 126,130 **** */ @Override ! public Modellor newInstance(Container s) { InnerWallModellor mod = new InnerWallModellor(s); Project.getInstance().addObserver(mod); --- 126,130 ---- */ @Override ! public Modellor newInstance(Space s) { InnerWallModellor mod = new InnerWallModellor(s); Project.getInstance().addObserver(mod); *************** *** 158,164 **** if (build) { if (net == null) { ! for (Space current : space.getElements()) { if (current.isNet()) { ! net = (Container) current; break; } --- 158,164 ---- if (build) { if (net == null) { ! for (Item current : space.getElements()) { if (current.isNet()) { ! net = (Space) current; break; } *************** *** 184,188 **** * @param net a net to build the framework from */ ! private void buildFramework(Container net) { Map<Edge, Edge> edge2Run = getRuns(net.getEdges()); Set<Edge> runs = new HashSet<Edge>(edge2Run.values()); --- 184,188 ---- * @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()); *************** *** 216,220 **** Surface base = joistBase(); space.add(base); ! Container joist = Space.createConstructionSpace("joist"); 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 = Item.createConstructionSpace("joist"); Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0); joist.setClassificationType(c.getPossibleTypes().getChildren().get(0)); *************** *** 257,261 **** } ! private void buildWoodSheets(Container net) { List<Edge> outline = netOutline(net); if (!outline.isEmpty()) { --- 257,261 ---- } ! private void buildWoodSheets(Space net) { List<Edge> outline = netOutline(net); if (!outline.isEmpty()) { *************** *** 268,274 **** Surface sheet1 = new Surface(outlineCopy1); Surface sheet2 = new Surface(outlineCopy2); ! Container sheetSpace1 = Space.createConstructionSpace("sheet1"); sheetSpace1.setClassification(woodSheet()); ! Container sheetSpace2 = Space.createConstructionSpace("sheet2"); sheetSpace2.setClassification(woodSheet()); Vertex j = cs.getJ().copy(); --- 268,274 ---- Surface sheet1 = new Surface(outlineCopy1); Surface sheet2 = new Surface(outlineCopy2); ! Space sheetSpace1 = Item.createConstructionSpace("sheet1"); sheetSpace1.setClassification(woodSheet()); ! Space sheetSpace2 = Item.createConstructionSpace("sheet2"); sheetSpace2.setClassification(woodSheet()); Vertex j = cs.getJ().copy(); *************** *** 348,354 **** * @return a net for building the framework */ ! private Container buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Container net = Container.createNet("net"); space.add(net); surface = findSurface(); --- 348,354 ---- * @return a net for building the framework */ ! private Space buildNet() { if (space != null && !space.getEnvelope().isEmpty()) { ! Space net = Space.createNet("net"); space.add(net); surface = findSurface(); *************** *** 416,421 **** for (Surface s : envelope) { //support for other innerwalls ! Container front = s.getFrontDomain(); ! Container back = s.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); --- 416,421 ---- for (Surface s : envelope) { //support for other innerwalls ! Space front = s.getFrontDomain(); ! Space back = s.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); *************** *** 487,492 **** for (Surface s : envelope) { for (Surface h : s.getHoles()) { ! Container front = h.getFrontDomain(); ! Container back = h.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); --- 487,492 ---- for (Surface s : envelope) { for (Surface h : s.getHoles()) { ! Space front = h.getFrontDomain(); ! Space back = h.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); *************** *** 563,568 **** Surface surface = space.getEnvelope().iterator().next(); for (Surface s : space.getEnvelope()) { ! Container front = s.getFrontDomain(); ! Container back = s.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); --- 563,568 ---- Surface surface = space.getEnvelope().iterator().next(); for (Surface s : space.getEnvelope()) { ! Space front = s.getFrontDomain(); ! Space back = s.getBackDomain(); Classification frontClass = front.getClassification(); Classification backClass = back.getClassification(); *************** *** 592,596 **** * @return the space */ ! public Container getSpace() { return space; } --- 592,596 ---- * @return the space */ ! public Space getSpace() { return space; } *************** *** 599,603 **** * @param space the space */ ! public void setSpace(Container space) { this.space = space; } --- 599,603 ---- * @param space the space */ ! public void setSpace(Space space) { this.space = space; } *************** *** 672,676 **** * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Container net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); --- 672,676 ---- * @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>(); *************** *** 725,729 **** * @return the net of this modellor */ ! public Container getNet() { return net; } --- 725,729 ---- * @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.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ModelBathModellor2.java 25 Jun 2009 20:29:33 -0000 1.19 --- ModelBathModellor2.java 25 Jun 2009 22:17:30 -0000 1.20 *************** *** 16,20 **** import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; --- 16,20 ---- import net.sourceforge.bprocessor.model.Attribute; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 24,28 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 24,28 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; ! import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 38,50 **** private static Logger log = Logger.getLogger(ModelBathModellor2.class); ! private Container space; ! private Container floor; ! private Container walls; ! private Container ceiling; ! private Container bath; private double length; --- 38,50 ---- private static Logger log = Logger.getLogger(ModelBathModellor2.class); ! private Space space; ! private Space floor; ! private Space walls; ! private Space ceiling; ! private Space bath; private double length; *************** *** 62,66 **** private CoordinateSystem coord; ! private Container net; private double doorHeight = 2.2; --- 62,66 ---- private CoordinateSystem coord; ! private Space net; private double doorHeight = 2.2; *************** *** 70,74 **** private double windowHeight = 0.5; ! private Collection<Container> doorAndWindows = new ArrayList<Container>(); private Collection<Modellor> insideModellors = new LinkedList<Modellor>(); --- 70,74 ---- private double windowHeight = 0.5; ! private Collection<Space> doorAndWindows = new ArrayList<Space>(); private Collection<Modellor> insideModellors = new LinkedList<Modellor>(); *************** *** 85,89 **** * @param s the Space to realize the modellor in */ ! public ModelBathModellor2(Container s) { this(); space = s; --- 85,89 ---- * @param s the Space to realize the modellor in */ ! public ModelBathModellor2(Space s) { this(); space = s; *************** *** 119,123 **** Surface s = new Surface(edges); ! net = Container.createNet("Boundary"); net.add(v1); net.add(v2); --- 119,123 ---- Surface s = new Surface(edges); ! net = Space.createNet("Boundary"); net.add(v1); net.add(v2); *************** *** 157,167 **** */ private void generateBath() { ! floor = Space.createConstructionSpace("Floor"); space.add(floor); ! bath = Space.createFunctionalSpace("Bath cabin"); space.add(bath); ! walls = Space.createConstructionSpace("Walls"); space.add(walls); ! ceiling = Space.createConstructionSpace("Ceiling"); space.add(ceiling); makeFloor(); --- 157,167 ---- */ private void generateBath() { ! floor = Item.createConstructionSpace("Floor"); space.add(floor); ! bath = Item.createFunctionalSpace("Bath cabin"); space.add(bath); ! walls = Item.createConstructionSpace("Walls"); space.add(walls); ! ceiling = Item.createConstructionSpace("Ceiling"); space.add(ceiling); makeFloor(); *************** *** 273,277 **** Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Container concrete = Space.createConstructionSpace("Concrete"); walls.add(concrete); if (s.normal().getZ() == 1.0) { --- 273,277 ---- Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = Item.createConstructionSpace("Concrete"); walls.add(concrete); if (s.normal().getZ() == 1.0) { *************** *** 292,296 **** between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Container tile = Space.createConstructionSpace("Tile"); walls.add(tile); if (s.normal().getZ() == 1.0) { --- 292,296 ---- between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = Item.createConstructionSpace("Tile"); walls.add(tile); if (s.normal().getZ() == 1.0) { *************** *** 345,349 **** } // copy doors and windows in ! for (Container spc : doorAndWindows) { Surface inner = null; for (Surface s : spc.getEnvelope()) { --- 345,349 ---- } // copy doors and windows in ! for (Space spc : doorAndWindows) { Surface inner = null; for (Surface s : spc.getEnvelope()) { *************** *** 376,380 **** if (s.getCurrentValue().equals("Door")) { // make a door ! Container doorSpc = Space.createConstructionSpace("Door"); doorAndWindows.add(doorSpc); space.add(doorSpc); --- 376,380 ---- if (s.getCurrentValue().equals("Door")) { // make a door ! Space doorSpc = Item.createConstructionSpace("Door"); doorAndWindows.add(doorSpc); space.add(doorSpc); *************** *** 419,423 **** } else if (s.getCurrentValue().equals("Window")) { //make a window ! Container winSpc = Space.createConstructionSpace("Window"); doorAndWindows.add(winSpc); space.add(winSpc); --- 419,423 ---- } else if (s.getCurrentValue().equals("Window")) { //make a window ! Space winSpc = Item.createConstructionSpace("Window"); doorAndWindows.add(winSpc); space.add(winSpc); *************** *** 651,657 **** /** {@inheritDoc} */ @Override ! public Modellor newInstance(Container s) { ! if (s.getLevel() == Container.PROJECT_LEVEL) { ! Container bath = Space.createUnion("Bath-union"); s.add(bath); return new ModelBathModellor2(bath); --- 651,657 ---- /** {@inheritDoc} */ @Override ! public Modellor newInstance(Space s) { ! if (s.getLevel() == Space.PROJECT_LEVEL) { ! Space bath = Item.createUnion("Bath-union"); s.add(bath); return new ModelBathModellor2(bath); *************** *** 755,760 **** @Override public void setSubContent(Map<String, Object> m) { ! space = (Container)m.get("Space"); ! net = (Container)m.get("Net"); wallThickness = (Double)m.get("wallThickness"); floorThickness = (Double)m.get("floorThickness"); --- 755,760 ---- @Override 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"); *************** *** 787,791 **** @Override public int getUseableLevel() { ! return Container.PROJECT_LEVEL; } } --- 787,791 ---- @Override public int getUseableLevel() { ! return Space.PROJECT_LEVEL; } } Index: Modellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Modellor.java 17 Dec 2007 13:09:18 -0000 1.16 --- Modellor.java 25 Jun 2009 22:17:30 -0000 1.17 *************** *** 18,22 **** import net.sourceforge.bprocessor.model.Observer; import net.sourceforge.bprocessor.model.Parametric; ! import net.sourceforge.bprocessor.model.Container; --- 18,22 ---- import net.sourceforge.bprocessor.model.Observer; import net.sourceforge.bprocessor.model.Parametric; ! import net.sourceforge.bprocessor.model.Space; *************** *** 131,135 **** * @return The created modellor object for the given space */ ! public abstract Modellor newInstance(Container space); --- 131,135 ---- * @return The created modellor object for the given space */ ! public abstract Modellor newInstance(Space space); *************** *** 138,142 **** * @return Space */ ! public Container createSpace() { return null; } --- 138,142 ---- * @return Space */ ! public Space createSpace() { return null; } *************** *** 147,151 **** * @return Parametric */ ! public Parametric get(Container element) { return (Parametric) parameters.get(element); } --- 147,151 ---- * @return Parametric */ ! public Parametric get(Space element) { return (Parametric) parameters.get(element); } *************** *** 156,160 **** * @param parametric Parametric */ ! public void set(Container element, Parametric parametric) { parameters.put(element, parametric); } --- 156,160 ---- * @param parametric Parametric */ ! public void set(Space element, Parametric parametric) { parameters.put(element, parametric); } |
|
From: Michael L. <he...@us...> - 2009-06-25 22:17:30
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17415/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java FacadeModellor.java Log Message: Renamed Space to Item and Container to Space Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** NetFacadeModellor.java 3 Nov 2008 13:14:15 -0000 1.47 --- NetFacadeModellor.java 25 Jun 2009 22:17:23 -0000 1.48 *************** *** 27,32 **** import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; - import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; --- 27,32 ---- import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 65,75 **** /** The space of the facade */ ! private Container space; /** The frame space */ ! private Container frame; /** The net for this facade */ ! private Container net; /** The framewidth of the facade */ --- 65,75 ---- /** The space of the facade */ ! private Space space; /** The frame space */ ! private Space frame; /** The net for this facade */ ! private Space net; /** The framewidth of the facade */ *************** *** 113,123 **** */ public void setSubContent(Map<String, Object> m) { ! space = (Container)m.get("space"); ! net = (Container)m.get("net"); depth = ((Double)m.get("depth")).doubleValue(); frameWidth = ((Double)m.get("frameWidth")).doubleValue(); front = (Surface)m.get("front"); single = ((Boolean)m.get("single")).booleanValue(); ! frame = (Container)m.get("frame"); Project.getInstance().addObserver(this); } --- 113,123 ---- */ 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(); front = (Surface)m.get("front"); single = ((Boolean)m.get("single")).booleanValue(); ! frame = (Space)m.get("frame"); Project.getInstance().addObserver(this); } *************** *** 128,137 **** * @return a new modellor */ ! public Modellor newInstance(Container s) { NetFacadeModellor mod = new NetFacadeModellor(); mod.setSpace(s); Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = Space.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); --- 128,137 ---- * @return a new modellor */ ! public Modellor newInstance(Space s) { NetFacadeModellor mod = new NetFacadeModellor(); mod.setSpace(s); Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = Item.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); *************** *** 148,152 **** * @return a suitable surface from the s' envelope */ ! private Surface findFront(Container s) { Surface frontCandidate = null; if (!s.getEnvelope().isEmpty()) { --- 148,152 ---- * @return a suitable surface from the s' envelope */ ! private Surface findFront(Space s) { Surface frontCandidate = null; if (!s.getEnvelope().isEmpty()) { *************** *** 226,230 **** Attribute a = attributes.get("Net"); if (a != null) { ! setNet((Container)a.getValue()); } a = attributes.get("Framewidth"); --- 226,230 ---- Attribute a = attributes.get("Net"); if (a != null) { ! setNet((Space)a.getValue()); } a = attributes.get("Framewidth"); *************** *** 268,272 **** *@return the space */ ! public Container getSpace() { return space; } --- 268,272 ---- *@return the space */ ! public Space getSpace() { return space; } *************** *** 276,280 **** * @param space the space */ ! public void setSpace(Container space) { this.space = space; } --- 276,280 ---- * @param space the space */ ! public void setSpace(Space space) { this.space = space; } *************** *** 284,288 **** * @return the net of this modellor */ ! public Container getNet() { return this.net; } --- 284,288 ---- * @return the net of this modellor */ ! public Space getNet() { return this.net; } *************** *** 292,296 **** * @param net the net */ ! public void setNet(Container net) { if (net.isNet()) { if (this.net != null) { --- 292,296 ---- * @param net the net */ ! public void setNet(Space net) { if (net.isNet()) { if (this.net != null) { *************** *** 343,347 **** * @param n the net */ ! private void prepareNet(Container n) { Collection<Edge> edges = n.getEdges(); for (Edge e : edges) { --- 343,347 ---- * @param n the net */ ! private void prepareNet(Space n) { Collection<Edge> edges = n.getEdges(); for (Edge e : edges) { *************** *** 387,393 **** * @param net the net */ ! private void createDoubleFacade(Container net) { if (frame == null) { ! frame = Space.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); --- 387,393 ---- * @param net the net */ ! private void createDoubleFacade(Space net) { if (frame == null) { ! frame = Item.createConstructionSpace("Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); frame.setClassification(frameClass); *************** *** 434,440 **** * @param net the net */ ! private void createSingleFacade(Container net) { if (frame == null) { ! frame = Space.createConstructionSpace("Frame"); space.add(frame); } --- 434,440 ---- * @param net the net */ ! private void createSingleFacade(Space net) { if (frame == null) { ! frame = Item.createConstructionSpace("Frame"); space.add(frame); } *************** *** 469,473 **** Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Container holeSpace = Space.createFunctionalSpace("Facade Hole"); space.add(holeSpace); Geometry.assignSame(front, hole, space, holeSpace); --- 469,473 ---- Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Space holeSpace = Item.createFunctionalSpace("Facade Hole"); space.add(holeSpace); Geometry.assignSame(front, hole, space, holeSpace); *************** *** 490,494 **** * @param holeSpace the space of the hole in the facade */ ! private void detailField(Map envF, Surface hole, Container holeSpace) { double frameSize = 0.0; String type = ""; --- 490,494 ---- * @param holeSpace the space of the hole in the facade */ ! private void detailField(Map envF, Surface hole, Space holeSpace) { double frameSize = 0.0; String type = ""; *************** *** 512,519 **** Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Container f = Space.createConstructionSpace(type + " Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Container g = Space.createConstructionSpace("Glass"); Classification glassClass = Project.getInstance().getClassification(GLASS, 0); g.setClassification(glassClass); --- 512,519 ---- Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Space f = Item.createConstructionSpace(type + " Frame"); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Space g = Item.createConstructionSpace("Glass"); Classification glassClass = Project.getInstance().getClassification(GLASS, 0); g.setClassification(glassClass); *************** *** 553,557 **** * @return a list of connected edges making up the net outline */ ! private List<Edge> netOutline(Container net) { /*Find outer edges*/ Set<Edge> outer = new HashSet<Edge>(); --- 553,557 ---- * @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>(); *************** *** 605,610 **** * @return a new net */ ! private Container createNet(Surface front) { ! Container n = Container.createNet("Facade net"); if (front != null) { front.copy(n); --- 605,610 ---- * @return a new net */ ! private Space createNet(Surface front) { ! Space n = Space.createNet("Facade net"); if (front != null) { front.copy(n); *************** *** 685,691 **** * @param sp2 second space */ ! private void assignOpposite(Surface s1, Surface s2, Container sp1, Container sp2) { ! Container back = s2.getBackDomain(); ! Container front = s2.getFrontDomain(); Geometry.assignSame(s1, s2, sp1, sp2); if (s2.getBackDomain() == sp2) { --- 685,691 ---- * @param sp2 second space */ ! private void assignOpposite(Surface s1, Surface s2, Space sp1, Space sp2) { ! Space back = s2.getBackDomain(); ! Space front = s2.getFrontDomain(); Geometry.assignSame(s1, s2, sp1, sp2); if (s2.getBackDomain() == sp2) { *************** *** 738,747 **** @Override public int getUseableLevel() { ! return Container.SPACE_LEVEL; } private Set<Surface> generateFrame2(Surface cut, Surface contourSurf, ! Container frameSpace, Vertex out) { Set<Surface> generatedSurfaces = new HashSet<Surface>(); --- 738,747 ---- @Override public int getUseableLevel() { ! return Space.SPACE_LEVEL; } private Set<Surface> generateFrame2(Surface cut, Surface contourSurf, ! Space frameSpace, Vertex out) { Set<Surface> generatedSurfaces = new HashSet<Surface>(); Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** FacadeModellor.java 3 Nov 2008 13:14:15 -0000 1.42 --- FacadeModellor.java 25 Jun 2009 22:17:23 -0000 1.43 *************** *** 18,24 **** import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.modellor.Modellor; - import net.sourceforge.bprocessor.model.Container; - import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Project; --- 18,24 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.modellor.Modellor; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Attribute; + import net.sourceforge.bprocessor.model.Item; import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Project; *************** *** 63,67 **** /** The space this modellor is connected to */ ! private Container space; /** The front surface of the facade */ --- 63,67 ---- /** The space this modellor is connected to */ ! private Space space; /** The front surface of the facade */ *************** *** 115,119 **** * @param s the space */ ! public FacadeModellor(Container s) { this(s, null); } --- 115,119 ---- * @param s the space */ ! public FacadeModellor(Space s) { this(s, null); } *************** *** 123,127 **** * @param front Front */ ! public FacadeModellor(Container s, Surface front) { if (front == null) { front = null; --- 123,127 ---- * @param front Front */ ! public FacadeModellor(Space s, Surface front) { if (front == null) { front = null; *************** *** 154,158 **** * @return The created modellor object for the given space */ ! public Modellor newInstance(Container s) { return new FacadeModellor(s); } --- 154,158 ---- * @return The created modellor object for the given space */ ! public Modellor newInstance(Space s) { return new FacadeModellor(s); } *************** *** 366,370 **** if (front != null && depth > 0) { ! Container frame = Space.createConstructionSpace("Frame"); space.add(frame); Surface eFront = front.copy(space); --- 366,370 ---- if (front != null && depth > 0) { ! Space frame = Item.createConstructionSpace("Frame"); space.add(frame); Surface eFront = front.copy(space); *************** *** 691,695 **** Surface s = (Surface)it.next(); Set sides = new HashSet(); ! Container w = Space.createConstructionSpace("Window"); double u = s.normal().dot(front.normal()); if ((u > 0 && front.getBackDomain() == space) || --- 691,695 ---- Surface s = (Surface)it.next(); Set sides = new HashSet(); ! Space w = Item.createConstructionSpace("Window"); double u = s.normal().dot(front.normal()); if ((u > 0 && front.getBackDomain() == space) || *************** *** 808,812 **** type = ((Integer)m.get("type")).intValue(); name = (String)m.get("name"); ! space = (Container)m.get("Space"); } --- 808,812 ---- type = ((Integer)m.get("type")).intValue(); name = (String)m.get("name"); ! space = (Space)m.get("Space"); } *************** *** 854,858 **** @Override public int getUseableLevel() { ! return Container.SPACE_LEVEL; } } --- 854,858 ---- @Override public int getUseableLevel() { ! return Space.SPACE_LEVEL; } } |
|
From: Michael L. <he...@us...> - 2009-06-25 20:29:48
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16536/src/net/sourceforge/bprocessor/gui Modified Files: MaterialView.java Toolbar.java Menu.java GUI.java Log Message: New files Index: Menu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/Menu.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Menu.java 27 Jun 2005 09:32:23 -0000 1.1.1.1 --- Menu.java 25 Jun 2009 20:29:36 -0000 1.2 *************** *** 11,23 **** import javax.swing.JMenuBar; - import org.apache.log4j.Logger; - /** * The menu class */ public class Menu { - /** The logger */ - private static Logger log = Logger.getLogger(Menu.class); - /** The singleton instance */ private static Menu instance; --- 11,18 ---- Index: Toolbar.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/Toolbar.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Toolbar.java 27 Dec 2007 23:14:30 -0000 1.8 --- Toolbar.java 25 Jun 2009 20:29:36 -0000 1.9 *************** *** 16,28 **** import javax.swing.ToolTipManager; - import org.apache.log4j.Logger; - /** * The toolbar class */ public class Toolbar extends JPanel { - /** The logger */ - private static Logger log = Logger.getLogger(Toolbar.class); - /** The singleton instance */ private static Toolbar instance; --- 16,23 ---- Index: MaterialView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/MaterialView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MaterialView.java 16 May 2008 11:48:56 -0000 1.2 --- MaterialView.java 25 Jun 2009 20:29:36 -0000 1.3 *************** *** 63,67 **** public void actionPerformed(ActionEvent a) { Object which = a.getSource(); - Project p = Project.getInstance(); if (which == add) { Material m = new Material(); --- 63,66 ---- Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** GUI.java 15 May 2009 09:10:42 -0000 1.109 --- GUI.java 25 Jun 2009 20:29:36 -0000 1.110 *************** *** 270,274 **** Container owner = Project.getInstance().getActiveSpace(); Container space; ! space = owner.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); --- 270,274 ---- Container owner = Project.getInstance().getActiveSpace(); Container space; ! space = Space.createFunctionalSpace(""); owner.add(space); AttributeView.instance().display(space); *************** *** 284,288 **** Container owner = Project.getInstance().getActiveSpace(); Container space; ! space = owner.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); --- 284,288 ---- Container owner = Project.getInstance().getActiveSpace(); Container space; ! space = Space.createConstructionSpace(""); owner.add(space); AttributeView.instance().display(space); |
|
From: Michael L. <he...@us...> - 2009-06-25 20:29:46
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/obj/kohler In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16380/src/etc/obj/kohler Added Files: 1721.mtl 4886.mtl 895.mtl Log Message: New files --- NEW FILE: 1721.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 --- NEW FILE: 4886.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 --- NEW FILE: 895.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 0.882353 0.882353 0.784314 Ks 0.330000 0.330000 0.330000 |
|
From: Michael L. <he...@us...> - 2009-06-25 20:29:46
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/obj/kirkland In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16380/src/etc/obj/kirkland Added Files: toilet.mtl Log Message: New files --- NEW FILE: toilet.mtl --- # ## Alias OBJ Material File # Exported from SketchUp, (c) 2000-2006 Google, Inc. newmtl FrontColor Ka 0.000000 0.000000 0.000000 Kd 1.000000 1.000000 1.000000 Ks 0.330000 0.330000 0.330000 newmtl Color_000 Ka 0.000000 0.000000 0.000000 Kd 1.000000 1.000000 1.000000 Ks 0.330000 0.330000 0.330000 |
