Changeset 124

Timestamp:

07/03/08 18:18:19 (16 years ago)

Author:

ra33

Message:

Repaint now works with cropping and changing color of @b and @v

Location:

trunk/src/org/expeditee

Files:

• gui/ExpediteeRepaintManager.java (modified) (3 diffs)
• gui/FrameGraphics.java (modified) (1 diff)
• items/Item.java (modified) (26 diffs)
• items/Picture.java (modified) (7 diffs)
• items/XRayable.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
-import java.applet.Applet;
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Window;
 
 import javax.swing.JComponent;
@@ -48 +46 @@
     }
     
-        @Override
+        /*@Override
         public void addDirtyRegion(Applet applet, int x, int y, int w, int h) {
                 // Ignore
@@ -56 +54 @@
         public void addDirtyRegion(Window window, int x, int y, int w, int h) {
                 // Ignore
-        }
+        }*/
     
     /**

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

@@ -799 +799 @@
                                 damagedAreas.clear();
                         }
-                        System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
+                        //System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
                 }
 

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

@@ -28 +28 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
@@ -186 +187 @@
                 if (parent != null) {
                         dest.setID(source.getParentOrCurrentFrame().getNextItemID());
-                } 
-//              else {
-//                      dest.setID(source.getID());
-//              }
+                }
+                // else {
+                // dest.setID(source.getID());
+                // }
         }
 
@@ -947 +948 @@
                         g.setColor(fillColor);
                         // The painting is not efficient enough for gradients...
-//                       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);
+                        // 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());
                 }
@@ -1023 +1024 @@
          */
         public void removeLine(Line line) {
-                if (_lines.remove(line)) 
+                if (_lines.remove(line))
                         line.invalidateAll();
         }
@@ -1177 +1178 @@
                         _color = c;
                         invalidateCommonTrait(ItemAppearence.ForegroundColorChanged);
+                        if (hasVector()) {
+                                //TODO make this more efficient so it only repaints the items for this vector
+                                FrameKeyboardActions.Refresh();
+                        }
                 }
         }
@@ -1213 +1218 @@
                                 other.setFillColor(c);
                 }
-                
+
                 invalidateCommonTrait(ItemAppearence.FillColor);
                 invalidateFill();
@@ -1264 +1269 @@
                 for (Line line : lines)
                         line.setLinePattern(getLinePattern());
-                
-                
+
         }
 
@@ -1276 +1280 @@
          */
         public void setLink(String frameName) {
-                if (FrameIO.isValidLink(frameName)) 
+                if (FrameIO.isValidLink(frameName))
                         _link = frameName;
                 else
@@ -1282 +1286 @@
                                         + "] is not a valid frame name");
                 // TODO make this throw exceptions etc...
-                
+
                 invalidate(getLinkDrawArea());
         }
@@ -1341 +1345 @@
         /**
          * Invalidates this, connected lines and fill
+         * 
          * @param trait
          */
         private void invalidateCommonTraitForAll(ItemAppearence trait) {
                 invalidateCommonTrait(trait);
-                for (Line line : getLines()) 
+                for (Line line : getLines())
                         line.invalidateCommonTrait(trait);
                 if (_colorFill != null) {
                         invalidateFill(); // only invalidates if has fill
                 }
-                for(XRayable x: getEnclosures()){
+                for (XRayable x : getEnclosures()) {
                         x.invalidateCommonTrait(trait);
                 }
 
         }
-        
-        
+
         /**
          * Sets the position of this item on the screen
@@ -1368 +1372 @@
                 float deltaX = x - _x;
                 float deltaY = y - _y;
-                
-                if (deltaX == 0 && deltaY == 0) return;
-                
+
+                if (deltaX == 0 && deltaY == 0)
+                        return;
+
                 invalidateCommonTraitForAll(ItemAppearence.PreMoved);
 
@@ -1460 +1465 @@
 
                 for (Line line : getLines()) {
-                        line.updatePolygon();   
-                }
-                
+                        line.updatePolygon();
+                }
+
                 invalidateCommonTraitForAll(ItemAppearence.PostMoved);
-                
+
         }
 
@@ -1513 +1518 @@
          */
         public void setThickness(float thick, boolean setConnectedThickness) {
-                
-                if (thick == _thickness) return;
+
+                if (thick == _thickness)
+                        return;
                 boolean bigger = thick > _thickness;
-                
-                if (!bigger) invalidateCommonTrait(ItemAppearence.Thickness);
-                
+
+                if (!bigger)
+                        invalidateCommonTrait(ItemAppearence.Thickness);
+
                 _thickness = thick;
                 // update the size of any lines
@@ -1524 +1531 @@
                         line.setThickness(thick, setConnectedThickness);
 
-                if (bigger) invalidateCommonTrait(ItemAppearence.Thickness);
+                if (bigger)
+                        invalidateCommonTrait(ItemAppearence.Thickness);
         }
 
@@ -1592 +1600 @@
 
         public int setHighlightColor(Color c) {
-                
+
                 _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                
+
                 Color selColor = (c != null) ? c : DEFAULT_HIGHLIGHT;
                 if (_highlightColor != c) {
@@ -1602 +1610 @@
 
                 return Item.UNCHANGED_CURSOR;
-                
+
         }
 
@@ -1720 +1728 @@
          */
         public void setEnclosedList(Collection<Item> enclosed) {
-                
+
                 boolean changed = (_enclosure == null && enclosed != null);
-                
+
                 if (_enclosure != null && enclosed == null) {
                         invalidateFill();
                 }
-                
+
                 _enclosure = enclosed;
-                
+
                 if (changed) {
-                        invalidateFill();;
+                        invalidateFill();
+                        ;
                 }
         }
@@ -1858 +1867 @@
                 return 0;
         }
-        
+
         protected Rectangle getLinkDrawArea() { // TODO: Revise
-                return new Rectangle(getX() - LEFT_MARGIN - 3, getY() + getLinkYOffset() - 3, 6, 6);
+                return new Rectangle(getX() - LEFT_MARGIN - 3, getY()
+                                + getLinkYOffset() - 3, 6, 6);
         }
 
@@ -2054 +2064 @@
          */
         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()));
@@ -2062 +2072 @@
                 for (Line line : getLines())
                         line.updatePolygon();
-                
+
                 invalidateCommonTraitForAll(ItemAppearence.PostMoved);
-                
+
         }
 
@@ -2092 +2102 @@
                                         setLinePattern(new int[] { LinePatterns[i], LinePatterns[i] });
                                 }
-                                
+
                                 invalidateCommonTrait(ItemAppearence.ToggleDashed);
                                 return;
                         }
                 }
-                
-                
+
         }
 
@@ -2129 +2138 @@
                 return _deleted;
         }
-        
-        /**
-         * @return The full canvas that this item draws to. Must include highlighting bounds
+
+        /**
+         * @return The full canvas that this item draws to. Must include
+         *         highlighting bounds
          */
         public Rectangle[] getDrawingArea() {
-                
-                return new Rectangle[] {
-                                ItemUtils.expandRectangle(getPolygon().getBounds(), 
-                                _highlightThickness)
-                        };
-                
-        }
-        
+
+                return new Rectangle[] { ItemUtils.expandRectangle(getPolygon()
+                                .getBounds(), _highlightThickness) };
+
+        }
+
         /**
          * 
@@ -2149 +2157 @@
         public final boolean isInDrawingArea(Area area) {
                 for (Rectangle r : getDrawingArea()) {
-                        if (area.intersects(r)) return true;
+                        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
+
+        /**
+         * 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. 
+
+        /**
+         * 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. 
+                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
          */
@@ -2180 +2191 @@
                 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)
-                                ) {
+
+                if (_colorFill != null
+                                && (trait == ItemAppearence.Added || trait == ItemAppearence.Removed)) {
                         invalidateFill();
                 }
         }
-        
+
         /**
          * Invalidates fill if has one, even if no color is set.
@@ -2204 +2214 @@
                 }
         }
-        
-        /**
-         * 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.
+
+        /**
+         * 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.
+         * @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
-                        
+
+                if (trait == ItemAppearence.LinkChanged)
+                        return new Rectangle[] { getLinkDrawArea() }; // Invalidate area
+                                                                                                                        // where link is
+                                                                                                                        // drawn
+
                 return getDrawingArea();
 
@@ -2229 +2241 @@
                 return _overlay instanceof Vector;
         }
-        
+
         public boolean hasOverlay() {
                 return _overlay != null;

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

@@ -112 +112 @@
                 String size = _source.getFirstLine();
                 size = AttributeUtils.getValue(size);
-                
-                if(_end.x != 0 || _end.y != 0)
+
+                if (_end.x != 0 || _end.y != 0)
                         return;
-                
+
                 // set the default values for start and end
                 _start.setLocation(0, 0);
@@ -163 +163 @@
 
         public void setStartCrop(int x, int y) {
+                invalidateCroppedArea();
                 _cropStart = new Point(x - getX(), y - getY());
+                invalidateCroppedArea();
         }
 
         public void setEndCrop(int x, int y) {
+                invalidateCroppedArea();
                 _cropEnd = new Point(x - getX(), y - getY());
+                invalidateCroppedArea();
+        }
+
+        private void invalidateCroppedArea() {
+                if (_cropStart != null && _cropEnd != null) {
+                        Point topLeft = getTopLeftCrop();
+                        Point bottomRight = getBottomRightCrop();
+                        int startX = getX() + topLeft.x - _highlightThickness;
+                        int startY = getY() + topLeft.y - _highlightThickness;
+                        int border = 2 * _highlightThickness;
+                        invalidate(new Rectangle(startX, startY, bottomRight.x - topLeft.x
+                                        + 2 * border, bottomRight.y - topLeft.y + 2 * border));
+                        invalidateAll();
+                } else {
+                        invalidateAll();
+                }
         }
 
@@ -181 +200 @@
 
         public void setShowCrop(boolean value) {
+                //invalidateCroppedArea();
                 _showCropping = value;
+                invalidateCroppedArea();
         }
 
@@ -195 +216 @@
 
         public void clearCropping() {
+                invalidateCroppedArea();
                 _cropStart = null;
                 _cropEnd = null;
@@ -391 +413 @@
                 return _scale;
         }
-        
-        public void setScale(float scale){
+
+        public void setScale(float scale) {
                 _scale = scale;
         }
-        
+
         @Override
         public float getSize() {
@@ -519 +541 @@
                 _source.setText(newText.toString());
         }
-        
-        @Override
-        public void translate(Point2D origin, double ratio){
+
+        @Override
+        public void translate(Point2D origin, double ratio) {
                 _scale *= ratio;
                 updateSource();
@@ -529 +551 @@
         @Override
         public Rectangle[] getDrawingArea() {
-                
+
                 Rectangle[] da = super.getDrawingArea();
-                
+
                 if (getLink() != null || getAction() != null) {
                         Rectangle[] da2 = new Rectangle[da.length + 1];
                         System.arraycopy(da, 0, da2, 0, da.length);
                         da2[da.length] = getLinkPoly().getBounds();
-                        da2[da.length].translate(getX() - LEFT_MARGIN, getY() + getLinkYOffset());
+                        da2[da.length].translate(getX() - LEFT_MARGIN, getY()
+                                        + getLinkYOffset());
                         da2[da.length].width += 2;
                         da2[da.length].height += 2;
                         da = da2;
-                } 
-                
+                }
+
                 return da;
-                
-        }
-        
-        
+
+        }
+
 }

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

@@ -88 +88 @@
         public void setColor(Color c) {
                 _source.setColor(c);
+                invalidateCommonTrait(ItemAppearence.ForegroundColorChanged);
         }