[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SpaceSelectTool.java, 1.4, 1.5 ToolFactory.java, 1.105, 1.106

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20840/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	SpaceSelectTool.java ToolFactory.java 
Log Message:
Brunata

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ToolFactory.java	19 Jun 2009 13:32:29 -0000	1.105
--- ToolFactory.java	14 Sep 2009 16:22:59 -0000	1.106
***************
*** 9,12 ****
--- 9,13 ----
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.gl.view.View;
+ import net.sourceforge.bprocessor.gl.view.ViewToolbarFactory;
  import net.sourceforge.bprocessor.gui.Toolbar;
  
***************
*** 26,31 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
- import java.awt.event.MouseEvent;
- import java.awt.event.MouseListener;
  
  import javax.swing.AbstractAction;
--- 27,30 ----
***************
*** 33,36 ****
--- 32,36 ----
  
  import javax.swing.ImageIcon;
+ import javax.swing.JComponent;
  import javax.swing.JToggleButton;
  import javax.swing.ButtonGroup;
***************
*** 44,47 ****
--- 44,51 ----
    /** The logger */
    private static Logger log = Logger.getLogger(ToolFactory.class);
+   
+   private List<JComponent> modellingset;
+   
+   private List<JComponent> viewingset;
  
    /** glv */
***************
*** 57,61 ****
    private ButtonGroup group;
      
-   /** The factory */
    private static ToolFactory factory;
  
--- 61,64 ----
***************
*** 93,96 ****
--- 96,100 ----
    protected static Cursor errorCursor;
    
+   
    /**
     * Constructor
***************
*** 98,101 ****
--- 102,107 ----
     */
    private ToolFactory(Editor editor) {
+     modellingset = new LinkedList();
+     viewingset = new LinkedList();
      tools = new HashMap();
      buttons = new HashMap();
***************
*** 104,107 ****
--- 110,116 ----
      
      ClassLoader cl = Thread.currentThread().getContextClassLoader();
+     
+     
+     
      URL url = cl.getResource("Bcursorpen1.gif");
      Image pencilimage = Toolkit.getDefaultToolkit().getImage(url);
***************
*** 152,207 ****
      pan = new PanTool(editor, panCursor);
      zoom = new ZoomTool(editor, zoomCursor);
-     Toolbar tb = Toolbar.getInstance();
      
!     registerTool(Tool.SPACE_SELECT, spaceselect, "Biconselecttool2.gif", "Sensor Select");
!     registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select");
!     registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign");
      
!     tb.addSeparator(10);
      
!     registerTool(Tool.PENCIL_TOOL, pencil, "pen-icon.png", "Pencil");
!     registerTool(Tool.ERASER_TOOL, eraser, "eraser-icon.png", "Eraser");
      
!     tb.addSeparator(2);
      
!     registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler");
!     registerTool(Tool.PROTRACTOR_TOOL, protractor, "protractor-icon.png", "Protractor");
      
!     tb.addSeparator(2);
      
!     registerTool(Tool.FINAL_MOVE_TOOL, moving, "Biconmovetool.gif", "Move");
!     registerTool(Tool.ROTATION_TOOL, rotation, "rotation-icon.png", "Rotate");
      
!     tb.addSeparator(2);
      
!     registerTool(Tool.OFFSET_TOOL, offset, "offset-icon.png", "Offset");
!     registerTool(Tool.EXTRUSION_TOOL, extrude, "Biconextrudetool.gif", "Extrude");
      
!     tb.addSeparator(10);
      
!     registerTool(Tool.ALT_RECT_TOOL, rectangle, "Biconaltrect.gif", "Rectangle");
!     registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc");
      
!     tb.addSeparator(2);
      
!     registerTool(Tool.EXTEND_TOOL, extend, "Biconextrudetool2.gif", "Extend");
     
!     tb.addSeparator(10);
      
!     registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "constructor-icon.png", "Constructor");
!     registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Relate");
      
!     tb.addSeparator(10);
      
!     registerTool(Tool.FOCUS_TOOL, focus, "Biconzomeselect.gif", "Focus");
!     registerTool(Tool.CLIP_TOOL, clipplane, "Bclip.gif", "Section");
      
!     tb.addSeparator(10);
      
!     registerTool(Tool.CAMERA_TOOL, orbit, "Biconrotcam.png", "Orbit");
!     registerTool(Tool.PAN_TOOL, pan, "Bicondrag.gif", "Pan");
!     registerTool(Tool.ZOOM_TOOL, zoom, "Biconzomeinout.gif", "Zoom");
      
!     tb.addSeparator(10);
      
      Action orthoAction = new ToolAction(editor, 0, "Borto.gif") {
--- 161,219 ----
      pan = new PanTool(editor, panCursor);
      zoom = new ZoomTool(editor, zoomCursor);
      
!     viewingset.add(registerTool(Tool.SPACE_SELECT, spaceselect, 
!       "Biconselecttool2.gif", "Sensor Select"));
      
!     modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select"));
!     modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign"));
      
!     modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.PENCIL_TOOL, pencil, "pen-icon.png", "Pencil"));
!     modellingset.add(registerTool(Tool.ERASER_TOOL, eraser, "eraser-icon.png", "Eraser"));
      
!     modellingset.add(addSeparator(2));
      
!     modellingset.add(registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler"));
!     modellingset.add(registerTool(Tool.PROTRACTOR_TOOL, protractor,
!       "protractor-icon.png", "Protractor"));
      
!     modellingset.add(addSeparator(2));
      
!     modellingset.add(registerTool(Tool.FINAL_MOVE_TOOL, moving, "Biconmovetool.gif", "Move"));
!     modellingset.add(registerTool(Tool.ROTATION_TOOL, rotation, "rotation-icon.png", "Rotate"));
      
!     modellingset.add(addSeparator(2));
      
!     modellingset.add(registerTool(Tool.OFFSET_TOOL, offset, "offset-icon.png", "Offset"));
!     modellingset.add(registerTool(Tool.EXTRUSION_TOOL, extrude, "Biconextrudetool.gif", "Extrude"));
      
!     modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.ALT_RECT_TOOL, rectangle, "Biconaltrect.gif", "Rectangle"));
!     modellingset.add(registerTool(Tool.ARC_TOOL, arc, "Barc.gif", "Arc"));
      
!     modellingset.add(addSeparator(2));
!     
!     modellingset.add(registerTool(Tool.EXTEND_TOOL, extend, "Biconextrudetool2.gif", "Extend"));
     
!     modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.CONSTRUCTOR_TOOL, constructor,
!       "constructor-icon.png", "Constructor"));
!     modellingset.add(registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Relate"));
      
!     modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.FOCUS_TOOL, focus, "Biconzomeselect.gif", "Focus"));
!     modellingset.add(registerTool(Tool.CLIP_TOOL, clipplane, "Bclip.gif", "Section"));
      
!     modellingset.add(addSeparator(10));
      
!     modellingset.add(registerTool(Tool.CAMERA_TOOL, orbit, "Biconrotcam.png", "Orbit"));
!     modellingset.add(registerTool(Tool.PAN_TOOL, pan, "Bicondrag.gif", "Pan"));
!     modellingset.add(registerTool(Tool.ZOOM_TOOL, zoom, "Biconzomeinout.gif", "Zoom"));
      
!     modellingset.add(addSeparator(10));
      
      Action orthoAction = new ToolAction(editor, 0, "Borto.gif") {
***************
*** 238,242 ****
        }
      };
!     Toolbar.getInstance().registerPushButtonAction(topAction, "Top");
      Action zoomAction = new ToolAction(editor, 0, "Biconzomeall.gif") {
        public void actionPerformed(ActionEvent agr0) {
--- 250,254 ----
        }
      };
!     modellingset.add(Toolbar.getInstance().registerPushButtonAction(topAction, "Top"));
      Action zoomAction = new ToolAction(editor, 0, "Biconzomeall.gif") {
        public void actionPerformed(ActionEvent agr0) {
***************
*** 254,261 ****
        }
      };
!     Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All");
  
      
!     tb.addSeparator(10);
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
--- 266,273 ----
        }
      };
!     modellingset.add(Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All"));
  
      
!     modellingset.add(addSeparator(10));
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
***************
*** 263,273 ****
--- 275,368 ----
      perspBut.setMnemonic(KeyEvent.VK_P);
      viewGroup.add(perspBut);
+     modellingset.add(perspBut);
      JToggleButton orthoBut = Toolbar.getInstance().registerAction(orthoAction);
      orthoBut.setToolTipText("Orthographic");
      orthoBut.setMnemonic(KeyEvent.VK_O);
      viewGroup.add(orthoBut);
+     modellingset.add(orthoBut);
      perspBut.setSelected(true);
+     
+     {
+       {
+         Action action = new ToolAction(editor, 0, "backwardicon.gif") {
+           public void actionPerformed(ActionEvent arg0) {
+             Project.getInstance().backward();
+           }
+         };
+         viewingset.add(Toolbar.getInstance().registerPushButtonAction(action, "Back"));
+       }
+       
+       {
+         Action action = new ToolAction(editor, 0, "forwardicon.gif") {
+           public void actionPerformed(ActionEvent arg0) {
+             Project.getInstance().forward();
+           }
+         };
+         viewingset.add(Toolbar.getInstance().registerPushButtonAction(action, "Forward"));
+       }
+     }
+     
+     {
+       ButtonGroup group = new ButtonGroup();
+       JToggleButton modelling;
+       JToggleButton viewing;
+       {
+         Action action = new ToolAction(editor, 0, "modellingicon.gif") {
+           public void actionPerformed(ActionEvent event) {
+             modelling();
+           }
+         };
+         modelling = Toolbar.getInstance().registerAction(action);
+         group.add(modelling);
+         modellingset.add(modelling);
+         viewingset.add(modelling);
+       }
+       {
+         Action action = new ToolAction(editor, 0, "viewingicon.gif") {
+           public void actionPerformed(ActionEvent event) {
+             viewing();
+           }
+         };
+         viewing = Toolbar.getInstance().registerAction(action);
+         group.add(viewing);
+         modellingset.add(viewing);
+         viewingset.add(viewing);
+       }
+       modelling.setSelected(true);
+     }
+     
+     setup();
+   }
+   
+   private void modelling() {
+     Toolbar toolbar = Toolbar.getInstance();
+     toolbar.clear();
+     for (JComponent current : modellingset) {
+       toolbar.addButton(current);
+     }
+     ViewToolbarFactory.instance().setup();
+     Editor.setViewing(false);
+   }
+   
+   private void viewing() {
+     Toolbar toolbar = Toolbar.getInstance();
+     toolbar.clear();
+     for (JComponent current : viewingset) {
+       toolbar.addButton(current);
+     }
+     ViewToolbarFactory.instance().setup();
+     Editor.setViewing(true);
    }
    
+   
+   private void setup() {
+     Toolbar toolbar = Toolbar.getInstance();
+     for (JComponent current : modellingset) {
+       toolbar.addButton(current);
+     }
+   }
+   
+   
+   
    /**
     * Get the factory
***************
*** 317,356 ****
      ToolAction action = new ToolAction(editor, key, iconname);
      JToggleButton button = Toolbar.getInstance().registerAction(action);
-     for (MouseListener current : button.getMouseListeners()) {
-       button.removeMouseListener(current);
-     }
-     button.addMouseListener(new MouseListener() {
- 
-       public void mouseClicked(MouseEvent arg0) {
-         // TODO Auto-generated method stub
-         
-       }
- 
-       public void mouseEntered(MouseEvent arg0) {
-         // TODO Auto-generated method stub
-         
-       }
- 
-       public void mouseExited(MouseEvent arg0) {
-         // TODO Auto-generated method stub
-         
-       }
- 
-       public void mousePressed(MouseEvent event) {
-         JToggleButton button = (JToggleButton) event.getComponent();
-         button.doClick();
-       }
- 
-       public void mouseReleased(MouseEvent arg0) {
-         // TODO Auto-generated method stub
-         
-       }
-       
-     });
      button.setToolTipText(tooltip);
      group.add(button);
      buttons.put(tool, button);
      return button;
!   }  
  
    /**
--- 412,430 ----
      ToolAction action = new ToolAction(editor, key, iconname);
      JToggleButton button = Toolbar.getInstance().registerAction(action);
      button.setToolTipText(tooltip);
      group.add(button);
      buttons.put(tool, button);
      return button;
!   }
!   
!   /**
!    * 
!    * @param size int
!    * @return component
!    */
!   public JComponent addSeparator(int size) {
!     JComponent sep = Toolbar.getInstance().addSeparator(size);
!     return sep;
!   }
  
    /**

Index: SpaceSelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SpaceSelectTool.java	25 Jun 2009 23:28:49 -0000	1.4
--- SpaceSelectTool.java	14 Sep 2009 16:22:59 -0000	1.5
***************
*** 53,61 ****
     */
    protected void pressed(MouseEvent e) {
-     boolean done = false;
      if (e.getButton() == MouseEvent.BUTTON1) {
!       findTarget(e);
!       if (target instanceof Surface) {
!         Surface surface = (Surface) target;
          Space front = surface.getFrontDomain();
          Space back = surface.getBackDomain();
--- 53,63 ----
     */
    protected void pressed(MouseEvent e) {
      if (e.getButton() == MouseEvent.BUTTON1) {
! 
!       double x = e.getX();
!       double y = e.getY();
! 
!       Surface surface = editor.getView().getSelectedSurface(x, y);
!       if (surface != null) {
          Space front = surface.getFrontDomain();
          Space back = surface.getBackDomain();
***************
*** 68,71 ****
--- 70,75 ----
          Selection.primary().clear();
        }
+     } else {
+       Selection.primary().clear();
      }
    }