Changeset 512

Timestamp:

11/20/13 11:13:16 (11 years ago)

Author:

jts21

Message:

Make F1/F2 on frame name scale the whole frame

Location:

trunk/src/org/expeditee

Files:

• agents/ScaleFrameset.java (modified) (2 diffs)
• gui/FrameKeyboardActions.java (modified) (2 diffs)

trunk/src/org/expeditee/agents/ScaleFrameset.java

@@ -37 +37 @@
                 // Scale each of the frames
                 for (int i = _firstFrame; i <= _maxFrame; i++) {
-                        Frame next = FrameIO.LoadFrame(framesetName + i);
-                        if (next == null)
-                                continue;
-
-                        for (Vector v : next.getVectors()) {
-                                v.Source.scale(_scale, 0, 0);
-                        }
-
-                        Collection<Item> items = next.getVisibleItems();
-
-                        for (Item item : items) {
-                                // This line is only needed for circles!!
-                                // Need to really fix up the way this works!!
-                                if (item.hasEnclosures())
-                                        continue;
-                                if (!item.hasPermission(UserAppliedPermission.full))
-                                        continue;
-                                item.invalidateAll();
-                                if (!(item instanceof Line)) {
-                                        item.scale(_scale, 0, 0);
-                                }
-                        }
-
-                        for (Item item : items) {
-                                if (!item.hasPermission(UserAppliedPermission.full))
-                                        continue;
-                                // if (!(item instanceof Line))
-                                item.updatePolygon();
-
-                                if (item instanceof Line) {
-                                        ((Line) item).refreshStroke(item.getThickness());
-                                }
-
-                                item.invalidateAll();
-                        }
+                        scaleFrame(FrameIO.LoadFrame(framesetName + i), _scale);
                 }
                 // TODO fix this so it actually works properly!!
@@ -81 +47 @@
                 return null;
         }
+        
+        public static void scaleFrame(Frame frame, float scaleFactor) {
+                
+                if (frame == null) {
+                        return;
+                }
+                
+                for (Vector v : frame.getVectors()) {
+                        v.Source.scale(scaleFactor, 0, 0);
+                }
+                
+                Collection<Item> items = frame.getVisibleItems();
+                
+                for (Item item : items) {
+                        // This line is only needed for circles!!
+                        // Need to really fix up the way this works!!
+                        if (item.hasEnclosures())
+                                continue;
+                        if (!item.hasPermission(UserAppliedPermission.full))
+                                continue;
+                        item.invalidateAll();
+                        if (!(item instanceof Line)) {
+                                item.scale(scaleFactor, 0, 0);
+                        }
+                }
+
+                for (Item item : items) {
+                        if (!item.hasPermission(UserAppliedPermission.full))
+                                continue;
+                        // if (!(item instanceof Line))
+                        item.updatePolygon();
+
+                        if (item instanceof Line) {
+                                ((Line) item).refreshStroke(item.getThickness());
+                        }
+
+                        item.invalidateAll();
+                }
+        }
 }

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -22 +22 @@
 import org.expeditee.actions.Navigation;
 import org.expeditee.actions.Simple;
+import org.expeditee.agents.ScaleFrameset;
 import org.expeditee.io.ItemSelection;
 import org.expeditee.items.Circle;
@@ -1560 +1561 @@
                 } else {
                         if (item.isFrameName()) {
-                                MessageBay.displayMessage("Can not resize the frame name");
+                                // scale the entire frame
+                                ScaleFrameset.scaleFrame(DisplayIO.getCurrentFrame(), (float) (diff > 0 ? 1.1 : 0.909090909));
+                                FrameKeyboardActions.Refresh();
+                                // MessageBay.displayMessage("Can not resize the frame name");
                                 return;
                         }