bprocessor-commit Mailing List for B-processor (Page 30)
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-18 13:11:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25178/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: popupmenu refactory Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Display.java 18 Dec 2007 08:02:58 -0000 1.72 --- Display.java 18 Dec 2007 13:11:14 -0000 1.73 *************** *** 512,517 **** --- 512,519 ---- gl.glEnable(GL.GL_CULL_FACE); gl.glCullFace(GL.GL_BACK); + // System.out.println("-- front --"); for (Surface current : surfaces) { Vertex n = current.normal(); + // System.out.println(" normal: " + n); gl.glNormal3d(n.getX(), n.getY(), n.getZ()); float[] color = frontColor(current); *************** *** 522,527 **** --- 524,531 ---- } } + // System.out.println("-- back --"); for (Surface current : surfaces) { Vertex n = current.normal(); + // System.out.println(" normal: " + n); gl.glNormal3d(-n.getX(), -n.getY(), -n.getZ()); float[] color = backColor(current); |
|
From: Michael L. <he...@us...> - 2007-12-18 10:37:02
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29001/src/net/sourceforge/bprocessor/model/modellor Modified Files: TileModellor.java Log Message: tile modellor works Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** TileModellor.java 17 Dec 2007 13:09:18 -0000 1.28 --- TileModellor.java 18 Dec 2007 10:36:59 -0000 1.29 *************** *** 25,28 **** --- 25,29 ---- import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Material; + import net.sourceforge.bprocessor.model.ParameterBlock; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selector; *************** *** 213,217 **** outline.clear(); surface.copyall(outline); - parameterizeOutline(); } --- 214,217 ---- *************** *** 220,223 **** --- 220,228 ---- for (Surface s : outline.getSurfaces()) { boolean contained = false; + ParameterBlock parameters = s.getParameters(); + if (parameters == null) { + parameters = new ParameterBlock(); + s.setParameters(parameters); + } for (Attribute a : s.getParameters().getAttributes()) { if (a.getName().equalsIgnoreCase("Fill")) { |
|
From: Michael L. <he...@us...> - 2007-12-18 08:02:54
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv785/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: material Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Display.java 17 Dec 2007 14:20:41 -0000 1.71 --- Display.java 18 Dec 2007 08:02:58 -0000 1.72 *************** *** 28,31 **** --- 28,32 ---- import net.sourceforge.bprocessor.gl.model.GlObject; + import net.sourceforge.bprocessor.model.Material; import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Camera; *************** *** 33,37 **** import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.CoordinateSystem; - import net.sourceforge.bprocessor.model.Defaults; import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometric; --- 34,37 ---- *************** *** 380,383 **** --- 380,392 ---- } + private static void apply(Material material) { + float[] color = material.getColor(); + float[] ambient = material.getAmbientColor(); + float[] diffuse = material.getDiffuseColor(); + gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, color, 0); + gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, ambient, 0); + gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, diffuse, 0); + } + private static void draw(Vertex vertex) { gl.glBegin(GL.GL_POINTS); *************** *** 483,494 **** } ! private static float[] colorOf(Container space) { ! if (space.isVoid()) { ! return Defaults.getVoidMaterial().getColor(); ! } else if (space.isConstructionSpace()) { ! return Defaults.getConstructionMaterial().getColor(); ! } else { ! return Defaults.getFunctionalMaterial().getColor(); ! } } --- 492,503 ---- } ! private static float[] frontColor(Surface surface) { ! Material material = surface.frontMaterial(); ! return material.getColor(); ! } ! ! private static float[] backColor(Surface surface) { ! Material material = surface.backMaterial(); ! return material.getColor(); } *************** *** 504,511 **** gl.glCullFace(GL.GL_BACK); for (Surface current : surfaces) { - Container front = current.getFrontDomain(); Vertex n = current.normal(); gl.glNormal3d(n.getX(), n.getY(), n.getZ()); ! float[] color = colorOf(front); if (!transparent(current)) { paint(current, color, 1.0f, false); --- 513,519 ---- gl.glCullFace(GL.GL_BACK); for (Surface current : surfaces) { Vertex n = current.normal(); gl.glNormal3d(n.getX(), n.getY(), n.getZ()); ! float[] color = frontColor(current); if (!transparent(current)) { paint(current, color, 1.0f, false); *************** *** 515,522 **** } for (Surface current : surfaces) { - Container back = current.getBackDomain(); Vertex n = current.normal(); gl.glNormal3d(-n.getX(), -n.getY(), -n.getZ()); ! float[] color = colorOf(back); if (!transparent(current)) { paint(current, color, 1.0f, true); --- 523,529 ---- } for (Surface current : surfaces) { Vertex n = current.normal(); gl.glNormal3d(-n.getX(), -n.getY(), -n.getZ()); ! float[] color = backColor(current); if (!transparent(current)) { paint(current, color, 1.0f, true); *************** *** 543,546 **** --- 550,559 ---- } + private static void paint(Surface surface, Material material, boolean reverse) { + apply(material); + draw(surface, reverse); + } + + private static void drawQuad(Surface surface, boolean reverse) { List<Vertex> vertices = surface.getVertices(); |
|
From: Michael L. <he...@us...> - 2007-12-18 08:02:50
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv772/src/net/sourceforge/bprocessor/model Modified Files: Surface.java Space.java Log Message: material Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.211 retrieving revision 1.212 diff -C2 -d -r1.211 -r1.212 *** Surface.java 17 Dec 2007 14:20:37 -0000 1.211 --- Surface.java 18 Dec 2007 08:02:53 -0000 1.212 *************** *** 574,577 **** --- 574,579 ---- } copy.setEdges(edges); + copy.setFrontMaterial(getFrontMaterial()); + copy.setBackMaterial(getBackMaterial()); } return copy; *************** *** 1298,1302 **** public void setBackMaterial(Material back) { backMaterial = back; ! } --- 1300,1316 ---- public void setBackMaterial(Material back) { backMaterial = back; ! } ! ! /** ! * Returs the material to be used on the back side ! * ! * @return back material ! */ ! public Material backMaterial() { ! if (backMaterial != null) { ! return backMaterial; ! } else { ! return backDomain.material(); ! } } *************** *** 1315,1319 **** public void setFrontMaterial(Material front) { frontMaterial = front; ! } --- 1329,1344 ---- public void setFrontMaterial(Material front) { frontMaterial = front; ! } ! ! /** ! * Returns the material to used for the front side ! * @return the front material ! */ ! public Material frontMaterial() { ! if (frontMaterial != null) { ! return frontMaterial; ! } else { ! return frontDomain.material(); ! } } Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.229 retrieving revision 1.230 diff -C2 -d -r1.229 -r1.230 *** Space.java 17 Dec 2007 13:09:16 -0000 1.229 --- Space.java 18 Dec 2007 08:02:53 -0000 1.230 *************** *** 61,64 **** --- 61,66 ---- protected boolean transparent; + + /** * The next boolean specifies wether or not *************** *** 196,199 **** --- 198,215 ---- /** + * Returns the material for this space + * @return material to used for this space + */ + public Material material() { + if (isVoid()) { + return Defaults.getVoidMaterial(); + } else if (isFunctionalSpace()) { + return Defaults.getFunctionalMaterial(); + } else { + return Defaults.getConstructionMaterial(); + } + } + + /** * * @param container isContainer |
|
From: rimestad <rim...@us...> - 2007-12-17 20:00:13
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6000/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: removed illigal instanciate popup on space Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** PopupMenu.java 17 Dec 2007 13:09:35 -0000 1.92 --- PopupMenu.java 17 Dec 2007 20:00:08 -0000 1.93 *************** *** 38,42 **** 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; --- 38,41 ---- *************** *** 247,268 **** menu.add(action); } - AbstractAction instantiate = new CollectionMenuAction(s, "Instantiate") { - public void actionPerformed(ActionEvent arg0) { - if (col != null) { - /*FIXME better if there were made a union if more than one - and a instance of it */ - Iterator iter = col.iterator(); - while (iter.hasNext()) { - Container space = (Container)iter.next(); - Instance instance = new Instance("Instance of " + space.getName()); - instance.setProto(space); - space.getOwner().add(instance); - } - Project.getInstance().changed(Project.getInstance()); - Project.getInstance().checkpoint(); - } - } - }; - menu.add(instantiate); if (s.size() == 1) { // Some options do only apply to one space --- 246,249 ---- |
|
From: rimestad <rim...@us...> - 2007-12-17 19:59:39
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5714/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: change of allignment of handle center Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** FinalMoveTool.java 17 Dec 2007 18:33:18 -0000 1.45 --- FinalMoveTool.java 17 Dec 2007 19:59:43 -0000 1.46 *************** *** 207,213 **** this.instance = instance; this.initialCoordinate = instance.getInstanceAnchor().copy(); ! Vertex center = handle.projection(start.vertex()); start = new Intersection(center, start.type(), start.object()); - this.handle = handle.copy(); this.prevCs = Project.getInstance().getActiveCoordinateSystem().copy(); this.prevCs.setOrigin(center); --- 207,213 ---- this.instance = instance; this.initialCoordinate = instance.getInstanceAnchor().copy(); ! this.handle = handle; ! Vertex center = this.initialCoordinate.translate(this.handle.center()); start = new Intersection(center, start.type(), start.object()); this.prevCs = Project.getInstance().getActiveCoordinateSystem().copy(); this.prevCs.setOrigin(center); |
|
From: rimestad <rim...@us...> - 2007-12-17 18:35:36
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3948/src/net/sourceforge/bprocessor/model Modified Files: CoordinateSystem.java Log Message: removed side effects from translate(coordinatesystem), and changed systemFor to use the active coordinatesystem when aligning with a normal and a origin... Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** CoordinateSystem.java 17 Dec 2007 13:09:16 -0000 1.72 --- CoordinateSystem.java 17 Dec 2007 18:35:22 -0000 1.73 *************** *** 151,160 **** */ public static CoordinateSystem systemFor(Vertex origin, Vertex n) { int index = n.largestCoefficient(); Vertex i = null; Vertex j = null; if (index == Vertex.X) { i = new Vertex(0, 1, 0); ! Vertex z = new Vertex(1, 0, 0); if (n.dot(z) < 0) { i = i.scale(-1); --- 151,162 ---- */ public static CoordinateSystem systemFor(Vertex origin, Vertex n) { + CoordinateSystem activeCoordinates = Project.getInstance().getActiveCoordinateSystem(); int index = n.largestCoefficient(); + Vertex i = null; Vertex j = null; if (index == Vertex.X) { i = new Vertex(0, 1, 0); ! Vertex z = activeCoordinates.getI(); if (n.dot(z) < 0) { i = i.scale(-1); *************** *** 163,167 **** if (index == Vertex.Y) { i = new Vertex(-1, 0, 0); ! Vertex z = new Vertex(0, 1, 0); if (n.dot(z) < 0) { i = i.scale(-1); --- 165,169 ---- if (index == Vertex.Y) { i = new Vertex(-1, 0, 0); ! Vertex z = activeCoordinates.getJ(); if (n.dot(z) < 0) { i = i.scale(-1); *************** *** 169,173 **** } if (index == Vertex.Z) { ! i = new Vertex(1, 0, 0); } --- 171,175 ---- } if (index == Vertex.Z) { ! i = activeCoordinates.getI(); } *************** *** 622,642 **** double y = j.dot(newI); double z = n.dot(newI); ! newI.setX(x); ! newI.setY(y); ! newI.setZ(z); ! Vertex newJ = coordinate.j; x = i.dot(newJ); y = j.dot(newJ); z = n.dot(newJ); ! newJ.setX(x); ! newJ.setY(y); ! newJ.setZ(z); ! Vertex newN = coordinate.n; x = i.dot(newN); y = j.dot(newN); z = n.dot(newN); ! newN.setX(x); ! newN.setY(y); ! newN.setZ(z); Vertex origin = translate(coordinate.origin); return new CoordinateSystem(newI, newJ, newN, origin); --- 624,638 ---- double y = j.dot(newI); double z = n.dot(newI); ! newI = new Vertex(x, y, z); ! Vertex newJ = coordinate.j.copy(); x = i.dot(newJ); y = j.dot(newJ); z = n.dot(newJ); ! newJ = new Vertex(x, y, z); ! Vertex newN = coordinate.n.copy(); x = i.dot(newN); y = j.dot(newN); z = n.dot(newN); ! newN = new Vertex(x, y, z); Vertex origin = translate(coordinate.origin); return new CoordinateSystem(newI, newJ, newN, origin); |
|
From: rimestad <rim...@us...> - 2007-12-17 18:33:15
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3129/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: Fixed the instance-move to use the active coordinatesystem when moving on the grid. Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** FinalMoveTool.java 17 Dec 2007 08:44:17 -0000 1.44 --- FinalMoveTool.java 17 Dec 2007 18:33:18 -0000 1.45 *************** *** 19,22 **** --- 19,23 ---- import net.sourceforge.bprocessor.gl.Editor; + import net.sourceforge.bprocessor.gl.model.Intersection; import net.sourceforge.bprocessor.gl.view.View; import net.sourceforge.bprocessor.gui.GUI; *************** *** 28,31 **** --- 29,33 ---- import net.sourceforge.bprocessor.model.Instance; import net.sourceforge.bprocessor.model.Mesh; + import net.sourceforge.bprocessor.model.Plane; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; *************** *** 195,198 **** --- 197,201 ---- private CoordinateSystem handle; private CoordinateSystem initialCoordinate; + private CoordinateSystem prevCs; /** *************** *** 203,208 **** public InstanceMove(Instance instance, CoordinateSystem handle) { this.instance = instance; - this.handle = handle; this.initialCoordinate = instance.getInstanceAnchor().copy(); } --- 206,215 ---- public InstanceMove(Instance instance, CoordinateSystem handle) { this.instance = instance; this.initialCoordinate = instance.getInstanceAnchor().copy(); + Vertex center = handle.projection(start.vertex()); + start = new Intersection(center, start.type(), start.object()); + this.handle = handle.copy(); + this.prevCs = Project.getInstance().getActiveCoordinateSystem().copy(); + this.prevCs.setOrigin(center); } *************** *** 211,215 **** */ public void move(Vertex delta) { ! revert(); if (current.object() instanceof Surface) { // convert the handle into the coordinatesystems of the surface and translate --- 218,222 ---- */ public void move(Vertex delta) { ! CoordinateSystem cs = null; if (current.object() instanceof Surface) { // convert the handle into the coordinatesystems of the surface and translate *************** *** 220,236 **** n = n.scale(-1); } ! CoordinateSystem cs = CoordinateSystem.systemFor(current.vertex(), n); ! CoordinateSystem anchor = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), ! new Vertex(0, 0, 1), new Vertex(0, 0, 0)); ! CoordinateSystem tmp = handle.translate(anchor); ! tmp = cs.unTranslate(tmp); ! instance.getInstanceAnchor().setOrigin(tmp.center()); ! instance.getInstanceAnchor().setIJN(tmp.getI(), tmp.getJ(), tmp.getN()); } else { ! // change i, j, n of the anchor back to its originals and then just move the delta ! instance.getInstanceAnchor().setIJN(initialCoordinate.getI(), ! initialCoordinate.getJ(), initialCoordinate.getN()); ! instance.getInstanceAnchor().move(delta.getX(), delta.getY(), delta.getZ()); } } --- 227,246 ---- n = n.scale(-1); } ! cs = CoordinateSystem.systemFor(current.vertex(), n); ! } else if (current.object() instanceof Plane) { ! Plane p = (Plane)current.object(); ! Vertex normal = p.normal(); ! cs = CoordinateSystem.systemFor(current.vertex(), normal); ! } ! if (cs == null) { ! cs = prevCs; ! cs.setOrigin(current.vertex()); } else { ! prevCs = cs; } + CoordinateSystem tmp = handle.translate(Project.getInstance().getActiveCoordinateSystem()); + tmp = cs.unTranslate(tmp); + instance.getInstanceAnchor().setOrigin(tmp.center()); + instance.getInstanceAnchor().setIJN(tmp.getI(), tmp.getJ(), tmp.getN()); } *************** *** 497,500 **** --- 507,514 ---- mover = new VectorMove(vertices); + affected = getAffected(geometrics); + current = findIntersection(e); + start = current.copy(); + if (geometrics.size() == 1) { Geometric work = geometrics.iterator().next(); *************** *** 508,512 **** } if (anchor == null) { ! anchor = space.getInstanceAnchor(); } mover = new InstanceMove(space, anchor); --- 522,526 ---- } if (anchor == null) { ! anchor = Project.getInstance().getActiveCoordinateSystem().copy(); } mover = new InstanceMove(space, anchor); *************** *** 514,520 **** } } - affected = getAffected(geometrics); - current = findIntersection(e); - start = current.copy(); updateFeedback(); setTip(secondClickTip()); --- 528,531 ---- |
|
From: Michael L. <he...@us...> - 2007-12-17 14:20:48
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32622/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: refactored material Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** Display.java 17 Dec 2007 11:21:15 -0000 1.70 --- Display.java 17 Dec 2007 14:20:41 -0000 1.71 *************** *** 485,493 **** private static float[] colorOf(Container space) { if (space.isVoid()) { ! return misty; } else if (space.isConstructionSpace()) { ! return Defaults.getFrontColor(); } else { ! return Defaults.getBackColor(); } } --- 485,493 ---- private static float[] colorOf(Container space) { if (space.isVoid()) { ! return Defaults.getVoidMaterial().getColor(); } else if (space.isConstructionSpace()) { ! return Defaults.getConstructionMaterial().getColor(); } else { ! return Defaults.getFunctionalMaterial().getColor(); } } |
|
From: Michael L. <he...@us...> - 2007-12-17 14:20:34
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32608/src/net/sourceforge/bprocessor/model Modified Files: Material.java Surface.java Defaults.java Project.java Log Message: refactored material Index: Defaults.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Defaults.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Defaults.java 15 Oct 2007 12:41:24 -0000 1.2 --- Defaults.java 17 Dec 2007 14:20:37 -0000 1.3 *************** *** 13,30 **** public class Defaults { ! /** Front color for surfaces */ ! private static Material frontMaterial = new Material("Front", new float[] {0.90f, 0.90f, 0.90f}); ! /** NONE color for surfaces */ ! private static Material noneMaterial = new Material("None", new float[] {0.40f, 0.58f, 0.93f}); ! /** Back color for surfaces */ ! private static Material backMaterial = new Material("Back", new float[] {0.96f, 0.87f, 0.70f}); ! ! /** ! * Return front color ! * @return The front color ! */ ! public static float[] getFrontColor() { ! return frontMaterial.getColor(); ! } --- 13,22 ---- public class Defaults { ! private static Material constructionMaterial ! = new Material("Construction", new float[] {0.90f, 0.90f, 0.90f}); ! private static Material voidMaterial ! = new Material("Void", new float[] {255f / 280, 228f / 280, 225f / 280}); ! private static Material functionalMaterial ! = new Material("Functional", new float[] {0.96f, 0.87f, 0.70f}); *************** *** 32,37 **** * @return the backMaterial */ ! public static Material getBackMaterial() { ! return backMaterial; } --- 24,29 ---- * @return the backMaterial */ ! public static Material getFunctionalMaterial() { ! return functionalMaterial; } *************** *** 40,45 **** * @return the frontMaterial */ ! public static Material getFrontMaterial() { ! return frontMaterial; } --- 32,37 ---- * @return the frontMaterial */ ! public static Material getConstructionMaterial() { ! return constructionMaterial; } *************** *** 48,70 **** * @return the noneMaterial */ ! public static Material getNoneMaterial() { ! return noneMaterial; ! } ! ! ! /** ! * Return back color ! * @return The back color ! */ ! public static float[] getBackColor() { ! return backMaterial.getColor(); ! } ! ! /** ! * Return none color ! * @return The none color ! */ ! public static float[] getNoneColor() { ! return backMaterial.getColor(); } --- 40,45 ---- * @return the noneMaterial */ ! public static Material getVoidMaterial() { ! return voidMaterial; } Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.210 retrieving revision 1.211 diff -C2 -d -r1.210 -r1.211 *** Surface.java 17 Dec 2007 13:09:16 -0000 1.210 --- Surface.java 17 Dec 2007 14:20:37 -0000 1.211 *************** *** 1871,1879 **** } else { if (getFrontDomain().isConstructionSpace()) { ! res.add(new Attribute("Front Material", Defaults.getFrontMaterial())); } else if (getFrontDomain().isFunctionalSpace()) { ! res.add(new Attribute("Front Material", Defaults.getBackMaterial())); } else { ! res.add(new Attribute("Front Material", Defaults.getNoneMaterial())); } } --- 1871,1879 ---- } else { if (getFrontDomain().isConstructionSpace()) { ! res.add(new Attribute("Front Material", Defaults.getConstructionMaterial())); } else if (getFrontDomain().isFunctionalSpace()) { ! res.add(new Attribute("Front Material", Defaults.getFunctionalMaterial())); } else { ! res.add(new Attribute("Front Material", Defaults.getVoidMaterial())); } } *************** *** 1889,1897 **** } else { if (getBackDomain().isConstructionSpace()) { ! res.add(new Attribute("Back Material", Defaults.getFrontMaterial())); } else if (getBackDomain().isFunctionalSpace()) { ! res.add(new Attribute("Back Material", Defaults.getBackMaterial())); } else { ! res.add(new Attribute("Back Material", Defaults.getNoneMaterial())); } } --- 1889,1897 ---- } else { if (getBackDomain().isConstructionSpace()) { ! res.add(new Attribute("Back Material", Defaults.getConstructionMaterial())); } else if (getBackDomain().isFunctionalSpace()) { ! res.add(new Attribute("Back Material", Defaults.getFunctionalMaterial())); } else { ! res.add(new Attribute("Back Material", Defaults.getVoidMaterial())); } } Index: Material.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Material.java 17 Dec 2007 13:55:06 -0000 1.13 --- Material.java 17 Dec 2007 14:20:37 -0000 1.14 *************** *** 59,66 **** public Material(String name, float[] color3fv) { this(); ! this.setName(name); ! if (color3fv != null) { ! this.setColor(color3fv); ! } } --- 59,64 ---- public Material(String name, float[] color3fv) { this(); ! setName(name); ! setColor(color3fv); } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** Project.java 17 Dec 2007 13:09:16 -0000 1.152 --- Project.java 17 Dec 2007 14:20:37 -0000 1.153 *************** *** 185,191 **** materials = new HashMap<Long, Material>(); nextMaterialId = 0; ! add(Defaults.getBackMaterial()); ! add(Defaults.getFrontMaterial()); ! add(Defaults.getNoneMaterial()); activeCoordinateSystem = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), new Vertex(0, 0, 1), new Vertex(0, 0, 0)); --- 185,191 ---- materials = new HashMap<Long, Material>(); nextMaterialId = 0; ! add(Defaults.getFunctionalMaterial()); ! add(Defaults.getConstructionMaterial()); ! add(Defaults.getVoidMaterial()); activeCoordinateSystem = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), new Vertex(0, 0, 1), new Vertex(0, 0, 0)); |
|
From: Michael L. <he...@us...> - 2007-12-17 13:55:08
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24534/src/net/sourceforge/bprocessor/gui/attrview Modified Files: MaterialAttribute.java GenericPanel.java Log Message: removed depency to AWT from model Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** GenericPanel.java 17 Dec 2007 13:09:35 -0000 1.49 --- GenericPanel.java 17 Dec 2007 13:55:09 -0000 1.50 *************** *** 8,12 **** import java.awt.BorderLayout; - import java.awt.Color; import java.awt.Dimension; import java.awt.event.ItemEvent; --- 8,11 ---- *************** *** 215,219 **** } else if (a.getValue() instanceof Description) { handleDescription(a, where); ! } else if (a.getValue() instanceof Color) { handleColor(a, where); } else if (a.getValue() instanceof Boolean) { --- 214,218 ---- } else if (a.getValue() instanceof Description) { handleDescription(a, where); ! } else if (a.getValue() instanceof float[]) { handleColor(a, where); } else if (a.getValue() instanceof Boolean) { Index: MaterialAttribute.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/MaterialAttribute.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MaterialAttribute.java 20 Nov 2007 08:36:08 -0000 1.5 --- MaterialAttribute.java 17 Dec 2007 13:55:09 -0000 1.6 *************** *** 49,54 **** this.attribute = attribute; this.listeners = new LinkedList(); ! ! //this.add(Box.createHorizontalStrut(7)); component = Box.createHorizontalBox(); component.add(createValueLabel(attribute)); --- 49,53 ---- this.attribute = attribute; this.listeners = new LinkedList(); ! component = Box.createHorizontalBox(); component.add(createValueLabel(attribute)); *************** *** 56,59 **** --- 55,66 ---- } + private Color rgbToColor(float[] rgb) { + return new Color(rgb[0], rgb[1], rgb[2]); + } + + private float[] colorToRgb(Color color) { + return color.getColorComponents(null); + } + /** * Add a mouselisterner to the active elements in the MaterialAttribute *************** *** 99,102 **** --- 106,110 ---- } + /** * Create a value label *************** *** 106,110 **** private JComponent createValueLabel(Attribute a) { JPanel valueLabel = new JPanel(); ! Color color = (Color) a.getValue(); valueLabel.setOpaque(true); Border blackline = BorderFactory.createLineBorder(Color.black); --- 114,119 ---- private JComponent createValueLabel(Attribute a) { JPanel valueLabel = new JPanel(); ! float[] rgb = (float[]) a.getValue(); ! Color color = rgbToColor(rgb); valueLabel.setOpaque(true); Border blackline = BorderFactory.createLineBorder(Color.black); *************** *** 129,135 **** Color color = JColorChooser.showDialog(GUI.getInstance(), "Color chooser", ! (Color) attribute.getValue()); if (color != null) { ! attribute.setValue(color); } valueChanged(); --- 138,144 ---- Color color = JColorChooser.showDialog(GUI.getInstance(), "Color chooser", ! rgbToColor((float[]) attribute.getValue())); if (color != null) { ! attribute.setValue(colorToRgb(color)); } valueChanged(); |
|
From: Michael L. <he...@us...> - 2007-12-17 13:55:03
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24516/src/net/sourceforge/bprocessor/model Modified Files: Material.java Log Message: removed depency to AWT from model Index: Material.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Material.java 17 Dec 2007 13:09:17 -0000 1.12 --- Material.java 17 Dec 2007 13:55:06 -0000 1.13 *************** *** 7,13 **** package net.sourceforge.bprocessor.model; - import java.awt.Color; - import java.awt.color.ColorSpace; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; --- 7,10 ---- *************** *** 21,25 **** * usage="read-write" */ ! public class Material extends Entity implements Parametric, Serializable { /** The name of the material */ --- 18,22 ---- * usage="read-write" */ ! public class Material extends Entity implements Parametric { /** The name of the material */ *************** *** 243,252 **** res.add(new Attribute("Name", getName(), true)); res.add(new Attribute("Id", getId().toString(), false)); ! res.add(new Attribute("diffuseColor", ! new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB), getDiffuseColor(), 1.0f))); ! res.add(new Attribute("ambientColor", ! new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB), getAmbientColor(), 1.0f))); ! res.add(new Attribute("specularColor", ! new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB), getSpecularColor(), 1.0f))); res.add(new Attribute("Opacity", opacity)); res.add(new Attribute("Shininess", shininess)); --- 240,246 ---- res.add(new Attribute("Name", getName(), true)); res.add(new Attribute("Id", getId().toString(), false)); ! res.add(new Attribute("diffuseColor", getDiffuseColor())); ! res.add(new Attribute("ambientColor", getAmbientColor())); ! res.add(new Attribute("specularColor", getSpecularColor())); res.add(new Attribute("Opacity", opacity)); res.add(new Attribute("Shininess", shininess)); *************** *** 270,281 **** setName((String)a.getValue()); } else if (a.getName().equalsIgnoreCase("diffusecolor")) { ! Color c = (Color)a.getValue(); ! setDiffuseColor(c.getColorComponents(null)); } else if (a.getName().equalsIgnoreCase("ambientcolor")) { ! Color c = (Color)a.getValue(); ! setAmbientColor(c.getColorComponents(null)); } else if (a.getName().equalsIgnoreCase("specularcolor")) { ! Color c = (Color)a.getValue(); ! setSpecularColor(c.getColorComponents(null)); } else if (a.getName().equalsIgnoreCase("opacity")) { setOpacity((Double)a.getValue()); --- 264,272 ---- setName((String)a.getValue()); } else if (a.getName().equalsIgnoreCase("diffusecolor")) { ! setDiffuseColor((float[]) a.getValue()); } else if (a.getName().equalsIgnoreCase("ambientcolor")) { ! setAmbientColor((float[]) a.getValue()); } else if (a.getName().equalsIgnoreCase("specularcolor")) { ! setSpecularColor((float[]) a.getValue()); } else if (a.getName().equalsIgnoreCase("opacity")) { setOpacity((Double)a.getValue()); |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:33
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6467/src/net/sourceforge/bprocessor/gui/attrview Modified Files: GenericPanel.java Log Message: Renamed getGeneralName to title Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** GenericPanel.java 20 Nov 2007 08:36:08 -0000 1.48 --- GenericPanel.java 17 Dec 2007 13:09:35 -0000 1.49 *************** *** 72,76 **** Box header = Box.createHorizontalBox(); JLabel label = new JLabel(" - " + ! param.getGeneralName() + " - "); label.setFont(AttributeView.FONT_HEADER); header.add(Box.createHorizontalGlue()); --- 72,76 ---- Box header = Box.createHorizontalBox(); JLabel label = new JLabel(" - " + ! param.title() + " - "); label.setFont(AttributeView.FONT_HEADER); header.add(Box.createHorizontalGlue()); |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:33
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6467/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java GUI.java Log Message: Renamed getGeneralName to title Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** PopupMenu.java 13 Dec 2007 12:29:05 -0000 1.91 --- PopupMenu.java 17 Dec 2007 13:09:35 -0000 1.92 *************** *** 195,199 **** public ModellorAction(Modellor modellor, Container space) { ! super(modellor.getGeneralName()); this.modellor = modellor; this.space = space; --- 195,199 ---- public ModellorAction(Modellor modellor, Container space) { ! super(modellor.title()); this.modellor = modellor; this.space = space; *************** *** 300,304 **** } { ! AbstractAction action = new SpaceMenuAction(sp, "Layer..") { public void actionPerformed(ActionEvent event) { Command command = new Command.Layer(space); --- 300,304 ---- } { ! AbstractAction action = new SpaceMenuAction(sp, "Offset..") { public void actionPerformed(ActionEvent event) { Command command = new Command.Layer(space); Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** GUI.java 13 Dec 2007 12:00:55 -0000 1.88 --- GUI.java 17 Dec 2007 13:09:35 -0000 1.89 *************** *** 248,252 **** public ModellorAction(Modellor modellor) { ! super(modellor.getGeneralName()); this.modellor = modellor; } --- 248,252 ---- public ModellorAction(Modellor modellor) { ! super(modellor.title()); this.modellor = modellor; } *************** *** 320,324 **** int level = s.getLevel(); for (Modellor m : Modellor.getRegisteredModellors()) { ! JMenuItem mod = new JMenuItem(m.getGeneralName()); if (level == m.getUseableLevel()) { mod.addActionListener(new ModellorMenuAction(s, m)); --- 320,324 ---- int level = s.getLevel(); for (Modellor m : Modellor.getRegisteredModellors()) { ! JMenuItem mod = new JMenuItem(m.title()); if (level == m.getUseableLevel()) { mod.addActionListener(new ModellorMenuAction(s, m)); |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:33
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6467/src/net/sourceforge/bprocessor/gui/actions Modified Files: ModellorMenuAction.java Log Message: Renamed getGeneralName to title Index: ModellorMenuAction.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ModellorMenuAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ModellorMenuAction.java 13 Dec 2007 12:00:55 -0000 1.3 --- ModellorMenuAction.java 17 Dec 2007 13:09:35 -0000 1.4 *************** *** 37,41 **** */ public ModellorMenuAction(Container s, Modellor m) { ! super(m.getGeneralName()); this.space = s; this.modellor = m; --- 37,41 ---- */ public ModellorMenuAction(Container s, Modellor m) { ! super(m.title()); this.space = s; this.modellor = m; |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:27
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6451/src/net/sourceforge/bprocessor/facade/modellor Modified Files: NetFacadeModellor.java FacadeModellor.java Log Message: Renamed getGeneralName to title Index: NetFacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** NetFacadeModellor.java 13 Dec 2007 12:00:15 -0000 1.45 --- NetFacadeModellor.java 17 Dec 2007 13:09:29 -0000 1.46 *************** *** 262,266 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Net Facade Modellor"; } --- 262,266 ---- /** {@inheritDoc} */ ! public String title() { return "Net Facade Modellor"; } *************** *** 743,747 **** /** {@inheritDoc} */ public String getName() { ! return getGeneralName(); } --- 743,747 ---- /** {@inheritDoc} */ public String getName() { ! return title(); } Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** FacadeModellor.java 13 Dec 2007 12:00:15 -0000 1.40 --- FacadeModellor.java 17 Dec 2007 13:09:29 -0000 1.41 *************** *** 352,356 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Facade Modellor"; } --- 352,356 ---- /** {@inheritDoc} */ ! public String title() { return "Facade Modellor"; } |
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6388/src/net/sourceforge/bprocessor/model Modified Files: Line.java Rotate.java AxisRotate.java Project.java CoordinateSystem.java Edge.java Classification.java Surface.java Component.java ClassificationType.java TransformStack.java Grid.java Camera.java Space.java IDTransform.java Point.java Attribute.java Command.java Parametric.java Relation.java Vertex.java Material.java ClippingPlane.java Translate.java Scale.java ParameterBlock.java Transform.java Log Message: Renamed getGeneralName to title Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** CoordinateSystem.java 13 Dec 2007 12:00:31 -0000 1.71 --- CoordinateSystem.java 17 Dec 2007 13:09:16 -0000 1.72 *************** *** 764,768 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "B-System"; } --- 764,768 ---- /** {@inheritDoc} */ ! public String title() { return "B-System"; } Index: Component.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Component.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Component.java 13 Dec 2007 12:00:31 -0000 1.5 --- Component.java 17 Dec 2007 13:09:16 -0000 1.6 *************** *** 109,113 **** * {@inheritDoc} */ ! public String getGeneralName() { return "Library Object"; } --- 109,113 ---- * {@inheritDoc} */ ! public String title() { return "Library Object"; } Index: Material.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Material.java 23 Nov 2007 10:35:35 -0000 1.11 --- Material.java 17 Dec 2007 13:09:17 -0000 1.12 *************** *** 258,262 **** * {@inheritDoc} */ ! public String getGeneralName() { return "Material"; } --- 258,262 ---- * {@inheritDoc} */ ! public String title() { return "Material"; } Index: Parametric.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Parametric.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Parametric.java 8 May 2007 12:35:38 -0000 1.5 --- Parametric.java 17 Dec 2007 13:09:16 -0000 1.6 *************** *** 29,35 **** /** ! * Return the general name of the object ! * @return The general name */ ! public String getGeneralName(); } --- 29,35 ---- /** ! * Return the title of the object ! * @return The title */ ! public String title(); } Index: TransformStack.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/TransformStack.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TransformStack.java 12 Nov 2007 07:42:51 -0000 1.5 --- TransformStack.java 17 Dec 2007 13:09:16 -0000 1.6 *************** *** 93,100 **** } ! /** ! * @return Name ! */ ! public String getGeneralName() { return "Transformation Stack"; } --- 93,98 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Transformation Stack"; } Index: Point.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Point.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Point.java 13 Nov 2007 09:46:28 -0000 1.19 --- Point.java 17 Dec 2007 13:09:16 -0000 1.20 *************** *** 55,59 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "B-Point"; } --- 55,59 ---- /** {@inheritDoc} */ ! public String title() { return "B-Point"; } Index: Vertex.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Vertex.java 13 Dec 2007 08:21:34 -0000 1.75 --- Vertex.java 17 Dec 2007 13:09:17 -0000 1.76 *************** *** 455,459 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Vertex"; } --- 455,459 ---- /** {@inheritDoc} */ ! public String title() { return "Vertex"; } Index: Rotate.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Rotate.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Rotate.java 12 Nov 2007 07:42:51 -0000 1.7 --- Rotate.java 17 Dec 2007 13:09:15 -0000 1.8 *************** *** 138,146 **** } ! /** ! * Get display name ! * @return name ! */ ! public String getGeneralName() { return "Rotate"; } --- 138,143 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Rotate"; } Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Grid.java 10 Oct 2007 08:32:00 -0000 1.1 --- Grid.java 17 Dec 2007 13:09:16 -0000 1.2 *************** *** 25,30 **** /** {@inheritDoc} */ ! public String getGeneralName() { ! return null; } --- 25,30 ---- /** {@inheritDoc} */ ! public String title() { ! return "Grid"; } Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.209 retrieving revision 1.210 diff -C2 -d -r1.209 -r1.210 *** Surface.java 13 Dec 2007 12:00:31 -0000 1.209 --- Surface.java 17 Dec 2007 13:09:16 -0000 1.210 *************** *** 1916,1920 **** /** {@inheritDoc} */ ! public String getGeneralName() { String res = ""; switch (getOwner().getLevel() + 1) { --- 1916,1920 ---- /** {@inheritDoc} */ ! public String title() { String res = ""; switch (getOwner().getLevel() + 1) { Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.228 retrieving revision 1.229 diff -C2 -d -r1.228 -r1.229 *** Space.java 17 Dec 2007 11:21:09 -0000 1.228 --- Space.java 17 Dec 2007 13:09:16 -0000 1.229 *************** *** 519,523 **** Parametric parameters = getOwner().getModellor().get((Container) this); if (parameters != null) { ! res.add(new Attribute(parameters.getGeneralName(), parameters)); } } --- 519,523 ---- Parametric parameters = getOwner().getModellor().get((Container) this); if (parameters != null) { ! res.add(new Attribute(parameters.title(), parameters)); } } *************** *** 526,530 **** /** {@inheritDoc} */ ! public String getGeneralName() { if (isInstance()) { return "Instance"; --- 526,530 ---- /** {@inheritDoc} */ ! public String title() { if (isInstance()) { return "Instance"; Index: ClassificationType.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClassificationType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClassificationType.java 9 Aug 2007 16:07:53 -0000 1.4 --- ClassificationType.java 17 Dec 2007 13:09:16 -0000 1.5 *************** *** 142,149 **** } ! /** ! * {@inheritDoc} ! */ ! public String getGeneralName() { return "Classification Type"; } --- 142,147 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Classification Type"; } Index: Transform.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Transform.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Transform.java 12 Nov 2007 07:42:51 -0000 1.5 --- Transform.java 17 Dec 2007 13:09:17 -0000 1.6 *************** *** 30,34 **** */ public String toString() { ! return getGeneralName(); } --- 30,34 ---- */ public String toString() { ! return title(); } Index: Classification.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Classification.java 13 Dec 2007 12:00:31 -0000 1.23 --- Classification.java 17 Dec 2007 13:09:16 -0000 1.24 *************** *** 170,174 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Classification"; } --- 170,174 ---- /** {@inheritDoc} */ ! public String title() { return "Classification"; } Index: Translate.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Translate.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Translate.java 12 Nov 2007 07:42:51 -0000 1.6 --- Translate.java 17 Dec 2007 13:09:17 -0000 1.7 *************** *** 130,138 **** } ! /** ! * Get display name ! * @return name ! */ ! public String getGeneralName() { return "Translate"; } --- 130,135 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Translate"; } Index: ClippingPlane.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ClippingPlane.java 13 Dec 2007 12:00:32 -0000 1.26 --- ClippingPlane.java 17 Dec 2007 13:09:17 -0000 1.27 *************** *** 348,352 **** /** {@inheritDoc} */ ! public String getGeneralName() { String s = "Clippingplane"; return s; --- 348,352 ---- /** {@inheritDoc} */ ! public String title() { String s = "Clippingplane"; return s; Index: ParameterBlock.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ParameterBlock.java 28 Oct 2007 22:45:37 -0000 1.14 --- ParameterBlock.java 17 Dec 2007 13:09:17 -0000 1.15 *************** *** 167,171 **** * @return String */ ! public String getGeneralName() { return "Parameters"; } --- 167,171 ---- * @return String */ ! public String title() { return "Parameters"; } Index: Attribute.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Attribute.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Attribute.java 18 Oct 2007 13:47:47 -0000 1.25 --- Attribute.java 17 Dec 2007 13:09:16 -0000 1.26 *************** *** 167,175 **** } ! /** ! * Get general name ! * @return String ! */ ! public String getGeneralName() { return "Parameter"; } --- 167,172 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Parameter"; } Index: Relation.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Relation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Relation.java 16 Apr 2007 15:55:22 -0000 1.8 --- Relation.java 17 Dec 2007 13:09:17 -0000 1.9 *************** *** 117,121 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Relation"; } --- 117,121 ---- /** {@inheritDoc} */ ! public String title() { return "Relation"; } Index: Edge.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** Edge.java 13 Dec 2007 12:00:31 -0000 1.105 --- Edge.java 17 Dec 2007 13:09:16 -0000 1.106 *************** *** 715,719 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Edge"; } --- 715,719 ---- /** {@inheritDoc} */ ! public String title() { return "Edge"; } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -d -r1.151 -r1.152 *** Project.java 13 Dec 2007 12:00:30 -0000 1.151 --- Project.java 17 Dec 2007 13:09:16 -0000 1.152 *************** *** 854,858 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Project"; } --- 854,858 ---- /** {@inheritDoc} */ ! public String title() { return "Project"; } Index: Camera.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Camera.java 13 Dec 2007 12:00:31 -0000 1.53 --- Camera.java 17 Dec 2007 13:09:16 -0000 1.54 *************** *** 602,610 **** } ! /** ! * Return the general name of Camera ! * @return "Camera" ! */ ! public String getGeneralName() { return "Camera"; } --- 602,607 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Camera"; } Index: Line.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Line.java 11 Dec 2007 14:49:01 -0000 1.38 --- Line.java 17 Dec 2007 13:09:15 -0000 1.39 *************** *** 135,139 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "B-Line"; } --- 135,139 ---- /** {@inheritDoc} */ ! public String title() { return "B-Line"; } Index: AxisRotate.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/AxisRotate.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AxisRotate.java 12 Nov 2007 07:42:51 -0000 1.6 --- AxisRotate.java 17 Dec 2007 13:09:15 -0000 1.7 *************** *** 163,167 **** * @return name */ ! public String getGeneralName() { return "General Rotate"; } --- 163,167 ---- * @return name */ ! public String title() { return "General Rotate"; } Index: Command.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Command.java 13 Dec 2007 12:00:32 -0000 1.59 --- Command.java 17 Dec 2007 13:09:16 -0000 1.60 *************** *** 44,49 **** /** {@inheritDoc} */ ! public String getGeneralName() { ! return "Command"; } --- 44,49 ---- /** {@inheritDoc} */ ! public String title() { ! return "Modellor"; } *************** *** 151,155 **** * {@inheritDoc} */ ! public String getGeneralName() { return "Offset Normal"; } --- 151,155 ---- * {@inheritDoc} */ ! public String title() { return "Offset Normal"; } *************** *** 231,235 **** * {@inheritDoc} */ ! public String getGeneralName() { return "Smooth Surface"; } --- 231,235 ---- * {@inheritDoc} */ ! public String title() { return "Smooth Surface"; } *************** *** 462,466 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Subdivide"; } --- 462,466 ---- /** {@inheritDoc} */ ! public String title() { return "Subdivide"; } *************** *** 651,655 **** * {@inheritDoc} */ ! public String getGeneralName() { return "Split Edge"; } --- 651,655 ---- * {@inheritDoc} */ ! public String title() { return "Split Edge"; } *************** *** 691,696 **** /** {@inheritDoc}} */ @Override ! public String getGeneralName() { ! return "Create cylinder"; } --- 691,696 ---- /** {@inheritDoc}} */ @Override ! public String title() { ! return "Create Cylinder"; } *************** *** 855,859 **** /** {@inheritDoc}} */ @Override ! public String getGeneralName() { return "Create Pyramid"; } --- 855,859 ---- /** {@inheritDoc}} */ @Override ! public String title() { return "Create Pyramid"; } *************** *** 890,894 **** } /** {@inheritDoc} */ ! public String getGeneralName() { return "Create Cube"; } --- 890,894 ---- } /** {@inheritDoc} */ ! public String title() { return "Create Cube"; } *************** *** 958,961 **** --- 958,968 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Scale"; + } + /** {@inheritDoc} */ @Override *************** *** 999,1002 **** --- 1006,1017 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Translate"; + } + + /** {@inheritDoc} */ @Override *************** *** 1040,1043 **** --- 1055,1065 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Rotate"; + } + /** {@inheritDoc} */ @Override *************** *** 1074,1077 **** --- 1096,1105 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Offset"; + } private static List<Vertex> offset(List<Vertex> vertices, Vertex normal, double distance) { *************** *** 1284,1287 **** --- 1312,1322 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Frame Net"; + } + private List<Edge> simplify(List<Edge> edges) { if (edges.size() > 3) { *************** *** 1464,1467 **** --- 1499,1509 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Offset"; + } + /** {@inheritDoc} */ @Override *************** *** 1536,1539 **** --- 1578,1588 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Extrude"; + } + private Prism connect(Surface bottom, Surface top) { List<Surface> sides = connect(bottom.getEdges(), top.getEdges()); *************** *** 1630,1633 **** --- 1679,1689 ---- } + /** + * {@inheritDoc} + */ + public String title() { + return "Insert Net"; + } + private void fill(List<Vertex> vertices, List<Edge> edges) { Iterator<Vertex> iter = vertices.iterator(); Index: IDTransform.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/IDTransform.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IDTransform.java 12 Nov 2007 07:42:51 -0000 1.3 --- IDTransform.java 17 Dec 2007 13:09:16 -0000 1.4 *************** *** 43,50 **** } ! /** ! * @return String ! */ ! public String getGeneralName() { return "ID"; } --- 43,48 ---- } ! /** {@inheritDoc} */ ! public String title() { return "ID"; } Index: Scale.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Scale.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Scale.java 12 Nov 2007 07:42:51 -0000 1.7 --- Scale.java 17 Dec 2007 13:09:17 -0000 1.8 *************** *** 129,137 **** } ! /** ! * Get display name ! * @return name ! */ ! public String getGeneralName() { return "Scale"; } --- 129,134 ---- } ! /** {@inheritDoc} */ ! public String title() { return "Scale"; } |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:16
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6388/src/net/sourceforge/bprocessor/model/modellor Modified Files: ModelBathModellor2.java InnerWallModellor.java TileModellor.java Modellor.java Log Message: Renamed getGeneralName to title Index: TileModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** TileModellor.java 13 Dec 2007 12:00:33 -0000 1.27 --- TileModellor.java 17 Dec 2007 13:09:18 -0000 1.28 *************** *** 566,570 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Tilemodellor"; } --- 566,570 ---- /** {@inheritDoc} */ ! public String title() { return "Tilemodellor"; } Index: ModelBathModellor2.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ModelBathModellor2.java 13 Dec 2007 12:00:33 -0000 1.15 --- ModelBathModellor2.java 17 Dec 2007 13:09:18 -0000 1.16 *************** *** 770,774 **** /** {@inheritDoc} */ @Override ! public String getGeneralName() { return "New Bath-module modellor"; } --- 770,774 ---- /** {@inheritDoc} */ @Override ! public String title() { return "New Bath-module modellor"; } Index: InnerWallModellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** InnerWallModellor.java 13 Dec 2007 12:00:33 -0000 1.16 --- InnerWallModellor.java 17 Dec 2007 13:09:18 -0000 1.17 *************** *** 753,757 **** /** {@inheritDoc} */ @Override ! public String getGeneralName() { return "Wall Module"; } --- 753,757 ---- /** {@inheritDoc} */ @Override ! public String title() { return "Wall Module"; } Index: Modellor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Modellor.java 13 Dec 2007 12:00:33 -0000 1.15 --- Modellor.java 17 Dec 2007 13:09:18 -0000 1.16 *************** *** 161,165 **** /** {@inheritDoc} */ ! public String getGeneralName() { return "Modellor"; } --- 161,165 ---- /** {@inheritDoc} */ ! public String title() { return "Modellor"; } |
|
From: Michael L. <he...@us...> - 2007-12-17 13:09:15
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/constraints In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6388/src/net/sourceforge/bprocessor/model/constraints Modified Files: OffsetConstraint.java Log Message: Renamed getGeneralName to title Index: OffsetConstraint.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/constraints/OffsetConstraint.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OffsetConstraint.java 11 Dec 2007 14:49:04 -0000 1.9 --- OffsetConstraint.java 17 Dec 2007 13:09:18 -0000 1.10 *************** *** 213,217 **** * @return General name */ ! public String getGeneralName() { return "Offset Constraint"; } --- 213,217 ---- * @return General name */ ! public String title() { return "Offset Constraint"; } |
|
From: Michael L. <he...@us...> - 2007-12-17 12:11:12
|
Update of /cvsroot/bprocessor/gl/src/gfx In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14387/src/gfx Modified Files: Biconassigntool.gif Added Files: Biconselect.gif Log Message: New cursor for assign tool --- NEW FILE: Biconselect.gif --- (This appears to be a binary file; contents omitted.) Index: Biconassigntool.gif =================================================================== RCS file: /cvsroot/bprocessor/gl/src/gfx/Biconassigntool.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6kgzNd and /tmp/cvsCEDeo3 differ |
|
From: Michael L. <he...@us...> - 2007-12-17 11:21:20
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26850/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: hilite of instance and container Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** GenericTreeView.java 13 Dec 2007 12:15:48 -0000 1.135 --- GenericTreeView.java 17 Dec 2007 11:21:24 -0000 1.136 *************** *** 1009,1013 **** /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! return new SpaceNode((Container) entity); } --- 1009,1013 ---- /** {@inheritDoc} */ public EntityNode nodeFor(Object entity) { ! return new SpaceNode((Space) entity); } |
|
From: Michael L. <he...@us...> - 2007-12-17 11:21:19
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26841/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: hilite of instance and container Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Display.java 13 Dec 2007 12:29:02 -0000 1.69 --- Display.java 17 Dec 2007 11:21:15 -0000 1.70 *************** *** 1190,1204 **** if (current instanceof Space) { Space space = (Space) current; ! if (space.isInstance()) { ! gl.glPushMatrix(); ! translateToCoordinatesystem((Instance) space); ! } ! Collection<Surface> envelope = new LinkedList(space.getEnvelope()); ! ! Collection<Edge> edges = Surface.edges(envelope); paintEdges(edges, redish, 2.0f); - if (space.isInstance()) { - gl.glPopMatrix(); - } } } --- 1190,1195 ---- if (current instanceof Space) { Space space = (Space) current; ! Collection<Edge> edges = space.hiliteEdges(); paintEdges(edges, redish, 2.0f); } } |
|
From: Michael L. <he...@us...> - 2007-12-17 11:21:19
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26812/src/net/sourceforge/bprocessor/model Modified Files: Instance.java Space.java Container.java Log Message: hilite of instance and container Index: Instance.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Instance.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Instance.java 13 Dec 2007 12:28:57 -0000 1.5 --- Instance.java 17 Dec 2007 11:21:09 -0000 1.6 *************** *** 8,12 **** --- 8,15 ---- package net.sourceforge.bprocessor.model; + import java.util.Collection; import java.util.HashSet; + import java.util.LinkedList; + import java.util.List; import java.util.Set; *************** *** 105,108 **** } ! } --- 108,122 ---- } ! /** ! * {@inheritDoc} ! */ ! @Override ! public Collection<Edge> hiliteEdges() { ! Collection<Edge> interior = proto.hiliteEdges(); ! List<Edge> edges = new LinkedList(); ! for (Edge current : interior) { ! edges.add(anchor.unTranslate(current)); ! } ! return edges; ! } } Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.227 retrieving revision 1.228 diff -C2 -d -r1.227 -r1.228 *** Space.java 13 Dec 2007 12:39:36 -0000 1.227 --- Space.java 17 Dec 2007 11:21:09 -0000 1.228 *************** *** 8,11 **** --- 8,12 ---- import java.util.ArrayList; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; *************** *** 52,56 **** protected Description description; /** The envelope (a set of surfaces) */ ! private Set<Surface> envelope; /** type of space */ --- 53,57 ---- protected Description description; /** The envelope (a set of surfaces) */ ! protected Set<Surface> envelope; /** type of space */ *************** *** 319,327 **** } - - - - - /** * Get the modellor --- 320,323 ---- *************** *** 622,640 **** } - /** - * collects the set of vertices in this space - * @return the set of vertices - */ - @Override - public Set<Vertex> collect() { - Set<Vertex> result = new HashSet<Vertex>(); - for (Surface s : envelope) { - result.addAll(s.collect()); - } - if (container) { - result.addAll(collectInterior()); - } - return result; - } /** --- 618,621 ---- *************** *** 838,840 **** --- 819,830 ---- log.info(object); } + + /** + * Returns collection of edges to hilite for + * this space + * @return collection of edges + */ + public Collection<Edge> hiliteEdges() { + return Collections.EMPTY_LIST; + } } Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Container.java 13 Dec 2007 12:39:36 -0000 1.6 --- Container.java 17 Dec 2007 11:21:10 -0000 1.7 *************** *** 1406,1408 **** --- 1406,1439 ---- nextSurfaceId = Entity.maxId(surfaces.values()) + 1; } + + /** + * collects the set of vertices in this space + * @return the set of vertices + */ + @Override + public Set<Vertex> collect() { + Set<Vertex> result = new HashSet<Vertex>(); + for (Surface s : envelope) { + result.addAll(s.collect()); + } + if (container) { + result.addAll(collectInterior()); + } + return result; + } + + /** + * {@inheritDoc} + */ + @Override + public Collection<Edge> hiliteEdges() { + List<Edge> edges = new LinkedList(); + edges.addAll(Surface.edges(envelope)); + Set<Edge> interior = new HashSet(); + for (Space current : getElements()) { + interior.addAll(current.hiliteEdges()); + } + edges.addAll(interior); + return edges; + } } |
|
From: Michael L. <he...@us...> - 2007-12-17 10:24:50
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4431/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Log Message: refactored persistence to handle space/container/instance Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Persistence.java 13 Dec 2007 12:15:40 -0000 1.71 --- Persistence.java 17 Dec 2007 10:24:27 -0000 1.72 *************** *** 255,259 **** ! private static Space internalizeElement(Container owner, net.sourceforge.bprocessor.model.xml.Space xml, Map mapper, Collection xmls) { --- 255,259 ---- ! private static Space internalizeSpace(Container owner, net.sourceforge.bprocessor.model.xml.Space xml, Map mapper, Collection xmls) { *************** *** 340,344 **** 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); } --- 340,344 ---- net.sourceforge.bprocessor.model.xml.Space current = (net.sourceforge.bprocessor.model.xml.Space) iter.next(); ! Space element = internalizeSpace(space, current, mapper, xmls); elements.put(element.getId(), element); } *************** *** 957,972 **** */ private static SpaceType externalizeSpace(Space space, Map map) { ! SpaceType xml = new SpaceImpl(); ! return externalizeSpace(xml, space, map); } /** * Create content - * @param xml the space xml * @param space The space * @param map The map * @return The SpaceImpl */ ! private static SpaceType externalizeSpace(SpaceType xml, Space space, Map map) { xml.setId(counter++); if (space.getId() != null) { --- 957,977 ---- */ private static SpaceType externalizeSpace(Space space, Map map) { ! SpaceType xml = null; ! if (space instanceof Container) { ! xml = externalizeContainer((Container) space, map); ! } else if (space instanceof Instance) { ! xml = externalizeInstance((Instance) space, map); ! } ! return xml; } /** * Create content * @param space The space * @param map The map * @return The SpaceImpl */ ! private static SpaceType externalizeContainer(Container space, Map map) { ! SpaceType xml = new SpaceImpl(); xml.setId(counter++); if (space.getId() != null) { *************** *** 989,1042 **** } map.put(space, xml); ! if (!space.isInstance()) { ! Container container = (Container) space; ! //Only save geometry if space isn't a instance ! { ! List elements = new LinkedList(container.getElements()); ! Entity.sort(elements); ! Iterator iter = elements.iterator(); ! while (iter.hasNext()) { ! Object current = iter.next(); ! xml.getSpace().add(externalizeSpace((Space)current, map)); ! } } ! { ! List surfaces = new LinkedList(container.getSurfaces()); ! Entity.sort(surfaces); ! Iterator iter = surfaces.iterator(); ! while (iter.hasNext()) { ! Surface current = (Surface) iter.next(); ! xml.getSurface().add(externalizeSurface(current, map)); ! } } ! { ! List edges = new LinkedList(container.getEdges()); ! Entity.sort(edges); ! Iterator iter = edges.iterator(); ! while (iter.hasNext()) { ! Edge current = (Edge) iter.next(); ! xml.getEdge().add(externalizeEdge(current, map)); ! } } ! { ! List vertices = new LinkedList(container.getVertices()); ! Entity.sort(vertices); ! Iterator iter = vertices.iterator(); ! while (iter.hasNext()) { ! Vertex current = (Vertex) iter.next(); ! xml.getVertex().add(externalizeVertex(current, map)); ! } } ! { ! Iterator iter = container.getConstructors().iterator(); ! while (iter.hasNext()) { ! Constructor current = (Constructor) iter.next(); ! xml.getConstructor().add(externalizeConstructor(current, map)); ! } } - } else { - Instance instance = (Instance) space; - xml.setAnchor(externalizeCoordinateSystem(instance.getInstanceAnchor(), map)); } { if (space.getModellor() != null) { --- 994,1041 ---- } map.put(space, xml); ! { ! List elements = new LinkedList(space.getElements()); ! Entity.sort(elements); ! Iterator iter = elements.iterator(); ! while (iter.hasNext()) { ! Object current = iter.next(); ! xml.getSpace().add(externalizeSpace((Space)current, map)); } ! } ! { ! List surfaces = new LinkedList(space.getSurfaces()); ! Entity.sort(surfaces); ! Iterator iter = surfaces.iterator(); ! while (iter.hasNext()) { ! Surface current = (Surface) iter.next(); ! xml.getSurface().add(externalizeSurface(current, map)); } ! } ! { ! List edges = new LinkedList(space.getEdges()); ! Entity.sort(edges); ! Iterator iter = edges.iterator(); ! while (iter.hasNext()) { ! Edge current = (Edge) iter.next(); ! xml.getEdge().add(externalizeEdge(current, map)); } ! } ! { ! List vertices = new LinkedList(space.getVertices()); ! Entity.sort(vertices); ! Iterator iter = vertices.iterator(); ! while (iter.hasNext()) { ! Vertex current = (Vertex) iter.next(); ! xml.getVertex().add(externalizeVertex(current, map)); } ! } ! { ! Iterator iter = space.getConstructors().iterator(); ! while (iter.hasNext()) { ! Constructor current = (Constructor) iter.next(); ! xml.getConstructor().add(externalizeConstructor(current, map)); } } + { if (space.getModellor() != null) { *************** *** 1048,1051 **** --- 1047,1083 ---- /** + * Create content + * @param space The space + * @param map The map + * @return The SpaceImpl + */ + private static SpaceType externalizeInstance(Instance space, Map map) { + SpaceType xml = new SpaceImpl(); + xml.setId(counter++); + if (space.getId() != null) { + xml.setProgid(space.getId()); + } + xml.setName(space.getName()); + xml.setType(space.getType()); + xml.setTransparent(space.isTransparent()); + xml.setDescription(space.getDescription().toString()); + xml.setUnion(space.isUnion()); + xml.setNet(space.isNet()); + if (space.getClassification() != null) { + if (space.getClassification().getId().equalsIgnoreCase("-1")) { + xml.setClassification(space.getClassification().getName()); + } else { + xml.setClassification(space.getClassification().getFullId(space)); + } + } else { + xml.setClassification("unassigned"); + } + map.put(space, xml); + xml.setAnchor(externalizeCoordinateSystem(space.getInstanceAnchor(), map)); + return xml; + } + + + /** * Externalize a transformation * @param current the original object |
|
From: rimestad <rim...@us...> - 2007-12-17 08:44:20
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29796/src/net/sourceforge/bprocessor/gl/tool Modified Files: FinalMoveTool.java Log Message: Now a length can be typed in with the move tool Index: FinalMoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** FinalMoveTool.java 13 Dec 2007 12:00:49 -0000 1.43 --- FinalMoveTool.java 17 Dec 2007 08:44:17 -0000 1.44 *************** *** 407,412 **** @Override public void onVertex() { ! // TODO Auto-generated method stub ! } --- 407,412 ---- @Override public void onVertex() { ! move(); ! finish(); } *************** *** 489,492 **** --- 489,494 ---- geometrics = mesh.geometrics(); Project.getInstance().getActiveSpace().addProtected(geometrics); + } else { + mesh = null; } *************** *** 521,533 **** } } else { ! if (copy) { ! owner.removeProtected(geometrics); ! owner.insert(mesh); ! geometrics = null; ! } ! owner.simplify(); ! Project.getInstance().checkpoint(); ! start = null; ! cleanUp(); moved(e); } --- 523,527 ---- } } else { ! finish(); moved(e); } *************** *** 535,538 **** --- 529,547 ---- /** + * Finish the tool action + */ + private void finish() { + if (copy) { + owner.removeProtected(geometrics); + owner.insert(mesh); + geometrics = null; + } + owner.simplify(); + Project.getInstance().checkpoint(); + start = null; + cleanUp(); + } + + /** * {@inheritDoc} */ *************** *** 541,565 **** if (value.length() > 0) { char token = value.charAt(0); ! if (token == '*' || token == '/') { ! String expression = value.substring(1); ! Stack result = evaluateString("echo " + expression); ! if (result.size() == 1) { ! Object top = result.pop(); ! if (top instanceof Double) { ! Double d = (Double) top; ! int n = d.intValue(); ! if (token == '*') { ! for (int i = 1; i < n - 1; i++) { ! multiply(i); ! } ! } else if (token == '/') { ! for (int i = 1; i < n - 1; i++) { ! divide(i, n); } } - - Project.getInstance().checkpoint(); } } } } --- 550,580 ---- if (value.length() > 0) { char token = value.charAt(0); ! if ((token == '*' || token == '/')) { ! if (mesh != null) { ! String expression = value.substring(1); ! Stack result = evaluateString("echo " + expression); ! if (result.size() == 1) { ! Object top = result.pop(); ! if (top instanceof Double) { ! Double d = (Double) top; ! int n = d.intValue(); ! if (token == '*') { ! for (int i = 1; i < n - 1; i++) { ! multiply(i); ! } ! } else if (token == '/') { ! for (int i = 1; i < n - 1; i++) { ! divide(i, n); ! } } + + Project.getInstance().checkpoint(); } } + } else { + GUI.getInstance().alert("No copy to repeat"); } + } else { + super.evaluate(value); } } |
