[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.63,1.64 MoveTool.j
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2006-03-21 22:33:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16784/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java MoveTool.java TapeMeasureTool.java EraserTool.java Log Message: Checkpoints inserted in most tools (for the benefit of undo) Index: TapeMeasureTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/TapeMeasureTool.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TapeMeasureTool.java 10 Mar 2006 16:41:25 -0000 1.11 --- TapeMeasureTool.java 21 Mar 2006 22:33:36 -0000 1.12 *************** *** 333,336 **** --- 333,337 ---- Project.getInstance().remove(constructionPoint); measuring = false; + Project.getInstance().checkpoint(); } } Index: EraserTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EraserTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EraserTool.java 22 Feb 2006 09:02:45 -0000 1.2 --- EraserTool.java 21 Mar 2006 22:33:36 -0000 1.3 *************** *** 50,54 **** findTarget(e); if (target instanceof Edge) { ! Project.getInstance().delete((Edge) target); } else { glv.getView().makeTarget(null); --- 50,55 ---- findTarget(e); if (target instanceof Edge) { ! ((Edge) target).delete(); ! Project.getInstance().checkpoint(); } else { glv.getView().makeTarget(null); Index: MoveTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** MoveTool.java 20 Mar 2006 23:18:09 -0000 1.47 --- MoveTool.java 21 Mar 2006 22:33:36 -0000 1.48 *************** *** 277,280 **** --- 277,281 ---- dragPlane = null; number = ""; + Project.getInstance().checkpoint(); } Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** AbstractTool.java 17 Mar 2006 09:55:20 -0000 1.63 --- AbstractTool.java 21 Mar 2006 22:33:36 -0000 1.64 *************** *** 192,223 **** } } else { ! if (e.getKeyCode() == KeyEvent.VK_UP) { ! c.translate(new double[] {up.getX(), up.getY(), up.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_DOWN) { ! c.translate(new double[] {-up.getX(), -up.getY(), -up.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_LEFT) { ! c.translate(new double[] {sidewards.getX(), sidewards.getY(), sidewards.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { ! c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_Z) { ! c.zoomout(); ! } else if (e.getKeyCode() == KeyEvent.VK_X) { ! c.zoomin(); ! } else if (e.getKeyCode() == KeyEvent.VK_Q) { ! glv.changeTool(Tool.SELECT_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_W) { ! glv.changeTool(Tool.PENCIL_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_M) { ! glv.changeTool(Tool.MOVE_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_R) { ! glv.changeTool(Tool.CAMERA_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_E) { ! glv.changeTool(Tool.EXTRUSION_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_F5) { ! glv.getView().changeDrawMode(View.WIREFRAME_MODE); ! } else if (e.getKeyCode() == KeyEvent.VK_F6) { ! glv.getView().changeDrawMode(View.SOLID_MODE); ! } else if (e.getKeyCode() == KeyEvent.VK_F7) { ! glv.getView().changeDrawMode(View.LIGHTING_MODE); } } --- 192,225 ---- } } else { ! if (e.getModifiers() == 0) { ! if (e.getKeyCode() == KeyEvent.VK_UP) { ! c.translate(new double[] {up.getX(), up.getY(), up.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_DOWN) { ! c.translate(new double[] {-up.getX(), -up.getY(), -up.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_LEFT) { ! c.translate(new double[] {sidewards.getX(), sidewards.getY(), sidewards.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) { ! c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()}); ! } else if (e.getKeyCode() == KeyEvent.VK_Z) { ! c.zoomout(); ! } else if (e.getKeyCode() == KeyEvent.VK_X) { ! c.zoomin(); ! } else if (e.getKeyCode() == KeyEvent.VK_Q) { ! glv.changeTool(Tool.SELECT_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_W) { ! glv.changeTool(Tool.PENCIL_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_M) { ! glv.changeTool(Tool.MOVE_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_R) { ! glv.changeTool(Tool.CAMERA_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_E) { ! glv.changeTool(Tool.EXTRUSION_TOOL); ! } else if (e.getKeyCode() == KeyEvent.VK_F5) { ! glv.getView().changeDrawMode(View.WIREFRAME_MODE); ! } else if (e.getKeyCode() == KeyEvent.VK_F6) { ! glv.getView().changeDrawMode(View.SOLID_MODE); ! } else if (e.getKeyCode() == KeyEvent.VK_F7) { ! glv.getView().changeDrawMode(View.LIGHTING_MODE); ! } } } |