Changeset 905 for trunk/src

Timestamp:

04/13/14 22:33:29 (10 years ago)

Author:

davidb

Message:

Support for bounding box calculation more closely aligned with the actual text drawn on the frame

Location:

trunk/src/org/expeditee

Files:

• io/flowlayout/XRawItem.java (modified) (2 diffs)
• items/Text.java (modified) (2 diffs)

trunk/src/org/expeditee/io/flowlayout/XRawItem.java

@@ -2 +2 @@
 
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 public class XRawItem extends XItem 
@@ -11 +12 @@
                 this.item = item;
                 
-                bounding_rect = item.getArea().getBounds();
+                if (item instanceof Text) {
+                        // Expecting it to be a text item
+                        // For it's bounding rectangle, go with the tighter 'PixelBounds' version
+                        
+                        Text text_item = (Text)item;
+                        bounding_rect = text_item.getPixelBoundsUnion();
+                }
+                else {
+                        // Just in case it isn't a text item
+                        bounding_rect = item.getArea().getBounds();
+                }
                 
         }

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

@@ -1844 +1844 @@
                                 }
 
-                                layout.draw(g, 1 + getX() + getJustOffset(layout), y);
+                                int ldx = 1+getX()+getJustOffset(layout); // Layout draw x
+                                
+                                boolean debug = false;
+                                if (debug) {
+                                        g.setColor(new Color(c.getRed(),c.getGreen(),c.getBlue(),40));
+                                        Rectangle layout_rect = layout.getPixelBounds(null, ldx, y);
+                                        g.fillRect(layout_rect.x, layout_rect.y, layout_rect.width, layout_rect.height);
+                                        g.setColor(c);
+                                }
+                                
+                                
+                                layout.draw(g, ldx, y);
 
                                 /*
@@ -2592 +2603 @@
         }
 
+        
+        
+        public Rectangle getPixelBoundsUnion()
+        {
+                synchronized (_textLayouts) {
+                        
+                        int x = getX();
+                        int y = getY();
+        
+                        int min_xl = Integer.MAX_VALUE;
+                        int max_xr = Integer.MIN_VALUE;
+        
+                        int min_yt = Integer.MAX_VALUE;
+                        int max_yb = Integer.MIN_VALUE;
+                
+                        
+                        for (int i = 0; i < _textLayouts.size(); i++) {
+                                TextLayout layout = _textLayouts.get(i);
+
+                                int ldx = 1+x+getJustOffset(layout); // Layout draw x                           
+                                Rectangle layout_rect = layout.getPixelBounds(null, ldx, y);
+                                        
+                                int xl = layout_rect.x;
+                                int xr = xl + layout_rect.width -1;
+                                
+                                int yt = layout_rect.y;
+                                int yb = yt + layout_rect.height -1;
+                                
+                                min_xl = Math.min(min_xl,xl);
+                                max_xr = Math.max(max_xr,xr);
+                                
+                                min_yt = Math.min(min_yt,yt);
+                                max_yb = Math.max(max_yb,yb);
+                        }
+                        
+                        if ((min_xl >= max_xr) || (min_yt >= max_yb)) {
+                                // No valid rectangle are found
+                                return null;
+                        }
+                        
+                        return new Rectangle(min_xl,min_yt,max_xr-min_xl+1,max_yb-min_yt+1);
+                        
+                }
+                                        
+        }
         /*
          * Returns the SIMPLE statement contained by this text item.