[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.134, 1.135 SpaceTool.java, 1.90, 1.91

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31993/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java SpaceTool.java 
Log Message:
coordinate systems

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** SpaceTool.java	5 Nov 2007 10:18:46 -0000	1.90
--- SpaceTool.java	12 Nov 2007 08:05:34 -0000	1.91
***************
*** 35,39 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.model.Geometry;
  
  /**
--- 35,38 ----
***************
*** 220,224 ****
        createFuncItem.addActionListener(funcListener);
        
-       // MARK 1
        JMenuItem createConstItem = new JMenuItem("New Construction " + category);
        ActionListener constListener = new CreateSpaceActionListener(surface,
--- 219,222 ----
***************
*** 248,285 ****
          }
        });
-       JMenuItem copySpaceItem = new JMenuItem("Duplicate " + category);
-       copySpaceItem.addActionListener(new SpaceMenuAction(space, "Duplicate") {
-         public void actionPerformed(ActionEvent arg0) {
-           if (space != null) {
-             Space spaceCopy = space.copy();
-             space.getOwner().add(spaceCopy);
-             Selection.primary().set(spaceCopy);
-             glv.changeTool(Tool.MOVE_TOOL);
-             space.getOwner().changed();
-             Project.getInstance().checkpoint();
-           }
-         }
-       });
        
!       JMenuItem flipSpaceItem = new JMenuItem("Rotate " + category + " 90 degrees CCW");
!       flipSpaceItem.addActionListener(new SpaceMenuAction(space, "Rotate") {
!         public void actionPerformed(ActionEvent arg0) {
!           if (space != null) {
!             Iterator it = space.collect().iterator();
!             Vertex center = space.center();
!             while (it.hasNext()) {
!               Geometry.rotate(Math.PI / 2, 
!                               0, 0, 1, 
!                               (Vertex)it.next(), 
!                               center);
!             }
!             space.changed();
!           }
!         }
!       });
        if (!space.isContainer()) {
          editSpaceItem.setEnabled(false);
-         copySpaceItem.setEnabled(false);
-         flipSpaceItem.setEnabled(false);
        }
        
--- 246,254 ----
          }
        });
        
!       
!       
        if (!space.isContainer()) {
          editSpaceItem.setEnabled(false);
        }
        
***************
*** 312,318 ****
        menu.addSeparator();
        menu.add(voidItem);
-       menu.add(copySpaceItem);
        menu.add(editSpaceItem);
-       menu.add(flipSpaceItem);
        menu.addPopupMenuListener(spl);
        menu.pack();
--- 281,285 ----

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** AbstractTool.java	5 Nov 2007 10:18:46 -0000	1.134
--- AbstractTool.java	12 Nov 2007 08:05:34 -0000	1.135
***************
*** 302,311 ****
      sidewards.scale(2 / sidewards.length());
      up.scale(2 / up.length());
!     if (e.getKeyCode() == KeyEvent.VK_META || e.getKeyCode() == KeyEvent.VK_ALT) {
        metaPressed = true;
        glv.setCursor(metaCursor);
        return;
      }    
!     if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
        setActiveStrategy(AbstractTool.select);
        glv.getView().makeTarget(null);
--- 302,313 ----
      sidewards.scale(2 / sidewards.length());
      up.scale(2 / up.length());
!     
!     
!     if (e.getKeyCode() == KeyEvent.VK_ALT) {
        metaPressed = true;
        glv.setCursor(metaCursor);
        return;
      }    
!     if (e.getKeyCode() == KeyEvent.VK_CONTROL || e.getKeyCode() == KeyEvent.VK_META) {
        setActiveStrategy(AbstractTool.select);
        glv.getView().makeTarget(null);
***************
*** 464,468 ****
        setActiveStrategy(AbstractTool.pan);
      }
!     if (activeStrategy != null) {
        activeStrategy.pressed(e);
      } else {
--- 466,470 ----
        setActiveStrategy(AbstractTool.pan);
      }
!     if (!e.isPopupTrigger() && activeStrategy != null) {
        activeStrategy.pressed(e);
      } else {