bprocessor-commit Mailing List for B-processor (Page 32)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2007-12-12 14:38:46
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28498/src/net/sourceforge/bprocessor/gl/model Modified Files: SelectionPath.java Log Message: Moved proto and anchor to instance Index: SelectionPath.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model/SelectionPath.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SelectionPath.java 12 Dec 2007 12:56:09 -0000 1.2 --- SelectionPath.java 12 Dec 2007 14:38:48 -0000 1.3 *************** *** 15,19 **** import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Geometric; ! import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Vertex; --- 15,19 ---- import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Geometric; ! import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Vertex; *************** *** 98,103 **** Set<Vertex> vertices = untranslated.collect(); for (Geometric current : reversed) { ! if (current instanceof Space) { ! CoordinateSystem cs = ((Space)current).getInstanceAnchor(); cs.unTranslateIt(vertices); } --- 98,103 ---- Set<Vertex> vertices = untranslated.collect(); for (Geometric current : reversed) { ! if (current instanceof Instance) { ! CoordinateSystem cs = ((Instance)current).getInstanceAnchor(); cs.unTranslateIt(vertices); } *************** *** 114,119 **** Geometric translated = geometric; for (Geometric current : path) { ! if (current instanceof Space) { ! CoordinateSystem cs = ((Space)current).getInstanceAnchor(); cs.translateIt(geometric.collect()); } --- 114,119 ---- Geometric translated = geometric; for (Geometric current : path) { ! if (current instanceof Instance) { ! CoordinateSystem cs = ((Instance)current).getInstanceAnchor(); cs.translateIt(geometric.collect()); } |
|
From: Michael L. <he...@us...> - 2007-12-12 14:38:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28498/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Moved proto and anchor to instance Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Display.java 12 Dec 2007 14:14:31 -0000 1.66 --- Display.java 12 Dec 2007 14:38:47 -0000 1.67 *************** *** 1142,1154 **** private static void translateToCoordinatesystem(Space space) { List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! if (space.isInstance()) { ! translation.add(space.getInstanceAnchor()); ! } ! while (space.getOwner() != null) { ! if (space.getOwner().isInstance()) { ! translation.add(0, space.getOwner().getInstanceAnchor()); } ! space = space.getOwner(); ! } for (CoordinateSystem cs : translation) { --- 1142,1155 ---- private static void translateToCoordinatesystem(Space space) { List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! ! Space current = space; ! ! while (current != null) { ! if (current instanceof Instance) { ! Instance instance = (Instance) current; ! translation.add(0, instance.getInstanceAnchor()); } ! current = current.getOwner(); ! } for (CoordinateSystem cs : translation) { |
|
From: Michael L. <he...@us...> - 2007-12-12 14:38:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28498/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: Moved proto and anchor to instance Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** FinalMoveTool.java 12 Dec 2007 14:14:31 -0000 1.41 --- FinalMoveTool.java 12 Dec 2007 14:38:47 -0000 1.42 *************** *** 192,196 **** */ public class InstanceMove implements Mover { ! private Space instance; private CoordinateSystem handle; private CoordinateSystem initialCoordinate; --- 192,196 ---- */ public class InstanceMove implements Mover { ! private Instance instance; private CoordinateSystem handle; private CoordinateSystem initialCoordinate; *************** *** 201,205 **** * @param handle the handle to moove acording to */ ! public InstanceMove(Space instance, CoordinateSystem handle) { this.instance = instance; this.handle = handle; --- 201,205 ---- * @param handle the handle to moove acording to */ ! public InstanceMove(Instance instance, CoordinateSystem handle) { this.instance = instance; this.handle = handle; |
|
From: Michael L. <he...@us...> - 2007-12-12 14:38:44
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28483/src/net/sourceforge/bprocessor/model Modified Files: Instance.java Space.java Persistence.java Container.java Log Message: Moved proto and anchor to instance Index: Instance.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Instance.java 12 Dec 2007 12:02:21 -0000 1.2 --- Instance.java 12 Dec 2007 14:38:43 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- package net.sourceforge.bprocessor.model; + import java.util.HashSet; + import java.util.Set; + /** * *************** *** 13,16 **** --- 16,29 ---- public class Instance extends Space { /** + * If proto points to another space, this space + * is an instance of the other space and is not + * a container. + */ + private Space proto; + + /** A anchor for instances */ + protected CoordinateSystem anchor; + + /** * Constructs instance * @param name name *************** *** 19,21 **** --- 32,99 ---- super(name, Space.CONSTRUCTION, false); } + + /** + * {@inheritDoc} + */ + public boolean isInstance() { + return true; + } + + /** + * Get proto + * @return proto + */ + public Space getProto() { + return proto; + } + + /** + * Set proto + * @param space Space + */ + public void setProto(Space space) { + this.proto = space; + if (proto != null) { + if (anchor == null) { + this.anchor = Project.getInstance().getActiveCoordinateSystem().copy(); + } + } else { + this.anchor = null; + } + } + + /** + * Getter for anchor + * @return The anchor + */ + public CoordinateSystem getInstanceAnchor() { + if (isInstance()) { + if (anchor == null) { + anchor = Project.getInstance().getActiveCoordinateSystem().copy(); + } + return anchor; + } else { + return null; + } + } + + /** + * set the anchor for a instance + * @param cs the coordinatesystem to use as anchor + */ + public void setInstanceAnchor(CoordinateSystem cs) { + anchor = cs; + } + + + + /** + * {@inheritDoc} + */ + @Override + public Set<Vertex> collect() { + Set<Vertex> result = new HashSet<Vertex>(); + result.addAll(anchor.collect()); + return result; + } } Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Persistence.java 12 Dec 2007 14:12:11 -0000 1.68 --- Persistence.java 12 Dec 2007 14:38:43 -0000 1.69 *************** *** 1035,1039 **** } } else { ! xml.setAnchor(externalizeCoordinateSystem(space.getInstanceAnchor(), map)); } { --- 1035,1040 ---- } } else { ! Instance instance = (Instance) space; ! xml.setAnchor(externalizeCoordinateSystem(instance.getInstanceAnchor(), map)); } { Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.220 retrieving revision 1.221 diff -C2 -d -r1.220 -r1.221 *** Space.java 12 Dec 2007 14:12:11 -0000 1.220 --- Space.java 12 Dec 2007 14:38:43 -0000 1.221 *************** *** 77,90 **** private ClassificationType productType; - - /** - * If proto points to another space, this space - * is an instance of the other space and is not - * a container. - * - * FIXME Should be handled by a class hierarchy. - */ - private Space proto; - /** The empty space in this space (also called void) */ protected Space empty; --- 77,80 ---- *************** *** 121,126 **** private LinkedHashMap<String, Object> ownParameters = new LinkedHashMap<String, Object>(); ! /** A anchor for instances */ ! private CoordinateSystem anchor; /** --- 111,115 ---- private LinkedHashMap<String, Object> ownParameters = new LinkedHashMap<String, Object>(); ! /** *************** *** 263,289 **** /** - * Set proto - * @param space Space - */ - public void setProto(Space space) { - this.proto = space; - if (proto != null) { - if (anchor == null) { - this.anchor = Project.getInstance().getActiveCoordinateSystem().copy(); - } - } else { - this.anchor = null; - } - } - - /** - * Get proto - * @return proto - */ - public Space getProto() { - return proto; - } - - /** * * @return isContainer --- 252,255 ---- *************** *** 1381,1387 **** result.addAll(s.collect()); } - if (isInstance()) { - result.addAll(anchor.collect()); - } if (container) { result.addAll(collectInterior()); --- 1347,1350 ---- *************** *** 1888,1894 **** * @return true if it is a instance otherwise false */ ! public boolean isInstance() { ! return proto != null; ! } /** --- 1851,1855 ---- * @return true if it is a instance otherwise false */ ! public abstract boolean isInstance(); /** *************** *** 2300,2325 **** } - /** - * Getter for anchor - * @return The anchor - */ - public CoordinateSystem getInstanceAnchor() { - if (isInstance()) { - if (anchor == null) { - anchor = Project.getInstance().getActiveCoordinateSystem().copy(); - } - return anchor; - } else { - return null; - } - } - - /** - * set the anchor for a instance - * @param cs the coordinatesystem to use as anchor - */ - public void setInstanceAnchor(CoordinateSystem cs) { - anchor = cs; - } /** --- 2261,2264 ---- Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Container.java 12 Dec 2007 12:48:23 -0000 1.2 --- Container.java 12 Dec 2007 14:38:43 -0000 1.3 *************** *** 28,30 **** --- 28,37 ---- super(name, type, container); } + + /** + * {@inheritDoc} + */ + public boolean isInstance() { + return false; + } } |
|
From: Michael L. <he...@us...> - 2007-12-12 14:14:31
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18975/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: another step in instance/container refactor Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Display.java 12 Dec 2007 10:51:40 -0000 1.65 --- Display.java 12 Dec 2007 14:14:31 -0000 1.66 *************** *** 36,39 **** --- 36,40 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; + import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Line; import net.sourceforge.bprocessor.model.Project; *************** *** 841,845 **** private static void draw(Space space, boolean inside) { if (space.isInstance()) { ! drawInstance(space, inside); } else { drawSpace(space, inside); --- 842,846 ---- private static void draw(Space space, boolean inside) { if (space.isInstance()) { ! drawInstance((Instance) space, inside); } else { drawSpace(space, inside); *************** *** 847,851 **** } ! private static void drawInstance(Space space, boolean inside) { gl.glPushMatrix(); if (space == active) { --- 848,852 ---- } ! private static void drawInstance(Instance space, boolean inside) { gl.glPushMatrix(); if (space == active) { |
|
From: Michael L. <he...@us...> - 2007-12-12 14:14:31
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18975/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: another step in instance/container refactor Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** FinalMoveTool.java 11 Dec 2007 14:49:11 -0000 1.40 --- FinalMoveTool.java 12 Dec 2007 14:14:31 -0000 1.41 *************** *** 26,29 **** --- 26,30 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; + import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Mesh; import net.sourceforge.bprocessor.model.Project; *************** *** 496,501 **** if (geometrics.size() == 1) { Geometric work = geometrics.iterator().next(); ! if (work instanceof Space) { ! Space space = (Space)work; if (space.isInstance()) { CoordinateSystem anchor = null; --- 497,502 ---- if (geometrics.size() == 1) { Geometric work = geometrics.iterator().next(); ! if (work instanceof Instance) { ! Instance space = (Instance)work; if (space.isInstance()) { CoordinateSystem anchor = null; |
|
From: Michael L. <he...@us...> - 2007-12-12 14:12:26
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18193/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: another step in instance/container refactor Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** GenericTreeView.java 12 Dec 2007 12:02:28 -0000 1.132 --- GenericTreeView.java 12 Dec 2007 14:12:19 -0000 1.133 *************** *** 632,636 **** super(space); if (space.isInstance()) { ! makeInstanceContent(space); } else if (space.isContainer()) { makeContainerContent(space); --- 632,636 ---- super(space); if (space.isInstance()) { ! makeInstanceContent((Instance) space); } else if (space.isContainer()) { makeContainerContent(space); *************** *** 646,650 **** */ private void makeContainerContent(Space space) { - Set surfaces = space.getEnvelope(); add(new EnvelopeContainer("Envelope", space)); String lvlstr = Space.levelToString(space.getLevel() + 1); --- 646,649 ---- *************** *** 664,668 **** * @param space The space */ ! private void makeInstanceContent(Space space) { Set surfaces = space.getEnvelope(); add(new SurfaceContainer("Envelope", surfaces, false)); --- 663,667 ---- * @param space The space */ ! private void makeInstanceContent(Instance space) { Set surfaces = space.getEnvelope(); add(new SurfaceContainer("Envelope", surfaces, false)); *************** *** 683,693 **** Space s = (Space)o; if (s.isInstance()) { if (this.getChildCount() == 3) { ! ((GenericNode)getChildAt(0)).update(s.getEnvelope()); ! ((GenericNode)getChildAt(1)).update(s.getProto()); ! ((GenericNode)getChildAt(2)).update(s.getInstanceAnchor()); } else { removeAllChildren(); ! makeInstanceContent(s); model.nodeStructureChanged(this); } --- 682,693 ---- Space s = (Space)o; if (s.isInstance()) { + Instance instance = (Instance) s; if (this.getChildCount() == 3) { ! ((GenericNode)getChildAt(0)).update(instance.getEnvelope()); ! ((GenericNode)getChildAt(1)).update(instance.getProto()); ! ((GenericNode)getChildAt(2)).update(instance.getInstanceAnchor()); } else { removeAllChildren(); ! makeInstanceContent(instance); model.nodeStructureChanged(this); } |
|
From: Michael L. <he...@us...> - 2007-12-12 14:12:25
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18176/src/net/sourceforge/bprocessor/model Modified Files: Space.java Persistence.java Log Message: another step in instance/container refactor Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Persistence.java 12 Dec 2007 12:48:23 -0000 1.67 --- Persistence.java 12 Dec 2007 14:12:11 -0000 1.68 *************** *** 125,129 **** Collection xmls = new LinkedList(); ! Space world = internalizeSpace(null, (SpaceType) document.getSpace().iterator().next(), mapper, xmls); --- 125,129 ---- Collection xmls = new LinkedList(); ! Space world = internalizeContainer(null, (SpaceType) document.getSpace().iterator().next(), mapper, xmls); *************** *** 262,266 **** return internalizeInstance(owner, type, mapper, xmls); } else { ! return internalizeSpace(owner, type, mapper, xmls); } } --- 262,266 ---- return internalizeInstance(owner, type, mapper, xmls); } else { ! return internalizeContainer(owner, type, mapper, xmls); } } *************** *** 302,306 **** * @return The Space */ ! private static Space internalizeSpace(Space owner, SpaceType xml, Map mapper, Collection xmls) { --- 302,306 ---- * @return The Space */ ! private static Container internalizeContainer(Space owner, SpaceType xml, Map mapper, Collection xmls) { *************** *** 317,321 **** //space.setContainer(container); ! Space space = new Container(name, type, container); --- 317,321 ---- //space.setContainer(container); ! Container space = new Container(name, type, container); *************** *** 668,673 **** */ private static void internalizeReferences(Object object, EntityType xml, Map map) { ! if (object instanceof Space) { ! internalizeReferences((Space) object, (SpaceType) xml, map); } else if (object instanceof Surface) { internalizeReferences((Surface) object, (SurfaceType) xml, map); --- 668,675 ---- */ private static void internalizeReferences(Object object, EntityType xml, Map map) { ! if (object instanceof Container) { ! internalizeReferences((Container) object, (SpaceType) xml, map); ! } else if (object instanceof Instance) { ! internalizeReferences((Instance) object, (SpaceType) xml, map); } else if (object instanceof Surface) { internalizeReferences((Surface) object, (SurfaceType) xml, map); *************** *** 755,761 **** * @param map The map */ ! private static void internalizeReferences(Space object, SpaceType xml, Map map) { ! object.setProto((Space) get(xml.getProtoref(), map)); ! object.setEnvelope(asSet(xml.getBoundary(), map)); { --- 757,761 ---- * @param map The map */ ! private static void internalizeReferences(Container object, SpaceType xml, Map map) { object.setEnvelope(asSet(xml.getBoundary(), map)); { *************** *** 771,774 **** --- 771,785 ---- * @param map The map */ + private static void internalizeReferences(Instance object, SpaceType xml, Map map) { + object.setProto((Space) get(xml.getProtoref(), map)); + } + + + /** + * + * @param object The object + * @param xml The xml + * @param map The map + */ private static void internalizeReferences(Surface object, SurfaceType xml, Map map) { object.setEdges(asList(xml.getEdgeref(), map)); *************** *** 1294,1299 **** */ private static void externalizeReferences(Object object, EntityType xml, Map map) { ! if (object instanceof Space) { ! externalizeReferences((Space) object, (SpaceType) xml, map); } else if (object instanceof Surface) { externalizeReferences((Surface) object, (SurfaceType) xml, map); --- 1305,1312 ---- */ private static void externalizeReferences(Object object, EntityType xml, Map map) { ! if (object instanceof Container) { ! externalizeReferences((Container) object, (SpaceType) xml, map); ! } else if (object instanceof Instance) { ! externalizeReferences((Instance) object, (SpaceType) xml, map); } else if (object instanceof Surface) { externalizeReferences((Surface) object, (SurfaceType) xml, map); *************** *** 1317,1321 **** * @param map The map */ ! private static void externalizeReferences(Space object, SpaceType xml, Map map) { if (object.getEmpty() != null) { xml.setVoidref(id(map, object.getEmpty())); --- 1330,1347 ---- * @param map The map */ ! private static void externalizeReferences(Container object, SpaceType xml, Map map) { ! if (object.getEmpty() != null) { ! xml.setVoidref(id(map, object.getEmpty())); ! } ! xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope()))); ! } ! ! /** ! * Externalize references ! * @param object The object ! * @param xml The xml entity ! * @param map The map ! */ ! private static void externalizeReferences(Instance object, SpaceType xml, Map map) { if (object.getEmpty() != null) { xml.setVoidref(id(map, object.getEmpty())); *************** *** 1324,1330 **** xml.setProtoref(id(map, object.getProto())); } - xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope()))); } /** * Externalize references --- 1350,1356 ---- xml.setProtoref(id(map, object.getProto())); } } + /** * Externalize references *************** *** 1691,1695 **** lo.setLocked(lot.isLocked()); lo.setId(lot.getProgid()); ! lo.setSpace(internalizeSpace(null, lot.getSpace(), map, xmls)); return lo; } --- 1717,1721 ---- lo.setLocked(lot.isLocked()); lo.setId(lot.getProgid()); ! lo.setSpace(internalizeContainer(null, lot.getSpace(), map, xmls)); return lo; } Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.219 retrieving revision 1.220 diff -C2 -d -r1.219 -r1.220 *** Space.java 12 Dec 2007 12:48:23 -0000 1.219 --- Space.java 12 Dec 2007 14:12:11 -0000 1.220 *************** *** 549,557 **** return vertices.values(); } else { ! if (proto != null) { ! return proto.getVertices(); ! } else { ! return Collections.emptyList(); ! } } } --- 549,553 ---- return vertices.values(); } else { ! return Collections.emptyList(); } } *************** *** 678,686 **** return edges.values(); } else { ! if (proto != null) { ! return proto.getEdges(); ! } else { ! return Collections.emptyList(); ! } } } --- 674,678 ---- return edges.values(); } else { ! return Collections.emptyList(); } } *************** *** 793,801 **** return surfaces.values(); } else { ! if (proto != null) { ! return proto.getSurfaces(); ! } else { ! return Collections.emptyList(); ! } } } --- 785,789 ---- return surfaces.values(); } else { ! return Collections.emptyList(); } } *************** *** 1123,1131 **** return elements.values(); } else { ! if (proto != null) { ! return proto.getElements(); ! } else { ! return Collections.EMPTY_LIST; ! } } } --- 1111,1115 ---- return elements.values(); } else { ! return Collections.EMPTY_LIST; } } *************** *** 1296,1300 **** /** {@inheritDoc} */ public String getGeneralName() { ! if (proto != null) { return "Instance"; } --- 1280,1284 ---- /** {@inheritDoc} */ public String getGeneralName() { ! if (isInstance()) { return "Instance"; } |
|
From: rimestad <rim...@us...> - 2007-12-12 13:07:12
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24779/src/net/sourceforge/bprocessor/gl/view Modified Files: GLPreviewPanel.java Log Message: Fixed preview of small objects... Index: GLPreviewPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/GLPreviewPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GLPreviewPanel.java 20 Nov 2007 18:25:08 -0000 1.5 --- GLPreviewPanel.java 12 Dec 2007 13:07:14 -0000 1.6 *************** *** 124,129 **** gl.glMatrixMode(GL.GL_PROJECTION); gl.glLoadIdentity(); ! double tal = Math.tan(Math.toRadians(camera.getFocalwidth() / 2)); ! gl.glFrustum(-tal, tal, -tal / aspect, tal / aspect, 1, camera.dist() * 2); gl.glMatrixMode(GL.GL_MODELVIEW); gl.glLoadIdentity(); --- 124,129 ---- gl.glMatrixMode(GL.GL_PROJECTION); gl.glLoadIdentity(); ! double tal = Math.tan(Math.toRadians(camera.getFocalwidth() / 2) * 0.1); ! gl.glFrustum(-tal, tal, -tal / aspect, tal / aspect, 0.1, camera.dist() * 2); gl.glMatrixMode(GL.GL_MODELVIEW); gl.glLoadIdentity(); |
|
From: rimestad <rim...@us...> - 2007-12-12 12:56:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20484/src/net/sourceforge/bprocessor/gl/model Modified Files: SelectionPath.java Log Message: Made recursive inference of intersection on instances with instances... Index: SelectionPath.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model/SelectionPath.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SelectionPath.java 7 Dec 2007 14:38:54 -0000 1.1 --- SelectionPath.java 12 Dec 2007 12:56:09 -0000 1.2 *************** *** 7,13 **** --- 7,20 ---- package net.sourceforge.bprocessor.gl.model; + import java.util.Collections; + import java.util.HashMap; import java.util.List; import java.util.LinkedList; + import java.util.Set; + + import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Geometric; + import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Vertex; /** *************** *** 79,81 **** --- 86,123 ---- return path.size(); } + + /** + * Translate a geometric out of the selected path + * @param geometric The geometric to untranslate + * @return The unTranslated geometric + */ + public Geometric translateOut(Geometric geometric) { + List<Geometric> reversed = new LinkedList<Geometric>(path); + Collections.reverse(reversed); + Geometric untranslated = geometric.copy(new HashMap()); + Set<Vertex> vertices = untranslated.collect(); + for (Geometric current : reversed) { + if (current instanceof Space) { + CoordinateSystem cs = ((Space)current).getInstanceAnchor(); + cs.unTranslateIt(vertices); + } + } + return untranslated; + } + + /** + * Translate a geometric into the selected path + * @param geometric The geometric to translate + * @return The translated geometric + */ + public Geometric translateIn(Geometric geometric) { + Geometric translated = geometric; + for (Geometric current : path) { + if (current instanceof Space) { + CoordinateSystem cs = ((Space)current).getInstanceAnchor(); + cs.translateIt(geometric.collect()); + } + } + return translated; + } } |
|
From: rimestad <rim...@us...> - 2007-12-12 12:56:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20484/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Made recursive inference of intersection on instances with instances... Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.269 retrieving revision 1.270 diff -C2 -d -r1.269 -r1.270 *** View.java 11 Dec 2007 14:49:11 -0000 1.269 --- View.java 12 Dec 2007 12:56:09 -0000 1.270 *************** *** 1290,1298 **** SelectionPath currentPath = new SelectionPath(); if (names > 1) { ! Space instance = (Space)getObject(selectBuffer.get(bufferOffset + names - 1)); ! if (unWantedEntities.contains(instance)) { continue; } - currentPath.addGeometricToPath(instance); } int id = selectBuffer.get(bufferOffset + names); --- 1290,1305 ---- SelectionPath currentPath = new SelectionPath(); if (names > 1) { ! for (int namesIndex = 1; namesIndex < names; namesIndex++) { ! Space instance = (Space)getObject(selectBuffer.get(bufferOffset + namesIndex)); ! if (unWantedEntities.contains(instance)) { ! currentPath = null; ! break; ! } ! currentPath.addGeometricToPath(instance); ! } ! if (currentPath == null) { ! bufferOffset += names + 1; continue; } } int id = selectBuffer.get(bufferOffset + names); *************** *** 1387,1393 **** } else { if (surface.getPathLength() > 1) { - Space space = (Space)surface.getFirstInPath(); Surface theSurface = ! space.getInstanceAnchor().unTranslate((Surface)surface.getLastInPath()); setLastSurface(theSurface); } else { --- 1394,1399 ---- } else { if (surface.getPathLength() > 1) { Surface theSurface = ! (Surface)surface.translateOut((Surface)surface.getLastInPath()); setLastSurface(theSurface); } else { *************** *** 1398,1404 **** if (lastSurface == null && surface != null) { if (surface.getPathLength() > 1) { - Space space = (Space)surface.getFirstInPath(); Surface theSurface = ! space.getInstanceAnchor().unTranslate((Surface)surface.getLastInPath()); setLastSurface(theSurface); } else { --- 1404,1409 ---- if (lastSurface == null && surface != null) { if (surface.getPathLength() > 1) { Surface theSurface = ! (Surface)surface.translateOut((Surface)surface.getLastInPath()); setLastSurface(theSurface); } else { *************** *** 1408,1411 **** --- 1413,1417 ---- if (edge != null) { edges.remove(edge); + Edge theEdge = (Edge)edge.translateOut((Edge)edge.getLastInPath()); if (((Edge)edge.getLastInPath()).getStrippled()) { Iterator iter = edges.iterator(); *************** *** 1413,1418 **** Edge current = (Edge) iter.next(); if (!current.getStrippled()) { ! if (((Edge)edge.getLastInPath()).intersects(current.getFrom()) && ! ((Edge)edge.getLastInPath()).intersects(current.getTo())) { edge = new SelectionPath(current); break; --- 1419,1424 ---- Edge current = (Edge) iter.next(); if (!current.getStrippled()) { ! if (theEdge.intersects(current.getFrom()) && ! theEdge.intersects(current.getTo())) { edge = new SelectionPath(current); break; *************** *** 1437,1443 **** Vertex intersection = (Vertex)vertex.getLastInPath(); if (vertex.getPathLength() > 1) { ! Space instance = (Space)vertex.getFirstInPath(); ! Vertex cur = (Vertex)vertex.getLastInPath(); ! intersection = instance.getInstanceAnchor().unTranslate(cur); } return new Intersection(intersection, Intersection.VERTEX, intersection); --- 1443,1447 ---- Vertex intersection = (Vertex)vertex.getLastInPath(); if (vertex.getPathLength() > 1) { ! intersection = (Vertex)vertex.translateOut(intersection); } return new Intersection(intersection, Intersection.VERTEX, intersection); *************** *** 1448,1452 **** Edge current = (Edge)edge.getLastInPath(); if (edge.getPathLength() > 1) { ! current = ((Space)edge.getFirstInPath()).getInstanceAnchor().unTranslate(current); } if (!current.getStrippled()) { --- 1452,1456 ---- Edge current = (Edge)edge.getLastInPath(); if (edge.getPathLength() > 1) { ! current = (Edge)edge.translateOut(current); } if (!current.getStrippled()) { *************** *** 1511,1516 **** Surface theSurface = (Surface)surface.getLastInPath(); if (surface.getPathLength() > 1) { ! Space instance = (Space)surface.getFirstInPath(); ! theSurface = instance.getInstanceAnchor().unTranslate(theSurface); } Plane plane = theSurface.plane(); --- 1515,1519 ---- Surface theSurface = (Surface)surface.getLastInPath(); if (surface.getPathLength() > 1) { ! theSurface = (Surface)(surface.translateOut(theSurface)); } Plane plane = theSurface.plane(); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:30
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17301/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: Instance/Container instantiated as appropriately Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** PopupMenu.java 12 Dec 2007 12:02:28 -0000 1.88 --- PopupMenu.java 12 Dec 2007 12:48:31 -0000 1.89 *************** *** 32,35 **** --- 32,36 ---- 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; *************** *** 311,315 **** AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Space union = new Space("Normals", Space.CONSTRUCTION, true); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); --- 312,316 ---- AbstractAction action = new SpaceMenuAction(sp, "Normals") { public void actionPerformed(ActionEvent event) { ! Space union = new Container("Normals", Space.CONSTRUCTION, true); for (Surface surface : space.getSurfaces()) { Vertex normal = surface.normal(); *************** *** 519,523 **** HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = new Space("Union", Space.CONSTRUCTION, true); union.setUnion(true); for (Vertex current : copy.vertices()) { --- 520,524 ---- HashMap map = new HashMap(); Mesh copy = mesh.copy(map); ! Space union = new Container("Union", Space.CONSTRUCTION, true); union.setUnion(true); for (Vertex current : copy.vertices()) { |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:29
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17301/src/net/sourceforge/bprocessor/gui/actions Modified Files: ImportFileReader.java FileImportActionListener.java Log Message: Instance/Container instantiated as appropriately Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FileImportActionListener.java 26 Nov 2007 18:13:30 -0000 1.17 --- FileImportActionListener.java 12 Dec 2007 12:48:31 -0000 1.18 *************** *** 27,30 **** --- 27,31 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.Component; + import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Space; *************** *** 108,112 **** } else if (lfile.getName().endsWith(".obj")) { try { ! Space s = new Space(lfile.getName(), Space.CONSTRUCTION, true); s.setUnion(true); Component lo = new Component(Byte.MAX_VALUE, lfile, s); --- 109,113 ---- } else if (lfile.getName().endsWith(".obj")) { try { ! Space s = new Container(lfile.getName(), Space.CONSTRUCTION, true); s.setUnion(true); Component lo = new Component(Byte.MAX_VALUE, lfile, s); Index: ImportFileReader.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ImportFileReader.java 23 Nov 2007 10:35:39 -0000 1.15 --- ImportFileReader.java 12 Dec 2007 12:48:31 -0000 1.16 *************** *** 25,28 **** --- 25,29 ---- import net.sourceforge.bprocessor.model.Classification; + import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.CoordinateSystem; import net.sourceforge.bprocessor.model.Edge; *************** *** 404,408 **** } if (spaceid != previousSpaceId) { ! currentSpace = new Space("Space with id " + spaceid, Space.CONSTRUCTION, true); where.add(currentSpace); --- 405,409 ---- } if (spaceid != previousSpaceId) { ! currentSpace = new Container("Space with id " + spaceid, Space.CONSTRUCTION, true); where.add(currentSpace); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:29
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17291/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java Log Message: Instance/Container instantiated as appropriately Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** AbstractTool.java 11 Dec 2007 14:49:11 -0000 1.142 --- AbstractTool.java 12 Dec 2007 12:48:27 -0000 1.143 *************** *** 9,12 **** --- 9,13 ---- import net.sourceforge.bprocessor.model.AxisRotate; import net.sourceforge.bprocessor.model.Camera; + import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometry; *************** *** 812,816 **** public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = new Space(name, Space.CONSTRUCTION, true); stack.push(result); } --- 813,817 ---- public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); ! Space result = new Container(name, Space.CONSTRUCTION, true); stack.push(result); } |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:21
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17268/src/net/sourceforge/bprocessor/model/modellor Modified Files: TileModellor.java WallPartingModellor.java InnerWallModellor.java ModelBathModellor2.java Log Message: Instance/Container instantiated as appropriately Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** TileModellor.java 11 Dec 2007 14:49:03 -0000 1.24 --- TileModellor.java 12 Dec 2007 12:48:22 -0000 1.25 *************** *** 21,24 **** --- 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; *************** *** 177,181 **** outer.addHole(newS); space.addAll(newS); ! Space sp = new Space("Tile", Space.CONSTRUCTION, true); if (sign == -1) { newS.setBackDomain(sp); --- 178,182 ---- outer.addHole(newS); space.addAll(newS); ! Space sp = new Container("Tile", Space.CONSTRUCTION, true); if (sign == -1) { newS.setBackDomain(sp); *************** *** 189,193 **** } ! Space joint = new Space("Tile", Space.CONSTRUCTION, true); if (sign == -1) { outer.setBackDomain(joint); --- 190,194 ---- } ! Space joint = new Container("Tile", Space.CONSTRUCTION, true); if (sign == -1) { outer.setBackDomain(joint); Index: WallPartingModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WallPartingModellor.java 11 Dec 2007 14:49:03 -0000 1.6 --- WallPartingModellor.java 12 Dec 2007 12:48:22 -0000 1.7 *************** *** 14,17 **** --- 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; *************** *** 162,166 **** Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = new Space("Concrete", Space.CONSTRUCTION, true); space.add(concrete); if (s.normal().getZ() == 1.0) { --- 163,167 ---- Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = new Container("Concrete", Space.CONSTRUCTION, true); space.add(concrete); if (s.normal().getZ() == 1.0) { *************** *** 181,185 **** between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = new Space("Tile", Space.CONSTRUCTION, true); space.add(tile); if (s.normal().getZ() == 1.0) { --- 182,186 ---- between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = new Container("Tile", Space.CONSTRUCTION, true); space.add(tile); if (s.normal().getZ() == 1.0) { Index: InnerWallModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** InnerWallModellor.java 11 Dec 2007 14:49:03 -0000 1.14 --- InnerWallModellor.java 12 Dec 2007 12:48:22 -0000 1.15 *************** *** 17,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; *************** *** 216,220 **** Surface base = joistBase(); space.add(base); ! Space joist = new Space("joist", Space.CONSTRUCTION, true); Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0); joist.setClassificationType(c.getPossibleTypes().getChildren().get(0)); --- 217,221 ---- Surface base = joistBase(); space.add(base); ! Space joist = new Container("joist", Space.CONSTRUCTION, true); Classification c = Project.getInstance().getClassification("-1.-205.01.01", 0); joist.setClassificationType(c.getPossibleTypes().getChildren().get(0)); *************** *** 268,274 **** Surface sheet1 = new Surface(outlineCopy1); Surface sheet2 = new Surface(outlineCopy2); ! Space sheetSpace1 = new Space("sheet1", Space.CONSTRUCTION, true); sheetSpace1.setClassification(woodSheet()); ! Space sheetSpace2 = new Space("sheet2", Space.CONSTRUCTION, true); sheetSpace2.setClassification(woodSheet()); Vertex j = cs.getJ().copy(); --- 269,275 ---- Surface sheet1 = new Surface(outlineCopy1); Surface sheet2 = new Surface(outlineCopy2); ! Space sheetSpace1 = new Container("sheet1", Space.CONSTRUCTION, true); sheetSpace1.setClassification(woodSheet()); ! Space sheetSpace2 = new Container("sheet2", Space.CONSTRUCTION, true); sheetSpace2.setClassification(woodSheet()); Vertex j = cs.getJ().copy(); Index: ModelBathModellor2.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ModelBathModellor2.java 11 Dec 2007 14:49:03 -0000 1.13 --- ModelBathModellor2.java 12 Dec 2007 12:48:23 -0000 1.14 *************** *** 16,19 **** --- 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; *************** *** 156,166 **** */ private void generateBath() { ! floor = new Space("Floor", Space.CONSTRUCTION, true); space.add(floor); ! bath = new Space("Bath cabin", Space.FUNCTIONAL, true); space.add(bath); ! walls = new Space("Walls", Space.CONSTRUCTION, true); space.add(walls); ! ceiling = new Space("Ceiling", Space.CONSTRUCTION, true); space.add(ceiling); makeFloor(); --- 157,167 ---- */ private void generateBath() { ! floor = new Container("Floor", Space.CONSTRUCTION, true); space.add(floor); ! bath = new Container("Bath cabin", Space.FUNCTIONAL, true); space.add(bath); ! walls = new Container("Walls", Space.CONSTRUCTION, true); space.add(walls); ! ceiling = new Container("Ceiling", Space.CONSTRUCTION, true); space.add(ceiling); makeFloor(); *************** *** 291,295 **** Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = new Space("Concrete", Space.CONSTRUCTION, true); walls.add(concrete); if (s.normal().getZ() == 1.0) { --- 292,296 ---- Edge between2 = new Edge(inner.getTo(), outerCopy.getTo()); Surface s = new Surface(inner, between1, outerCopy, between2); ! Space concrete = new Container("Concrete", Space.CONSTRUCTION, true); walls.add(concrete); if (s.normal().getZ() == 1.0) { *************** *** 310,314 **** between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = new Space("Tile", Space.CONSTRUCTION, true); walls.add(tile); if (s.normal().getZ() == 1.0) { --- 311,315 ---- between2 = new Edge(inner2.getTo(), tileCopy.getTo()); s = new Surface(inner2, between1, tileCopy, between2); ! Space tile = new Container("Tile", Space.CONSTRUCTION, true); walls.add(tile); if (s.normal().getZ() == 1.0) { *************** *** 395,399 **** if (s.getCurrentValue().equals("Door")) { // make a door ! Space doorSpc = new Space("Door", Space.CONSTRUCTION, true); doorAndWindows.add(doorSpc); space.add(doorSpc); --- 396,400 ---- if (s.getCurrentValue().equals("Door")) { // make a door ! Space doorSpc = new Container("Door", Space.CONSTRUCTION, true); doorAndWindows.add(doorSpc); space.add(doorSpc); *************** *** 438,442 **** } else if (s.getCurrentValue().equals("Window")) { //make a window ! Space winSpc = new Space("Window", Space.CONSTRUCTION, true); doorAndWindows.add(winSpc); space.add(winSpc); --- 439,443 ---- } else if (s.getCurrentValue().equals("Window")) { //make a window ! Space winSpc = new Container("Window", Space.CONSTRUCTION, true); doorAndWindows.add(winSpc); space.add(winSpc); *************** *** 673,677 **** public Modellor newInstance(Space s) { if (s.getLevel() == Space.PROJECT_LEVEL) { ! Space bath = new Space("Bath-union", Space.CONSTRUCTION, true); bath.setUnion(true); s.add(bath); --- 674,678 ---- public Modellor newInstance(Space s) { if (s.getLevel() == Space.PROJECT_LEVEL) { ! Space bath = new Container("Bath-union", Space.CONSTRUCTION, true); bath.setUnion(true); s.add(bath); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:21
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17268/src/net/sourceforge/bprocessor/model Modified Files: Command.java Space.java Project.java Persistence.java Container.java Log Message: Instance/Container instantiated as appropriately Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Persistence.java 12 Dec 2007 12:34:58 -0000 1.66 --- Persistence.java 12 Dec 2007 12:48:23 -0000 1.67 *************** *** 311,316 **** boolean container = (empty != 0); - long proto = xml.getProtoref(); - // Alternative: //space = new Space() --- 311,314 ---- *************** *** 319,323 **** //space.setContainer(container); ! Space space = new Space(name, type, container); --- 317,321 ---- //space.setContainer(container); ! Space space = new Container(name, type, container); Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.218 retrieving revision 1.219 diff -C2 -d -r1.218 -r1.219 *** Space.java 12 Dec 2007 11:06:11 -0000 1.218 --- Space.java 12 Dec 2007 12:48:23 -0000 1.219 *************** *** 28,32 **** * Space */ ! public class Space extends Geometric implements Parametric { private static Logger log = Logger.getLogger(Space.class); --- 28,32 ---- * Space */ ! public abstract class Space extends Geometric implements Parametric { private static Logger log = Logger.getLogger(Space.class); *************** *** 197,201 **** if (container) { initializeContainers(); ! empty = new Space("Void", FUNCTIONAL, false); this.add(empty); } --- 197,201 ---- if (container) { initializeContainers(); ! empty = new Container("Void", FUNCTIONAL, false); this.add(empty); } *************** *** 210,214 **** */ public Space createConstructionSpace(String name) { ! return new Space(name, Space.CONSTRUCTION, true); } --- 210,214 ---- */ public Space createConstructionSpace(String name) { ! return new Container(name, Space.CONSTRUCTION, true); } *************** *** 219,223 **** */ public Space createFunctionalSpace(String name) { ! return new Space(name, Space.FUNCTIONAL, true); } --- 219,223 ---- */ public Space createFunctionalSpace(String name) { ! return new Container(name, Space.FUNCTIONAL, true); } *************** *** 241,245 **** */ public static Space createNet(String name) { ! Space net = new Space(name, Space.FUNCTIONAL, true); net.setNet(true); return net; --- 241,245 ---- */ public static Space createNet(String name) { ! Space net = new Container(name, Space.FUNCTIONAL, true); net.setNet(true); return net; *************** *** 1475,1479 **** */ public Space shallowCopy() { ! Space copy = new Space(); copy.classification = classification; copy.container = container; --- 1475,1479 ---- */ public Space shallowCopy() { ! Space copy = new Container(); copy.classification = classification; copy.container = container; Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Container.java 12 Dec 2007 10:53:50 -0000 1.1 --- Container.java 12 Dec 2007 12:48:23 -0000 1.2 *************** *** 12,15 **** */ public class Container extends Space { ! } --- 12,30 ---- */ public class Container extends Space { ! /** ! * Empty constructor ! * ! */ ! public Container() { ! } ! ! /** ! * Constructor for container ! * @param name The name ! * @param type The type ! * @param container The container flag ! */ ! public Container(String name, int type, boolean container) { ! super(name, type, container); ! } } Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Command.java 12 Dec 2007 09:38:34 -0000 1.53 --- Command.java 12 Dec 2007 12:48:23 -0000 1.54 *************** *** 840,844 **** Surface side3 = new Surface(list(e3, l3, l0)); ! Space union = new Space("Pyramid", Space.CONSTRUCTION, true); addTo(union, list(s0, side0, side1, side2, side3)); --- 840,844 ---- Surface side3 = new Surface(list(e3, l3, l0)); ! Space union = new Container("Pyramid", Space.CONSTRUCTION, true); addTo(union, list(s0, side0, side1, side2, side3)); *************** *** 923,927 **** Surface top = s0.extrusion(d, sides); ! Space union = new Space("Cube", Space.CONSTRUCTION, true); Collection<Surface> surfaces = new LinkedList(); surfaces.add(s0); --- 923,927 ---- Surface top = s0.extrusion(d, sides); ! Space union = new Container("Cube", Space.CONSTRUCTION, true); Collection<Surface> surfaces = new LinkedList(); surfaces.add(s0); *************** *** 1357,1361 **** Offset.offsetIt(boundary, -inside + (delta / 2)); ! Space union = new Space("Frame", Space.CONSTRUCTION, true); Collection<Surface> inserted = new LinkedList(); --- 1357,1361 ---- Offset.offsetIt(boundary, -inside + (delta / 2)); ! Space union = new Container("Frame", Space.CONSTRUCTION, true); Collection<Surface> inserted = new LinkedList(); *************** *** 1391,1396 **** { ! Space ext = new Space(exteriorName, Space.FUNCTIONAL, true); ! Space frame = new Space(frameName, Space.CONSTRUCTION, true); if (depth > 0) { exterior.assignBack(ext, true); --- 1391,1396 ---- { ! Space ext = new Container(exteriorName, Space.FUNCTIONAL, true); ! Space frame = new Container(frameName, Space.CONSTRUCTION, true); if (depth > 0) { exterior.assignBack(ext, true); *************** *** 1413,1417 **** sign = depth; } ! Space hole = new Space(holeName + " " + i, Space.FUNCTIONAL, true); if (sign > 0) { current.assignFront(hole, true); --- 1413,1417 ---- sign = depth; } ! Space hole = new Container(holeName + " " + i, Space.FUNCTIONAL, true); if (sign > 0) { current.assignFront(hole, true); *************** *** 1516,1520 **** } } ! Space union = new Space("Layer", Space.CONSTRUCTION, true); for (Prism current : prisms) { Shape.addTo(union, current.surfaces()); --- 1516,1520 ---- } } ! Space union = new Container("Layer", Space.CONSTRUCTION, true); for (Prism current : prisms) { Shape.addTo(union, current.surfaces()); Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.149 retrieving revision 1.150 diff -C2 -d -r1.149 -r1.150 *** Project.java 11 Dec 2007 15:14:13 -0000 1.149 --- Project.java 12 Dec 2007 12:48:23 -0000 1.150 *************** *** 181,185 **** staticObservers = new LinkedList(); scheduledObservers = new LinkedList(); ! world = new Space("World", Space.FUNCTIONAL, true); world.setId(new Long(0)); materials = new HashMap<Long, Material>(); --- 181,185 ---- staticObservers = new LinkedList(); scheduledObservers = new LinkedList(); ! world = new Container("World", Space.FUNCTIONAL, true); world.setId(new Long(0)); materials = new HashMap<Long, Material>(); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:48:19
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17258/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java FacadeModellor.java Log Message: Instance/Container instantiated as appropriately Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** NetFacadeModellor.java 11 Dec 2007 14:48:47 -0000 1.43 --- NetFacadeModellor.java 12 Dec 2007 12:48:18 -0000 1.44 *************** *** 19,22 **** --- 19,23 ---- 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; *************** *** 132,136 **** Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = new Space("Frame", Space.CONSTRUCTION, true); --- 133,137 ---- Project.getInstance().scheduleObserver(mod); s.setModellor(mod); ! frame = new Container("Frame", Space.CONSTRUCTION, true); *************** *** 390,394 **** private void createDoubleFacade(Space net) { if (frame == null) { ! frame = new Space("Frame", Space.CONSTRUCTION, true); --- 391,395 ---- private void createDoubleFacade(Space net) { if (frame == null) { ! frame = new Container("Frame", Space.CONSTRUCTION, true); *************** *** 439,443 **** private void createSingleFacade(Space net) { if (frame == null) { ! frame = new Space("Frame", Space.CONSTRUCTION, true); --- 440,444 ---- private void createSingleFacade(Space net) { if (frame == null) { ! frame = new Container("Frame", Space.CONSTRUCTION, true); *************** *** 474,478 **** Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Space holeSpace = new Space("Facade Hole", Space.FUNCTIONAL, true); --- 475,479 ---- Surface hole = new Surface(Edge.placeOffset(field.getEdges(), field, offsetMap)); hole = space.insert(hole); ! Space holeSpace = new Container("Facade Hole", Space.FUNCTIONAL, true); *************** *** 519,528 **** Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Space f = new Space(type + " Frame", Space.CONSTRUCTION, true); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Space g = new Space("Glass", Space.CONSTRUCTION, true); --- 520,529 ---- Surface in = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap1)); Surface out = new Surface(Edge.placeOffset(hole.getEdges(), hole, offmap2)); ! Space f = new Container(type + " Frame", Space.CONSTRUCTION, true); Classification frameClass = Project.getInstance().getClassification(FRAME, 0); f.setClassification(frameClass); ! Space g = new Container("Glass", Space.CONSTRUCTION, true); Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** FacadeModellor.java 11 Dec 2007 14:48:47 -0000 1.38 --- FacadeModellor.java 12 Dec 2007 12:48:18 -0000 1.39 *************** *** 18,21 **** --- 18,22 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.modellor.Modellor; + import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Attribute; *************** *** 365,369 **** if (front != null && depth > 0) { ! Space frame = new Space("Frame", Space.CONSTRUCTION, true); space.add(frame); Surface eFront = front.copy(space); --- 366,370 ---- if (front != null && depth > 0) { ! Space frame = new Container("Frame", Space.CONSTRUCTION, true); space.add(frame); Surface eFront = front.copy(space); *************** *** 690,694 **** Surface s = (Surface)it.next(); Set sides = new HashSet(); ! Space w = new Space("Window", Space.CONSTRUCTION, true); 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 = new Container("Window", Space.CONSTRUCTION, true); double u = s.normal().dot(front.normal()); if ((u > 0 && front.getBackDomain() == space) || |
|
From: Michael L. <he...@us...> - 2007-12-12 12:34:59
|
Update of /cvsroot/bprocessor/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11847 Added Files: components Log Message: intermediate step in space/instance refactoring --- NEW FILE: components --- |
|
From: Michael L. <he...@us...> - 2007-12-12 12:34:58
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11838/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: intermediate step in space/instance refactoring Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Persistence.java 12 Dec 2007 12:02:21 -0000 1.65 --- Persistence.java 12 Dec 2007 12:34:58 -0000 1.66 *************** *** 259,263 **** Map mapper, Collection xmls) { SpaceType type = xml.getValueObject(); ! return internalizeSpace(owner, type, mapper, xmls); } --- 259,296 ---- Map mapper, Collection xmls) { SpaceType type = xml.getValueObject(); ! if (type.getProtoref() != 0) { ! return internalizeInstance(owner, type, mapper, xmls); ! } else { ! return internalizeSpace(owner, type, mapper, xmls); ! } ! } ! ! private static Space internalizeInstance(Space owner, SpaceType xml, ! Map mapper, Collection xmls) { ! String name = xml.getName(); ! int type = xml.getType(); ! ! Instance space = new Instance(name); ! ! space.setTransparent(xml.isTransparent()); ! space.setId(new Long(xml.getProgid())); ! space.setDescription(xml.getDescription()); ! space.setUnion(xml.isUnion()); ! space.setNet(xml.isNet()); ! space.setClassification(internalizeClassifaction(xml.getClassification(), type)); ! ClassificationType classType = internalizeClassificationType(xml.getClassification(), type); ! if (classType != null) { ! space.setClassificationType(classType); ! } ! mapper.put(new Long(xml.getId()), space); ! ! xmls.add(xml); ! if (xml.getAnchor() != null) { ! CoordinateSystem anchor; ! anchor = internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls); ! space.setInstanceAnchor(anchor); ! } ! space.setOwner(owner); ! return space; } *************** *** 279,283 **** long proto = xml.getProtoref(); - boolean instance = (proto != 0); // Alternative: --- 312,315 ---- *************** *** 303,394 **** xmls.add(xml); ! if (!instance) { ! { ! HashMap elements = new HashMap(); ! Iterator iter = xml.getSpace().iterator(); ! while (iter.hasNext()) { ! net.sourceforge.bprocessor.model.xml.Space current = ! (net.sourceforge.bprocessor.model.xml.Space) iter.next(); ! Space element = internalizeElement(space, current, mapper, xmls); ! elements.put(element.getId(), element); ! } ! space.setElements(elements); ! } ! if (empty != 0) { ! space.setEmpty((Space) mapper.get(new Long(empty))); } ! { ! HashMap surfaces = new HashMap(); ! Iterator iter = xml.getSurface().iterator(); ! while (iter.hasNext()) { ! SurfaceType current = (SurfaceType) iter.next(); ! Surface surface = internalizeSurface(space, current, mapper, xmls); ! surfaces.put(surface.getId(), surface); ! } ! space.setSurfaces(surfaces); } ! { ! HashMap edges = new HashMap(); ! Iterator iter = xml.getEdge().iterator(); ! while (iter.hasNext()) { ! EdgeType current = (EdgeType) iter.next(); ! Edge edge = internalizeEdge(space, current, mapper, xmls); ! edges.put(edge.getId(), edge); ! } ! space.setEdges(edges); } ! { ! HashMap vertices = new HashMap(); ! Iterator iter = xml.getVertex().iterator(); ! while (iter.hasNext()) { ! VertexType current = (VertexType) iter.next(); ! Vertex vertex = internalizeVertex(space, current, mapper, xmls); ! vertices.put(vertex.getId(), vertex); ! } ! space.setVertices(vertices); } ! /*{ ! Iterator iter = xml.getMaterial().iterator(); ! while (iter.hasNext()) { ! MaterialType current = (MaterialType) iter.next(); ! space.add(internalizeMaterial(current, mapper, xmls)); } ! }*/ ! ! { ! Iterator iter = xml.getConstructor().iterator(); ! while (iter.hasNext()) { ! Object current = iter.next(); ! Constructor c = null; ! if (current instanceof CoordinateSystemType) { ! c = internalizeCoordinateSystem((CoordinateSystemType)current, mapper, xmls); ! } else if (current instanceof PointType) { ! c = internalizePoint((PointType)current, mapper, xmls); ! } else if (current instanceof LineType) { ! c = internalizeLine((LineType)current, mapper, xmls); ! } else { ! log.info("Const were " + current.getClass()); ! } ! if (c != null) { ! Set connected = new HashSet(); ! Iterator cs = ((ConstructorType)current).getConnected().iterator(); ! while (cs.hasNext()) { ! Long l = (Long)cs.next(); ! Object g = get(l.longValue(), mapper); ! if (g instanceof Geometric) { ! connected.add(g); ! } } - c.connect(connected); - space.add(c); } } } - } else { - if (xml.getAnchor() != null) { - CoordinateSystem anchor; - anchor = internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls); - space.setInstanceAnchor(anchor); - } } space.setOwner(owner); --- 335,411 ---- xmls.add(xml); ! ! { ! HashMap elements = new HashMap(); ! Iterator iter = xml.getSpace().iterator(); ! while (iter.hasNext()) { ! net.sourceforge.bprocessor.model.xml.Space current = ! (net.sourceforge.bprocessor.model.xml.Space) iter.next(); ! Space element = internalizeElement(space, current, mapper, xmls); ! elements.put(element.getId(), element); } ! space.setElements(elements); ! } ! if (empty != 0) { ! space.setEmpty((Space) mapper.get(new Long(empty))); ! } ! { ! HashMap surfaces = new HashMap(); ! Iterator iter = xml.getSurface().iterator(); ! while (iter.hasNext()) { ! SurfaceType current = (SurfaceType) iter.next(); ! Surface surface = internalizeSurface(space, current, mapper, xmls); ! surfaces.put(surface.getId(), surface); } ! space.setSurfaces(surfaces); ! } ! { ! HashMap edges = new HashMap(); ! Iterator iter = xml.getEdge().iterator(); ! while (iter.hasNext()) { ! EdgeType current = (EdgeType) iter.next(); ! Edge edge = internalizeEdge(space, current, mapper, xmls); ! edges.put(edge.getId(), edge); } ! space.setEdges(edges); ! } ! { ! HashMap vertices = new HashMap(); ! Iterator iter = xml.getVertex().iterator(); ! while (iter.hasNext()) { ! VertexType current = (VertexType) iter.next(); ! Vertex vertex = internalizeVertex(space, current, mapper, xmls); ! vertices.put(vertex.getId(), vertex); } ! space.setVertices(vertices); ! } ! { ! Iterator iter = xml.getConstructor().iterator(); ! while (iter.hasNext()) { ! Object current = iter.next(); ! Constructor c = null; ! if (current instanceof CoordinateSystemType) { ! c = internalizeCoordinateSystem((CoordinateSystemType)current, mapper, xmls); ! } else if (current instanceof PointType) { ! c = internalizePoint((PointType)current, mapper, xmls); ! } else if (current instanceof LineType) { ! c = internalizeLine((LineType)current, mapper, xmls); ! } else { ! log.info("Const were " + current.getClass()); } ! if (c != null) { ! Set connected = new HashSet(); ! Iterator cs = ((ConstructorType)current).getConnected().iterator(); ! while (cs.hasNext()) { ! Long l = (Long)cs.next(); ! Object g = get(l.longValue(), mapper); ! if (g instanceof Geometric) { ! connected.add(g); } } + c.connect(connected); + space.add(c); } } } space.setOwner(owner); *************** *** 742,745 **** --- 759,763 ---- private static void internalizeReferences(Space object, SpaceType xml, Map map) { object.setProto((Space) get(xml.getProtoref(), map)); + object.setEnvelope(asSet(xml.getBoundary(), map)); { *************** *** 1000,1010 **** } } - /*{ - Iterator iter = space.getMaterials().iterator(); - while (iter.hasNext()) { - Material current = (Material) iter.next(); - xml.getMaterial().add(externalizeMaterial(current, map)); - } - }*/ { Iterator iter = space.getConstructors().iterator(); --- 1018,1021 ---- |
|
From: Michael L. <he...@us...> - 2007-12-12 12:02:30
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30970/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: refactoring of space/instance Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** GenericTreeView.java 10 Dec 2007 23:10:08 -0000 1.131 --- GenericTreeView.java 12 Dec 2007 12:02:28 -0000 1.132 *************** *** 46,49 **** --- 46,50 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Component; + import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Material; import net.sourceforge.bprocessor.model.Observer; *************** *** 1249,1253 **** Component lo = (Component)o; Space space = lo.getSpace(); ! Space instance = new Space(space.getName() + " instance ", space.getType(), false); proj.addCalalogObject(lo); instance.setProto(space); --- 1250,1254 ---- Component lo = (Component)o; Space space = lo.getSpace(); ! Instance instance = new Instance(space.getName() + " instance "); proj.addCalalogObject(lo); instance.setProto(space); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:02:30
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30970/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: refactoring of space/instance Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** PopupMenu.java 12 Dec 2007 10:48:19 -0000 1.87 --- PopupMenu.java 12 Dec 2007 12:02:28 -0000 1.88 *************** *** 37,40 **** --- 37,41 ---- import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; + import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Mesh; import net.sourceforge.bprocessor.model.Project; *************** *** 254,259 **** while (iter.hasNext()) { Space space = (Space)iter.next(); ! Space instance = new Space("Instance of " + space.getName(), ! Space.CONSTRUCTION, false); instance.setProto(space); space.getOwner().add(instance); --- 255,259 ---- while (iter.hasNext()) { Space space = (Space)iter.next(); ! Instance instance = new Instance("Instance of " + space.getName()); instance.setProto(space); space.getOwner().add(instance); |
|
From: Michael L. <he...@us...> - 2007-12-12 12:02:22
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30792/src/net/sourceforge/bprocessor/model Modified Files: Instance.java Persistence.java Log Message: refactoring of space/instance Index: Instance.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Instance.java 12 Dec 2007 10:53:50 -0000 1.1 --- Instance.java 12 Dec 2007 12:02:21 -0000 1.2 *************** *** 12,15 **** */ public class Instance extends Space { ! } --- 12,21 ---- */ public class Instance extends Space { ! /** ! * Constructs instance ! * @param name name ! */ ! public Instance(String name) { ! super(name, Space.CONSTRUCTION, false); ! } } Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Persistence.java 7 Dec 2007 13:19:54 -0000 1.64 --- Persistence.java 12 Dec 2007 12:02:21 -0000 1.65 *************** *** 230,240 **** } - private static Space internalizeSpace(Space owner, SpaceType xml, - Map mapper, Collection xmls) { - Space s = new Space(xml.getName(), xml.getType(), xml.getVoidref() != 0); - return internalizeSpace(owner, s, xml, mapper, xmls); - } - - private static Classification internalizeClassifaction(String string, int type) { Classification classification = null; --- 230,233 ---- *************** *** 276,292 **** * @return The Space */ ! private static Space internalizeSpace(Space owner, Space space, SpaceType xml, Map mapper, Collection xmls) { ! //String name = xml.getName(); int type = xml.getType(); long empty = xml.getVoidref(); ! //boolean container = (empty != 0); long proto = xml.getProtoref(); boolean instance = (proto != 0); //space.setName(name); //space.setType(type); //space.setContainer(container); space.setTransparent(xml.isTransparent()); space.setId(new Long(xml.getProgid())); --- 269,293 ---- * @return The Space */ ! private static Space internalizeSpace(Space owner, SpaceType xml, Map mapper, Collection xmls) { ! ! ! String name = xml.getName(); int type = xml.getType(); long empty = xml.getVoidref(); ! boolean container = (empty != 0); long proto = xml.getProtoref(); boolean instance = (proto != 0); + // Alternative: + //space = new Space() //space.setName(name); //space.setType(type); //space.setContainer(container); + + Space space = new Space(name, type, container); + + space.setTransparent(xml.isTransparent()); space.setId(new Long(xml.getProgid())); |
|
From: Michael L. <he...@us...> - 2007-12-12 11:06:15
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8943/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: cut code that adds/removes to/from proto Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.217 retrieving revision 1.218 diff -C2 -d -r1.217 -r1.218 *** Space.java 12 Dec 2007 10:48:11 -0000 1.217 --- Space.java 12 Dec 2007 11:06:11 -0000 1.218 *************** *** 406,411 **** constructors.put(id, c); c.setOwner(this); - } else if (isInstance()) { - proto.add(c); } else { throw new Error("adding constructor to non-container " + this); --- 406,409 ---- *************** *** 424,429 **** c.setOwner(null); } - } else if (isInstance()) { - proto.remove(c); } } --- 422,425 ---- *************** *** 510,515 **** vertex.setId(null); vertex.setOwner(null); - } else if (isInstance()) { - proto.remove(vertex); } } --- 506,509 ---- *************** *** 602,607 **** edge.setId(null); edge.setOwner(null); - } else if (isInstance()) { - proto.remove(edge); } } --- 596,599 ---- *************** *** 741,746 **** surface.setId(null); surface.setOwner(null); - } else if (isInstance()) { - proto.remove(surface); } } --- 733,736 ---- *************** *** 1097,1102 **** element.getModellor().delete(); } - } else if (isInstance()) { - proto.remove(element); } } --- 1087,1090 ---- *************** *** 1721,1726 **** } } - } else if (isInstance()) { - proto.remove(surface); } } --- 1709,1712 ---- *************** *** 1740,1745 **** removeProtected(edge.to); } - } else if (isInstance()) { - proto.remove(edge); } } --- 1726,1729 ---- *************** *** 1757,1762 **** } } - } else if (isInstance()) { - proto.remove(vertex); } } --- 1741,1744 ---- *************** *** 1799,1804 **** add(surface); } - } else if (isInstance()) { - proto.addProtected(surface); } } --- 1781,1784 ---- *************** *** 1816,1821 **** add(edge); } - } else if (isInstance()) { - proto.addProtected(edge); } } --- 1796,1799 ---- *************** *** 1831,1836 **** add(vertex); } - } else if (isInstance()) { - proto.addProtected(vertex); } } --- 1809,1812 ---- |
|
From: Michael L. <he...@us...> - 2007-12-12 10:53:51
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3862/src/net/sourceforge/bprocessor/model Added Files: Instance.java Union.java Construct.java Container.java Log Message: Added specialisations of space --- NEW FILE: Instance.java --- //--------------------------------------------------------------------------------- // $Id: Instance.java,v 1.1 2007/12/12 10:53:50 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * */ public class Instance extends Space { } --- NEW FILE: Union.java --- //--------------------------------------------------------------------------------- // $Id: Union.java,v 1.1 2007/12/12 10:53:50 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * */ public class Union extends Container { } --- NEW FILE: Construct.java --- //--------------------------------------------------------------------------------- // $Id: Construct.java,v 1.1 2007/12/12 10:53:50 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * */ public class Construct extends Container { } --- NEW FILE: Container.java --- //--------------------------------------------------------------------------------- // $Id: Container.java,v 1.1 2007/12/12 10:53:50 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; /** * */ public class Container extends Space { } |
|
From: rimestad <rim...@us...> - 2007-12-12 10:51:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3053/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: translate hilite through all instances not just the active one Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Display.java 7 Dec 2007 14:38:53 -0000 1.64 --- Display.java 12 Dec 2007 10:51:40 -0000 1.65 *************** *** 1136,1153 **** /** ! * @param space */ private static void translateToCoordinatesystem(Space space) { ! CoordinateSystem cs = space.getInstanceAnchor(); ! Vertex i = cs.getI(); ! Vertex j = cs.getJ(); ! Vertex k = cs.getN(); ! Vertex center = cs.center(); ! double[] matrix = new double[]{ ! i.getX(), i.getY(), i.getZ(), 0, ! j.getX(), j.getY(), j.getZ(), 0, ! k.getX(), k.getY(), k.getZ(), 0, ! center.getX(), center.getY(), center.getZ(), 1}; ! gl.glMultMatrixd(matrix, 0); } --- 1136,1166 ---- /** ! * Translate through all spaces till (containing) space ! * @param space The last space in the line of translations */ private static void translateToCoordinatesystem(Space space) { ! List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! if (space.isInstance()) { ! translation.add(space.getInstanceAnchor()); ! } ! while (space.getOwner() != null) { ! if (space.getOwner().isInstance()) { ! translation.add(0, space.getOwner().getInstanceAnchor()); ! } ! space = space.getOwner(); ! } ! ! for (CoordinateSystem cs : translation) { ! Vertex i = cs.getI(); ! Vertex j = cs.getJ(); ! Vertex k = cs.getN(); ! Vertex center = cs.center(); ! double[] matrix = new double[]{ ! i.getX(), i.getY(), i.getZ(), 0, ! j.getX(), j.getY(), j.getZ(), 0, ! k.getX(), k.getY(), k.getZ(), 0, ! center.getX(), center.getY(), center.getZ(), 1}; ! gl.glMultMatrixd(matrix, 0); ! } } |
