bprocessor-commit Mailing List for B-processor (Page 19)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2009-05-26 10:34:35
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26306/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Snapping to grid implemented Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** Display.java 19 May 2009 10:33:42 -0000 1.90 --- Display.java 26 May 2009 10:33:53 -0000 1.91 *************** *** 1317,1352 **** private static void draw(Grid grid) { - double size = grid.getSize(); - double delta = grid.getDistance(); - CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem(); - Vertex origin = system.getOrigin(); - Vertex v = system.getI(); - Vertex u = system.getJ(); - int n = (int) Math.floor((size / 2) / delta); gl.glColor3fv(grey, 0); gl.glLineWidth(1.0f); ! for (int i = 0; i < n; i++) { ! Vertex o = origin.add(u.scale(i * delta)); ! Line line = new Line(o, v); ! Edge edge = line.edge(size / 2); ! draw(edge); ! } ! for (int i = 1; i < n; i++) { ! Vertex o = origin.add(u.scale(-i * delta)); ! Line line = new Line(o, v); ! Edge edge = line.edge(size / 2); ! draw(edge); ! } ! for (int i = 0; i < n; i++) { ! Vertex o = origin.add(v.scale(i * delta)); ! Line line = new Line(o, u); ! Edge edge = line.edge(size / 2); ! draw(edge); ! } ! for (int i = 1; i < n; i++) { ! Vertex o = origin.add(v.scale(-i * delta)); ! Line line = new Line(o, u); ! Edge edge = line.edge(size / 2); draw(edge); } --- 1317,1325 ---- private static void draw(Grid grid) { gl.glColor3fv(grey, 0); gl.glLineWidth(1.0f); ! Collection<Edge> guides = grid.guides(grid.getSize() / 2); ! for (Edge edge : guides) { draw(edge); } |
|
From: Michael L. <he...@us...> - 2009-05-26 10:34:02
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26296/src/net/sourceforge/bprocessor/model Modified Files: Grid.java Log Message: Snapping to grid implemented Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Grid.java 19 May 2009 10:33:45 -0000 1.6 --- Grid.java 26 May 2009 10:33:50 -0000 1.7 *************** *** 7,10 **** --- 7,11 ---- package net.sourceforge.bprocessor.model; + import java.util.Collection; import java.util.LinkedList; import java.util.List; *************** *** 83,86 **** --- 84,140 ---- } + + /** + * + * @return lines + */ + public Collection<Line> lines() { + + double size = getSize(); + double delta = getDistance(); + CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem(); + Vertex origin = system.getOrigin(); + Vertex v = system.getI(); + Vertex u = system.getJ(); + int n = (int) Math.floor((size / 2) / delta); + + Collection<Line> lines = new LinkedList(); + + for (int i = 0; i < n; i++) { + Vertex o = origin.add(u.scale(i * delta)); + Line line = new Line(o, v); + lines.add(line); + } + for (int i = 1; i < n; i++) { + Vertex o = origin.add(u.scale(-i * delta)); + Line line = new Line(o, v); + lines.add(line); + } + for (int i = 0; i < n; i++) { + Vertex o = origin.add(v.scale(i * delta)); + Line line = new Line(o, u); + lines.add(line); + } + for (int i = 1; i < n; i++) { + Vertex o = origin.add(v.scale(-i * delta)); + Line line = new Line(o, u); + lines.add(line); + } + return lines; + } + + /** + * {@inheritDoc} + */ + public Collection<Edge> guides(double length) { + Collection<Edge> guides = super.guides(length); + Collection<Line> lines = lines(); + for (Line line : lines) { + Edge edge = line.edge(length); + guides.add(edge); + } + return guides; + } + /** {@inheritDoc} */ public String title() { |
|
From: Michael L. <he...@us...> - 2009-05-25 12:00:57
|
Update of /cvsroot/bprocessor/bprocessor In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24073 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 7 Sep 2006 11:39:29 -0000 1.3 --- .classpath 25 May 2009 12:00:49 -0000 1.4 *************** *** 2,6 **** <classpath> <classpathentry excluding="etc/" kind="src" path="src"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/gl/src/gfx"/> <classpathentry kind="lib" path="/gui/src/gfx"/> --- 2,6 ---- <classpath> <classpathentry excluding="etc/" kind="src" path="src"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0"/> <classpathentry kind="lib" path="/gl/src/gfx"/> <classpathentry kind="lib" path="/gui/src/gfx"/> |
|
From: Michael L. <he...@us...> - 2009-05-25 12:00:55
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/bridge In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24062/src/net/sourceforge/bprocessor/model/bridge Modified Files: Sensor.java Mote.java Log Message: Index: Sensor.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/bridge/Sensor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Sensor.java 17 Feb 2009 10:50:22 -0000 1.3 --- Sensor.java 25 May 2009 12:00:46 -0000 1.4 *************** *** 67,71 **** */ public void update() { - System.out.println("update sensors"); for (Mote current : motes) { long id = current.id(); --- 67,70 ---- *************** *** 73,77 **** DataItem item = Project.latest((int)id); if (item != null) { - System.out.println(" addinng " + item); current.add(item); } --- 72,75 ---- Index: Mote.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/bridge/Mote.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mote.java 17 Feb 2009 10:50:22 -0000 1.3 --- Mote.java 25 May 2009 12:00:46 -0000 1.4 *************** *** 15,18 **** --- 15,19 ---- import net.sourceforge.bprocessor.model.Entity; import net.sourceforge.bprocessor.model.Parametric; + import net.sourceforge.bprocessor.model.Vertex; /** *************** *** 23,26 **** --- 24,28 ---- private List<DataItem> items; private long lasttime; + private Vertex position; /** *************** *** 32,35 **** --- 34,50 ---- items = new LinkedList(); lasttime = 0; + if (id == 15198069) { + position = new Vertex(20, 7.1, 4.1); + } else if (id == 15198041) { + position = new Vertex(20, 14.2, 4.1); + } else if (id == 15198042) { + position = new Vertex(20, 21.3, 4.1); + } else if (id == 15198043) { + position = new Vertex(20, 28.4, 4.1); + } else if (id == 15198044) { + position = new Vertex(20, 35.5, 4.1); + } else if (id == 15198028) { + position = new Vertex(20, 42.6, 4.1); + } } *************** *** 41,44 **** --- 56,75 ---- return id; } + + /** + * + * @param value Vertex + */ + public void setPosition(Vertex value) { + this.position = value; + } + + /** + * + * @return position + */ + public Vertex getPosition() { + return position; + } /** *************** *** 60,66 **** */ public void add(DataItem item) { - System.out.println(" " + item.timestamp() + " | " + lasttime); if (item.timestamp() > lasttime) { - System.out.println(" appending"); items.add(item); lasttime = item.timestamp(); --- 91,95 ---- *************** *** 93,96 **** --- 122,128 ---- ArrayList<Attribute> res = new ArrayList<Attribute>(); res.add(new Attribute("ID", new String(String.valueOf(id)), false)); + res.add(new Attribute("X", new Double(position.getX()))); + res.add(new Attribute("Y", new Double(position.getY()))); + res.add(new Attribute("Z", new Double(position.getZ()))); return res; } |
|
From: Michael L. <he...@us...> - 2009-05-25 12:00:48
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24047/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.287 retrieving revision 1.288 diff -C2 -d -r1.287 -r1.288 *** View.java 21 Apr 2009 10:21:18 -0000 1.287 --- View.java 25 May 2009 12:00:40 -0000 1.288 *************** *** 62,70 **** /** The logger */ private static Logger log = Logger.getLogger(View.class); ! private static final boolean DISP = false; ! private boolean enabled; ! private GLTesselator tesselator; --- 62,70 ---- /** The logger */ private static Logger log = Logger.getLogger(View.class); ! private static final boolean DISP = false; ! private boolean enabled; ! private GLTesselator tesselator; *************** *** 110,114 **** /** Used for selected objects */ public static final float[] SELECTED_COLOR = new float[] {0.7f, 0.3f, 0.1f}; ! /** Used for clipping planes */ --- 110,114 ---- /** Used for selected objects */ public static final float[] SELECTED_COLOR = new float[] {0.7f, 0.3f, 0.1f}; ! /** Used for clipping planes */ *************** *** 132,136 **** /** Used for vertices on edges */ public static final float[] EDGE_ON_COLOR = new float[] {0.2f, 0.3f, 0.6f}; ! /** Used for testing */ public static final float[] UGLY_COLOR = new float[] {0.0f, 1.0f, 1.0f}; --- 132,136 ---- /** Used for vertices on edges */ public static final float[] EDGE_ON_COLOR = new float[] {0.2f, 0.3f, 0.6f}; ! /** Used for testing */ public static final float[] UGLY_COLOR = new float[] {0.0f, 1.0f, 1.0f}; *************** *** 170,175 **** /** The last touched surface */ protected static Surface lastSurface; ! ! /** Flag for the lighted style of view (this is the default) */ --- 170,175 ---- /** The last touched surface */ protected static Surface lastSurface; ! ! /** Flag for the lighted style of view (this is the default) */ *************** *** 265,287 **** /** The y-coordinate of last selection */ protected double y; ! /** * Keeps track of the current EdgeAttributes. */ private EdgeAttributes currentEdgeAttributes; ! /** * Keeps track of the current stippling */ private boolean stipple; ! /** grid enabled */ private boolean gridEnabled; ! private boolean edgesEnabled; ! private boolean showTransparent = true; ! /** What type of entities should be selected */ private int selectionMode; --- 265,287 ---- /** The y-coordinate of last selection */ protected double y; ! /** * Keeps track of the current EdgeAttributes. */ private EdgeAttributes currentEdgeAttributes; ! /** * Keeps track of the current stippling */ private boolean stipple; ! /** grid enabled */ private boolean gridEnabled; ! private boolean edgesEnabled; ! private boolean showTransparent = true; ! /** What type of entities should be selected */ private int selectionMode; *************** *** 325,329 **** /** Maps entities to a color */ private Map<Geometric, float[]> colorMap; ! /** Maps edges to a set of attributes */ private Map<Edge, EdgeAttributes> edgeStyleMap; --- 325,329 ---- /** Maps entities to a color */ private Map<Geometric, float[]> colorMap; ! /** Maps edges to a set of attributes */ private Map<Edge, EdgeAttributes> edgeStyleMap; *************** *** 334,338 **** */ private Set<GlObject> glObjects3D; ! /** * A list of Widget objects displayed on top of the 3d model. --- 334,338 ---- */ private Set<GlObject> glObjects3D; ! /** * A list of Widget objects displayed on top of the 3d model. *************** *** 342,346 **** /** Max number of clipplanes */ private int maxClippingPlanes; ! private HashMap<Surface, Integer> displayLists = new HashMap<Surface, Integer>(); --- 342,346 ---- /** Max number of clipplanes */ private int maxClippingPlanes; ! private HashMap<Surface, Integer> displayLists = new HashMap<Surface, Integer>(); *************** *** 422,426 **** } } ! /** * The constructor --- 422,426 ---- } } ! /** * The constructor *************** *** 428,431 **** --- 428,432 ---- */ public View(Editor editor) { + this.editor = editor; bgColor = BACKGROUND_COLOR; *************** *** 454,458 **** return lastSurface; } ! /** * --- 455,459 ---- return lastSurface; } ! /** * *************** *** 472,484 **** log.debug("[init]"); } ! //ENABLE FOR DEBUG gld.setGL(new DebugGL(gld.getGL())); glu = new GLU(); ! tesselator = new GLTesselator(glu); Project.getInstance().setTesselator(tesselator); ! ! int[] maxplanes = new int[1]; gl.glGetIntegerv(GL.GL_MAX_CLIP_PLANES, maxplanes, 0); --- 473,485 ---- log.debug("[init]"); } ! //ENABLE FOR DEBUG gld.setGL(new DebugGL(gld.getGL())); glu = new GLU(); ! tesselator = new GLTesselator(glu); Project.getInstance().setTesselator(tesselator); ! ! int[] maxplanes = new int[1]; gl.glGetIntegerv(GL.GL_MAX_CLIP_PLANES, maxplanes, 0); *************** *** 520,524 **** gridEnabled = true; } ! /** * Disable grid --- 521,525 ---- gridEnabled = true; } ! /** * Disable grid *************** *** 527,531 **** gridEnabled = false; } ! /** * Enable edges --- 528,532 ---- gridEnabled = false; } ! /** * Enable edges *************** *** 534,538 **** edgesEnabled = true; } ! /** * Disable edges --- 535,539 ---- edgesEnabled = true; } ! /** * Disable edges *************** *** 541,545 **** edgesEnabled = false; } ! /** * --- 542,546 ---- edgesEnabled = false; } ! /** * *************** *** 549,553 **** showTransparent = true; } ! /** * --- 550,554 ---- showTransparent = true; } ! /** * *************** *** 557,561 **** showTransparent = false; } ! /** * --- 558,562 ---- showTransparent = false; } ! /** * *************** *** 567,571 **** Container front = surface.getFrontDomain(); Container back = surface.getBackDomain(); ! Container owner = surface.getOwner(); Collection<Surface> holes = new LinkedList(surface.getHoles()); --- 568,572 ---- Container front = surface.getFrontDomain(); Container back = surface.getBackDomain(); ! Container owner = surface.getOwner(); Collection<Surface> holes = new LinkedList(surface.getHoles()); *************** *** 574,578 **** } surface.erase(); ! for (Surface current : surfaces) { Surface inserted = owner.insert(current); --- 575,579 ---- } surface.erase(); ! for (Surface current : surfaces) { Surface inserted = owner.insert(current); *************** *** 589,593 **** Project.getInstance().changed(Project.getInstance()); } ! /** * Apply edge attributes --- 590,594 ---- Project.getInstance().changed(Project.getInstance()); } ! /** * Apply edge attributes *************** *** 614,623 **** } } ! private void draw(GLAutoDrawable gld) { gl = gld.getGL(); glu = new GLU(); ! // remove old displayLists for (Integer i : deletedLists) { --- 615,624 ---- } } ! private void draw(GLAutoDrawable gld) { gl = gld.getGL(); glu = new GLU(); ! // remove old displayLists for (Integer i : deletedLists) { *************** *** 625,634 **** } deletedLists.clear(); ! boolean hitdetection = false; ! gl.glClearColor(bgColor[0], bgColor[1], bgColor[2], bgColor[3]); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); ! if (picking > 0) { try { --- 626,635 ---- } deletedLists.clear(); ! boolean hitdetection = false; ! gl.glClearColor(bgColor[0], bgColor[1], bgColor[2], bgColor[3]); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); ! if (picking > 0) { try { *************** *** 643,656 **** } } ! initCamera(); gl.glPushMatrix(); picking = 0; ! enableClipplanes(); ! gl.glColor3fv(lineColor, 0); gl.glLineWidth(1.0f); ! Display.selecting(hitdetection); Display.construction(gridEnabled); --- 644,657 ---- } } ! initCamera(); gl.glPushMatrix(); picking = 0; ! enableClipplanes(); ! gl.glColor3fv(lineColor, 0); gl.glLineWidth(1.0f); ! Display.selecting(hitdetection); Display.construction(gridEnabled); *************** *** 678,687 **** extras.addAll(tempVertices); Display.extras(extras); ! Collection<ClippingPlane> clips = Project.getInstance().getCurrentCamera().getClipplanes(); ! Display.clips(clips); ! Display.glos(glObjects3D); try { --- 679,688 ---- extras.addAll(tempVertices); Display.extras(extras); ! Collection<ClippingPlane> clips = Project.getInstance().getCurrentCamera().getClipplanes(); ! Display.clips(clips); ! Display.glos(glObjects3D); try { *************** *** 693,704 **** Display.intersecting(false); ! gl.glEnable(GL.GL_DEPTH_TEST); ! disableClipplanes(); ! //draw the clipping planes ! ! for (ClippingPlane current : clips) { Collection selection = Selection.primary(); --- 694,705 ---- Display.intersecting(false); ! gl.glEnable(GL.GL_DEPTH_TEST); ! disableClipplanes(); ! //draw the clipping planes ! ! for (ClippingPlane current : clips) { Collection selection = Selection.primary(); *************** *** 721,726 **** } } ! ! gl.glMatrixMode(GL.GL_PROJECTION); gl.glDisable(GL.GL_DEPTH_TEST); --- 722,727 ---- } } ! ! gl.glMatrixMode(GL.GL_PROJECTION); gl.glDisable(GL.GL_DEPTH_TEST); *************** *** 735,743 **** gl.glPushMatrix(); gl.glLoadIdentity(); ! ! ! Geometric candidate = null; ! Collection<Geometric> selection = Selection.primary(); if (!selection.isEmpty()) { --- 736,744 ---- gl.glPushMatrix(); gl.glLoadIdentity(); ! ! ! Geometric candidate = null; ! Collection<Geometric> selection = Selection.primary(); if (!selection.isEmpty()) { *************** *** 751,769 **** } } ! //drawObscureBox(); ! drawSpacePath(hitdetection); ! for (Widget widget : widgets) { widget.display(gl, glu, hitdetection); } ! gl.glMatrixMode(GL.GL_PROJECTION); gl.glPopMatrix(); gl.glMatrixMode(GL.GL_MODELVIEW); gl.glPopMatrix(); ! ! gl.glPopMatrix(); if (hitdetection) { --- 752,770 ---- } } ! //drawObscureBox(); ! drawSpacePath(hitdetection); ! for (Widget widget : widgets) { widget.display(gl, glu, hitdetection); } ! gl.glMatrixMode(GL.GL_PROJECTION); gl.glPopMatrix(); gl.glMatrixMode(GL.GL_MODELVIEW); gl.glPopMatrix(); ! ! gl.glPopMatrix(); if (hitdetection) { *************** *** 778,782 **** } } ! /** * The function responsible for drawing at each update --- 779,783 ---- } } ! /** * The function responsible for drawing at each update *************** *** 794,798 **** } } ! /** * disable all clipping planes --- 795,799 ---- } } ! /** * disable all clipping planes *************** *** 885,892 **** } } ! private void drawObscureBox(double x, double y, double w, double h, float l, float alpha) { ! gl.glColor4f(l, l, l, alpha); gl.glPushMatrix(); --- 886,893 ---- } } ! private void drawObscureBox(double x, double y, double w, double h, float l, float alpha) { ! gl.glColor4f(l, l, l, alpha); gl.glPushMatrix(); *************** *** 905,909 **** gl.glPopMatrix(); } ! private void drawBox(double x, double y, double w, double h) { --- 906,910 ---- gl.glPopMatrix(); } ! private void drawBox(double x, double y, double w, double h) { *************** *** 915,920 **** gl.glEnd(); } ! ! private void drawObscureBox() { double w = width / 10; --- 916,921 ---- gl.glEnd(); } ! ! private void drawObscureBox() { double w = width / 10; *************** *** 930,934 **** } } ! private void drawPath(LinkedList<Container> path, boolean selecting) { LinkedList<Label> labels = new LinkedList<Label>(); --- 931,935 ---- } } ! private void drawPath(LinkedList<Container> path, boolean selecting) { LinkedList<Label> labels = new LinkedList<Label>(); *************** *** 938,944 **** labels.add(new Label("/")); } ! Selection selection = Selection.primary(); ! if (selection.size() == 1) { Geometric geometric = selection.iterator().next(); --- 939,945 ---- labels.add(new Label("/")); } ! Selection selection = Selection.primary(); ! if (selection.size() == 1) { Geometric geometric = selection.iterator().next(); *************** *** 949,953 **** } } ! { double w = 0; --- 950,954 ---- } } ! { double w = 0; *************** *** 961,965 **** drawBox(x, y, w, h); } ! int x = 5; int y = (int) height - 15; --- 962,966 ---- drawBox(x, y, w, h); } ! int x = 5; int y = (int) height - 15; *************** *** 969,973 **** x += label.width() + 6; } ! gl.glColor3f(1, 1, 1); gl.glPushMatrix(); --- 970,974 ---- x += label.width() + 6; } ! gl.glColor3f(1, 1, 1); gl.glPushMatrix(); *************** *** 984,988 **** gl.glPopMatrix(); } ! /** * Draw the space path --- 985,989 ---- gl.glPopMatrix(); } ! /** * Draw the space path *************** *** 1070,1074 **** frontLabelSelect = false; } ! /** * Put labels on a Surface --- 1071,1075 ---- frontLabelSelect = false; } ! /** * Put labels on a Surface *************** *** 1104,1108 **** Vertex backTextAnchor; Vertex mid; ! if (!facingFront(surface)) { frontTextAnchor = new Vertex(front.getX(), --- 1105,1109 ---- Vertex backTextAnchor; Vertex mid; ! if (!facingFront(surface)) { frontTextAnchor = new Vertex(front.getX(), *************** *** 1120,1141 **** front.getY() + 4, front.getZ()); } ! double distance = mid.getX() - front.getX(); ! mid.setX(mid.getX() - distance); frontTextAnchor.setX(frontTextAnchor.getX() - distance); backTextAnchor.setX(backTextAnchor.getX() - distance); ! Display.paint(mid, new float[]{0, 0, 0}, 5); if (clickable) { //Name must be "front" drawClickBox(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontWidth, 10, ! "front"); //Name must be "back" drawClickBox(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backWidth, 10, ! "back"); } else { double fcb = 0; --- 1121,1143 ---- front.getY() + 4, front.getZ()); } ! double distance = mid.getX() - front.getX(); ! mid.setX(mid.getX() - distance); frontTextAnchor.setX(frontTextAnchor.getX() - distance); backTextAnchor.setX(backTextAnchor.getX() - distance); ! Display.paint(mid, new float[]{0, 0, 0}, 5); + if (clickable) { //Name must be "front" drawClickBox(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontWidth, 10, ! "front"); //Name must be "back" drawClickBox(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backWidth, 10, ! "back"); } else { double fcb = 0; *************** *** 1152,1156 **** } drawString(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontName); double bcb = 0; if (backLabelSelect) { --- 1154,1158 ---- } drawString(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontName); double bcb = 0; if (backLabelSelect) { *************** *** 1168,1175 **** drawString(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backName); } } ! /** * Put labels on a Surface --- 1170,1177 ---- drawString(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backName); } } ! /** * Put labels on a Surface *************** *** 1206,1218 **** if (!facingFront(surface)) { ! frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), ! front.getY() - 17, front.getZ()); backTextAnchor = new Vertex(front.getX() - (backWidth / 2), ! front.getY() + 7, front.getZ()); } else { frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), ! front.getY() + 7, front.getZ()); backTextAnchor = new Vertex(front.getX() - (backWidth / 2), ! front.getY() - 17, front.getZ()); } --- 1208,1220 ---- if (!facingFront(surface)) { ! frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), ! front.getY() - 17, front.getZ()); backTextAnchor = new Vertex(front.getX() - (backWidth / 2), ! front.getY() + 7, front.getZ()); } else { frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), ! front.getY() + 7, front.getZ()); backTextAnchor = new Vertex(front.getX() - (backWidth / 2), ! front.getY() - 17, front.getZ()); } *************** *** 1220,1229 **** //Name must be "front" drawClickBox(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontWidth, 10, ! "front"); //Name must be "back" drawClickBox(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backWidth, 10, ! "back"); //Name must be "bar" pushName(gl, "bar"); --- 1222,1229 ---- //Name must be "front" drawClickBox(frontTextAnchor.getX(), frontTextAnchor.getY(), ! frontTextAnchor.getZ(), frontWidth, 10, "front"); //Name must be "back" drawClickBox(backTextAnchor.getX(), backTextAnchor.getY(), ! backTextAnchor.getZ(), backWidth, 10, "back"); //Name must be "bar" pushName(gl, "bar"); *************** *** 1373,1377 **** objectTable = null; } ! /** * Process Selection --- 1373,1377 ---- objectTable = null; } ! /** * Process Selection *************** *** 1412,1416 **** Object object = null; Collection<Edge> edges = new HashSet<Edge>(); ! for (int i = 0; i < hits; i++) { names = selectBuffer.get(bufferOffset); --- 1412,1416 ---- Object object = null; Collection<Edge> edges = new HashSet<Edge>(); ! for (int i = 0; i < hits; i++) { names = selectBuffer.get(bufferOffset); *************** *** 1726,1734 **** public Object getObjectAtPoint(double x, double y, Collection unWantedEntities, int mode, Plane xy) { ! if (!enabled) { return null; } ! this.x = x; this.y = y; --- 1726,1734 ---- public Object getObjectAtPoint(double x, double y, Collection unWantedEntities, int mode, Plane xy) { ! if (!enabled) { return null; } ! this.x = x; this.y = y; *************** *** 1743,1747 **** Object object = processSelect(unWantedEntities, mode == INTERSECTIONS, xy); clearNames(); ! if (mode == View.OBJECTS) { if (object instanceof Geometric) { --- 1743,1747 ---- Object object = processSelect(unWantedEntities, mode == INTERSECTIONS, xy); clearNames(); ! if (mode == View.OBJECTS) { if (object instanceof Geometric) { *************** *** 1993,1997 **** colorMap.remove(e); } ! /** * Sets a new style for a given edge --- 1993,1997 ---- colorMap.remove(e); } ! /** * Sets a new style for a given edge *************** *** 2109,2113 **** return glObjects3D.remove(glo); } ! /** * remove a whole set of GLObject --- 2109,2113 ---- return glObjects3D.remove(glo); } ! /** * remove a whole set of GLObject *************** *** 2133,2137 **** this.glObjects3D.add(glo); } ! /** * --- 2133,2137 ---- this.glObjects3D.add(glo); } ! /** * *************** *** 2141,2145 **** widgets.add(widget); } ! /** * --- 2141,2145 ---- widgets.add(widget); } ! /** * |
|
From: Michael L. <he...@us...> - 2009-05-25 10:21:14
|
Update of /cvsroot/bprocessor/tools/jogl/macosx In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11249/jogl/macosx Modified Files: libjogl.jnilib libjogl_cg.jnilib libjogl_awt.jnilib Added Files: libgluegen-rt.jnilib Log Message: Index: libjogl.jnilib =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/macosx/libjogl.jnilib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsVOrexo and /tmp/cvsreUHRH differ --- NEW FILE: libgluegen-rt.jnilib --- (This appears to be a binary file; contents omitted.) Index: libjogl_awt.jnilib =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/macosx/libjogl_awt.jnilib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsZqnwhw and /tmp/cvszcM3FP differ Index: libjogl_cg.jnilib =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/macosx/libjogl_cg.jnilib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsjioFsw and /tmp/cvsB0KdTP differ |
|
From: Michael L. <he...@us...> - 2009-05-25 10:16:09
|
Update of /cvsroot/bprocessor/tools/jogl/win32 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10473/jogl/win32 Modified Files: jogl_awt.dll jogl.dll jogl_cg.dll Added Files: gluegen-rt.dll Log Message: New jogl --- NEW FILE: gluegen-rt.dll --- (This appears to be a binary file; contents omitted.) Index: jogl_awt.dll =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/win32/jogl_awt.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsRUbsKW and /tmp/cvs6eZ6Vm differ Index: jogl_cg.dll =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/win32/jogl_cg.dll,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvs8mcjoX and /tmp/cvs0rX6An differ Index: jogl.dll =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/win32/jogl.dll,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvs1QJKDV and /tmp/cvsTT7rSl differ |
|
From: Michael L. <he...@us...> - 2009-05-25 10:16:01
|
Update of /cvsroot/bprocessor/tools/jogl In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10473/jogl Modified Files: jogl.jar Added Files: gluegen-rt.jar Log Message: New jogl Index: jogl.jar =================================================================== RCS file: /cvsroot/bprocessor/tools/jogl/jogl.jar,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvshOGATZ and /tmp/cvsMzxZkl differ --- NEW FILE: gluegen-rt.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2009-05-25 10:15:50
|
Update of /cvsroot/bprocessor/gl In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10448 Modified Files: .classpath Log Message: New jogl Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/gl/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .classpath 11 Sep 2006 20:38:59 -0000 1.4 --- .classpath 25 May 2009 10:15:42 -0000 1.5 *************** *** 7,10 **** --- 7,11 ---- <classpathentry kind="lib" path="/tools/jogl/jogl.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/bscript"/> + <classpathentry kind="lib" path="/tools/jogl/gluegen-rt.jar"/> <classpathentry kind="output" path="build"/> </classpath> |
|
From: Michael L. <he...@us...> - 2009-05-19 10:33:55
|
Update of /cvsroot/bprocessor/model/src/etc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32130/src/etc Modified Files: bprocessor.xsd Log Message: Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** bprocessor.xsd 5 Feb 2008 14:21:08 -0000 1.42 --- bprocessor.xsd 19 May 2009 10:33:45 -0000 1.43 *************** *** 197,200 **** --- 197,209 ---- </xsd:complexType> + <xsd:complexType name="GridType"> + <xsd:complexContent> + <xsd:extension base="ConstructorType"> + <xsd:attribute name="size" type="xsd:float" use="optional"/> + <xsd:attribute name="distance" type="xsd:float" use="optional"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:complexType name="RelationType"> |
|
From: Michael L. <he...@us...> - 2009-05-19 10:33:54
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32130/src/net/sourceforge/bprocessor/model Modified Files: Grid.java Project.java Persistence.java Log Message: Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Persistence.java 5 Feb 2008 14:21:08 -0000 1.75 --- Persistence.java 19 May 2009 10:33:45 -0000 1.76 *************** *** 19,22 **** --- 19,23 ---- import net.sourceforge.bprocessor.model.xml.EdgeType; import net.sourceforge.bprocessor.model.xml.EntityType; + import net.sourceforge.bprocessor.model.xml.GridType; import net.sourceforge.bprocessor.model.xml.IDTransformType; import net.sourceforge.bprocessor.model.xml.IntegerType; *************** *** 53,56 **** --- 54,58 ---- import net.sourceforge.bprocessor.model.xml.impl.DoubleTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.EdgeImpl; + import net.sourceforge.bprocessor.model.xml.impl.GridTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.IDTransformTypeImpl; import net.sourceforge.bprocessor.model.xml.impl.IntegerTypeImpl; *************** *** 402,405 **** --- 404,409 ---- } else if (current instanceof LineType) { c = internalizeLine((LineType)current, mapper, xmls); + } else if (current instanceof GridType) { + c = internalizeGrid((GridType) current, mapper, xmls); } else { log.info("Const were " + current.getClass()); *************** *** 565,568 **** --- 569,584 ---- } + private static Grid internalizeGrid(GridType xml, Map mapper, Collection xmls) { + Grid res = new Grid(); + res.setActive(xml.isActive()); + res.setDistance(xml.getDistance()); + res.setSize(xml.getSize()); + res.setId(xml.getProgid()); + mapper.put(xml.getId(), res); + res.setOrigin(internalizeVertex(null, xml.getVertex(), new HashMap(), new LinkedList())); + xmls.add(xml); + return res; + } + /** * *************** *** 1170,1173 **** --- 1186,1191 ---- } else if (constructor instanceof CoordinateSystem) { return externalizeCoordinateSystem((CoordinateSystem)constructor, map); + } else if (constructor instanceof Grid) { + return externalizeGrid((Grid) constructor, map); } else { log.error(constructor + " were of unknown type"); *************** *** 1223,1226 **** --- 1241,1259 ---- return xml; } + + private static GridType externalizeGrid(Grid grid, Map map) { + GridType xml = new GridTypeImpl(); + xml.setId(counter++); + + xml.setProgid(grid.getId()); + xml.setActive(grid.isActive()); + xml.setDistance((float) grid.getDistance()); + xml.setSize((float) grid.getSize()); + + xml.setVertex(externalizeVertex(grid.getOrigin(), new HashMap())); + + map.put(grid, xml); + return xml; + } /** Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Grid.java 18 May 2009 07:10:22 -0000 1.5 --- Grid.java 19 May 2009 10:33:45 -0000 1.6 *************** *** 15,19 **** public class Grid extends Constructor { private double size; ! private double delta; /** --- 15,19 ---- public class Grid extends Constructor { private double size; ! private double distance; /** *************** *** 24,28 **** super(new Vertex(0, 0, 0)); size = 40.0; ! delta = 1.0; } --- 24,28 ---- super(new Vertex(0, 0, 0)); size = 40.0; ! distance = 1.0; } *************** *** 31,37 **** * @return size */ ! public double size() { return size; } /** --- 31,45 ---- * @return size */ ! public double getSize() { return size; } + + /** + * + * @param value new size + */ + public void setSize(double value) { + size = value; + } /** *************** *** 39,44 **** * @return delta */ ! public double delta() { ! return delta; } --- 47,60 ---- * @return delta */ ! public double getDistance() { ! return distance; ! } ! ! /** ! * ! * @param value new distance ! */ ! public void setDistance(double value) { ! distance = value; } *************** *** 52,56 **** LinkedList<Attribute> attributes = new LinkedList(); attributes.add(new Attribute("Size", new Double(size))); ! attributes.add(new Attribute("Distance", new Double(delta))); return attributes; } --- 68,72 ---- LinkedList<Attribute> attributes = new LinkedList(); attributes.add(new Attribute("Size", new Double(size))); ! attributes.add(new Attribute("Distance", new Double(distance))); return attributes; } *************** *** 62,66 **** size = (Double)(current.getValue()); } else if (current.getName().equals("Distance")) { ! delta = (Double)(current.getValue()); } } --- 78,82 ---- size = (Double)(current.getValue()); } else if (current.getName().equals("Distance")) { ! distance = (Double)(current.getValue()); } } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.175 retrieving revision 1.176 diff -C2 -d -r1.175 -r1.176 *** Project.java 19 May 2009 07:02:59 -0000 1.175 --- Project.java 19 May 2009 10:33:45 -0000 1.176 *************** *** 318,322 **** super(); staticObservers = new LinkedList(); ! initialize(); } --- 318,322 ---- super(); staticObservers = new LinkedList(); ! reset(); } *************** *** 332,338 **** scheduledObservers = new LinkedList(); - undoStack = new Stack(); - redoStack = new Stack(); - catalog = new LinkedList(); --- 332,335 ---- *************** *** 383,386 **** --- 380,392 ---- /** + * Reset everything + */ + public void reset() { + clear(); + undoStack = new Stack(); + redoStack = new Stack(); + } + + /** * Clear all objects */ *************** *** 901,905 **** public void load(File file) throws Exception { Selection.primary().clear(); ! clear(); Persistence.load(file); makeClean(); --- 907,911 ---- public void load(File file) throws Exception { Selection.primary().clear(); ! reset(); Persistence.load(file); makeClean(); *************** *** 915,919 **** public void close() { Selection.primary().clear(); ! this.clear(); } --- 921,925 ---- public void close() { Selection.primary().clear(); ! reset(); } |
|
From: Michael L. <he...@us...> - 2009-05-19 10:33:53
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32121/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** Display.java 15 May 2009 12:46:05 -0000 1.89 --- Display.java 19 May 2009 10:33:42 -0000 1.90 *************** *** 720,724 **** private static void draw(Line line) { ! Edge edge = line.edge(grid.size()); //gl.glDepthMask(false); --- 720,724 ---- private static void draw(Line line) { ! Edge edge = line.edge(grid.getSize()); //gl.glDepthMask(false); *************** *** 812,816 **** for (Constructor current : constructors) { if (!excluded.contains(current)) { ! Collection<Edge> guides = current.guides(grid.size()); selectEdges(guides); if (current instanceof CoordinateSystem) { --- 812,816 ---- for (Constructor current : constructors) { if (!excluded.contains(current)) { ! Collection<Edge> guides = current.guides(grid.getSize()); selectEdges(guides); if (current instanceof CoordinateSystem) { *************** *** 1317,1322 **** private static void draw(Grid grid) { ! double size = grid.size(); ! double delta = grid.delta(); CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem(); Vertex origin = system.getOrigin(); --- 1317,1322 ---- private static void draw(Grid grid) { ! double size = grid.getSize(); ! double delta = grid.getDistance(); CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem(); Vertex origin = system.getOrigin(); |
|
From: Michael L. <he...@us...> - 2009-05-19 07:03:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31058/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Adjusted PPLM export Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -d -r1.174 -r1.175 *** Project.java 18 May 2009 09:31:26 -0000 1.174 --- Project.java 19 May 2009 07:02:59 -0000 1.175 *************** *** 1339,1347 **** if (envelope.size() > 0) { for (Surface current : envelope) { - no++; locs.add(createLocationModel(space, level, locations, openings, current, no)); } } else { ! locs.add(createLocationModel(space, level, locations, openings, null, no)); } return locs; --- 1339,1347 ---- if (envelope.size() > 0) { for (Surface current : envelope) { locs.add(createLocationModel(space, level, locations, openings, current, no)); + no++; } } else { ! locs.add(createLocationModel(space, level, locations, openings, null, 0)); } return locs; *************** *** 1352,1358 **** Surface surface, int no) { Location location = new Location(); ! if (surface != null) { location.setId(space.getName() + "-" + no); } else { location.setId(space.getName()); } --- 1352,1359 ---- Surface surface, int no) { Location location = new Location(); ! if (no > 0) { location.setId(space.getName() + "-" + no); } else { + System.out.println("using just the name " + space.getName()); location.setId(space.getName()); } |
|
From: Michael L. <he...@us...> - 2009-05-18 09:31:35
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28544/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.173 retrieving revision 1.174 diff -C2 -d -r1.173 -r1.174 *** Project.java 15 May 2009 12:46:08 -0000 1.173 --- Project.java 18 May 2009 09:31:26 -0000 1.174 *************** *** 1352,1356 **** Surface surface, int no) { Location location = new Location(); ! location.setId(space.getName() + no); if (level == 1) { location.setDescription("Site"); --- 1352,1360 ---- Surface surface, int no) { Location location = new Location(); ! if (surface != null) { ! location.setId(space.getName() + "-" + no); ! } else { ! location.setId(space.getName()); ! } if (level == 1) { location.setDescription("Site"); |
|
From: Michael L. <he...@us...> - 2009-05-18 07:10:33
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9079/src/net/sourceforge/bprocessor/model Modified Files: Grid.java Log Message: Grid attributes Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Grid.java 15 May 2009 12:46:08 -0000 1.4 --- Grid.java 18 May 2009 07:10:22 -0000 1.5 *************** *** 50,58 **** /** {@inheritDoc} */ public List<Attribute> getAttributes() { ! return new LinkedList(); } /** {@inheritDoc} */ public void setAttributes(List<Attribute> attributes) { } --- 50,68 ---- /** {@inheritDoc} */ public List<Attribute> getAttributes() { ! LinkedList<Attribute> attributes = new LinkedList(); ! attributes.add(new Attribute("Size", new Double(size))); ! attributes.add(new Attribute("Distance", new Double(delta))); ! return attributes; } /** {@inheritDoc} */ public void setAttributes(List<Attribute> attributes) { + for (Attribute current : attributes) { + if (current.getName().equals("Size")) { + size = (Double)(current.getValue()); + } else if (current.getName().equals("Distance")) { + delta = (Double)(current.getValue()); + } + } } |
|
From: Michael L. <he...@us...> - 2009-05-15 12:46:28
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11876/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Refactored grid Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** Display.java 15 May 2009 08:01:39 -0000 1.88 --- Display.java 15 May 2009 12:46:05 -0000 1.89 *************** *** 659,665 **** } else if (constructor instanceof Line) { paint((Line) constructor, middleblue); ! } else if (constructor instanceof Grid) { ! draw((Grid) constructor); ! } } --- 659,663 ---- } else if (constructor instanceof Line) { paint((Line) constructor, middleblue); ! } } *************** *** 1148,1157 **** if (space == active) { if (construction()) { ! disableClipplanes(); ! gl.glDepthMask(false); ! draw(grid); ! gl.glDepthMask(true); ! paintConstructors(constructors); ! enableClipplanes(); } } --- 1146,1163 ---- if (space == active) { if (construction()) { ! Grid grid = null; ! for (Constructor constructor : constructors) { ! if (constructor instanceof Grid) { ! grid = (Grid) constructor; ! } ! disableClipplanes(); ! if (grid != null) { ! gl.glDepthMask(false); ! draw(grid); ! gl.glDepthMask(true); ! } ! paintConstructors(constructors); ! enableClipplanes(); ! } } } |
|
From: Michael L. <he...@us...> - 2009-05-15 12:46:12
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11887/src/net/sourceforge/bprocessor/model Modified Files: Grid.java Project.java Log Message: Refactored grid Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Grid.java 14 May 2009 12:28:12 -0000 1.3 --- Grid.java 15 May 2009 12:46:08 -0000 1.4 *************** *** 61,63 **** --- 61,68 ---- return "Grid"; } + + /** {@inheritDoc} */ + public String getName() { + return "Grid"; + } } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** Project.java 15 May 2009 11:17:48 -0000 1.172 --- Project.java 15 May 2009 12:46:08 -0000 1.173 *************** *** 359,364 **** world.add(activeCoordinateSystem); ! // Grid grid = new Grid(); ! // world.add(grid); globals = new ParameterBlock(); --- 359,364 ---- world.add(activeCoordinateSystem); ! Grid grid = new Grid(); ! world.add(grid); globals = new ParameterBlock(); |
|
From: Michael L. <he...@us...> - 2009-05-15 11:19:12
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32318/src/net/sourceforge/bprocessor/model Modified Files: Project.java Container.java Log Message: Fixed tesselation Index: Container.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Container.java 12 May 2009 12:19:05 -0000 1.24 --- Container.java 15 May 2009 11:17:48 -0000 1.25 *************** *** 52,55 **** --- 52,82 ---- protected long nextConstructorId; + /** + * + * @param surfaces list of surfaces to export + * @param out PrintStream to export to + */ + public static void export(List<Surface> surfaces, PrintStream out) { + List<Edge> edges = new LinkedList(Surface.edges(surfaces)); + List<Vertex> vertices = new LinkedList(Edge.vertices(edges)); + + HashMap<Vertex, Integer> vmap = new HashMap(); + int count = 1; + for (Vertex current : vertices) { + vmap.put(current, count++); + out.println("v " + current.getX() + + " " + current.getY() + " " + current.getZ()); + } + for (Surface current : surfaces) { + List<Vertex> verts = current.getVertices(); + out.print("f"); + for (Vertex v : verts) { + int i = vmap.get(v); + out.print(" " + i); + } + out.println(); + } + } + /** *************** *** 1552,1569 **** } } - - List<Surface> unreachable = new LinkedList(); - for (Surface current : envelope) { - if (!mark.contains(current)) { - unreachable.add(current); - } - } } /** * ! * @param out PrintStream */ ! public void exportTesselated(PrintStream out) { Tesselator tesselator = Project.getInstance().getTesselator(); Container holder = --- 1579,1590 ---- } } } + /** * ! * @return Container */ ! public Container tesselate() { Tesselator tesselator = Project.getInstance().getTesselator(); Container holder = *************** *** 1596,1600 **** } interior.orient(interior.getEnvelope().iterator().next()); ! interior.export(out); //getOwner().add(holder); //Project.getInstance().changed(Project.getInstance()); --- 1617,1630 ---- } interior.orient(interior.getEnvelope().iterator().next()); ! return holder; ! } ! ! /** ! * ! * @param out PrintStream ! */ ! public void exportTesselated(PrintStream out) { ! Container tesselation = tesselate(); ! tesselation.export(out); //getOwner().add(holder); //Project.getInstance().changed(Project.getInstance()); *************** *** 1606,1629 **** */ public void export(PrintStream out) { ! List<Surface> surfaces = new LinkedList(getEnvelope()); ! List<Edge> edges = new LinkedList(Surface.edges(surfaces)); ! List<Vertex> vertices = new LinkedList(Edge.vertices(edges)); ! ! HashMap<Vertex, Integer> vmap = new HashMap(); ! int count = 1; ! for (Vertex current : vertices) { ! vmap.put(current, count++); ! out.println("v " + current.getX() + ! " " + current.getY() + " " + current.getZ()); ! } ! for (Surface current : surfaces) { ! List<Vertex> verts = current.getVertices(); ! out.print("f"); ! for (Vertex v : verts) { ! int i = vmap.get(v); ! out.print(" " + i); ! } ! out.println(); ! } } } --- 1636,1641 ---- */ public void export(PrintStream out) { ! List<Surface> surfaces = new LinkedList(getSurfaces()); ! export(surfaces, out); } } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** Project.java 15 May 2009 10:18:12 -0000 1.171 --- Project.java 15 May 2009 11:17:48 -0000 1.172 *************** *** 1601,1608 **** } } for (Container current : constructs) { System.out.println("-- " + current.getName() + " --"); ! current.exportTesselated(printer); } } --- 1601,1611 ---- } } + List<Surface> surfaces = new LinkedList(); for (Container current : constructs) { System.out.println("-- " + current.getName() + " --"); ! Container tesselation = current.tesselate(); ! surfaces.addAll(tesselation.getSurfaces()); } + Container.export(surfaces, printer); } |
|
From: Michael L. <he...@us...> - 2009-05-15 10:19:38
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22534/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Observing Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** Project.java 15 May 2009 09:51:39 -0000 1.170 --- Project.java 15 May 2009 10:18:12 -0000 1.171 *************** *** 317,320 **** --- 317,321 ---- public Project() { super(); + staticObservers = new LinkedList(); initialize(); } *************** *** 328,333 **** script = new Description(""); - staticObservers = new LinkedList(); - observers = new LinkedList(); scheduledObservers = new LinkedList(); --- 329,332 ---- |
|
From: Michael L. <he...@us...> - 2009-05-15 09:52:13
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17596/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: A Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** Project.java 15 May 2009 09:10:39 -0000 1.169 --- Project.java 15 May 2009 09:51:39 -0000 1.170 *************** *** 1319,1323 **** } ! private List<Edge> bounds(List<Surface> surfaces) { Command.Inverse inv = new Command.Inverse(surfaces); --- 1319,1323 ---- } ! @SuppressWarnings("unused") private List<Edge> bounds(List<Surface> surfaces) { Command.Inverse inv = new Command.Inverse(surfaces); |
|
From: Michael L. <he...@us...> - 2009-05-15 09:13:31
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/constraints In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13580/src/net/sourceforge/bprocessor/model/constraints Removed Files: OffsetConstraint.java package.html Log Message: A --- package.html DELETED --- --- OffsetConstraint.java DELETED --- |
|
From: Michael L. <he...@us...> - 2009-05-15 09:13:26
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13580/src/net/sourceforge/bprocessor/model Modified Files: Project.java Removed Files: Constraint.java Log Message: A --- Constraint.java DELETED --- Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** Project.java 15 May 2009 08:01:43 -0000 1.168 --- Project.java 15 May 2009 09:10:39 -0000 1.169 *************** *** 80,84 **** /** The observers */ ! private List observers; /** Static observers */ --- 80,84 ---- /** The observers */ ! private List<Observer> observers; /** Static observers */ *************** *** 109,115 **** private long nextCameraID; - /** The constraints */ - private Collection constraints; - /** The globals */ private ParameterBlock globals; --- 109,112 ---- *************** *** 154,160 **** private String exportPath; - - /** The copy buffer */ - private Collection<Geometric> copyBuffer; /** Flag set when updating */ --- 151,154 ---- *************** *** 333,347 **** exportPath = "b-processor-export.obj"; script = new Description(""); undoStack = new Stack(); redoStack = new Stack(); ! copyBuffer = new LinkedList(); ! catalog = new LinkedList<Component>(); currentCamera = new Camera("(Current)", new double[]{6, 3, 2}, new double[]{7, -21, 24}, new double[]{0, 0, 1}, Camera.PERSPECTIVE); ! observers = new LinkedList(); ! staticObservers = new LinkedList(); ! scheduledObservers = new LinkedList(); world = Space.createFunctionalSpace("World"); world.setId(new Long(0)); --- 327,347 ---- exportPath = "b-processor-export.obj"; script = new Description(""); + + staticObservers = new LinkedList(); + + observers = new LinkedList(); + scheduledObservers = new LinkedList(); + undoStack = new Stack(); redoStack = new Stack(); ! ! catalog = new LinkedList(); ! currentCamera = new Camera("(Current)", new double[]{6, 3, 2}, new double[]{7, -21, 24}, new double[]{0, 0, 1}, Camera.PERSPECTIVE); ! ! world = Space.createFunctionalSpace("World"); world.setId(new Long(0)); *************** *** 363,368 **** // world.add(grid); - - constraints = new LinkedList(); globals = new ParameterBlock(); globals.putDouble("pi", Math.PI); --- 363,366 ---- *************** *** 545,600 **** /** - * Add a constraint - * @param constraint The constraint to add - */ - public void add(Constraint constraint) { - constraints.add(constraint); - constraint.setId(new Long(constraints.size())); - } - - /** - * Remove a constraint and call change - * @param constraint The constraint to remove - */ - public void delete(Constraint constraint) { - remove(constraint); - } - - /** - * Remove a constraint dont call change - * @param constraint The constraint to remove - */ - private void remove(Constraint constraint) { - constraints.remove(constraint); - constraint.setId(null); - } - - /** - * Return constraints - * @return The constraints - */ - public Collection getConstraints() { - return constraints; - } - - /** - * Update all constraints related to entity - * @param entity The changed entity - */ - public void updateConstraints(Entity entity) { - // TODO implement general constraint updating mechanism - // that ensures that constraints are updated in correct - // order - - Iterator iter = constraints.iterator(); - while (iter.hasNext()) { - Constraint current = (Constraint) iter.next(); - if (current.depends(entity)) { - current.update(entity); - } - } - } - - /** * Handle the fact that a collection of vertices has been changed. * Re-evaluate constraints and modellors related to the vertices and connected --- 543,546 ---- *************** *** 639,649 **** } { - Iterator iter = surfaces.iterator(); - while (iter.hasNext()) { - Surface current = (Surface) iter.next(); - updateConstraints(current); - } - } - { Iterator iter = spaces.iterator(); while (iter.hasNext()) { --- 585,588 ---- *************** *** 1263,1274 **** } - /** - * getter for the copy buffer - * @return The copyBuffer - */ - public Collection<Geometric> getCopyBuffer() { - return copyBuffer; - } - /** * @return the classificatioTypes --- 1202,1205 ---- *************** *** 1295,1299 **** /** ! * Add a component to til list of catalog objects * @param lo the component object to add */ --- 1226,1230 ---- /** ! * Add a component to list of catalog objects * @param lo the component object to add */ *************** *** 1307,1311 **** /** ! * Add a component to til list of library objects * @param lo the component to add */ --- 1238,1242 ---- /** ! * Add a component to list of library objects * @param lo the component to add */ |
|
From: Michael L. <he...@us...> - 2009-05-15 09:11:04
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13597/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: A Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** GUI.java 12 May 2009 11:51:22 -0000 1.108 --- GUI.java 15 May 2009 09:10:42 -0000 1.109 *************** *** 25,45 **** import net.sourceforge.bprocessor.gui.treeview.LibraryTreeView; import net.sourceforge.bprocessor.gui.treeview.SpaceTreeView; - import net.sourceforge.bprocessor.model.CoordinateSystem; - import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Geometric; - import net.sourceforge.bprocessor.model.Line; import net.sourceforge.bprocessor.model.Persistence; - import net.sourceforge.bprocessor.model.Point; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Container; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.model.modellor.Modellor; import java.util.Collection; - import java.util.Iterator; - import java.util.LinkedList; import java.util.Set; import java.util.HashSet; --- 25,37 ---- *************** *** 421,433 **** editCopy.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! Selection s = Selection.primary(); ! Collection<Geometric> copy = Project.getInstance().getCopyBuffer(); ! copy.clear(); ! //FIXME check if it is legal to copy the selected geometry ! if (s.size() == 1) { ! copy.addAll(s); ! } else { ! GUI.getInstance().alert("Only single geometry can be copied"); ! } } }); --- 413,417 ---- editCopy.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); *************** *** 441,479 **** editPaste.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! LinkedList<Geometric> copied = new LinkedList<Geometric>(); ! Collection<Geometric> c = Project.getInstance().getCopyBuffer(); ! Iterator<Geometric> iter = c.iterator(); ! while (iter.hasNext()) { ! Geometric g = iter.next(); ! if (g instanceof Container) { ! // nothing ! } else if (g instanceof Edge) { ! Edge copy = ((Edge)g).copy(); ! g.getOwner().add(copy); ! copied.add(copy); ! } else if (g instanceof Vertex) { ! Vertex copy = ((Vertex)g).copy(); ! g.getOwner().add(copy); ! copied.add(copy); ! } else if (g instanceof Surface) { ! Surface copy = ((Surface)g).copy(g.getOwner()); ! copied.add(copy); ! } else if (g instanceof Line) { ! Line copy = ((Line)g).copy(); ! g.getOwner().add(copy); ! copied.add(copy); ! } else if (g instanceof Point) { ! Point copy = ((Point)g).copy(); ! g.getOwner().add(copy); ! copied.add(copy); ! } else if (g instanceof CoordinateSystem) { ! CoordinateSystem copy = ((CoordinateSystem)g).copy(); ! g.getOwner().add(copy); ! copied.add(copy); ! } ! } ! Selection.primary().set(copied); ! Project.getInstance().changed(Project.getInstance()); ! Project.getInstance().checkpoint(); } }); --- 425,429 ---- editPaste.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); |
|
From: Michael L. <he...@us...> - 2009-05-15 08:01:57
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5492/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: Refactoring initialization Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** Display.java 14 May 2009 12:28:09 -0000 1.87 --- Display.java 15 May 2009 08:01:39 -0000 1.88 *************** *** 659,663 **** } else if (constructor instanceof Line) { paint((Line) constructor, middleblue); ! } } --- 659,665 ---- } else if (constructor instanceof Line) { paint((Line) constructor, middleblue); ! } else if (constructor instanceof Grid) { ! draw((Grid) constructor); ! } } |
|
From: Michael L. <he...@us...> - 2009-05-15 08:01:55
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5521/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Refactoring initialization Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** Project.java 12 May 2009 11:51:19 -0000 1.167 --- Project.java 15 May 2009 08:01:43 -0000 1.168 *************** *** 105,113 **** private static boolean doExport; - /** The cameras */ - private HashMap cameras = new HashMap(); ! /** The domain id */ ! private long cameraId; /** The constraints */ --- 105,111 ---- private static boolean doExport; ! private HashMap cameras = new HashMap(); ! private long nextCameraID; /** The constraints */ *************** *** 325,330 **** public Project() { super(); ! setName("new project"); ! setExportPath("b-processor-export.obj"); script = new Description(""); undoStack = new Stack(); --- 323,335 ---- public Project() { super(); ! initialize(); ! } ! ! /** ! * ! */ ! public void initialize() { ! name = "New Project"; ! exportPath = "b-processor-export.obj"; script = new Description(""); undoStack = new Stack(); *************** *** 332,336 **** copyBuffer = new LinkedList(); catalog = new LinkedList<Component>(); ! resetCam(); observers = new LinkedList(); staticObservers = new LinkedList(); --- 337,344 ---- copyBuffer = new LinkedList(); catalog = new LinkedList<Component>(); ! currentCamera = new Camera("(Current)", ! new double[]{6, 3, 2}, ! new double[]{7, -21, 24}, ! new double[]{0, 0, 1}, Camera.PERSPECTIVE); observers = new LinkedList(); staticObservers = new LinkedList(); *************** *** 338,350 **** world = Space.createFunctionalSpace("World"); world.setId(new Long(0)); ! 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)); activeCoordinateSystem.setActive(true); world.add(activeCoordinateSystem); constraints = new LinkedList(); globals = new ParameterBlock(); --- 346,367 ---- world = Space.createFunctionalSpace("World"); world.setId(new Long(0)); ! materials = new HashMap(); nextMaterialId = 0; + cameras = new HashMap(); + nextCameraID = 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)); activeCoordinateSystem.setActive(true); world.add(activeCoordinateSystem); + + // Grid grid = new Grid(); + // world.add(grid); + + constraints = new LinkedList(); globals = new ParameterBlock(); *************** *** 369,372 **** --- 386,396 ---- /** + * Clear all objects + */ + public void clear() { + initialize(); + } + + /** * * @param tesselator Tesselator *************** *** 386,399 **** /** * - */ - public void resetCam() { - currentCamera = new Camera("(Current)", - new double[]{6, 3, 2}, - new double[]{7, -21, 24}, - new double[]{0, 0, 1}, Camera.PERSPECTIVE); - } - - /** - * * @return sensor */ --- 410,413 ---- *************** *** 514,534 **** } ! /** ! * Clear all objects ! */ ! public void clear() { ! world.clear(); ! getCatalogObjects().clear(); ! this.setActiveSpace(world); ! CoordinateSystem cs = new CoordinateSystem(new Vertex(1, 0, 0), ! new Vertex(0, 1, 0), new Vertex(0, 0, 1), new Vertex(0, 0, 0)); ! world.add(cs); ! this.setActiveCoordinateSystem(cs); ! this.cameras.clear(); ! this.cameraId = 0; ! cs.setActive(true); ! observers.clear(); ! } ! /** * remove all elements in the collection from the project --- 528,532 ---- } ! /** * remove all elements in the collection from the project *************** *** 716,720 **** */ public void add(Camera c) { ! c.setId(new Long(cameraId++)); cameras.put(c.getId(), c); } --- 714,718 ---- */ public void add(Camera c) { ! c.setId(new Long(nextCameraID++)); cameras.put(c.getId(), c); } |
