[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.105, 1.106 ToolFactory.java, 1.71, 1.72

[rimestad <rim...@us...>]

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

Modified Files:
	AbstractTool.java ToolFactory.java 
Log Message:
Made some minor changes and fixes to the factor chooser

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ToolFactory.java	12 Jan 2007 17:52:27 -0000	1.71
--- ToolFactory.java	14 Jan 2007 23:33:28 -0000	1.72
***************
*** 268,282 ****
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
        public void actionPerformed(ActionEvent agr0) {
!         Project.getInstance().getCurrentCamera().setType(Camera.ORTHOGRAPHIC);
!         Project.getInstance().getCurrentCamera().setFactor(glv.getView().calcFactor());
!         glv.repaint();
        }
      };
!     
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
        public void actionPerformed(ActionEvent agr0) {
!         Project.getInstance().getCurrentCamera().setType(Camera.PERSPECTIVE);
!         glv.getView().invertFactor();
!         glv.repaint();
        }
      };
--- 268,290 ----
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
        public void actionPerformed(ActionEvent agr0) {
!         if (Project.getInstance().getCurrentCamera().getType() != Camera.ORTHOGRAPHIC) {
!           Project.getInstance().getCurrentCamera().setType(Camera.ORTHOGRAPHIC);
!           int fac = (int)glv.getView().calcFactor();
!           Project.getInstance().getCurrentCamera().setFactor(fac);
!           glv.setFactor(fac);
!           glv.enableFactor();
!           glv.repaint();
!         }
        }
      };
! 
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
        public void actionPerformed(ActionEvent agr0) {
!         if (Project.getInstance().getCurrentCamera().getType() != Camera.PERSPECTIVE) {
!           Project.getInstance().getCurrentCamera().setType(Camera.PERSPECTIVE);
!           glv.disableFactor();
!           glv.getView().invertFactor();
!           glv.repaint();
!         }
        }
      };

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** AbstractTool.java	26 Nov 2006 22:15:15 -0000	1.105
--- AbstractTool.java	14 Jan 2007 23:33:28 -0000	1.106
***************
*** 159,162 ****
--- 159,163 ----
        cam.zoomin();
      }
+     glv.setFactor((int)cam.getFactor());
      glv.repaint(false);
    }