Changeset 656

Timestamp:

01/07/14 12:26:01 (10 years ago)

Author:

jts21

Message:

Implement tooltips

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (1 diff)
• gui/FrameGraphics.java (modified) (1 diff)
• io/DefaultFrameReader.java (modified) (1 diff)
• io/DefaultFrameWriter.java (modified) (1 diff)
• items/Item.java (modified) (3 diffs)
• setting/GenericSetting.java (modified) (1 diff)
• settings/Settings.java (modified) (1 diff)

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

@@ -263 +263 @@
                         _Attrib.put("Y",                    null,
                                                             Item.class.getMethod("setY", pFloat));
+                        _Attrib.put("Tooltip",              Item.class.getMethod("getTooltip"),
+                                                            Item.class.getMethod("setTooltip", pString));
                         
                         // Text Items

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

@@ -515 +515 @@
                         for (FrameRenderPass pass : _frameRenderPasses) {
                                 pass.paintFinalPass(bg);
+                        }
+                }
+                
+                // paint tooltip
+                if(!FreeItems.itemsAttachedToCursor()) {
+                        Item current = FrameUtils.getCurrentItem();
+                        if(current != null) {
+                                current.paintTooltip(bg);
                         }
                 }

trunk/src/org/expeditee/io/DefaultFrameReader.java

@@ -126 +126 @@
                         _ItemTags.put('h', Item.class.getMethod("setThickness", pFloat));
                         _ItemTags.put('l', Item.class.getMethod("setLineIDs", pString));
-                        _ItemTags.put('c', Item.class
-                                        .getMethod("setConstraintIDs", pString));
+                        _ItemTags.put('c', Item.class.getMethod("setConstraintIDs", pString));
+                        
+                        _ItemTags.put('A', Item.class.getMethod("setTooltip", pString));
+                        
                         // Lines and constraints are created differently
                         _ItemTags.put('L', Line.class.getMethod("setStartItem", pItem));
-                        _ItemTags.put('C', Constraint.class.getMethod("getID",
-                                        (Class[]) null));
+                        _ItemTags.put('C', Constraint.class.getMethod("getID", (Class[]) null));
                 } catch (Exception e) {
                         e.printStackTrace();

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -123 +123 @@
                         _ItemTags.put("l", Item.class.getMethod("getLineIDs", param));
                         _ItemTags.put("c", Item.class.getMethod("getConstraintIDs", param));
+                        
+                        _ItemTags.put("A", Item.class.getMethod("getTooltip", param));
 
                 } catch (Exception e) {

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

@@ -157 +157 @@
 
         protected boolean _filled = true;
+        
+        private String _tooltip = null;
+        private Text _tooltipItem = null;
 
         public static void DuplicateItem(Item source, Item dest) {
@@ -174 +177 @@
                 dest.setBorderColor(source.getBorderColor());
 
+                dest.setTooltip(source.getTooltip());
                 dest.setData(source.getData());
                 dest.setTag(source.getTag());
@@ -1122 +1126 @@
          */
         public abstract void paint(Graphics2D g);
-
+        
+        public void setTooltip(String tooltip) {
+                _tooltip = tooltip;
+                _tooltipItem = null;
+        }
+        
+        public String getTooltip() {
+                return _tooltip;
+        }
+        
+        public void paintTooltip(Graphics2D g) {
+                // don't try to show an empty tooltip
+                if(_tooltipItem == null) {
+                        if(_tooltip != null && _tooltip.trim().length() != 0) {
+                                _tooltipItem = (Text) getParentOrCurrentFrame().getStatsTextItem(_tooltip);
+                                _tooltipItem.setWidth(300);
+                        } else {
+                                return;
+                        }
+                }
+                Rectangle bounds = getPolygon().getBounds();
+                _tooltipItem.invalidateAll();
+                int x = bounds.x + bounds.width;
+                if(x + _tooltipItem.getPolygon().getBounds().width > FrameGraphics.getMaxFrameSize().width) {
+                        x = bounds.x - _tooltipItem.getPolygon().getBounds().width;
+                }
+                int y = bounds.y + bounds.height;
+                if(y + _tooltipItem.getPolygon().getBounds().height > FrameGraphics.getMaxFrameSize().height) {
+                        y = bounds.y - _tooltipItem.getPolygon().getBounds().height;
+                }
+                _tooltipItem.setPosition(x, y);
+                _tooltipItem.paint(g);
+        }
+        
         public void paintFill(Graphics2D g) {
                 Color fillColor = getFillColor();

trunk/src/org/expeditee/setting/GenericSetting.java

@@ -120 +120 @@
                 }
                 if(_default instanceof Text) {
+                        int id = ((Item) _value).getID();
+                        if(id < 0) {
+                                if(((Item) _value).getParentOrCurrentFrame() != null) {
+                                        id = ((Item) _value).getParentOrCurrentFrame().getNextItemID();
+                                } else {
+                                        id = 0;
+                                }
+                        }
                         _value = (T) ((Text) _default).copy();
-                        System.out.println("FRAME: " + ((Item) _value).getParentOrCurrentFrame());
-                        ((Item) _value).setID(((Item) _value).getParentOrCurrentFrame().getNextItemID());
+                        ((Item) _value).setID(id);
                 } else {
                         _value = _default;

trunk/src/org/expeditee/settings/Settings.java

@@ -219 +219 @@
                                         t.setY(y + h / 2);
                                         t.setText(name);
+                                        t.setTooltip(s.getTooltip());
                                         frame.addItem(t);
                                         y += h;
                                 } else {
-                                        frame.addText(x, y + dY / 2, name + value, null);
+                                        Text t = frame.addText(x, y + dY / 2, name + value, null);
+                                        t.setTooltip(s.getTooltip());
                                         y += dY;
                                 }