Changeset 80 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

05/30/08 10:14:43 (16 years ago)

Author:

ra33

Message:

Added some more unit tests
Did a bunch of refactoring
AND added a few new features... @b @v were the most significant

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (12 diffs)

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

@@ -16 +16 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -73 +74 @@
 
         // The link to the message frameset
-        public static Item MessageLink = new Text(-2, MESSAGES_FRAMESET_NAME);
+        public static Item MessageLink = new Text(-2, "@" + MESSAGES_FRAMESET_NAME);
 
         // creator for creating the message frames
@@ -98 +99 @@
                 FrameUtils.Parse(current);
                 DisplayIO.UpdateTitle();
+                setMaxSize(new Dimension(_MaxSize.width, _MessageBuffer.getHeight()
+                                + _MaxSize.height));
                 Repaint();
         }
@@ -112 +115 @@
 
                 FrameUtils.Parse(DisplayIO.getCurrentFrame());
+                DisplayIO.UpdateTitle();
                 Repaint();
         }
@@ -133 +137 @@
                         _MaxSize = max;
 
-                // Mike assumes this is the height of the Message window?
-                _MaxSize.setSize(max.width, max.height - MESSAGE_BUFFER_HEIGHT);
+                // Hide the message buffer if in audience mode
+                int newMaxHeight = max.height
+                                - (isAudienceMode() ? 0 : MESSAGE_BUFFER_HEIGHT);
+                if (newMaxHeight > 0)
+                        _MaxSize.setSize(max.width, newMaxHeight);
+
                 if (DisplayIO.getCurrentFrame() != null) {
                         DisplayIO.getCurrentFrame().setBuffer(null);
@@ -140 +148 @@
                 }
 
-                _MessageBuffer = null;
-
-                for (int i = 0; i < Messages.length; i++) {
-                        if (Messages[i] != null) {
-                                Messages[i].setOffset(0, -_MaxSize.height);
-                                Messages[i].setMaxSize(_MaxSize);
-                        }
-                }
-
-                MessageLink.setOffset(0, -_MaxSize.height);
-                MessageLink.setMaxSize(_MaxSize);
-                MessageLink.setPosition(_MaxSize.width - MESSAGE_LINK_Y_OFFSET,
-                                MESSAGE_LINK_X);
-
+                if (newMaxHeight > 0) {
+                        _MessageBuffer = null;
+
+                        for (int i = 0; i < Messages.length; i++) {
+                                if (Messages[i] != null) {
+                                        Messages[i].setOffset(0, -_MaxSize.height);
+                                        Messages[i].setMaxSize(_MaxSize);
+                                }
+                        }
+
+                        MessageLink.setOffset(0, -_MaxSize.height);
+                        MessageLink.setMaxSize(_MaxSize);
+                        MessageLink.setPosition(_MaxSize.width - MESSAGE_LINK_Y_OFFSET,
+                                        MESSAGE_LINK_X);
+                }
                 // Repaint();
         }
@@ -254 +263 @@
                 List<Item> copies = ItemUtils.CopyItems(vector.getItems());
                 // FrameMouseActions
-                for (Item i : copies) {
+                Iterator<Item> iterator = copies.iterator();
+                while(iterator.hasNext()){
+                        Item i = iterator.next();
+                        //Dont paint annotation items for @v
+                        if (i.isAnnotation()){
+                                iterator.remove();
+                                continue;
+                        }
+                        i.setLinkMark(false);
+                        i.setActionMark(false);
                         if (!(i instanceof Line)) {
                                 i.setPosition((int) (i.getX() * scale + dx + 0.5), (int) (i
@@ -260 +278 @@
                                                 * scale + dy + 0.5));
                                 i.setThickness((int) (i.getThickness() * scale + 0.5));
+                                i.setArrowheadLength((int) (i.getArrowheadLength() * scale + 0.5));
                         }
                         if (i instanceof Text)
@@ -419 +438 @@
 
                         if (isActualFrame) {
-                                PaintItem(bg, toPaint.getFrameNameItem());
+                                PaintItem(bg, toPaint.getNameItem());
                         }
 
@@ -476 +495 @@
                         _MessageBuffer = ge.getDefaultScreenDevice()
                                         .getDefaultConfiguration().createCompatibleVolatileImage(
-                                                        _MaxSize.width, MESSAGE_BUFFER_HEIGHT);
+                                                        _MaxSize.width,
+                                                        (isAudienceMode() ? 0 : MESSAGE_BUFFER_HEIGHT));
                 }
 
@@ -507 +527 @@
                                 g.drawImage(right, 0, 0, Item.DEFAULT_BACKGROUND, null);
                 }
-                // draw the message area
-                g.drawImage(_MessageBuffer, 0, _MaxSize.height, null);
+                // Dont display the message area in audience mode
+                if (!isAudienceMode()) {
+                        // draw the message area
+                        g.drawImage(_MessageBuffer, 0, _MaxSize.height, null);
+                }
                 g.dispose();
 
@@ -749 +772 @@
                 MessageLink.setLink(_creator.getCurrent());
                 Repaint();
+                
+                System.out.println(message);
         }