Changeset 1047 for trunk

Timestamp:

04/28/16 19:37:35 (8 years ago)

Author:

davidb

Message:

Anchor top and left added as minus options to an @i item. Relocation of ParseArgsApache(). Addition of getData type function for Bool. Some typos fixed in comments. Left click on image refinement: it check the pixel clicked on in the image, and if the same as the background, it does a back() operation rather than forming a new link

Location:

trunk/src/org/expeditee

Files:

• gui/FrameMouseActions.java (modified) (7 diffs)
• items/Picture.java (modified) (13 diffs)
• items/Text.java (modified) (3 diffs)
• items/widgets/InteractiveWidget.java (modified) (6 diffs)

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

@@ -19 +19 @@
 package org.expeditee.gui;
 
+import java.awt.Color;
 import java.awt.Image;
 import java.awt.Point;
@@ -911 +912 @@
 
                 /*
-                 * This makes it so clicking repeatedly on the frameName doesnt add the
+                 * This makes it so clicking repeatedly on the frameName doesn't add the
                  * frames to the backup stack. Only the first frame is added to the
                  * backup stack.
@@ -945 +946 @@
 
                 // Mike says...
-                // For somereason the modifiers for e are different from modifiersEx
+                // For some reason the modifiers for e are different from modifiersEx
                 // The SwingUtilities.convertMouseEvent method changes the modifiers
                 _lastMouseClick = e;
@@ -1060 +1061 @@
                 // Auto-hide popups when user clicks into expeditee world
                 // If the user clicks into empty space and a popup-is showing, then
-                // the user porbably wants to click away the popup - therefore ignore
+                // the user probably wants to click away the popup - therefore ignore
                 // the event
                 boolean shouldConsume = PopupManager.getInstance()
@@ -1401 +1402 @@
                 if (clicked instanceof Text) {
                         Text text = (Text) clicked;
-                        /* Dont follow link when just highlighting text with the left button */
+                        /* Don't follow link when just highlighting text with the left button */
                         if (text.getText().length() == 0)
                                 clicked = null;
@@ -1457 +1458 @@
                 }
 
+                
+                if (clicked instanceof Picture) {
+                        int mouseX = DisplayIO.getMouseX();
+                        int mouseY = FrameMouseActions.getY();
+                        Picture clickedOnPicture = (Picture)clicked;
+                        Frame current_frame = DisplayIO.getCurrentFrame();
+                        Color bg_col = current_frame.getBackgroundColor();
+                        if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                // Make 'clicked' null, effectively causing a back() operation
+                                clicked = null;
+                        }
+                }
+                
                 if (clicked != null) {
                         // check item permissions
@@ -1500 +1514 @@
 
                 } else {
+                        
                         IndirectMouseActions.getInstance().getBackAction().exec(new MouseInfo(clicked, clickedIn, isShiftDown, isControlDown));
                 }

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

@@ -36 +36 @@
 import java.awt.image.FilteredImageSource;
 import java.awt.image.ImageObserver;
+import java.awt.image.PixelGrabber;
 import java.io.File;
 import java.io.IOException;
@@ -43 +44 @@
 import javax.swing.ImageIcon;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.expeditee.gui.DisplayIO;
 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;
 
@@ -97 +105 @@
         private boolean _showCropping = false;
 
+        protected Integer _anchorLeft   = null;
+        protected Integer _anchorTop    = null;
+        
         private String _path = "";
 
@@ -113 +124 @@
                 refresh();
 
-                if (_image != null)
+                if (_image != null) {
+                        // Should parsing for minus options also be done?
+                        // To be honest, looking at the code, can't really see how _size can be anything but 
+                        // the empty string at this stage of calling the constructor, although it does have
+                        // the 'side' effect of setting other things (such as _start, _end, and _scale)
                         parseSize();
+                }
         }
 
@@ -140 +156 @@
                 _fileName = fileName;
                 _path = path;
-                _size = size;
+                
+                String size_without_options = parseMinusOptions(size);
+                _size = size_without_options;
 
                 refresh();
@@ -150 +168 @@
         }
 
+        protected String parseMinusOptions(String cmd_line) {
+                
+                String[] tokens = Text.parseArgsApache(cmd_line);
+
+                // make anything starting with a '-' lowercase
+                for (int i=0; i<tokens.length; i++) {
+                        if (tokens[i].startsWith("-")) {
+                                tokens[i] = tokens[i].toLowerCase();
+                        }
+                }
+                
+                // create the command line parser
+                CommandLineParser parser = new GnuParser();
+
+                // create the Options
+                Options options = new Options();
+                options.addOption( "al", "anchorleft",   true, "Anchor the vertical left-hand edge of the interactive widget to the value provided " );
+                options.addOption( "at", "anchortop",    true, "Anchor the vertical top edge of the interactive widget to the value provided " );
+        
+                CommandLine core_line;
+                try {
+                    // parse the command line arguments
+                    core_line = parser.parse( options, tokens );
+                    
+                    // Update tokens to be version with the options removed
+                    tokens = core_line.getArgs();
+                    
+                }
+                catch( ParseException exp ) {
+                    System.err.println( "Unexpected exception:" + exp.getMessage() );
+                    core_line = null;
+                    
+                }
+                
+                // Apply any anchor values supplied 
+                
+            if(core_line.hasOption( "anchorleft" ) ) {
+                String al_str = core_line.getOptionValue( "anchorleft" );
+                
+                _anchorLeft = Integer.parseInt(al_str);
+            }
+            
+            if(core_line.hasOption( "anchortop" ) ) {
+                String at_str = core_line.getOptionValue( "anchortop" );
+                
+                _anchorTop = Integer.parseInt(at_str);
+            }
+            
+            
+           return String.join(" ", tokens);
+        }
         protected void parseSize() {
                 String size = getImageSize();
@@ -294 +363 @@
                 Point centre = new Point();
 
+                int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
+                int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
+                
                 if (_cropStart == null || _cropEnd == null) {
                         int width = getWidth();
                         int height = getHeight();
                         
-                        centre.x = _source.getX() + width / 2;
-                        centre.y = _source.getY() + height / 2;
+                        centre.x = base_x + width / 2;
+                        centre.y = base_y + height / 2;
 
                         int xdiff = -MARGIN_RIGHT; // -getLeftMargin();
@@ -309 +381 @@
 //                      _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() + height);
                         
-                        ori[0] = new Point(_source.getX() + 1 + xdiff, _source.getY() - 1);
-                        ori[1] = new Point(_source.getX() + width, _source.getY() - 1);
-                        ori[2] = new Point(_source.getX() + width, _source.getY() + height);
-                        ori[3] = new Point(_source.getX() + 1 + xdiff, _source.getY() + height);
+                        ori[0] = new Point(base_x + 1 + xdiff, base_y - 1);
+                        ori[1] = new Point(base_x + width,  base_y - 1);
+                        ori[2] = new Point(base_x + width,  base_y + height);
+                        ori[3] = new Point(base_x + 1 + xdiff, base_y + height);
                         
                 } else {
@@ -318 +390 @@
                         Point bottomRight = getBottomRightCrop();
                         
-                        centre.x = _source.getX() + (bottomRight.x - topLeft.x) / 2;
-                        centre.y = _source.getY() + (bottomRight.y - topLeft.y) / 2;
-                        
-                        Rectangle clip = new Rectangle(topLeft.x + _source.getX(),
-                                        topLeft.y + _source.getY(), bottomRight.x - topLeft.x,
+                        centre.x = base_x + (bottomRight.x - topLeft.x) / 2;
+                        centre.y = base_y + (bottomRight.y - topLeft.y) / 2;
+                        
+                        Rectangle clip = new Rectangle(topLeft.x + base_x,
+                                        topLeft.y + base_y, bottomRight.x - topLeft.x,
                                         bottomRight.y - topLeft.y).getBounds();
 //                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
@@ -399 +471 @@
                 }
                 
-                int dX1 = _source.getX();
-                int dY1 = _source.getY();
-                int dX2 = _source.getX() + getWidth();
-                int dY2 = _source.getY() + getHeight();
+                int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
+                int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
+                
+                int dX1 = base_x;
+                int dY1 = base_y;
+                int dX2 = base_x + getWidth();
+                int dY2 = base_y + getHeight();
                 
                 BufferedImage tmp = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB);
@@ -485 +560 @@
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        Shape clip = new Rectangle(_source.getX() + topLeft.x, _source.getY() + topLeft.y,
+                        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());
@@ -572 +650 @@
                         p._start = new Point(startX, startY);
                         p._end = new Point(endX, endY);
-                        p._source.setPosition(topLeft.x + _source.getX(), topLeft.y
-                                        + _source.getY());
+                        int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
+                        int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
+                        p._source.setPosition(topLeft.x + base_x, topLeft.y + base_y);
                 } else {
                         p._start = new Point(_start);
@@ -891 +970 @@
         }
 
+        public boolean MouseOverBackgroundPixel(int mouseX, int mouseY, Color bg_col)
+        {
+                int[] pixels = new int[1];
+                 
+                int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
+                int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
+                int x = mouseX - base_x;
+                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;
+                
+                int red_diff   = Math.abs(c_red   - bg_red);
+                int green_diff = Math.abs(c_green - bg_green);
+                int blue_diff  = Math.abs(c_blue  - bg_blue);
+                
+                return ((red_diff<=2) && (green_diff<=2) && (blue_diff<=2));
+        
+        }
 }

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

@@ -44 +44 @@
 
 import java.text.AttributedString;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -49 +50 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.StringTokenizer;
 
 import org.expeditee.gui.AttributeValuePair;
@@ -251 +253 @@
         }
 
-        
+        /**
+     * Similar to parseArgs() in InteractiveWidget.  
+     * Code based on routine used in Apache Ant:
+     *   org.apache.tools.ant.types.Commandline::translateCommandline()
+     * @param toProcess the command line to process.
+     * @return the command line broken into strings.
+     * An empty or null toProcess parameter results in a zero sized array.
+     */
+    public static String[] parseArgsApache(String toProcess) {
+        if (toProcess == null || toProcess.length() == 0) {
+            //no command? no string
+            return new String[0];
+        }
+        // parse with a simple finite state machine
+
+        final int normal = 0;
+        final int inQuote = 1;
+        final int inDoubleQuote = 2;
+        int state = normal;
+        final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
+        final ArrayList<String> result = new ArrayList<String>();
+        final StringBuilder current = new StringBuilder();
+        boolean lastTokenHasBeenQuoted = false;
+
+        while (tok.hasMoreTokens()) {
+            String nextTok = tok.nextToken();
+            switch (state) {
+            case inQuote:
+                if ("\'".equals(nextTok)) {
+                    lastTokenHasBeenQuoted = true;
+                    state = normal;
+                } else {
+                    current.append(nextTok);
+                }
+                break;
+            case inDoubleQuote:
+                if ("\"".equals(nextTok)) {
+                    lastTokenHasBeenQuoted = true;
+                    state = normal;
+                } else {
+                    current.append(nextTok);
+                }
+                break;
+            default:
+                if ("\'".equals(nextTok)) {
+                    state = inQuote;
+                } else if ("\"".equals(nextTok)) {
+                    state = inDoubleQuote;
+                } else if (" ".equals(nextTok)) {
+                    if (lastTokenHasBeenQuoted || current.length() != 0) {
+                        result.add(current.toString());
+                        current.setLength(0);
+                    }
+                } else {
+                    current.append(nextTok);
+                }
+                lastTokenHasBeenQuoted = false;
+                break;
+            }
+        }
+        if (lastTokenHasBeenQuoted || current.length() != 0) {
+            result.add(current.toString());
+        }
+        if (state == inQuote || state == inDoubleQuote) {
+            System.err.println("Error: Unbalanced quotes -- failed to parse '" + toProcess + "'");
+            return null;
+        }
+
+        return result.toArray(new String[result.size()]);
+    }
+
 
         /**

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -197 +197 @@
                 //     @iw: <class name> [options] width height : <rest...>
                 //
-                //   Parse the 'core' part of the X-rayable text item
+                //    the 'core' part of the X-rayable text item
                 //   i.e, the text between the first ':' and the second ':'
                 //  
@@ -204 +204 @@
                 String tokens_str = (index == -1) ? text : text.substring(0, index);
 
-                String[] tokens = parseArgsApache(tokens_str);
+                String[] tokens = Text.parseArgsApache(tokens_str);
 
                 // make anything starting with a '-' lowercase
@@ -342 +342 @@
                                 String args_str = text.substring(index + 1);
                                 
-                                 args = parseArgsApache(args_str);
+                                 args = Text.parseArgsApache(args_str);
                 
                         }       
@@ -559 +559 @@
 
 
-    /**
-     * Similar to parseArgs() above.  
-     * Code based on routine used in Apache Ant:
-     *   org.apache.tools.ant.types.Commandline::translateCommandline()
-     * @param toProcess the command line to process.
-     * @return the command line broken into strings.
-     * An empty or null toProcess parameter results in a zero sized array.
-     */
-    public static String[] parseArgsApache(String toProcess) {
-        if (toProcess == null || toProcess.length() == 0) {
-            //no command? no string
-            return new String[0];
-        }
-        // parse with a simple finite state machine
-
-        final int normal = 0;
-        final int inQuote = 1;
-        final int inDoubleQuote = 2;
-        int state = normal;
-        final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
-        final ArrayList<String> result = new ArrayList<String>();
-        final StringBuilder current = new StringBuilder();
-        boolean lastTokenHasBeenQuoted = false;
-
-        while (tok.hasMoreTokens()) {
-            String nextTok = tok.nextToken();
-            switch (state) {
-            case inQuote:
-                if ("\'".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
-                }
-                break;
-            case inDoubleQuote:
-                if ("\"".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
-                }
-                break;
-            default:
-                if ("\'".equals(nextTok)) {
-                    state = inQuote;
-                } else if ("\"".equals(nextTok)) {
-                    state = inDoubleQuote;
-                } else if (" ".equals(nextTok)) {
-                    if (lastTokenHasBeenQuoted || current.length() != 0) {
-                        result.add(current.toString());
-                        current.setLength(0);
-                    }
-                } else {
-                    current.append(nextTok);
-                }
-                lastTokenHasBeenQuoted = false;
-                break;
-            }
-        }
-        if (lastTokenHasBeenQuoted || current.length() != 0) {
-            result.add(current.toString());
-        }
-        if (state == inQuote || state == inDoubleQuote) {
-            System.err.println("Error: Unbalanced quotes -- failed to parse '" + toProcess + "'");
-            return null;
-        }
-
-        return result.toArray(new String[result.size()]);
-    }
-
+    
 
 
@@ -1716 +1646 @@
                 return defaultValue;
         }
-
-        /**
-         * Looks fors a dataline in the current representation of the widget.
+        
+        
+
+        /**
+         * Looks for a dataline in the current representation of the widget.
          * 
          * @see #getCurrentRepresentation
@@ -1759 +1691 @@
         }
 
+        /**
+         * Looks for a data-line in the current representation of the widget.
+         * 
+         * @see #getCurrentRepresentation
+         * @see #getStrippedDataString(String)
+         * @see #getStrippedDataLong(String, long)
+         * 
+         * @param tag
+         *            The prefix of a data-line that will be matched. Must be larger
+         *            the zero and not null.
+         * 
+         * @param defaultValue
+         *            The default value if the tag does not exist or contains
+         *            invalid data.
+         * 
+         * @return The <i>first</i> data-line that matched the prefix - if
+         *         case insensitive match is 'true' then return true, otherwise
+         *         false. defaultValue if their was no data that
+         *         matched the given prefix or the data was invalid.
+         *         
+         * @throws IllegalArgumentException
+         *             If tag is null.
+         * 
+         * @throws NullPointerException
+         *             If tag is empty.
+         * 
+         */
+        protected Boolean getStrippedDataBool(String tag, Boolean defaultValue) {
+
+                String strippedStr = getStrippedDataString(tag);
+
+                if (strippedStr != null) {
+                        strippedStr = strippedStr.trim();
+                        if (strippedStr.length() > 0) {
+                                return strippedStr.equalsIgnoreCase("true") ? true : false;
+                        }
+                }
+
+                return defaultValue;
+        }
+        
+        
         /**
          * All data is removed that is prefixed with the given tag.