[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.86, 1.87

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

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

Modified Files:
	ToolFactory.java 
Log Message:
Toolbar reorganized

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** ToolFactory.java	27 Sep 2007 10:48:53 -0000	1.86
--- ToolFactory.java	12 Oct 2007 11:06:53 -0000	1.87
***************
*** 222,226 ****
        this.registerTool(Tool.ERASER_TOOL, eraser, "Biconeraser.gif", "Eraser");
      eraserBut.setMnemonic(KeyEvent.VK_A);
!     tb.addSeparator(3);
      JToggleButton offBut = 
        this.registerTool(Tool.OFFSET_TOOL, offset, "Biconoffset.gif", "Offset");
--- 222,226 ----
        this.registerTool(Tool.ERASER_TOOL, eraser, "Biconeraser.gif", "Eraser");
      eraserBut.setMnemonic(KeyEvent.VK_A);
!     tb.addSeparator(5);
      JToggleButton offBut = 
        this.registerTool(Tool.OFFSET_TOOL, offset, "Biconoffset.gif", "Offset");
***************
*** 239,248 ****
      JToggleButton rotationBut = 
        this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotaxe.gif", "Rotate");
!     tb.addSeparator(3);
      JToggleButton tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 
          "Bicontapemes.gif", "Tape Measure");        
      this.registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "Biconconstructor.gif", "Constructor");
      this.registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Create relation");
!     tb.addSeparator(3);
      
      JToggleButton cRotBut = 
--- 239,248 ----
      JToggleButton rotationBut = 
        this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotaxe.gif", "Rotate");
!     tb.addSeparator(5);
      JToggleButton tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 
          "Bicontapemes.gif", "Tape Measure");        
      this.registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "Biconconstructor.gif", "Constructor");
      this.registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Create relation");
!     tb.addSeparator(5);
      
      JToggleButton cRotBut = 
***************
*** 253,276 ****
      //walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
      
!     Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") {
!       public void actionPerformed(ActionEvent agr0) {
!         double aspect = glv.getView().getAspect();
!         if (Selection.primary().isEmpty()) {
!           List list = new LinkedList();
!           list.add(Project.getInstance().getActiveSpace());
!           Project.getInstance().getCurrentCamera().zoomOn(list, aspect);
!         } else {
!           Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect);
!         }
!         this.glv.repaint();
!       }
!     };
!     Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All");
! 
      this.registerTool(Tool.FOCUS_TOOL, focusTool, "Biconzomeselect.gif", "Focus on surface");
      
!     tb.addSeparator(10);     
      JToggleButton clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
          "Bclip.gif", "Clipping");
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
        public void actionPerformed(ActionEvent agr0) {
--- 253,264 ----
      //walkBut = this.registerTool(Tool.WALK_TOOL, walk, "Biconwalk.gif", "Walk");
      
!     
      this.registerTool(Tool.FOCUS_TOOL, focusTool, "Biconzomeselect.gif", "Focus on surface");
      
!     
      JToggleButton clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
          "Bclip.gif", "Clipping");
+     tb.addSeparator(10);
+     
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
        public void actionPerformed(ActionEvent agr0) {
***************
*** 306,310 ****
--- 294,314 ----
      };
      Toolbar.getInstance().registerPushButtonAction(topAction, "See from above");
+     Action zoomAction = new ToolAction(glv, 0, "Biconzomeall.gif") {
+       public void actionPerformed(ActionEvent agr0) {
+         double aspect = glv.getView().getAspect();
+         if (Selection.primary().isEmpty()) {
+           List list = new LinkedList();
+           list.add(Project.getInstance().getActiveSpace());
+           Project.getInstance().getCurrentCamera().zoomOn(list, aspect);
+         } else {
+           Project.getInstance().getCurrentCamera().zoomOn(Selection.primary(), aspect);
+         }
+         this.glv.repaint();
+       }
+     };
+     Toolbar.getInstance().registerPushButtonAction(zoomAction, "Zoom All");
+ 
      
+     tb.addSeparator(5);
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);