Changeset 121 for trunk/src/org/expeditee/items/Item.java

Timestamp:

07/03/08 16:48:09 (16 years ago)

Author:

bjn8

Message:

Added invalidation for graphics... biiiig commit. LOts of effeciency improvements - now can animate

File:

• trunk/src/org/expeditee/items/Item.java (modified) (34 diffs)

trunk/src/org/expeditee/items/Item.java

@@ -5 +5 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
@@ -29 +31 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.Overlay;
 import org.expeditee.gui.Vector;
@@ -185 +188 @@
                 if (parent != null) {
                         dest.setID(source.getParentOrCurrentFrame().getNextItemID());
-                }
+                } 
+//              else {
+//                      dest.setID(source.getID());
+//              }
         }
 
@@ -254 +260 @@
         private Color _color = null;
 
-        private Color _highlightColor = DEFAULT_HIGHLIGHT;
+        protected Color _highlightColor = DEFAULT_HIGHLIGHT;
 
         private Color _colorBackground = null;
@@ -525 +531 @@
         }
 
-        protected Polygon getCircle() {
+        protected Polygon getLinkPoly() {
                 if (_circle == null) {
                         int points = 16;
@@ -552 +558 @@
                         _circleCross = new Polygon();
 
-                        Rectangle bounds = getCircle().getBounds();
+                        Rectangle bounds = getLinkPoly().getBounds();
                         int x1 = (int) bounds.getMinX();
                         int x2 = (int) bounds.getMaxX();
@@ -943 +949 @@
                         g.setColor(fillColor);
                         // The painting is not efficient enough for gradients...
-                        // Shape s = getEnclosedShape();
-                        // Rectangle b = s.getBounds();
-                        // GradientPaint gp = new GradientPaint((int) (b.x + b.width * 0.3),
-                        // b.y, getFillColor(), (int) (b.x + b.width * 1.3), b.y,
-                        // Color.white);
-                        // g.setPaint(gp);
-                        // g.fill(s);
+//                       Polygon s = getEnclosedShape();
+//                       Rectangle b = s.getBounds();
+//                       GradientPaint gp = new GradientPaint((int) (b.x + b.width * 0.3),
+//                       b.y, getFillColor(), (int) (b.x + b.width * 1.3), b.y,
+//                       Color.white);
+//                       g.setPaint(gp);
+//                       g.fillPolygon(s);
                         g.fillPolygon(getEnclosedShape());
                 }
@@ -994 +1000 @@
          */
         public void removeAllLines() {
+                for (Line l : _lines) {
+                        l.invalidateAll();
+                }
                 _lines.clear();
         }
@@ -1016 +1025 @@
          */
         public void removeLine(Line line) {
-                _lines.remove(line);
+                if (_lines.remove(line)) 
+                        line.invalidateAll();
         }
 
@@ -1024 +1034 @@
                         Simple.RunFrameAndReportError(this, new Context());
                         Simple.ProgramFinished();
-                        FrameGraphics.DisplayMessage(AgentStats.getStats(), GREEN);
+                        MessageBay.displayMessage(AgentStats.getStats(), GREEN);
                 } catch (ConcurrentModificationException ce) {
                         Simple.ProgramFinished();
                         ce.printStackTrace();
                 } catch (Exception e) {
-                        FrameGraphics.LinkedErrorMessage(e.getMessage());
+                        MessageBay.linkedErrorMessage(e.getMessage());
                         Simple.ProgramFinished();
                 }
@@ -1142 +1152 @@
 
         public void setBackgroundColor(Color c) {
-                _colorBackground = c;
+                if (c != _colorBackground) {
+                        _colorBackground = c;
+                        invalidateCommonTrait(ItemAppearence.BackgroundColorChanged);
+                }
         }
 
@@ -1163 +1176 @@
          */
         public void setColor(Color c) {
-                _color = c;
+                if (c != _color) {
+                        _color = c;
+                        invalidateCommonTrait(ItemAppearence.ForegroundColorChanged);
+                }
         }
 
@@ -1191 +1207 @@
 
         public void setFillColor(Color c) {
+
                 _colorFill = c;
 
@@ -1198 +1215 @@
                                 other.setFillColor(c);
                 }
+                
+                invalidateCommonTrait(ItemAppearence.FillColor);
+                invalidateFill();
         }
 
         public void setFillPattern(String patternLink) {
                 _fillPattern = patternLink;
+                invalidateCommonTrait(ItemAppearence.FillPattern);
+                invalidateFill();
         }
 
@@ -1244 +1266 @@
                 for (Line line : lines)
                         line.setLinePattern(getLinePattern());
+                
+                
         }
 
@@ -1254 +1278 @@
          */
         public void setLink(String frameName) {
-                if (FrameIO.isValidLink(frameName))
+                if (FrameIO.isValidLink(frameName)) 
                         _link = frameName;
                 else
-                        FrameGraphics.ErrorMessage("[" + frameName
+                        MessageBay.errorMessage("[" + frameName
                                         + "] is not a valid frame name");
                 // TODO make this throw exceptions etc...
+                
+                invalidate(getLinkDrawArea());
         }
 
@@ -1266 +1292 @@
                         _link_frameset = frameset;
                 else
-                        FrameGraphics.ErrorMessage("[" + frameset
+                        MessageBay.errorMessage("[" + frameset
                                         + "] is not a valid frameset name");
                 // TODO make this throw exceptions etc...
@@ -1280 +1306 @@
                         _link_template = template;
                 else
-                        FrameGraphics.ErrorMessage("[" + template
+                        MessageBay.errorMessage("[" + template
                                         + "] is not a valid frame name");
                 // TODO make this throw exceptions etc...
@@ -1316 +1342 @@
 
         /**
+         * Invalidates this, connected lines and fill
+         * @param trait
+         */
+        private void invalidateCommonTraitForAll(ItemAppearence trait) {
+                invalidateCommonTrait(trait);
+                for (Line line : getLines()) 
+                        line.invalidateCommonTrait(trait);
+                if (_colorFill != null) {
+                        invalidateFill(); // only invalidates if has fill
+                }
+                for(XRayable x: getEnclosures()){
+                        x.invalidateCommonTrait(trait);
+                }
+
+        }
+        
+        
+        /**
          * Sets the position of this item on the screen
          * 
@@ -1326 +1370 @@
                 float deltaX = x - _x;
                 float deltaY = y - _y;
+                
+                if (deltaX == 0 && deltaY == 0) return;
+                
+                invalidateCommonTraitForAll(ItemAppearence.PreMoved);
 
                 _x = x;
@@ -1413 +1461 @@
                 }
 
-                for (Line line : getLines())
-                        line.updatePolygon();
+                for (Line line : getLines()) {
+                        line.updatePolygon();   
+                }
+                
+                invalidateCommonTraitForAll(ItemAppearence.PostMoved);
+                
         }
 
@@ -1463 +1515 @@
          */
         public void setThickness(float thick, boolean setConnectedThickness) {
+                
+                if (thick == _thickness) return;
+                boolean bigger = thick > _thickness;
+                
+                if (!bigger) invalidateCommonTrait(ItemAppearence.Thickness);
+                
                 _thickness = thick;
                 // update the size of any lines
                 for (Line line : getLines())
                         line.setThickness(thick, setConnectedThickness);
+
+                if (bigger) invalidateCommonTrait(ItemAppearence.Thickness);
         }
 
@@ -1534 +1594 @@
 
         public int setHighlightColor(Color c) {
+                
                 _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                if (c != null)
-                        _highlightColor = c;
-                else
-                        _highlightColor = DEFAULT_HIGHLIGHT;
+                
+                Color selColor = (c != null) ? c : DEFAULT_HIGHLIGHT;
+                if (_highlightColor != c) {
+                        _highlightColor = selColor;
+                        this.invalidateCommonTrait(ItemAppearence.HighlightColorChanged);
+                }
 
                 return Item.UNCHANGED_CURSOR;
+                
         }
 
@@ -1589 +1653 @@
         public void setHighlightMode(HighlightMode mode, Color color) {
                 setHighlightColor(color);
-                _mode = mode;
+                if (_mode != mode) {
+                        _mode = mode;
+                        this.invalidateCommonTrait(ItemAppearence.HighlightModeChanged);
+                }
         }
 
@@ -1655 +1722 @@
          */
         public void setEnclosedList(Collection<Item> enclosed) {
+                
+                boolean changed = (_enclosure == null && enclosed != null);
+                
+                if (_enclosure != null && enclosed == null) {
+                        invalidateFill();
+                }
+                
                 _enclosure = enclosed;
+                
+                if (changed) {
+                        invalidateFill();;
+                }
         }
 
@@ -1773 +1851 @@
                 if (_actions == null || _actions.size() == 0) {
                         _poly = null;
+                        invalidateCommonTrait(ItemAppearence.LinkChanged);
                 }
                 _actions = new LinkedList<String>();
@@ -1780 +1859 @@
         protected int getLinkYOffset() {
                 return 0;
+        }
+        
+        protected Rectangle getLinkDrawArea() { // TODO: Revise
+                return new Rectangle(getX() - LEFT_MARGIN - 3, getY() + getLinkYOffset() - 3, 6, 6);
         }
 
@@ -1804 +1887 @@
 
                         if (getLinkMark() && getLink() != null) {
-                                g.drawPolygon(getCircle());
+                                g.drawPolygon(getLinkPoly());
 
                                 // if the link is not valid, cross out the circle
@@ -1812 +1895 @@
 
                         if (getActionMark() && getAction() != null) {
-                                g.drawPolygon(getCircle());
-                                g.fillPolygon(getCircle());
+                                g.drawPolygon(getLinkPoly());
+                                g.fillPolygon(getLinkPoly());
 
                                 // if the link is not valid, cross out the circle
@@ -1973 +2056 @@
          */
         public void translate(Point2D origin, double ratio) {
+                
+                invalidateCommonTraitForAll(ItemAppearence.PreMoved);
+                
                 _x = (float) (origin.getX() + ratio * (_x - origin.getX()));
                 _y = (float) (origin.getY() + ratio * (_y - origin.getY()));
@@ -1978 +2064 @@
                 for (Line line : getLines())
                         line.updatePolygon();
+                
+                invalidateCommonTraitForAll(ItemAppearence.PostMoved);
+                
         }
 
@@ -2005 +2094 @@
                                         setLinePattern(new int[] { LinePatterns[i], LinePatterns[i] });
                                 }
+                                
+                                invalidateCommonTrait(ItemAppearence.ToggleDashed);
                                 return;
                         }
                 }
+                
+                
         }
 
@@ -2037 +2130 @@
         public boolean isDeleted() {
                 return _deleted;
+        }
+        
+        /**
+         * @return The full canvas that this item draws to. Must include highlighting bounds
+         */
+        public Rectangle[] getDrawingArea() {
+                
+                return new Rectangle[] {
+                                ItemUtils.expandRectangle(getPolygon().getBounds(), 
+                                _highlightThickness)
+                        };
+                
+        }
+        
+        /**
+         * 
+         * @param area
+         * @return True if area intersects with this items drawing area.
+         */
+        public final boolean isInDrawingArea(Area area) {
+                for (Rectangle r : getDrawingArea()) {
+                        if (area.intersects(r)) return true;
+                }
+                return false;
+        }
+        
+        /**
+         * Completetly invalidates the item - so that it should be redrawed.
+         * Note: This is handled internally, it should be reare to invoke this
+         * externally
+         */
+        public final void invalidateAll() {
+                invalidate(getDrawingArea());
+        }
+        
+        /**
+         * Invalidates areas on the parent frame.
+         * Purpose: to be called on specific areas of the item that needs redrawing. 
+         * @param damagedAreas
+         */
+        protected final void invalidate(Rectangle[] damagedAreas) {
+                for (Rectangle r : damagedAreas) invalidate(r);
+        }
+        
+        /**
+         * Invalidates areas on the parent frame.
+         * Purpose: to be called on specific areas of the item that needs redrawing. 
+         * @param damagedAreas
+         */
+        protected final void invalidate(Rectangle damagedArea) {
+                FrameGraphics.invalidateItem(this, damagedArea);
+        }
+        
+        /**
+         * Used to invalidate visual traits commonly shared by all items.
+         * @param trait
+         */
+        public final void invalidateCommonTrait(ItemAppearence trait) {
+                invalidate(getDamagedArea(trait));
+                
+                if (_colorFill != null && (
+                                trait == ItemAppearence.Added
+                                || trait == ItemAppearence.Removed)
+                                ) {
+                        invalidateFill();
+                }
+        }
+        
+        /**
+         * Invalidates fill if has one, even if no color is set.
+         */
+        public void invalidateFill() {
+                if (isLineEnd() && _enclosure != null) {
+                        invalidate(getEnclosedShape().getBounds());
+                }
+        }
+        
+        /**
+         * Default implementation always uses drawing area except for links,
+         * where the link drawing area is used. Override to make item 
+         * drawing more efficient - defining only parts of the item that needs
+         * redrawing.
+         * 
+         * @see Item.getDrawingArea
+         * 
+         * @param trait The visual trait that has changed.
+         * 
+         * @return The damaged area according to the visual trait that has changed.
+         */
+        protected Rectangle[] getDamagedArea(ItemAppearence trait) {
+                
+                if (trait == ItemAppearence.LinkChanged) 
+                        return new Rectangle[] {getLinkDrawArea()}; // Invalidate area where link is drawn
+                        
+                return getDrawingArea();
+
         }
 
@@ -2056 +2245 @@
                 _overlay = overlay;
         }
+
 }