[Imagetools-commit] SF.net SVN: imagetools:[60] trunk/imagetools/src/net/codebuilders/desktop/ imagetools

[<cm...@us...>]

Revision: 60
          http://imagetools.svn.sourceforge.net/imagetools/?rev=60&view=rev
Author:   cmarcum
Date:     2009-06-07 14:42:24 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
ticket:8 - implemented red and blue annotation color selection

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

Added Paths:
-----------
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_blue16.png
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_red16.png

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java	2009-06-07 12:13:35 UTC (rev 59)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java	2009-06-07 14:42:24 UTC (rev 60)
@@ -584,9 +584,10 @@
                 // draw the real rectangle
                 g2d.setStroke(bsAnnotate);
                 // g2d.setPaint(gpAnnotate);
-                g2d.setColor(Color.RED);
+                // get the color from the model
+                g2d.setColor(itModel.getColor());
                 g2d.draw(rectSelection);
-
+                g2d.dispose();
                 // set the image
                 setImage(biNew, true);
 
@@ -670,7 +671,8 @@
                 // draw the real line
                 g2d.setStroke(bsAnnotate);
                 // g2d.setPaint(gpAnnotate);
-                g2d.setColor(Color.RED);
+                // get the color from the model
+                g2d.setColor(itModel.getColor());
                 g2d.draw(lineSelection);
                 setImage(biNew, true);
 
@@ -753,7 +755,7 @@
 
                 }
 
-                g2d.setColor(Color.RED);
+                g2d.setColor(itModel.getColor());
                 // save a local copy of the text
                 drawText = itModel.getText();
                 attStr = new AttributedString(drawText, map);

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java	2009-06-07 12:13:35 UTC (rev 59)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java	2009-06-07 14:42:24 UTC (rev 60)
@@ -30,6 +30,7 @@
 import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeSupport;
 import java.util.LinkedList;
+import java.awt.Color;
 
 /**
  *
@@ -44,6 +45,7 @@
     private String text = "";
     private int fontSize = 10;
     private float textBoxWidth = (float)200.0;
+    private Color color = Color.RED;
     Robot robot = null;
 
     // current image between undo and redo queue
@@ -250,4 +252,19 @@
     public void setTextBoxWidth(float textBoxWidth) {
         this.textBoxWidth = textBoxWidth;
     }
+
+    /**
+     * @return the color
+     */
+    public Color getColor() {
+        return color;
+    }
+
+    /**
+     * @param color the color to set
+     */
+    public void setColor(Color color) {
+        this.color = color;
+        
+    }
 }

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form	2009-06-07 12:13:35 UTC (rev 59)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form	2009-06-07 14:42:24 UTC (rev 60)
@@ -204,6 +204,9 @@
           <SubComponents>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="colorRedItem">
               <Properties>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="net.codebuilders.desktop.imagetools.ImageToolsView" id="setColorRed" methodName="setColorRed"/>
+                </Property>
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="colorButtonGroup"/>
                 </Property>
@@ -214,6 +217,9 @@
             </MenuItem>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="colorBlueItem">
               <Properties>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="net.codebuilders.desktop.imagetools.ImageToolsView" id="setColorBlue" methodName="setColorBlue"/>
+                </Property>
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="colorButtonGroup"/>
                 </Property>

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-06-07 12:13:35 UTC (rev 59)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-06-07 14:42:24 UTC (rev 60)
@@ -78,7 +78,7 @@
         imageChooser.setAcceptAllFileFilterUsed(false);
         imageChooser.setFileFilter(new ImageFileFilter());
 
-        itModel = new ImageToolsModel();
+        itModel = ImageToolsApp.getApplication().getItModel();
 
         initComponents();
 
@@ -91,6 +91,8 @@
         this.setDrawLineEnabled(false);
         this.setDrawRectangleEnabled(false);
         this.setDrawTextEnabled(false);
+        this.setColorRedEnabled(true);
+        this.setColorBlueEnabled(true); 
 
         // undo and redo depends on their collection status
 
@@ -379,12 +381,14 @@
         optionsMenu.setText(resourceMap.getString("optionsMenu.text")); // NOI18N
         optionsMenu.setName("optionsMenu"); // NOI18N
 
+        colorRedItem.setAction(actionMap.get("setColorRed")); // NOI18N
         colorButtonGroup.add(colorRedItem);
         colorRedItem.setSelected(true);
         colorRedItem.setText(resourceMap.getString("colorRedItem.text")); // NOI18N
         colorRedItem.setName("colorRedItem"); // NOI18N
         optionsMenu.add(colorRedItem);
 
+        colorBlueItem.setAction(actionMap.get("setColorBlue")); // NOI18N
         colorButtonGroup.add(colorBlueItem);
         colorBlueItem.setText(resourceMap.getString("colorBlueItem.text")); // NOI18N
         colorBlueItem.setName("colorBlueItem"); // NOI18N
@@ -1311,6 +1315,60 @@
         firePropertyChange("cropSelected", old, isCropSelected());
     }
 
+        @Action(enabledProperty = "colorRedEnabled", selectedProperty = "colorRedSelected")
+    public void setColorRed() {
+        itModel.setColor(java.awt.Color.RED); 
+    }
+
+    @Action(enabledProperty = "colorBlueEnabled", selectedProperty = "colorBlueSelected")
+    public void setColorBlue() {
+         itModel.setColor(java.awt.Color.BLUE); 
+    }
+
+    private boolean colorBlueEnabled = false;
+    public boolean isColorBlueEnabled() {
+        return colorBlueEnabled;
+    }
+
+    public void setColorBlueEnabled(boolean b) {
+        boolean old = isColorBlueEnabled();
+        this.colorBlueEnabled = b;
+        firePropertyChange("colorBlueEnabled", old, isColorBlueEnabled());
+    }
+
+    private boolean colorBlueSelected = false;
+    public boolean isColorBlueSelected() {
+        return colorBlueSelected;
+    }
+
+    public void setColorBlueSelected(boolean b) {
+        boolean old = isColorBlueSelected();
+        this.colorBlueSelected = b;
+        firePropertyChange("colorBlueSelected", old, isColorBlueSelected());
+    }
+
+    private boolean colorRedEnabled = false;
+    public boolean isColorRedEnabled() {
+        return colorRedEnabled;
+    }
+
+    public void setColorRedEnabled(boolean b) {
+        boolean old = isColorRedEnabled();
+        this.colorRedEnabled = b;
+        firePropertyChange("colorRedEnabled", old, isColorRedEnabled());
+    }
+
+    private boolean colorRedSelected = false;
+    public boolean isColorRedSelected() {
+        return colorRedSelected;
+    }
+
+    public void setColorRedSelected(boolean b) {
+        boolean old = isColorRedSelected();
+        this.colorRedSelected = b;
+        firePropertyChange("colorRedSelected", old, isColorRedSelected());
+    }
+
     // 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 12:13:35 UTC (rev 59)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties	2009-06-07 14:42:24 UTC (rev 60)
@@ -139,3 +139,11 @@
 fontSerifItem.font=DejaVu Serif-Plain-13
 #NOI18N
 fontSansSerifItem.font=DejaVu Sans-Plain-13
+setColorRed.Action.text=Red
+setColorRed.Action.smallIcon=/net/codebuilders/desktop/imagetools/resources/color_line_red16.png
+setColorRed.Action.icon=/net/codebuilders/desktop/imagetools/resources/color_line_red16.png
+setColorRed.Action.shortDescription=Set color to red
+setColorBlue.Action.text=Blue
+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

Added: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_blue16.png
===================================================================
(Binary files differ)


Property changes on: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_blue16.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_red16.png
===================================================================
(Binary files differ)


Property changes on: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/color_line_red16.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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