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

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

Revision: 34
          http://imagetools.svn.sourceforge.net/imagetools/?rev=34&view=rev
Author:   cmarcum
Date:     2009-04-19 20:03:13 +0000 (Sun, 19 Apr 2009)

Log Message:
-----------
Updated methods to clear selection for draw button group if we cropped, closed, or undo, redo and set mouse listeners.

Modified Paths:
--------------
    trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java

Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-04-19 19:34:17 UTC (rev 33)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java	2009-04-19 20:03:13 UTC (rev 34)
@@ -590,6 +590,9 @@
 
         statusMessageLabel.setText("Select area to crop.");
 
+        // set mouse listener for crop rectangle
+        imageArea.setMouseEvtType(ImageArea.DRAW_CROP_RECTANGLE);
+
         // setup button enabled status after a capture
         this.setFileOpenEnabled(false);
         this.setFileSaveEnabled(true);
@@ -639,6 +642,9 @@
     @Action(enabledProperty = "cropEnabled", selectedProperty = "cropSelected")
     public void cropImage() {
 
+        // in case we were drawing
+        drawButtonGroup.clearSelection();
+
         // setup the mouse event for rectangle
         imageArea.setMouseEvtType(ImageArea.DRAW_CROP_RECTANGLE);
 
@@ -791,7 +797,7 @@
      *  @param message the message to be presented
      */
     public static void showError(String message) {
-        
+
         JOptionPane.showMessageDialog(null, message, "Image Tools",
                 JOptionPane.ERROR_MESSAGE, errorIcon);
     }
@@ -854,7 +860,7 @@
         ImageToolsApp.getApplication().show(drawTextBox);
 
         // override the size saved by application
-        drawTextBox.setPreferredSize(new Dimension(320,200));
+        drawTextBox.setPreferredSize(new Dimension(320, 200));
         drawTextBox.pack();
 
         imageArea.setMouseEvtType(ImageArea.DRAW_TEXT);
@@ -872,6 +878,10 @@
     @Action(enabledProperty = "undoEnabled", selectedProperty = "undoSelected")
     public void undo() {
 
+        // in case we were drawing
+        drawButtonGroup.clearSelection();
+        imageArea.tearDownMouseListeners();
+
         // ImageToolsModel itModel = ImageToolsApp.getApplication().getItModel();
         // itModel.setImage((BufferedImage) imageArea.getImage());
         itModel.undo();
@@ -889,6 +899,10 @@
     @Action(enabledProperty = "redoEnabled", selectedProperty = "redoSelected")
     public void redo() {
 
+        // in case we were drawing
+        drawButtonGroup.clearSelection();
+        imageArea.tearDownMouseListeners();
+
         // ImageToolsModel itModel = ImageToolsApp.getApplication().getItModel();
         // itModel.setImage((BufferedImage) imageArea.getImage());
         itModel.redo();
@@ -946,28 +960,28 @@
 
             imageArea.setImage(itModel.getImage(), false);
 
-        JScrollPane scrollPane = new JScrollPane(imageArea);
+            JScrollPane scrollPane = new JScrollPane(imageArea);
 
-        // switch to new panel with image
-        this.setComponent(scrollPane);
+            // switch to new panel with image
+            this.setComponent(scrollPane);
 
-        statusMessageLabel.setText("Select area to crop.");
+            statusMessageLabel.setText("Select area to crop.");
 
-        // setup button enabled status after a capture
-        this.setFileOpenEnabled(false);
-        this.setFileSaveEnabled(true);
-        this.setFileCloseEnabled(true);
-        this.setCaptureEnabled(false);
-        this.setCropEnabled(true);
-        this.setDrawLineEnabled(true);
-        this.setDrawRectangleEnabled(true);
-        this.setDrawTextEnabled(true);
-        this.setUndoEnabled(!itModel.undoQueue.isEmpty());
-        this.setRedoEnabled(!itModel.redoQueue.isEmpty());
-        
-        // force a re-layout
-        this.getRootPane().validate();
-            
+            // setup button enabled status after a capture
+            this.setFileOpenEnabled(false);
+            this.setFileSaveEnabled(true);
+            this.setFileCloseEnabled(true);
+            this.setCaptureEnabled(false);
+            this.setCropEnabled(true);
+            this.setDrawLineEnabled(true);
+            this.setDrawRectangleEnabled(true);
+            this.setDrawTextEnabled(true);
+            this.setUndoEnabled(!itModel.undoQueue.isEmpty());
+            this.setRedoEnabled(!itModel.redoQueue.isEmpty());
+
+            // force a re-layout
+            this.getRootPane().validate();
+
         } else {
             showError("File to open is not a usable image");
         }
@@ -976,7 +990,11 @@
 
     @Action(enabledProperty = "fileCloseEnabled", selectedProperty = "fileCloseSelected")
     public void fileClose() {
-        
+
+        // in case we were drawing
+        drawButtonGroup.clearSelection();
+        imageArea.tearDownMouseListeners();
+
         // put the label back in
         this.setComponent(jLabel1);
         // empty the queues
@@ -1001,7 +1019,7 @@
         this.getRootPane().validate();
         // resize the frame
         this.getFrame().pack();
-        
+
     }
 
     @Action
@@ -1294,7 +1312,6 @@
     private javax.swing.JButton undoButton;
     private javax.swing.JMenuItem usingMenuItem;
     // End of variables declaration//GEN-END:variables
-    
     // more variables
     private static Icon errorIcon;
     private static Icon infoIcon;
@@ -1303,7 +1320,6 @@
     private final Timer busyIconTimer;
     private final Icon idleIcon;
     private final Icon[] busyIcons = new Icon[15];
-    
     private int busyIconIndex = 0;
     private JDialog aboutBox;
     private JDialog usingBox;
@@ -1314,5 +1330,4 @@
     private final JFileChooser imageChooser;
     // added to test new events 2009-03-20
     private ImageToolsModel itModel;
-
 }


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