[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.74, 1.75

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25796/src/net/sourceforge/bprocessor/gui

Modified Files:
	PopupMenu.java 
Log Message:
Experiment with transforming coordinate system

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** PopupMenu.java	19 Nov 2007 10:51:38 -0000	1.74
--- PopupMenu.java	21 Nov 2007 13:50:56 -0000	1.75
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.bprocessor.model.Command;
  import net.sourceforge.bprocessor.model.Component;
+ import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 511,515 ****
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           Vertex center = Vertex.center(vertices);
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
--- 512,530 ----
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           
!           Vertex center = null;
!           
!           if (entities.size() == 1) {
!             Geometric geometric = entities.iterator().next();
!             if (geometric instanceof Constructor) {
!               Constructor constructor = (Constructor) geometric;
!               center = constructor.getOrigin();
!             }
!           }
!           
!           if (center == null) {
!             center = Vertex.center(vertices);
!           }
!           
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
***************
*** 525,532 ****
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           Vertex center = Vertex.center(vertices);
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
            system.setOrigin(center);
            Command command = new Command.Translate(vertices, system);
            AttributeView.instance().display(command);
--- 540,562 ----
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           
!           Vertex center = null;
!           
!           if (entities.size() == 1) {
!             Geometric geometric = entities.iterator().next();
!             if (geometric instanceof Constructor) {
!               Constructor constructor = (Constructor) geometric;
!               center = constructor.getOrigin();
!             }
!           }
!           
!           if (center == null) {
!             center = Vertex.center(vertices);
!           }
!           
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
            system.setOrigin(center);
+           
            Command command = new Command.Translate(vertices, system);
            AttributeView.instance().display(command);
***************
*** 539,546 ****
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           Vertex center = Vertex.center(vertices);
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
            system.setOrigin(center);
            Command command = new Command.Rotate(vertices, system);
            AttributeView.instance().display(command);
--- 569,591 ----
          public void actionPerformed(ActionEvent event) {
            Set<Vertex> vertices = Geometry.collect(entities);
!           
!           Vertex center = null;
!           
!           if (entities.size() == 1) {
!             Geometric geometric = entities.iterator().next();
!             if (geometric instanceof Constructor) {
!               Constructor constructor = (Constructor) geometric;
!               center = constructor.getOrigin();
!             }
!           }
!           
!           if (center == null) {
!             center = Vertex.center(vertices);
!           }
!           
            CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
            system = system.copy();
            system.setOrigin(center);
+           
            Command command = new Command.Rotate(vertices, system);
            AttributeView.instance().display(command);