Thread: [Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.114, 1.115 Sele
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit
|
From: rimestad <rim...@us...> - 2007-04-14 15:01:16
|
Update of /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3211/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java SelectStrategy.java SpaceTool.java Log Message: altered selection to a generic collection og geometrics which lead to quite alot of changes Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** SpaceTool.java 10 Apr 2007 20:56:47 -0000 1.71 --- SpaceTool.java 14 Apr 2007 15:00:52 -0000 1.72 *************** *** 38,41 **** --- 38,42 ---- import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Entity; + import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.IDTransform; import net.sourceforge.bprocessor.model.Mesh; *************** *** 85,88 **** --- 86,90 ---- * @param e The MouseEvent object */ + @Override protected void pressed(MouseEvent e) { glv.setLengthValue(""); *************** *** 92,96 **** if (e.getButton() == MouseEvent.BUTTON3 || ! (e.isControlDown() && e.getButton() == MouseEvent.BUTTON3)) { glv.popup(makeSelectionMenu(), e.getX(), e.getY()); done = true; --- 94,98 ---- if (e.getButton() == MouseEvent.BUTTON3 || ! e.isPopupTrigger()) { glv.popup(makeSelectionMenu(), e.getX(), e.getY()); done = true; *************** *** 168,172 **** } else { Iterator sel = Selection.primary().iterator(); ! Class type = null; while (sel.hasNext()) { Object next = sel.next(); --- 170,174 ---- } else { Iterator sel = Selection.primary().iterator(); ! Class<? extends Object> type = null; while (sel.hasNext()) { Object next = sel.next(); *************** *** 221,225 **** private JPopupMenu seperatorPopup() { JPopupMenu sepPop = new JPopupMenu(); ! Iterator selIt = new HashSet(Selection.primary()).iterator(); if (selIt.hasNext()) { Object o = selIt.next(); --- 223,227 ---- private JPopupMenu seperatorPopup() { JPopupMenu sepPop = new JPopupMenu(); ! Iterator<Geometric> selIt = new HashSet<Geometric>(Selection.primary()).iterator(); if (selIt.hasNext()) { Object o = selIt.next(); *************** *** 257,261 **** ! Iterator selIt = new HashSet(Selection.primary()).iterator(); Surface surface = null; Space space = null; --- 259,263 ---- ! Iterator<Geometric> selIt = new HashSet<Geometric>(Selection.primary()).iterator(); Surface surface = null; Space space = null; *************** *** 320,324 **** public void actionPerformed(ActionEvent arg0) { if (space != null) { - Selection.primary().clear(); glv.getView().makeTarget(null); Selection.primary().set(space); --- 322,325 ---- *************** *** 431,444 **** transform = new TransformStack(); id = new IDTransform(); ! HashMap globals = Project.getInstance().getGlobals().environment(); globals.put("echo", new Builtin() { ! public void evaluate(Environment env, Stack stack) { stack.push(env.get(0)); } }); globals.put("cos", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.cos(argument.doubleValue()))); --- 432,445 ---- transform = new TransformStack(); id = new IDTransform(); ! HashMap<String, Object> globals = Project.getInstance().getGlobals().environment(); globals.put("echo", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { stack.push(env.get(0)); } }); globals.put("cos", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.cos(argument.doubleValue()))); *************** *** 446,450 **** }); globals.put("sin", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.sin(argument.doubleValue()))); --- 447,451 ---- }); globals.put("sin", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.sin(argument.doubleValue()))); *************** *** 452,456 **** }); globals.put("sqrt", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.sqrt(argument.doubleValue()))); --- 453,457 ---- }); globals.put("sqrt", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double argument = (Double) env.get(0); stack.push(new Double(Math.sqrt(argument.doubleValue()))); *************** *** 458,462 **** }); globals.put("length", new Builtin() { ! public void evaluate(Environment env, Stack stack) { List argument = (List) env.get(0); stack.push(new Double(argument.size())); --- 459,463 ---- }); globals.put("length", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { List argument = (List) env.get(0); stack.push(new Double(argument.size())); *************** *** 464,473 **** }); globals.put("push", new Builtin() { ! public void evaluate(Environment env, Stack stack) { transform.push(id); } }); globals.put("pop", new Builtin() { ! public void evaluate(Environment env, Stack stack) { while (transform.pop() != id) { // NOTHING --- 465,474 ---- }); globals.put("push", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { transform.push(id); } }); globals.put("pop", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { while (transform.pop() != id) { // NOTHING *************** *** 478,482 **** globals.put("vertex", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); --- 479,483 ---- globals.put("vertex", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); *************** *** 488,492 **** }); globals.put("edge", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Vertex from = (Vertex) env.get(0); Vertex to = (Vertex) env.get(1); --- 489,493 ---- }); globals.put("edge", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Vertex from = (Vertex) env.get(0); Vertex to = (Vertex) env.get(1); *************** *** 496,501 **** }); globals.put("surface", new Builtin() { ! public void evaluate(Environment env, Stack stack) { ! List edges = new LinkedList(); for (int i = 0; i < env.length(); i++) { Edge current = (Edge) env.get(i); --- 497,502 ---- }); globals.put("surface", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { ! List<Edge> edges = new LinkedList<Edge>(); for (int i = 0; i < env.length(); i++) { Edge current = (Edge) env.get(i); *************** *** 507,511 **** }); globals.put("front", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Surface surface = (Surface) env.get(0); Space space = (Space) env.get(1); --- 508,512 ---- }); globals.put("front", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); Space space = (Space) env.get(1); *************** *** 514,518 **** }); globals.put("back", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Surface surface = (Surface) env.get(0); Space space = (Space) env.get(1); --- 515,519 ---- }); globals.put("back", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); Space space = (Space) env.get(1); *************** *** 521,525 **** }); globals.put("space", new Builtin() { ! public void evaluate(Environment env, Stack stack) { String name = (String) env.get(0); Space result = new Space(name, Space.CONSTRUCTION, Space.SPACE_LEVEL, true); --- 522,526 ---- }); globals.put("space", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { String name = (String) env.get(0); Space result = new Space(name, Space.CONSTRUCTION, Space.SPACE_LEVEL, true); *************** *** 528,532 **** }); globals.put("contour", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Vertex previous = (Vertex) env.get(env.length() - 1); for (int i = 0; i < env.length(); i++) { --- 529,533 ---- }); globals.put("contour", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Vertex previous = (Vertex) env.get(env.length() - 1); for (int i = 0; i < env.length(); i++) { *************** *** 538,542 **** }); globals.put("translate", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); --- 539,543 ---- }); globals.put("translate", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); *************** *** 548,552 **** }); globals.put("scale", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); --- 549,553 ---- }); globals.put("scale", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); *************** *** 558,562 **** }); globals.put("rotate", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double a = (Double) env.get(0); Double x = (Double) env.get(1); --- 559,563 ---- }); globals.put("rotate", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Double a = (Double) env.get(0); Double x = (Double) env.get(1); *************** *** 569,573 **** }); globals.put("extrude", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Surface surface = (Surface) env.get(0); Double distance = (Double) env.get(1); --- 570,574 ---- }); globals.put("extrude", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); Double distance = (Double) env.get(1); *************** *** 585,589 **** globals.put("extrudeall", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Surface surface = (Surface) env.get(0); Double distance = (Double) env.get(1); --- 586,590 ---- globals.put("extrudeall", new Builtin() { ! public void evaluate(Environment env, Stack<Object> stack) { Surface surface = (Surface) env.get(0); Double distance = (Double) env.get(1); *************** *** 631,638 **** Space space = Project.getInstance().getActiveSpace(); ! Collection<Vertex> vertices = new LinkedList(); ! Collection<Edge> edges = new LinkedList(); ! Collection<Surface> surfaces = new LinkedList(); ! Collection<Space> spaces = new LinkedList(); --- 632,639 ---- Space space = Project.getInstance().getActiveSpace(); ! Collection<Vertex> vertices = new LinkedList<Vertex>(); ! Collection<Edge> edges = new LinkedList<Edge>(); ! Collection<Surface> surfaces = new LinkedList<Surface>(); ! Collection<Space> spaces = new LinkedList<Space>(); *************** *** 646,652 **** surfaces.add((Surface)result); } else if (result instanceof Space) { ! spaces.add((Space) result); ! space.add((Space) result); ! Selection.primary().add(result); } else { glv.setLengthValue(result.toString()); --- 647,654 ---- surfaces.add((Surface)result); } else if (result instanceof Space) { ! Space s = (Space) result; ! spaces.add(s); ! space.add(s); ! Selection.primary().add(s); } else { glv.setLengthValue(result.toString()); *************** *** 701,704 **** --- 703,707 ---- * Delete */ + @Override public void delete() { if (typing) { *************** *** 713,719 **** Iterator it = Selection.primary().iterator(); ! List edges = new ArrayList(); ! List vertices = new ArrayList(); ! List surfaces = new ArrayList(); while (it.hasNext()) { Object selected = it.next(); --- 716,722 ---- Iterator it = Selection.primary().iterator(); ! List<Geometric> edges = new ArrayList<Geometric>(); ! List<Geometric> vertices = new ArrayList<Geometric>(); ! List<Geometric> surfaces = new ArrayList<Geometric>(); while (it.hasNext()) { Object selected = it.next(); Index: SelectStrategy.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SelectStrategy.java 20 Feb 2007 15:16:10 -0000 1.8 --- SelectStrategy.java 14 Apr 2007 15:00:52 -0000 1.9 *************** *** 22,25 **** --- 22,26 ---- import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.Edge; + import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; *************** *** 136,143 **** multipleSelection = true; } else if (e.isShiftDown()) { ! if (!selection.contains(target)) { ! selection.add(target); } else { ! selection.remove(target); } } else if (target instanceof GlCamera) { --- 137,149 ---- multipleSelection = true; } else if (e.isShiftDown()) { ! if (target instanceof Geometric) { ! Geometric g = (Geometric)target; ! if (!selection.contains(g)) { ! selection.add(g); ! } else { ! selection.remove(g); ! } } else { ! log.error("Tried to insert something different from Geometric in selection"); } } else if (target instanceof GlCamera) { *************** *** 145,150 **** Project.getInstance().setCurrentCamera(glcam.getCamera()); } else { ! if (!selection.contains(target)) { ! selection.retain(target); } } --- 151,160 ---- Project.getInstance().setCurrentCamera(glcam.getCamera()); } else { ! if (target instanceof Geometric) { ! if (!selection.contains(target)) { ! selection.set((Geometric)target); ! } ! } else { ! log.warn("Target weren't a Geometric"); } } Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** AbstractTool.java 20 Feb 2007 15:14:10 -0000 1.114 --- AbstractTool.java 14 Apr 2007 15:00:52 -0000 1.115 *************** *** 388,399 **** */ public void mousePressed(MouseEvent e) { - if (!e.isPopupTrigger()) { - if (e.getButton() == 1) { - if (selectMode) { - select.pressed(e); - return; - } - } - } pressPos[0] = e.getX(); pressPos[1] = e.getY(); --- 388,391 ---- *************** *** 409,412 **** --- 401,410 ---- if (cameraMode) { orbit.pressed(e); + } else if (selectMode) { + if (this instanceof SpaceTool) { + pressed(e); + } else { + select.pressed(e); + } } else { if (o instanceof Widget) { |
