[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/view PopupMenu.java, 1.5, 1.6

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

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

Modified Files:
	PopupMenu.java 
Log Message:
reset and align axis dont alter active coordinatesystem but keep it as it is

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PopupMenu.java	20 Dec 2007 14:19:51 -0000	1.5
--- PopupMenu.java	30 Dec 2007 23:21:17 -0000	1.6
***************
*** 527,538 ****
            if (entities.size() == 1) {
              Geometric geometric = entities.iterator().next();
!             CoordinateSystem system = systemFor(geometric);
!             Vertex i = system.getI();
!             Vertex j = system.getJ();
!             Vertex n = system.getN();
!             Vertex o = system.getOrigin();
!             CoordinateSystem active = Project.getInstance().getActiveCoordinateSystem();
!             active.setIJN(i, j, n);
!             active.setOrigin(o);
              Project.getInstance().changed(Project.getInstance());
              Project.getInstance().checkpoint();
--- 527,531 ----
            if (entities.size() == 1) {
              Geometric geometric = entities.iterator().next();
!             Project.getInstance().setActiveCoordinateSystem(systemFor(geometric));
              Project.getInstance().changed(Project.getInstance());
              Project.getInstance().checkpoint();
***************
*** 671,683 ****
        AbstractAction action = new AbstractAction("Reset Axes") {
          public void actionPerformed(ActionEvent event) {
!           CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
!           Vertex i = new Vertex(1, 0, 0);
!           Vertex j = new Vertex(0, 1, 0);
!           Vertex n = new Vertex(0, 0, 1);
!           Vertex o = new Vertex(0, 0, 0);
!           system.setIJN(i, j, n);
!           system.setOrigin(o);
!           Project.getInstance().changed(Project.getInstance());
!           Project.getInstance().checkpoint();
          }
        };
--- 664,677 ----
        AbstractAction action = new AbstractAction("Reset Axes") {
          public void actionPerformed(ActionEvent event) {
!           Project project = Project.getInstance();
!           for (Constructor current : project.world().getConstructors()) {
!             if (current.getId() == 1) {
!               project.setActiveCoordinateSystem(
!                   (CoordinateSystem)current);
!               break;
!             }
!           }
!           project.changed(project);
!           project.checkpoint();
          }
        };