bprocessor-commit Mailing List for B-processor (Page 24)
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...> - 2008-04-01 13:37:12
|
Update of /cvsroot/bprocessor/gui/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29489/.settings Added Files: org.eclipse.core.resources.prefs Log Message: o rly --- NEW FILE: org.eclipse.core.resources.prefs --- #Tue Apr 01 14:01:15 CEST 2008 eclipse.preferences.version=1 encoding/<project>=ISO-8859-1 |
|
From: Michael L. <he...@us...> - 2008-04-01 13:37:12
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29489/src/net/sourceforge/bprocessor/gui/actions Modified Files: FileImportActionListener.java Log Message: o rly Index: FileImportActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FileImportActionListener.java 13 Dec 2007 12:00:55 -0000 1.19 --- FileImportActionListener.java 1 Apr 2008 13:37:15 -0000 1.20 *************** *** 69,73 **** @Override public String getDescription() { ! return "Obj - wavefront format"; } }; --- 69,73 ---- @Override public String getDescription() { ! return "obj - Wavefront format"; } }; *************** *** 80,84 **** @Override public String getDescription() { ! return "Csv - Landmålergården file"; } }; --- 80,84 ---- @Override public String getDescription() { ! return "csv - Landmålergården format"; } }; |
|
From: Michael L. <he...@us...> - 2008-03-27 15:59:59
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26727/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: Danhaus Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Command.java 27 Feb 2008 13:49:05 -0000 1.73 --- Command.java 27 Mar 2008 14:49:22 -0000 1.74 *************** *** 2110,2113 **** --- 2110,2419 ---- * */ + public static class InsertFrame extends Command { + + /** */ + public static final String WALL = "-1.-205.-01"; + /** */ + public static final String PLATE = "-1.-205.-01.-03"; + + /** + * Constructs a frame + * @param surface Surface + */ + public InsertFrame(Surface surface) { + parameters.put("surface", surface); + parameters.put("post distance", 400.0); + } + + private static int round(double value) { + int n = (int) Math.floor(value); + double rest = value - n; + if (rest < 0.0000001) { + n--; + } + return n; + } + + private void stipple(List<Edge> edges, + List<Vertex> vertices) { + Iterator<Vertex> iter = vertices.iterator(); + for (int k = 0; k < (vertices.size() / 2); k++) { + Vertex f = iter.next(); + Vertex t = iter.next(); + edges.add(new Edge(f, t)); + } + } + + private static boolean isVertical(Edge edge, CoordinateSystem system) { + Vertex from = system.translate(edge.from); + Vertex to = system.translate(edge.to); + double dx = Math.abs(from.x - to.x); + return dx < 0.0001; + } + + /** + * Render frame + * @param element Element + */ + public static void render(Container element) { + Container net = null; + for (Space current : element.getElements()) { + if (current.isNet()) { + net = (Container) current; + } + } + element.clear(); + if (net != null) { + element.add(net); + Container fema1 = new Container("Femacell", Container.CONSTRUCTION, true); + { + Classification classification = Project.getInstance().getClassification(PLATE, 0); + fema1.setClassification(classification); + } + Container fema2 = new Container("Femacell", Container.CONSTRUCTION, true); + Container bitumen = new Container("Bitumen", Container.CONSTRUCTION, true); + Container foot1 = new Container("Bundrem", Container.CONSTRUCTION, true); + Container foot2 = new Container("Fodrem", Container.CONSTRUCTION, true); + Container top1 = new Container("Toprem", Container.CONSTRUCTION, true); + Container top2 = new Container("Toprem", Container.CONSTRUCTION, true); + Container post1 = new Container("Stolpe", Container.CONSTRUCTION, true); + Container post2 = new Container("Stolpe", Container.CONSTRUCTION, true); + element.add(fema1); + element.add(fema2); + element.add(bitumen); + element.add(foot1); + element.add(foot2); + element.add(top1); + element.add(top2); + element.add(post1); + element.add(post2); + + + ParameterBlock parameters = net.getParameters(); + Surface surface = (Surface) parameters.get("surface"); + Vertex n = surface.normal(); + CoordinateSystem system = CoordinateSystem.systemFor(surface.getFirstVertex(), n); + + + { + Map map = new HashMap(); + Container inside = new Container("Inside", Container.CONSTRUCTION, true); + Container outside = new Container("Outside", Container.FUNCTIONAL, false); + Surface base = (Surface) surface.copy(map); + Collection<Surface> sides = new LinkedList(); + Surface top = base.extrusion(0.01, sides); + Collection<Surface> all = new LinkedList(); + all.add(base); + all.addAll(sides); + all.add(top); + fema1.add(inside); + fema1.add(outside); + for (Surface current : all) { + current.setFrontDomain(inside); + current.setBackDomain(outside); + } + Shape.addSurfacesTo(fema1, all); + } + { + Map map = new HashMap(); + Container inside = new Container("Inside", Container.CONSTRUCTION, true); + Container outside = new Container("Outside", Container.FUNCTIONAL, false); + Surface base = (Surface) surface.copy(map); + Vertex normal = base.normal(); + for (Vertex current : base.getVertices()) { + current.set(current.add(normal.scale(0.01))); + } + + Collection<Surface> sides = new LinkedList(); + Surface top = base.extrusion(0.01, sides); + Collection<Surface> all = new LinkedList(); + all.add(base); + all.addAll(sides); + all.add(top); + fema2.add(inside); + fema2.add(outside); + for (Surface current : all) { + current.setFrontDomain(inside); + current.setBackDomain(outside); + } + Shape.addSurfacesTo(fema2, all); + } + { + Map map = new HashMap(); + Container inside = new Container("Inside", Container.CONSTRUCTION, true); + Container outside = new Container("Outside", Container.FUNCTIONAL, false); + Surface base = (Surface) surface.copy(map); + Vertex normal = base.normal(); + double delta = 0.01 + 0.01 + 0.145; + for (Vertex current : base.getVertices()) { + current.set(current.add(normal.scale(delta))); + } + Collection<Surface> sides = new LinkedList(); + Surface top = base.extrusion(0.012, sides); + Collection<Surface> all = new LinkedList(); + all.add(base); + all.addAll(sides); + all.add(top); + bitumen.add(inside); + bitumen.add(outside); + for (Surface current : all) { + current.setFrontDomain(inside); + current.setBackDomain(outside); + } + Shape.addSurfacesTo(bitumen, all); + } + + { + for (Edge current : net.getEdges()) { + if (isVertical(current, system)) { + Vertex v = current.getDirection(); + double length = v.length(); + v.normalize(); + Vertex u = v.cross(n); + Vertex from = current.getFrom(); + from = from.add(v.scale(0.032 + 0.045)); + Vertex a = from.add(n.scale(0.02)); + Vertex b = a.add(n.scale(0.145)); + Vertex c = b.add(u.scale(0.045)); + Vertex d = a.add(u.scale(0.045)); + Edge e1 = new Edge(a, b); + Edge e2 = new Edge(b, c); + Edge e3 = new Edge(c, d); + Edge e4 = new Edge(d, a); + Container inside = new Container("Inside", Container.CONSTRUCTION, true); + Container outside = new Container("Outside", Container.FUNCTIONAL, false); + Surface base = new Surface(Shape.list(e1, e2, e3, e4)); + Collection<Surface> sides = new LinkedList(); + Surface top = base.extrusion(length - (0.032 + 0.045 + 0.045 + 0.045), sides); + Collection<Surface> all = new LinkedList(); + all.add(base); + all.addAll(sides); + all.add(top); + Container post = new Container("Post", Container.CONSTRUCTION, true); + post.add(inside); + post.add(outside); + for (Surface s : all) { + s.setFrontDomain(inside); + s.setBackDomain(outside); + } + Shape.addSurfacesTo(post, all); + element.add(post); + } + } + } + } + } + + /** {@inheritDoc} */ + @Override + public void evaluate() { + Surface surface = (Surface) parameters.get("surface"); + Space front = surface.getFrontDomain(); + Space back = surface.getBackDomain(); + Container element = null; + Classification c1 = front.getClassification(); + Classification c2 = back.getClassification(); + String id1 = c1.getFullId(front); + String id2 = c2.getFullId(back); + if (id1.equals(WALL)) { + element = (Container) front; + } else if (id2.equals(WALL)) { + element = (Container) back; + } else { + element = (Container) front; + } + System.out.println("element = " + element); + double postDistance = parameters.getDouble("post distance"); + + double dx = postDistance / 1000.0; + + { + Container net = Container.createNet("Frame Net"); + net.setParameters(parameters); + HashMap map = new HashMap(); + + List<Edge> contour = new LinkedList(); + for (Edge current : surface.getEdges()) { + contour.add((Edge) current.copy(map)); + } + + + Vertex vertex = surface.getFirstVertex(); + Vertex normal = surface.normal(); + CoordinateSystem system = CoordinateSystem.systemFor(vertex, normal); + + List<Vertex> vertices = new LinkedList(Edge.vertices(contour)); + system.translateIt(vertices); + + HashMap<Edge, List<Vertex>> cuts = new HashMap(); + for (Edge current : contour) { + cuts.put(current, new LinkedList()); + } + + List<Edge> all = new LinkedList(); + + BoundingBox box = new BoundingBox(vertices); + double xmin = box.xmin().getX(); + double xmax = box.xmax().getX(); + double ymin = box.ymin().getY(); + double ymax = box.ymax().getY(); + + double width = xmax - xmin; + double height = ymax - ymin; + int n; + int m; + + + if (dx > 0) { + n = round(width / dx); + } else { + n = 0; + } + + List<Edge> verticals = new LinkedList(); + + for (int i = 0; i < n; i++) { + double x = xmin + (i + 1) * dx; + Vertex from = new Vertex(x, ymin, 0); + Vertex to = new Vertex(x, ymax, 0); + Edge edge = new Edge(from, to); + List<Vertex> intersections = new LinkedList(); + for (Edge current : contour) { + double x0 = current.from.x; + double x1 = current.to.x; + if (x0 > x1) { + double tmp = x1; + x1 = x0; + x0 = tmp; + } + if (x0 <= x && x < x1) { + Vertex intersect = current.intersection(edge); + if (intersect != null) { + intersections.add(intersect); + } + } + } + + if (intersections.size() > 0) { + Vertex.sortByY(intersections); + stipple(verticals, intersections); + } + } + all.addAll(verticals); + all.addAll(contour); + system.unTranslateIt(Edge.vertices(all)); + + Shape.addEdgesTo(net, all); + + element.add(net); + render(element); + } + } + } + + + /** + * + */ public static class InsertGrid extends Command { /** |
|
From: Michael L. <he...@us...> - 2008-03-27 15:12:25
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26718/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Danhaus Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** PopupMenu.java 18 Feb 2008 14:58:44 -0000 1.20 --- PopupMenu.java 27 Mar 2008 14:49:18 -0000 1.21 *************** *** 36,39 **** --- 36,41 ---- import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Camera; + import net.sourceforge.bprocessor.model.Classification; + import net.sourceforge.bprocessor.model.ClassificationType; import net.sourceforge.bprocessor.model.Command; import net.sourceforge.bprocessor.model.Component; *************** *** 157,160 **** --- 159,172 ---- menu.add(action); } + { + AbstractAction action = new GeometricMenuAction(surfaces, "Insert Frame...") { + public void actionPerformed(ActionEvent event) { + Surface surface = (Surface) entities.iterator().next(); + Command command = new Command.InsertFrame(surface); + AttributeView.instance().display(command); + } + }; + menu.add(action); + } } return menu; *************** *** 378,381 **** --- 390,404 ---- } + { + AbstractAction action = new SpaceMenuAction(sp, "Print Classification") { + public void actionPerformed(ActionEvent event) { + Classification classification = space.getClassification(); + System.out.println("id " + classification.getFullId(space)); + ClassificationType type = space.getClassificationType(); + System.out.println("type " + type.getIndex()); + } + }; + menu.add(action); + } for (Modellor current : Modellor.getRegisteredModellors()) { if (current.application() == Modellor.DETAIL) { |
|
From: Michael L. <he...@us...> - 2008-03-27 15:12:07
|
Update of /cvsroot/bprocessor/bprocessor/src/etc/building_3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26708/src/etc/building_3 Modified Files: elements.bp Log Message: Danhaus Index: elements.bp =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/etc/building_3/elements.bp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** elements.bp 8 Feb 2008 12:50:21 -0000 1.2 --- elements.bp 27 Mar 2008 14:49:14 -0000 1.3 *************** *** 4,25 **** <cs>414</cs> <name>new project</name> ! <space transparent="true" voidref="2" name="World" type="1" net="false" union="false" progid="0" id="1"> <description/> <Classification>unassigned</Classification> <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="414" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ! <vertex z="0.0" y="0.0" x="0.0" id="415"/> <ijn> ! <vertex z="0.0" y="0.0" x="1.0" id="411"/> ! <vertex z="0.0" y="1.0" x="0.0" id="412"/> [...2067 lines suppressed...] </space> ! <material R="0.9" G="0.9" B="0.9" name="Construction" id="416"/> ! <material R="0.96" G="0.87" B="0.7" name="Functional" id="417"/> ! <material R="0.91071427" G="0.8142857" B="0.8035714" name="Void" id="418"/> <view name="(Current)" id="419"> <scalefactor>0</scalefactor> ! <camera y="-3.103671052954285" x="-5.647536156690793" z="14.18827914837882"/> ! <center y="6.5193715056285875" x="6.720064480225855" z="1.5051402849739148"/> ! <roll y="-0.0374893953927226" x="-0.04818162940818533" z="0.9981347984219411"/> <focalwidth>35.0</focalwidth> <type>6</type> + <hidden>297</hidden> <hidden>3</hidden> <hidden>295</hidden> ! <hidden>301</hidden> <hidden>303</hidden> <hidden>299</hidden> ! <hidden>15</hidden> </view> <global> |
|
From: Michael L. <he...@us...> - 2008-03-10 14:07:48
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22718/src/net/sourceforge/bprocessor Modified Files: Application.java Log Message: Removed some warnings Index: Application.java =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Application.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Application.java 8 Feb 2008 13:41:10 -0000 1.7 --- Application.java 10 Mar 2008 14:07:46 -0000 1.8 *************** *** 10,14 **** public Application() { super(); - // TODO Auto-generated constructor stub } --- 10,13 ---- *************** *** 21,27 **** PropertyConfigurator.configure(args[0]); } ! GUI gui = new GUI(); ! Editor editor = new Editor(); ! FacadeMain fm = new FacadeMain(); } } --- 20,26 ---- PropertyConfigurator.configure(args[0]); } ! new GUI(); ! new Editor(); ! new FacadeMain(); } } |
|
From: Michael L. <he...@us...> - 2008-02-27 13:49:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10685/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: new offset operation Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Command.java 20 Feb 2008 13:48:28 -0000 1.72 --- Command.java 27 Feb 2008 13:49:05 -0000 1.73 *************** *** 1562,1565 **** --- 1562,1601 ---- } + /** + * + * @param boundary Edges to offset + * @param distances Distances to offset + */ + public static void offsetIt(List<Edge> boundary, Map<Edge, Double> distances) { + Vertex normal = Surface.normalOf(boundary); + Map<Vertex, Vertex> offsets = new HashMap(); + + Edge previous = boundary.get(boundary.size() - 1); + for (Edge current : boundary) { + Vertex q = Edge.commonVertex(previous, current); + Vertex p = previous.otherVertex(q); + Vertex r = current.otherVertex(q); + Vertex u = q.minus(p); + u.normalize(); + Vertex v = r.minus(q); + v.normalize(); + + double a = distances.get(previous); + double b = distances.get(current); + + Vertex d = u.scale(b).add(v.scale(-a)); + d.normalize(); + Vertex m = u.cross(normal); + double t = a / m.dot(d); + d.scaleIt(t); + offsets.put(q, d); + previous = current; + } + Collection<Vertex> vertices = Edge.vertices(boundary); + for (Vertex current : vertices) { + current.set(current.add(offsets.get(current))); + } + } + /** {@inheritDoc} */ @Override *************** *** 2020,2023 **** --- 2056,2107 ---- ParameterBlock block = net.getParameters(); System.out.println("block " + block); + + Collection<Surface> surfaces = net.getSurfaces(); + Inverse inv = new Inverse(surfaces); + List<Edge> boundary = new LinkedList(); + for (Edge current : inv.edges()) { + List<Surface> adjacent = inv.surfaces(current); + if (adjacent.size() == 1) { + boundary.add(current); + } + } + boundary = Offset.order(boundary); + Map map = new HashMap(); + + List<Edge> edges = new LinkedList(); + for (Edge current : boundary) { + edges.add((Edge) current.copy(map)); + } + + Map<Edge, Double> distances = new HashMap(); + { + double distance = block.getDouble("frame-width"); + for (Edge current : boundary) { + ParameterBlock params = current.getParameters(); + double d = distance; + if (params != null) { + Double param = (Double) params.get("width"); + if (param != null) { + d = param.doubleValue(); + } + } + Edge edge = (Edge) map.get(current); + distances.put(edge, d); + } + } + Offset.offsetIt(edges, distances); + + Collection<Vertex> vertices = Edge.vertices(edges); + + Container union = new Container("Frame", Space.CONSTRUCTION, true); + union.setUnion(true); + for (Vertex current : vertices) { + union.add(current); + } + for (Edge current : edges) { + union.add(current); + } + Project.getInstance().getActiveSpace().add(union); + Project.getInstance().changed(Project.getInstance()); } } |
|
From: Michael L. <he...@us...> - 2008-02-25 13:02:56
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16563/src/net/sourceforge/bprocessor/gl/tool Modified Files: SelectStrategy.java Log Message: double-click to edit net Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** SelectStrategy.java 13 Feb 2008 08:43:07 -0000 1.31 --- SelectStrategy.java 25 Feb 2008 13:02:52 -0000 1.32 *************** *** 300,304 **** if (leader instanceof Container) { Container space = (Container) leader; ! if (space.isUnion()) { space.edit(); } --- 300,304 ---- if (leader instanceof Container) { Container space = (Container) leader; ! if (space.isUnion() || space.isNet()) { space.edit(); } |
|
From: Michael L. <he...@us...> - 2008-02-20 15:20:22
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22923/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: Papir Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** GUI.java 20 Feb 2008 13:48:32 -0000 1.97 --- GUI.java 20 Feb 2008 15:20:26 -0000 1.98 *************** *** 8,13 **** import net.sourceforge.bprocessor.gui.actions.AboutActionListener; - import net.sourceforge.bprocessor.gui.actions.CreateConstructionSpaceActionListener; - import net.sourceforge.bprocessor.gui.actions.CreateFunctionalSpaceActionListener; import net.sourceforge.bprocessor.gui.actions.EditMenuListener; import net.sourceforge.bprocessor.gui.actions.FileCloseActionListener; --- 8,11 ---- *************** *** 265,272 **** public void menuSelected(MenuEvent arg0) { - if (!(arg0.getSource() instanceof JMenu)) { - log.error("MenuListener reacted on wrong object " + arg0.getSource()); - return; - } JMenu create = (JMenu)arg0.getSource(); create.removeAll(); --- 263,266 ---- *************** *** 274,287 **** if (lvl < Container.PART_LEVEL) { String append = Container.levelToString(lvl + 1); ! ! JMenuItem createFunctionalSpace = new JMenuItem("Functional " + append); ! createFunctionalSpace.setMnemonic(KeyEvent.VK_F); ! createFunctionalSpace.addActionListener(new CreateFunctionalSpaceActionListener()); ! create.add(createFunctionalSpace); ! ! JMenuItem createConstructionSpace = new JMenuItem("Construction " + append); ! createConstructionSpace.setMnemonic(KeyEvent.VK_O); ! createConstructionSpace.addActionListener(new CreateConstructionSpaceActionListener()); ! create.add(createConstructionSpace); } { --- 268,299 ---- 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 = owner.createFunctionalSpace(""); ! owner.add(space); ! AttributeView.instance().display(space); ! Project.getInstance().checkpoint(); ! Project.getInstance().changed(owner); ! } ! }; ! create.add(action); ! } ! { ! AbstractAction action = new AbstractAction("Construction " + append) { ! public void actionPerformed(ActionEvent e) { ! Container owner = Project.getInstance().getActiveSpace(); ! Container space; ! space = owner.createConstructionSpace(""); ! owner.add(space); ! AttributeView.instance().display(space); ! Project.getInstance().checkpoint(); ! Project.getInstance().changed(owner); ! } ! }; ! create.add(action); ! } } { *************** *** 292,295 **** --- 304,308 ---- active.add(net); net.edit(); + AttributeView.instance().display(net); Project.getInstance().checkpoint(); Project.getInstance().changed(active); *************** *** 306,309 **** --- 319,323 ---- active.add(union); union.edit(); + AttributeView.instance().display(union); Project.getInstance().checkpoint(); Project.getInstance().changed(Project.getInstance()); |
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22923/src/net/sourceforge/bprocessor/gui/actions Removed Files: CreateConstructionSpaceActionListener.java CreateConstructorActionListener.java CreateFunctionalSpaceActionListener.java Log Message: Papir --- CreateConstructorActionListener.java DELETED --- --- CreateFunctionalSpaceActionListener.java DELETED --- --- CreateConstructionSpaceActionListener.java DELETED --- |
|
From: Michael L. <he...@us...> - 2008-02-20 15:20:19
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22911/src/net/sourceforge/bprocessor/model Modified Files: ParameterBlock.java Log Message: Papir Index: ParameterBlock.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ParameterBlock.java 20 Feb 2008 13:48:28 -0000 1.16 --- ParameterBlock.java 20 Feb 2008 15:20:23 -0000 1.17 *************** *** 13,17 **** import java.util.List; - import org.apache.log4j.Logger; /** --- 13,16 ---- *************** *** 19,24 **** */ public class ParameterBlock implements Parametric { - /** The logger */ - private static Logger log = Logger.getLogger(ParameterBlock.class); /** Parameters */ --- 18,21 ---- |
|
From: Michael L. <he...@us...> - 2008-02-20 13:48:34
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18224/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: create operations Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** GUI.java 13 Feb 2008 08:43:13 -0000 1.96 --- GUI.java 20 Feb 2008 13:48:32 -0000 1.97 *************** *** 10,14 **** import net.sourceforge.bprocessor.gui.actions.CreateConstructionSpaceActionListener; import net.sourceforge.bprocessor.gui.actions.CreateFunctionalSpaceActionListener; - import net.sourceforge.bprocessor.gui.actions.CreateNetActionListener; import net.sourceforge.bprocessor.gui.actions.EditMenuListener; import net.sourceforge.bprocessor.gui.actions.FileCloseActionListener; --- 10,13 ---- *************** *** 281,285 **** create.add(createFunctionalSpace); - // MARK 2 JMenuItem createConstructionSpace = new JMenuItem("Construction " + append); createConstructionSpace.setMnemonic(KeyEvent.VK_O); --- 280,283 ---- *************** *** 287,295 **** create.add(createConstructionSpace); } ! JMenuItem createNet = new JMenuItem("B-net"); ! createNet.setMnemonic(KeyEvent.VK_N); ! createNet.addActionListener(new CreateNetActionListener()); ! create.add(createNet); ! { AbstractAction action = new AbstractAction("Union") { --- 285,301 ---- create.add(createConstructionSpace); } ! { ! 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(); ! Project.getInstance().checkpoint(); ! Project.getInstance().changed(active); ! } ! }; ! create.add(action); ! } { AbstractAction action = new AbstractAction("Union") { *************** *** 299,302 **** --- 305,309 ---- Container active = Project.getInstance().getActiveSpace(); active.add(union); + union.edit(); Project.getInstance().checkpoint(); Project.getInstance().changed(Project.getInstance()); |
|
From: Michael L. <he...@us...> - 2008-02-20 13:48:34
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18224/src/net/sourceforge/bprocessor/gui/actions Removed Files: CreateNetActionListener.java Log Message: create operations --- CreateNetActionListener.java DELETED --- |
|
From: Michael L. <he...@us...> - 2008-02-20 13:48:31
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18214/src/net/sourceforge/bprocessor/model Modified Files: Command.java ParameterBlock.java Log Message: create operations Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Command.java 19 Feb 2008 12:44:32 -0000 1.71 --- Command.java 20 Feb 2008 13:48:28 -0000 1.72 *************** *** 1958,1964 **** public InitializeFrame(Container net) { parameters.put("net", net); ! parameters.put("left", 0.05); ! parameters.put("right", 0.05); ! parameters.put("depth", 0.1); } --- 1958,1964 ---- public InitializeFrame(Container net) { parameters.put("net", net); ! parameters.put("frame-width", 0.4); ! parameters.put("interior-width", 0.1); ! parameters.put("depth", 1.0); } *************** *** 1967,1978 **** public void evaluate() { Container net = (Container) parameters.get("net"); ! double left = parameters.getDouble("left"); ! double right = parameters.getDouble("right"); double depth = parameters.getDouble("depth"); ParameterBlock block = new ParameterBlock(); ! block.put("left", left); ! block.put("right", right); block.put("depth", depth); ! net.setParameters(block); } } --- 1967,2001 ---- public void evaluate() { Container net = (Container) parameters.get("net"); ! double frameWidth = parameters.getDouble("frame-width"); ! double interiorWidth = parameters.getDouble("interior-width"); double depth = parameters.getDouble("depth"); ParameterBlock block = new ParameterBlock(); ! block.put("frame-width", frameWidth); ! block.put("interior-width", interiorWidth); block.put("depth", depth); ! net.setParameters(block); ! Collection<Surface> surfaces = net.getSurfaces(); ! Collection<Edge> edges = Surface.edges(surfaces); ! Inverse inv = new Inverse(surfaces); ! List<Edge> frame = new LinkedList(); ! List<Edge> interior = new LinkedList(); ! for (Edge current : edges) { ! List<Surface> adjacent = inv.surfaces(current); ! if (adjacent.size() == 1) { ! frame.add(current); ! } else { ! interior.add(current); ! } ! } ! for (Edge current : frame) { ! ParameterBlock parms = new ParameterBlock(); ! parms.put("width", frameWidth); ! current.setParameters(parms); ! } ! for (Edge current : interior) { ! ParameterBlock parms = new ParameterBlock(); ! parms.put("width", interiorWidth); ! current.setParameters(parms); ! } } } *************** *** 1996,2002 **** Container net = (Container) parameters.get("net"); ParameterBlock block = net.getParameters(); ! double left = block.getDouble("left"); ! double right = block.getDouble("right"); ! double depth = block.getDouble("depth"); } } --- 2019,2023 ---- Container net = (Container) parameters.get("net"); ParameterBlock block = net.getParameters(); ! System.out.println("block " + block); } } Index: ParameterBlock.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ParameterBlock.java 17 Dec 2007 13:09:17 -0000 1.15 --- ParameterBlock.java 20 Feb 2008 13:48:28 -0000 1.16 *************** *** 186,188 **** --- 186,197 ---- parameters.clear(); } + + /** + * {@inheritDoc} + */ + public String toString() { + StringBuffer buffer = new StringBuffer(); + buffer.append("{parameters " + parameters + "}"); + return buffer.toString(); + } } |
|
From: Michael L. <he...@us...> - 2008-02-19 12:44:29
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15709/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: simplefied frame Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** Command.java 18 Feb 2008 14:58:40 -0000 1.70 --- Command.java 19 Feb 2008 12:44:32 -0000 1.71 *************** *** 1586,1592 **** public Frame(Container net) { this.net = net; ! parameters.put("outside-frame", 0.0); ! parameters.put("inside-frame", 0.035); ! parameters.put("interior", 0.035); parameters.put("depth", 0.07); --- 1586,1591 ---- public Frame(Container net) { this.net = net; ! parameters.put("frame-width", 0.035); ! parameters.put("interior-width", 0.035); parameters.put("depth", 0.07); *************** *** 1640,1646 **** @Override public void evaluate() { ! double outside = parameters.getDouble("outside-frame"); ! double inside = parameters.getDouble("inside-frame"); ! double delta = parameters.getDouble("interior"); double depth = parameters.getDouble("depth"); String frameName = (String) parameters.get("frame name"); --- 1639,1644 ---- @Override public void evaluate() { ! double inside = parameters.getDouble("frame-width"); ! double delta = parameters.getDouble("interior-width"); double depth = parameters.getDouble("depth"); String frameName = (String) parameters.get("frame name"); *************** *** 1676,1680 **** Collection<Surface> inserted = new LinkedList(); ! List<Edge> offset = Offset.offset(boundary, inside + outside - (delta / 2)); Surface exterior = new Surface(simplify(offset)); inserted.add(exterior); --- 1674,1678 ---- Collection<Surface> inserted = new LinkedList(); ! List<Edge> offset = Offset.offset(boundary, inside - (delta / 2)); Surface exterior = new Surface(simplify(offset)); inserted.add(exterior); *************** *** 1997,2001 **** public void evaluate() { Container net = (Container) parameters.get("net"); ! } } --- 1995,2002 ---- public void evaluate() { Container net = (Container) parameters.get("net"); ! ParameterBlock block = net.getParameters(); ! double left = block.getDouble("left"); ! double right = block.getDouble("right"); ! double depth = block.getDouble("depth"); } } |
|
From: Michael L. <he...@us...> - 2008-02-18 14:58:45
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24538/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Commitski Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** PopupMenu.java 15 Feb 2008 13:48:04 -0000 1.19 --- PopupMenu.java 18 Feb 2008 14:58:44 -0000 1.20 *************** *** 823,827 **** AbstractAction action = new SpaceMenuAction(net, "Initialize Frame") { public void actionPerformed(ActionEvent e) { ! Command command = new Command.InitializeNet(space); AttributeView.instance().display(command); } --- 823,836 ---- AbstractAction action = new SpaceMenuAction(net, "Initialize Frame") { public void actionPerformed(ActionEvent e) { ! Command command = new Command.InitializeFrame(space); ! AttributeView.instance().display(command); ! } ! }; ! menu.add(action); ! } ! { ! AbstractAction action = new SpaceMenuAction(net, "Render Frame") { ! public void actionPerformed(ActionEvent e) { ! Command command = new Command.RenderFrame(space); AttributeView.instance().display(command); } |
|
From: Michael L. <he...@us...> - 2008-02-18 14:58:43
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24529/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: Commitski Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Command.java 15 Feb 2008 13:48:01 -0000 1.69 --- Command.java 18 Feb 2008 14:58:40 -0000 1.70 *************** *** 1952,1956 **** * */ ! public static class InitializeNet extends Command { /** --- 1952,1956 ---- * */ ! public static class InitializeFrame extends Command { /** *************** *** 1958,1965 **** * @param net Container */ ! public InitializeNet(Container net) { parameters.put("net", net); ! parameters.put("frame-width", 0.045); ! parameters.put("depth", 0.145); } --- 1958,1966 ---- * @param net Container */ ! public InitializeFrame(Container net) { parameters.put("net", net); ! parameters.put("left", 0.05); ! parameters.put("right", 0.05); ! parameters.put("depth", 0.1); } *************** *** 1968,1975 **** public void evaluate() { Container net = (Container) parameters.get("net"); ! double width = parameters.getDouble("frame-width"); double depth = parameters.getDouble("depth"); ParameterBlock block = new ParameterBlock(); ! block.put("frame-width", width); block.put("depth", depth); net.setParameters(block); --- 1969,1978 ---- public void evaluate() { Container net = (Container) parameters.get("net"); ! double left = parameters.getDouble("left"); ! double right = parameters.getDouble("right"); double depth = parameters.getDouble("depth"); ParameterBlock block = new ParameterBlock(); ! block.put("left", left); ! block.put("right", right); block.put("depth", depth); net.setParameters(block); *************** *** 1978,1981 **** --- 1981,2005 ---- /** + * + */ + public static class RenderFrame extends Command { + + /** + * Render Frame + * @param net Container + */ + public RenderFrame(Container net) { + parameters.put("net", net); + } + + /** {@inheritDoc} */ + @Override + public void evaluate() { + Container net = (Container) parameters.get("net"); + + } + } + + /** * */ |
|
From: Michael L. <he...@us...> - 2008-02-15 13:48:06
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9847/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: frame Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PopupMenu.java 13 Feb 2008 13:18:24 -0000 1.18 --- PopupMenu.java 15 Feb 2008 13:48:04 -0000 1.19 *************** *** 307,310 **** --- 307,311 ---- menu.add(action); } + menu.add(getFrameMenu(sp)); { AbstractAction action = new SpaceMenuAction(sp, "Frame..") { *************** *** 817,820 **** --- 818,835 ---- } + private JMenu getFrameMenu(Container net) { + JMenu menu = new JMenu("Frame"); + { + AbstractAction action = new SpaceMenuAction(net, "Initialize Frame") { + public void actionPerformed(ActionEvent e) { + Command command = new Command.InitializeNet(space); + AttributeView.instance().display(command); + } + }; + menu.add(action); + } + return menu; + } + /** * |
|
From: Michael L. <he...@us...> - 2008-02-15 13:48:04
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9698/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: frame Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Command.java 13 Feb 2008 13:18:20 -0000 1.68 --- Command.java 15 Feb 2008 13:48:01 -0000 1.69 *************** *** 1952,1955 **** --- 1952,1983 ---- * */ + public static class InitializeNet extends Command { + + /** + * Initialize Net + * @param net Container + */ + public InitializeNet(Container net) { + parameters.put("net", net); + parameters.put("frame-width", 0.045); + parameters.put("depth", 0.145); + } + + /** {@inheritDoc} */ + @Override + public void evaluate() { + Container net = (Container) parameters.get("net"); + double width = parameters.getDouble("frame-width"); + double depth = parameters.getDouble("depth"); + ParameterBlock block = new ParameterBlock(); + block.put("frame-width", width); + block.put("depth", depth); + net.setParameters(block); + } + } + + /** + * + */ public static class InsertGrid extends Command { /** *************** *** 1967,1971 **** */ public String title() { ! return "Insert Net"; } --- 1995,1999 ---- */ public String title() { ! return "Insert Grid"; } |
|
From: Michael L. <he...@us...> - 2008-02-13 13:18:20
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13356/src/net/sourceforge/bprocessor/model Modified Files: Command.java Log Message: Renamed Insert Net to Insert Grid Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Command.java 7 Feb 2008 13:04:21 -0000 1.67 --- Command.java 13 Feb 2008 13:18:20 -0000 1.68 *************** *** 1952,1961 **** * */ ! public static class InsertNet extends Command { /** * * @param surface Surface */ ! public InsertNet(Surface surface) { parameters.put("surface", surface); parameters.put("x distance", 0.5); --- 1952,1961 ---- * */ ! public static class InsertGrid extends Command { /** * * @param surface Surface */ ! public InsertGrid(Surface surface) { parameters.put("surface", surface); parameters.put("x distance", 0.5); |
|
From: Michael L. <he...@us...> - 2008-02-13 13:18:20
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13366/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Renamed Insert Net to Insert Grid Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** PopupMenu.java 13 Feb 2008 08:43:08 -0000 1.17 --- PopupMenu.java 13 Feb 2008 13:18:24 -0000 1.18 *************** *** 148,155 **** } { ! AbstractAction action = new GeometricMenuAction(surfaces, "Insert Net...") { public void actionPerformed(ActionEvent event) { Surface surface = (Surface) entities.iterator().next(); ! Command command = new Command.InsertNet(surface); AttributeView.instance().display(command); } --- 148,155 ---- } { ! AbstractAction action = new GeometricMenuAction(surfaces, "Insert Grid...") { public void actionPerformed(ActionEvent event) { Surface surface = (Surface) entities.iterator().next(); ! Command command = new Command.InsertGrid(surface); AttributeView.instance().display(command); } |
|
From: Michael L. <he...@us...> - 2008-02-13 09:59:25
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4819/src/net/sourceforge/bprocessor/gl/tool Modified Files: SelectStrategy.java Log Message: create union, displays net, detail renamed to edit, doubleclick edits union Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** SelectStrategy.java 24 Jan 2008 10:35:31 -0000 1.30 --- SelectStrategy.java 13 Feb 2008 08:43:07 -0000 1.31 *************** *** 296,299 **** --- 296,308 ---- Geometric.connected(Selection.primary(), false); Selection.primary().set(geometrics); + if (Selection.primary().size() == 1) { + Geometric leader = Selection.primary().iterator().next(); + if (leader instanceof Container) { + Container space = (Container) leader; + if (space.isUnion()) { + space.edit(); + } + } + } } } else { |
|
From: Michael L. <he...@us...> - 2008-02-13 09:59:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4584/src/net/sourceforge/bprocessor/model Modified Files: Classification.java Log Message: create union, displays net, detail renamed to edit, doubleclick edits union Index: Classification.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Classification.java 17 Dec 2007 13:09:16 -0000 1.24 --- Classification.java 13 Feb 2008 08:43:03 -0000 1.25 *************** *** 87,95 **** String fullId = id; if (current != null && current.getClassificationType() != null) { - /*if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) { - fullId = current.getClassificationType().getPrefix(); - } else { - fullId = "-" + current.getClassificationType().getPrefix() + fullId.replaceFirst("-", ""); - }*/ fullId = "-" + current.getClassificationType().getPrefix() + fullId.replaceFirst("-", ""); } --- 87,90 ---- |
|
From: Michael L. <he...@us...> - 2008-02-13 08:59:26
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4819/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java PopupMenu.java Log Message: create union, displays net, detail renamed to edit, doubleclick edits union Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** Display.java 25 Jan 2008 13:05:58 -0000 1.79 --- Display.java 13 Feb 2008 08:43:07 -0000 1.80 *************** *** 992,996 **** interior = true; } else { ! interior = false; } } else { --- 992,996 ---- interior = true; } else { ! interior = true; } } else { Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PopupMenu.java 25 Jan 2008 13:05:58 -0000 1.16 --- PopupMenu.java 13 Feb 2008 08:43:08 -0000 1.17 *************** *** 231,235 **** { ! AbstractAction action = new CollectionMenuAction(s, "Dissolve") { public void actionPerformed(ActionEvent event) { List<Container> spaces = new LinkedList(col); --- 231,235 ---- { ! AbstractAction action = new CollectionMenuAction(s, "Explode") { public void actionPerformed(ActionEvent event) { List<Container> spaces = new LinkedList(col); *************** *** 270,274 **** Container sp = (Container)s.iterator().next(); ! AbstractAction edit = new SpaceMenuAction(sp, "Detail") { public void actionPerformed(ActionEvent arg0) { space.edit(); --- 270,274 ---- Container sp = (Container)s.iterator().next(); ! AbstractAction edit = new SpaceMenuAction(sp, "Edit") { public void actionPerformed(ActionEvent arg0) { space.edit(); *************** *** 277,281 **** menu.add(edit); { ! AbstractAction action = new SpaceMenuAction(sp, "Reduce") { public void actionPerformed(ActionEvent event) { space.reduce(); --- 277,281 ---- menu.add(edit); { ! AbstractAction action = new SpaceMenuAction(sp, "Simplify") { public void actionPerformed(ActionEvent event) { space.reduce(); |
|
From: Michael L. <he...@us...> - 2008-02-13 08:59:19
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4845/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: create union, displays net, detail renamed to edit, doubleclick edits union Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** GUI.java 8 Feb 2008 13:41:14 -0000 1.95 --- GUI.java 13 Feb 2008 08:43:13 -0000 1.96 *************** *** 292,295 **** --- 292,309 ---- create.add(createNet); + { + AbstractAction action = new AbstractAction("Union") { + public void actionPerformed(ActionEvent e) { + Container union = new Container("Union", Container.CONSTRUCTION, true); + union.setUnion(true); + Container active = Project.getInstance().getActiveSpace(); + active.add(union); + Project.getInstance().checkpoint(); + Project.getInstance().changed(Project.getInstance()); + } + }; + create.add(action); + } + for (Modellor current : Modellor.getRegisteredModellors()) { if (current.application() == Modellor.SHAPE) { |
