imagetools-commit Mailing List for Image Tools (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 61
          http://imagetools.svn.sourceforge.net/imagetools/?rev=61&view=rev
Author:   cmarcum
Date:     2009-06-11 02:16:36 +0000 (Thu, 11 Jun 2009)

Log Message:
-----------
ticket:11 - implemented Serif and SansSerif fonts settings

Modified Paths:
--------------
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
===================================================================

--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java	2009-06-07 14:42:24 UTC (rev 60)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java	2009-06-11 02:16:36 UTC (rev 61)
@@ -31,6 +31,8 @@
 import java.awt.font.TextLayout;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 /**
  *  This class defines a specialized panel for displaying a captured image.
@@ -84,12 +86,8 @@
      * for drawing text
      */
     private Point2D pointSelection;
+
     /**
-     *  Location and extents of selection point.
-     * for drawing text
-     */
-    private String drawText;
-    /**
      *  Ready to crop, usually after rectangle selection
      */
     private boolean readyToCrop;
@@ -111,8 +109,7 @@
 
     // index of the first character after the end of the paragraph.
     private int paragraphEnd;
-    private final Hashtable<TextAttribute, Object> map =
-            new Hashtable<TextAttribute, Object>();
+    private Hashtable<TextAttribute, Object> map;
     private AttributedString attStr;
 
     /**
@@ -156,14 +153,36 @@
         // this.setupCropMouseListeners();
         this.setMouseEvtType(ImageArea.DRAW_CROP_RECTANGLE);
 
+        map = new Hashtable<TextAttribute, Object>();
+        // get textFont value from model
+        map.put(TextAttribute.FAMILY, itModel.getFont());
+        // get text height value from model
+        map.put(TextAttribute.SIZE, new Float(itModel.getFontSize()));
+        // make a new attributed string
+        attStr = new AttributedString(itModel.getText(), map);
 
-        // TODO get font value from somewhere
-        map.put(TextAttribute.FAMILY, "Serif");
-        // TODO get text height value from somewhere
-        map.put(TextAttribute.SIZE, new Float(12.0));
+        // listen for ImageTools Model to update textFont
+        itModel.pcs.addPropertyChangeListener("font", new PropertyChangeListener() {
 
-        
+            @Override
+            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+                // update map
+                map.put(TextAttribute.FAMILY, itModel.getFont());
+                // make a new attributed string
+                attStr = new AttributedString(itModel.getText(), map);
+            }
+        });
 
+        // listen for ImageTools Model to update Text
+        itModel.pcs.addPropertyChangeListener("text", new PropertyChangeListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+                // make a new attributed string
+                attStr = new AttributedString(itModel.getText(), map);
+            }
+        });
+
     } // end constructor
 
     /**
@@ -352,9 +371,7 @@
 
             // Draw selection line.
             Graphics2D g2d = (Graphics2D) g;
-            // save a local copy of the text
-            drawText = itModel.getText();
-            attStr = new AttributedString(drawText, map);
+
             // set the pre-placement color to light gray
             g2d.setColor(Color.LIGHT_GRAY);
 
@@ -400,6 +417,7 @@
             }
 
             g2d.dispose();
+            lineMeasurer = null;
 
         } // end if
 
@@ -721,11 +739,6 @@
                     return;
                 }
 
-                // save a local copy of the text
-                // get the model to get text from
-                ImageToolsModel itModel = ImageToolsApp.getApplication().getItModel();
-                drawText = itModel.getText();
-
                 destx = srcx = e.getX();
                 desty = srcy = e.getY();
 
@@ -756,9 +769,7 @@
                 }
 
                 g2d.setColor(itModel.getColor());
-                // save a local copy of the text
-                drawText = itModel.getText();
-                attStr = new AttributedString(drawText, map);
+
                 // Create a new LineBreakMeasurer from the paragraph.
                 // It will be cached and re-used.
                 if (lineMeasurer == null) {
@@ -804,6 +815,7 @@
 
                 setImage(biNew, true);
                 g2d.dispose();
+                lineMeasurer = null;
             }
         };
         this.addMouseListener(ml);

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java	2009-06-07 14:42:24 UTC (rev 60)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java	2009-06-11 02:16:36 UTC (rev 61)
@@ -31,6 +31,7 @@
 import java.beans.PropertyChangeSupport;
 import java.util.LinkedList;
 import java.awt.Color;
+import java.awt.Font;
 
 /**
  *
@@ -42,8 +43,9 @@
     private String fileName = "";
     private String fileExt = "";
 
-    private String text = "";
-    private int fontSize = 10;
+    private String text = "XXX";
+    private String font = Font.SANS_SERIF;
+    private int fontSize = 12;
     private float textBoxWidth = (float)200.0;
     private Color color = Color.RED;
     Robot robot = null;
@@ -191,7 +193,9 @@
      * @param text the text to set
      */
     public void setText(String text) {
+        String oldText = getText();
         this.text = text;
+        pcs.firePropertyChange("text", oldText, this.text);
     }
 
     /**
@@ -267,4 +271,20 @@
         this.color = color;
         
     }
+
+    /**
+     * @return the font
+     */
+    public String getFont() {
+        return font;
+    }
+
+    /**
+     * @param font the font to set
+     */
+    public void setFont(String font) {
+        String oldFont = this.getFont();
+        this.font = font;
+        pcs.firePropertyChange("font", oldFont, this.font);
+    }
 }

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form	2009-06-07 14:42:24 UTC (rev 60)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form	2009-06-11 02:16:36 UTC (rev 61)
@@ -234,21 +234,27 @@
             </MenuItem>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="fontSerifItem">
               <Properties>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="net.codebuilders.desktop.imagetools.ImageToolsView" id="setFontSerif" methodName="setFontSerif"/>
+                </Property>
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="fontButtonGroup"/>
                 </Property>
                 <Property name="font" type="java.awt.Font" resourceKey="fontSerifItem.font"/>
-                <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" resourceKey="fontSerifItem.text"/>
                 <Property name="name" type="java.lang.String" value="fontSerifItem" noResource="true"/>
               </Properties>
             </MenuItem>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="fontSansSerifItem">
               <Properties>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="net.codebuilders.desktop.imagetools.ImageToolsView" id="setFontSansSerif" methodName="setFontSansSerif"/>
+                </Property>
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="fontButtonGroup"/>
                 </Property>
                 <Property name="font" type="java.awt.Font" resourceKey="fontSansSerifItem.font"/>
+                <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" resourceKey="fontSansSerifItem.text"/>
                 <Property name="name" type="java.lang.String" value="fontSansSerifItem" noResource="true"/>
               </Properties>

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-06-07 14:42:24 UTC (rev 60)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-06-11 02:16:36 UTC (rev 61)
@@ -91,8 +91,8 @@
         this.setDrawLineEnabled(false);
         this.setDrawRectangleEnabled(false);
         this.setDrawTextEnabled(false);
-        this.setColorRedEnabled(true);
-        this.setColorBlueEnabled(true); 
+        // this.setColorRedEnabled(true); set with methods
+        // this.setColorBlueEnabled(true); set with methods
 
         // undo and redo depends on their collection status
 
@@ -181,7 +181,7 @@
 
         // listen for ImageTools Model to update - test 2009-03-20
         itModel.pcs.addPropertyChangeListener("image", new PropertyChangeListener() {
-
+            @Override
             public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
                 // DEBUG
                 System.out.println("Model Event Caught...");
@@ -397,15 +397,17 @@
         jSeparator4.setName("jSeparator4"); // NOI18N
         optionsMenu.add(jSeparator4);
 
+        fontSerifItem.setAction(actionMap.get("setFontSerif")); // NOI18N
         fontButtonGroup.add(fontSerifItem);
         fontSerifItem.setFont(resourceMap.getFont("fontSerifItem.font")); // NOI18N
-        fontSerifItem.setSelected(true);
         fontSerifItem.setText(resourceMap.getString("fontSerifItem.text")); // NOI18N
         fontSerifItem.setName("fontSerifItem"); // NOI18N
         optionsMenu.add(fontSerifItem);
 
+        fontSansSerifItem.setAction(actionMap.get("setFontSansSerif")); // NOI18N
         fontButtonGroup.add(fontSansSerifItem);
         fontSansSerifItem.setFont(resourceMap.getFont("fontSansSerifItem.font")); // NOI18N
+        fontSansSerifItem.setSelected(true);
         fontSansSerifItem.setText(resourceMap.getString("fontSansSerifItem.text")); // NOI18N
         fontSansSerifItem.setName("fontSansSerifItem"); // NOI18N
         optionsMenu.add(fontSansSerifItem);
@@ -1325,7 +1327,7 @@
          itModel.setColor(java.awt.Color.BLUE); 
     }
 
-    private boolean colorBlueEnabled = false;
+    private boolean colorBlueEnabled = true;
     public boolean isColorBlueEnabled() {
         return colorBlueEnabled;
     }
@@ -1347,7 +1349,7 @@
         firePropertyChange("colorBlueSelected", old, isColorBlueSelected());
     }
 
-    private boolean colorRedEnabled = false;
+    private boolean colorRedEnabled = true;
     public boolean isColorRedEnabled() {
         return colorRedEnabled;
     }
@@ -1369,6 +1371,60 @@
         firePropertyChange("colorRedSelected", old, isColorRedSelected());
     }
 
+        @Action(enabledProperty = "fontSerifEnabled", selectedProperty = "fontSerifSelected")
+    public void setFontSerif() {
+        itModel.setFont(java.awt.Font.SERIF);
+    }
+
+    private boolean fontSerifEnabled = true;
+    public boolean isFontSerifEnabled() {
+        return fontSerifEnabled;
+    }
+
+    public void setFontSerifEnabled(boolean b) {
+        boolean old = isFontSerifEnabled();
+        this.fontSerifEnabled = b;
+        firePropertyChange("fontSerifEnabled", old, isFontSerifEnabled());
+    }
+
+    private boolean fontSerifSelected = false;
+    public boolean isFontSerifSelected() {
+        return fontSerifSelected;
+    }
+
+    public void setFontSerifSelected(boolean b) {
+        boolean old = isFontSerifSelected();
+        this.fontSerifSelected = b;
+        firePropertyChange("fontSerifSelected", old, isFontSerifSelected());
+    }
+
+        @Action(enabledProperty = "fontSansSerifEnabled", selectedProperty = "fontSansSerifSelected")
+    public void setFontSansSerif() {
+        itModel.setFont(java.awt.Font.SANS_SERIF); 
+    }
+
+    private boolean fontSansSerifEnabled = true;
+    public boolean isFontSansSerifEnabled() {
+        return fontSansSerifEnabled;
+    }
+
+    public void setFontSansSerifEnabled(boolean b) {
+        boolean old = isFontSansSerifEnabled();
+        this.fontSansSerifEnabled = b;
+        firePropertyChange("fontSansSerifEnabled", old, isFontSansSerifEnabled());
+    }
+
+    private boolean fontSansSerifSelected = false;
+    public boolean isFontSansSerifSelected() {
+        return fontSansSerifSelected;
+    }
+
+    public void setFontSansSerifSelected(boolean b) {
+        boolean old = isFontSansSerifSelected();
+        this.fontSansSerifSelected = b;
+        firePropertyChange("fontSansSerifSelected", old, isFontSansSerifSelected());
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton captureButton;
     private javax.swing.JButton closeButton;

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties	2009-06-07 14:42:24 UTC (rev 60)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties	2009-06-11 02:16:36 UTC (rev 61)
@@ -147,3 +147,11 @@
 setColorBlue.Action.smallIcon=/net/codebuilders/desktop/imagetools/resources/color_line_blue16.png
 setColorBlue.Action.icon=/net/codebuilders/desktop/imagetools/resources/color_line_blue16.png
 setColorBlue.Action.shortDescription=Set color to Blue
+fontSerif.Action.text=Serif
+fontSerif.Action.shortDescription=Set font to Serif
+fontSansSerif.Action.shortDescription=Set font to Sans Serif
+fontSansSerif.Action.text=Sans Serif
+setFontSerif.Action.text=
+setFontSerif.Action.shortDescription=
+setFontSansSerif.Action.shortDescription=
+setFontSansSerif.Action.text=


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




imagetools-commit Mailing List for Image Tools (Page 2)

imagetools-commit — Version Control Commit Mailing List