Changeset 1102 for trunk/src/org/expeditee/items/Picture.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/Picture.java (modified) (38 diffs)

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

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.Toolkit;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.CropImageFilter;
-import java.awt.image.FilteredImageSource;
-import java.awt.image.ImageObserver;
-import java.awt.image.PixelGrabber;
 import java.io.File;
 import java.io.IOException;
 import java.text.DecimalFormat;
-
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
 
 import org.apache.commons.cli.CommandLine;
@@ -49 +28 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Clip;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.EnforcedClipStack.EnforcedClipKey;
+import org.expeditee.core.Image;
+import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.core.bounds.CombinationBoxBounds;
+import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.GraphicsManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
-import org.expeditee.items.widgets.InteractiveWidget;
-import org.expeditee.stats.Logger;
 
 /**
@@ -75 +63 @@
  */
 public class Picture extends XRayable {
+        
+        private static final float CROPPING_COMPOSITE_ALPHA = 0.5f;
 
         private static final int MINIMUM_WIDTH = 10;
@@ -114 +104 @@
         private String _fileName = null;
 
-        // used to repaint animated GIF images, among other things.
-        protected ImageObserver _imageObserver = null;
-
-        protected Picture(Text source, ImageObserver observer, Image image) {
+        protected Picture(Text source, Image image) {
                 super(source);
-                _imageObserver = observer;
                 _image = image;
 
@@ -150 +136 @@
          *            screen.
          */
-        public Picture(Text source, String fileName, String path, String size,
-                        ImageObserver observer) {
+        public Picture(Text source, String fileName, String path, String size)
+        {
                 super(source);
-                _imageObserver = observer;
                 _fileName = fileName;
                 _path = path;
@@ -226 +211 @@
 
                 // set the default values for start and end
-                _start.setLocation(0, 0);
+                _start.set(0, 0);
                 if (_image == null)
-                        _end.setLocation(0, 0);
+                        _end.set(0, 0);
                 else
-                        _end.setLocation(_image.getWidth(null), _image.getHeight(null));
+                        _end.set(_image.getWidth(), _image.getHeight());
                 size = size.trim();
                 String sizeLower = size.toLowerCase();
@@ -272 +257 @@
                 try {
                         if (size.length() == 0) {
-                                size = "" + _image.getWidth(null);
+                                size = "" + _image.getWidth();
                                 _source.setText(getTagText() + size);
                                 return;
@@ -293 +278 @@
         }
 
+        public void setStartCrop(Point p)
+        {
+                if (p != null) setStartCrop(p.x, p.y);
+        }
+        
         public void setStartCrop(int x, int y) {
                 invalidateCroppedArea();
                 _cropStart = new Point(x - getX(), y - getY());
                 invalidateCroppedArea();
+        }
+
+        public void setEndCrop(Point p)
+        {
+                if (p != null) setEndCrop(p.x, p.y);
         }
 
@@ -312 +307 @@
                         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));
+                        // TODO: Why invalidate specific area just before invalidateAll? cts16
+                        invalidate(new AxisAlignedBoxBounds(startX, startY,
+                                        bottomRight.x - topLeft.x + 2 * border, bottomRight.y - topLeft.y + 2 * border));
                         invalidateAll();
                 } else {
@@ -325 +321 @@
         }
 
-        public Point getBottomRightCrop() {
-                return new Point(Math.max(_cropStart.x, _cropEnd.x), Math.max(
-                                _cropStart.y, _cropEnd.y));
+        public Point getBottomRightCrop()
+        {
+                return new Point(Math.max(_cropStart.x, _cropEnd.x), Math.max(_cropStart.y, _cropEnd.y));
         }
 
@@ -335 +331 @@
                 invalidateCroppedArea();
         }
-
-        public boolean isCropTooSmall() {
-                if (_cropStart == null || _cropEnd == null)
-                        return true;
+        
+        public boolean isBeingCropped()
+        {
+                return (_cropStart != null && _cropEnd != null);
+        }
+
+        public boolean isCropTooSmall()
+        {
+                if (!isBeingCropped()) return true;
 
                 int cropWidth = Math.abs(_cropEnd.x - _cropStart.x);
@@ -353 +354 @@
         }
 
-        public void updatePolygon() {
+        public PolygonBounds updateBounds()
+        {
                 if (_image == null) {
                         refresh();
@@ -360 +362 @@
                 
                 Point[] ori = new Point[4];
-                Point2D[] rot = new Point2D[4];
                 Point centre = new Point();
 
@@ -393 +394 @@
                         centre.y = base_y + (bottomRight.y - topLeft.y) / 2;
                         
-                        Rectangle clip = new Rectangle(topLeft.x + base_x,
+                        AxisAlignedBoxBounds clip = new AxisAlignedBoxBounds(topLeft.x + base_x,
                                         topLeft.y + base_y, bottomRight.x - topLeft.x,
-                                        bottomRight.y - topLeft.y).getBounds();
+                                        bottomRight.y - topLeft.y);
 //                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
 //                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMaxY());
@@ -408 +409 @@
                 }
                 
-                AffineTransform.getRotateInstance(Math.PI * _rotate / 180, centre.x, centre.y).transform(ori, 0, rot, 0, 4);
-                
-                _poly = new Polygon();
-                for(Point2D p : rot) {
-                        _poly.addPoint((int)p.getX(), (int)p.getY());
-                }
+                PolygonBounds poly = new PolygonBounds();
+                for (Point p : ori) {
+                        poly.addPoint(p);
+                }
+                poly.rotate(Math.PI * _rotate / 180, centre);
+                
+                return poly.close();
         }
 
@@ -454 +456 @@
          */
         @Override
-        protected void paintLink(Graphics2D g) {
-                if (FrameGraphics.isAudienceMode())
-                        return;
-                super.paintLink(g);
-        }
-        
-        public void paintImageTiling(Graphics2D g) {
-                if (_image == null) {
-                        return;
-                }
-                
-                int iw = _image.getWidth(null);
-                int ih = _image.getHeight(null);
-                if(iw <= 0 || ih <= 0) {
-                        return;
-                }
-                
-                int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
-                int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
+        protected void paintLink()
+        {
+                if (DisplayController.isAudienceMode()) return;
+                super.paintLink();
+        }
+        
+        /**
+         * Paint the image repeatedly tiled over the drawing area.
+         */
+        public void paintImageTiling()
+        {       
+                if (_image == null) return;
+                
+                int iw = _image.getWidth();
+                int ih = _image.getHeight();
+                if(iw <= 0 || ih <= 0) return;
+                
+                int base_x = (_anchorLeft != null) ? _anchorLeft : _source.getX();
+                int base_y = (_anchorTop != null) ? _anchorTop : _source.getY();
                 
                 int dX1 = base_x;
@@ -479 +481 @@
                 int dY2 = base_y + getHeight();
                 
-                BufferedImage tmp = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB);
-                Graphics2D g2d = tmp.createGraphics();
+                Image tmp = Image.createImage(getWidth(), getHeight());
+                EcosystemManager.getGraphicsManager().pushDrawingSurface(tmp);
+
                 int offX = (tmp.getWidth() - getWidth()) / 2;
                 int offY = (tmp.getHeight() - getHeight()) / 2;
-                
-                // g2d.rotate(rotate, tmp.getWidth() / 2, tmp.getHeight() / 2);
                 
                 int cropStartX = _start.x;
@@ -491 +492 @@
                 cropEndX = iw;
         }
+        
                 for(int x = dX1; x < dX2; ) {
                         // end - start = (cropEnd - cropStart) * scale
@@ -506 +508 @@
                         cropEndY = ih;
                 }
+                
                         for(int y = dY1; y < dY2; ) {
                                 int h = (int) ((cropEndY - cropStartY) * _scale);
@@ -518 +521 @@
                                 int sy = _flipY ? cropEndY : cropStartY;
                                 int ey = _flipY ? cropStartY : cropEndY;
-                                g2d.drawImage(_image, x - dX1 + offX, y - dY1 + offY, endX - dX1 + offX, endY - dY1 + offY, sx, sy, ex, ey, null);
+                                
+                                Point topLeft = new Point(x - dX1 + offX, y - dY1 + offY);
+                                Dimension size = new Dimension(endX - x, endY - y);
+                                Point cropTopLeft = new Point(sx, sy);
+                                Dimension cropSize = new Dimension(ex - sx, ey - sy);
+                                if (cropSize.width > 0 && cropSize.height > 0) {
+                                        EcosystemManager.getGraphicsManager().drawImage(_image, topLeft, size, 0.0, cropTopLeft, cropSize);
+                                }
                                 
                                 cropStartY = 0;
@@ -531 +541 @@
                         x = endX;
                 }
-                
-                AffineTransform at = new AffineTransform();
-                at.translate(dX1, dY1);
-                at.rotate(Math.PI * _rotate / 180, tmp.getWidth() / 2, tmp.getHeight() / 2);
-                g.drawImage(tmp, at, _imageObserver);
-                // g.drawImage(tmp, dX1, dY1, dX2, dY2, 0, 0, tmp.getWidth(), tmp.getHeight(), _imageObserver);
-        }
-
-        @Override
-        public void paint(Graphics2D g) {
-                if (_image == null)
-                        return;
-
-                paintLink(g);
-
-                // if we are showing the cropping, then show the original as transparent
+
+                EcosystemManager.getGraphicsManager().popDrawingSurface();
+                EcosystemManager.getGraphicsManager().drawImage(tmp, new Point(dX1, dY1), null, Math.PI * _rotate / 180);
+                tmp.releaseImage();
+        }
+
+        @Override
+        public void paint()
+        {
+                if (_image == null) return;
+
+                paintLink();
+                
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+
+                // if we are showing the cropping
                 if (_showCropping && !isCropTooSmall()) {
-                        // show the full image as transparent
-                        float alpha = .5f;
-                        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
-                                        alpha));
-                        
-                        paintImageTiling(g);
-
-                        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
-                                        1.0f));
+                        // show the uncropped area as transparent
+                        g.setCompositeAlpha(CROPPING_COMPOSITE_ALPHA);
+                        paintImageTiling();
+                        g.setCompositeAlpha(1.0f);
+                        
                         // show the cropped area normally
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
-                        int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
-                        
-                        Shape clip = new Rectangle(base_x + topLeft.x, base_y + topLeft.y,
-                                        bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
-                        g.setColor(getPaintHighlightColor());
-                        g.draw(clip);
-                        g.setClip(clip);
-
-                        paintImageTiling(g);
-                        
-                        g.draw(clip);
-                        // if the image is cropped, but we are not showing the cropping
-                        // otherwise, paint normally
+                        int base_x = (_anchorLeft != null) ? _anchorLeft : _source.getX();
+                        int base_y = (_anchorTop != null) ? _anchorTop : _source.getY();
+                        
+                        Clip clip = new Clip(new AxisAlignedBoxBounds(  base_x + topLeft.x,
+                                                                                                                                        base_y + topLeft.y,
+                                                                                                                                        bottomRight.x - topLeft.x,
+                                                                                                                                        bottomRight.y - topLeft.y));
+                        EnforcedClipKey key = g.pushClip(clip);
+                        paintImageTiling();
+                        g.popClip(key);
+
+                        // Draw an outline for the crop selection box
+                        g.drawRectangle(clip.getBounds(), 0.0, null, getPaintHighlightColor(), HIGHLIGHT_STROKE, null);
+
+                // otherwise, paint normally
                 } else {
-                        paintImageTiling(g);
-                }
-
+                        paintImageTiling();
+                }
+
+                PolygonBounds poly = (PolygonBounds) getBounds();
+                
                 if (hasVisibleBorder()) {
-                        g.setColor(getPaintBorderColor());
-                        Stroke borderStroke = new BasicStroke(getThickness(), CAP, JOIN);
-                        g.setStroke(borderStroke);
-                        g.drawPolygon(getPolygon());
+                        Stroke borderStroke = new Stroke(getThickness(), DEFAULT_CAP, DEFAULT_JOIN);
+                        g.drawPolygon(poly, null, null, 0.0, null, getPaintBorderColor(), borderStroke);
                 }
 
                 if (isHighlighted()) {
-                        Stroke borderStroke = new BasicStroke(1, CAP, JOIN);
-                        g.setStroke(borderStroke);
-                        g.setColor(getHighlightColor());
-                        g.drawPolygon(getPolygon());
-                }
-                
-                //System.out.print("p_");       
-        }
-
-        @Override
-        public Color getHighlightColor() {
-                if (_highlightColor.equals(getBorderColor()))
-                        return ALTERNATE_HIGHLIGHT;
-                return _highlightColor;
-        }
-
-        @Override
-        public int setHighlightColor() {
-                super.setHighlightColor();
-
-                return Item.DEFAULT_CURSOR;
-        }
-
-        protected Picture createPicture() {
-                return ItemUtils.CreatePicture((Text) _source.copy(), _imageObserver);
+                        Stroke borderStroke = new Stroke(1, DEFAULT_CAP, DEFAULT_JOIN);
+                        g.drawPolygon(poly, null, null, 0.0, null, getHighlightColor(), borderStroke);
+                }
+        }
+
+        @Override
+        public Colour getHighlightColor()
+        {
+                if (_highlightColour.equals(getBorderColor())) return ALTERNATE_HIGHLIGHT;
+                return _highlightColour;
+        }
+
+        protected Picture createPicture()
+        {
+                return ItemUtils.CreatePicture((Text) _source.copy());
         }
 
@@ -617 +614 @@
                 Picture p = createPicture();
                 p._image = _image;
-                p._mode = _mode;
+                p._highlightMode = _highlightMode;
                 // Doing Duplicate item duplicates link mark which we dont want to do
                 // when in audience mode because the linkMark will be copied incorrectly
@@ -632 +629 @@
                         int endX = Math.round(bottomRight.x / _scale + _start.x);
                         int endY = Math.round(bottomRight.y / _scale + _start.y);
-                        int width = _image.getWidth(null);
-                        int height = _image.getHeight(null);
+                        int width = _image.getWidth();
+                        int height = _image.getHeight();
                         // adjust our start and end if the user has dragged outside of the
                         // shape
@@ -663 +660 @@
 
                 p.updateSource();
-                p.updatePolygon();
+                p.invalidateBounds();
 
                 return p;
@@ -678 +675 @@
         public void scaleCrop() {
                 // scale crop values to within image bounds
-                int iw = _image.getWidth(null);
-                int ih = _image.getHeight(null);
+                int iw = _image.getWidth();
+                int ih = _image.getHeight();
                 if(iw > 0 || ih > 0) {
                         while(_start.x >= iw) {
@@ -723 +720 @@
                         _scale = oldScale;
                 } else {
-                        _source.translate(new Point2D.Float(FrameMouseActions.MouseX,
-                                        FrameMouseActions.MouseY), multiplier);
+                        _source.translate(EcosystemManager.getInputManager().getCursorPosition(), multiplier);
                 }
                 updateSource();
-                updatePolygon();
+                invalidateBounds();
                 // Make sure items that are resized display the border
                 invalidateAll();
@@ -753 +749 @@
                 }
                 
-                return Toolkit.getDefaultToolkit().createImage(
-                                new FilteredImageSource(_image.getSource(),
-                                                new CropImageFilter(_start.x, _start.y,
-                                                                getUnscaledWidth(), getUnscaledHeight())));
+                return Image.createImageAsCroppedCopy(_image, _start.x, _start.y, getUnscaledWidth(), getUnscaledHeight());
         }
 
@@ -771 +764 @@
          */
         public boolean isCropped() {
-                return (_end.x != 0 && _end.x != _image.getWidth(null)) || (_end.y != 0 && _end.y != _image.getHeight(null)) || _start.y != 0 || _start.x != 0;
+                return (_end.x != 0 && _end.x != _image.getWidth()) || (_end.y != 0 && _end.y != _image.getHeight()) || _start.y != 0 || _start.x != 0;
         }
 
@@ -779 +772 @@
                 // (notably.bmp) hence, we try this first, then if it fails we try
                 // ImageIO
+                /*
                 try {
                         _image = new ImageIcon(_path).getImage();
@@ -785 +779 @@
 
                 // if ImageIcon failed to read the image
-                if (_image == null || _image.getWidth(null) <= 0) {
+                if (_image == null || _image.getWidth() <= 0) {
                         try {
                                 _image = ImageIO.read(new File(_path));
@@ -795 +789 @@
                         }
                 }
+*/
+                _image = Image.getImage(_path);
                 return true;
         }
@@ -827 +823 @@
         @Override
         public boolean getLinkMark() {
-                return !FrameGraphics.isAudienceMode() && _source.getLinkMark();
+                return !DisplayController.isAudienceMode() && _source.getLinkMark();
         }
 
@@ -892 +888 @@
                 // If the image is cropped add the position for the start and finish of
                 // the crop to the soure text
-                if (_start.x > 0 || _start.y > 0 || _end.x != _image.getWidth(null)
-                                || _end.y != _image.getHeight(null)) {
+                if (_start.x > 0 || _start.y > 0 || _end.x != _image.getWidth()
+                                || _end.y != _image.getHeight()) {
                         newText.append(" ").append(_start.x).append(" ").append(_start.y);
                         newText.append(" ").append(_end.x).append(" ").append(_end.y);
@@ -912 +908 @@
 
         @Override
-        public void translate(Point2D origin, double ratio) {
+        public void translate(Point origin, double ratio) {
                 _scale *= ratio;
                 updateSource();
@@ -919 +915 @@
 
         @Override
-        public Rectangle[] getDrawingArea() {
-
-                Rectangle[] da = super.getDrawingArea();
+        public AxisAlignedBoxBounds getDrawingArea() {
+
+                AxisAlignedBoxBounds da = super.getDrawingArea();
 
                 if (getLink() != null || hasAction()) {
-                        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].width += 2;
-                        da2[da.length].height += 2;
-                        da = da2;
+                        AxisAlignedBoxBounds linkBounds = AxisAlignedBoxBounds.getEnclosing(getLinkBounds());
+                        linkBounds.getTopLeft().add(getX() - LEFT_MARGIN, getY() + getLinkYOffset());
+                        linkBounds.getSize().width += 2;
+                        linkBounds.getSize().height += 2;
+                        da.combineWith(linkBounds);
                 }
 
@@ -963 +956 @@
                 _rotate = rotate;
                 updateSource();
-                updatePolygon();
+                invalidateBounds();
         }
         
@@ -970 +963 @@
         }
 
-        public boolean MouseOverBackgroundPixel(int mouseX, int mouseY, Color bg_col)
-        {
-                int[] pixels = new int[1];
-                 
+        public boolean MouseOverBackgroundPixel(int mouseX, int mouseY, Colour bg_col)
+        {
                 int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
                 int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
@@ -979 +970 @@
                 int y = mouseY - base_y;
                 
-                // Consider making this a slightly larger area to check, say 3 x 3?
-                // Back op if all are the same sought after color?
-                PixelGrabber grabber = new PixelGrabber(_image, x,y, 1, 1, pixels, 0, 1);
-                
-                // The following might be a better approach, as it sets the color model
-                // when getPixels() is called, however, it might return an int[] or byte[]
-                // array (handled as Object), as so some extra complexity would exist in
-                // handling the returned result
-                
-                //PixelGrabber pg = new PixelGrabber(_image, mouseX, mouseY, 1, 1, true);
-                
-                try {
-                        grabber.grabPixels(0);
-                } 
-                catch (Exception e) {
-                        e.printStackTrace();
-                }
-                
-        
-                int c = pixels[0];
-                int c_red    = (c & 0x00ff0000) >> 16;
-                int c_green  = (c & 0x0000ff00) >> 8;
-                int c_blue   =  c & 0x000000ff;
-                
-                int bg_red   = (bg_col!=null) ? bg_col.getRed()   : 0xff;
-                int bg_green = (bg_col!=null) ? bg_col.getGreen() : 0xff;
-                int bg_blue  = (bg_col!=null) ? bg_col.getBlue()  : 0xff;
+                Colour c = _image.getPixel(x, y);
+
+                int c_red    = c.getRed255();
+                int c_green  = c.getGreen255();
+                int c_blue   = c.getBlue255();
+                
+                int bg_red   = (bg_col!=null) ? bg_col.getRed255()   : 0xff;
+                int bg_green = (bg_col!=null) ? bg_col.getGreen255() : 0xff;
+                int bg_blue  = (bg_col!=null) ? bg_col.getBlue255()  : 0xff;
                 
                 int red_diff   = Math.abs(c_red   - bg_red);