Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7571/src/net/sourceforge/bprocessor/gui
Modified Files:
PopupMenu.java
Log Message:
Removed transformations from a space and removed all of its uses through space. Added a anchor to space to be used with instances. Changed the display code to use that. Added try catch clause arround display.draw to be able to continue using the tool even if the display method throws exceptions
Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** PopupMenu.java 6 Nov 2007 15:29:06 -0000 1.66
--- PopupMenu.java 6 Nov 2007 18:27:09 -0000 1.67
***************
*** 36,47 ****
import net.sourceforge.bprocessor.model.Mesh;
import net.sourceforge.bprocessor.model.Project;
- import net.sourceforge.bprocessor.model.Rotate;
- import net.sourceforge.bprocessor.model.Scale;
import net.sourceforge.bprocessor.model.Selection;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.SurfaceAnalysis;
- import net.sourceforge.bprocessor.model.Transform;
- import net.sourceforge.bprocessor.model.Translate;
import net.sourceforge.bprocessor.model.Vertex;
import net.sourceforge.bprocessor.model.modellor.Modellor;
--- 36,43 ----
***************
*** 130,202 ****
/**
- * @param s Space
- * @return Transform Menu
- */
- public static JMenu getTransformMenu(Space s) {
- JMenu pm = new JMenu("Transform");
- AbstractAction translate = new SpaceMenuAction(s, "Translate") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Translate();
- space.addTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(translate);
- AbstractAction rotate = new SpaceMenuAction(s, "Rotate") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Rotate();
- space.addTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(rotate);
- AbstractAction scale = new SpaceMenuAction(s, "Scale") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Scale();
- space.addTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(scale);
- AbstractAction translatelocal = new SpaceMenuAction(s, "Translate Local") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Translate();
- space.pushTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(translatelocal);
- AbstractAction rotatelocal = new SpaceMenuAction(s, "Rotate Local") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Rotate();
- space.pushTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(rotatelocal);
- AbstractAction scalelocal = new SpaceMenuAction(s, "Scale Local") {
- public void actionPerformed(ActionEvent arg0) {
- Transform t = new Scale();
- space.pushTransform(t);
- space.changed();
- AttributeView.instance().display(t);
- Project.getInstance().checkpoint();
- }
- };
- pm.add(scalelocal);
- return pm;
- }
-
- /**
* A popup generator for a space
* @param space the space
--- 126,129 ----
***************
*** 315,320 ****
menu.add(modCheck);
}
-
- menu.add(getTransformMenu(sp));
for (Modellor current : Modellor.getRegisteredModellors()) {
--- 242,245 ----
|
