dcm4che, a DICOM Implementation in JAVA

Revision: 13756
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13756&view=rev
Author:   marcheschi
Date:     2010-07-19 08:37:03 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
Issue #MAYAM-7 - Add some stack traces for better troubleshooting
Added e.printStackTrace(); to empty catch {}

Paolo

Modified Paths:
--------------
    oviyam/mayam/trunk/src/de/iftm/dcm4che/services/ConfigProperties.java
    oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageServiceAdapter.java
    oviyam/mayam/trunk/src/in/raster/mayam/context/ApplicationContext.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/DestinationFinder.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/ImportDelegate.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/JpegConvertorDelegate.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/LocalizerDelegate.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/NetworkQueueUpdateDelegate.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/LayeredCanvas.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingLayeredCanvas.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/ExportDialog.java
    oviyam/mayam/trunk/src/in/raster/mayam/model/AEModel.java
    oviyam/mayam/trunk/src/in/raster/mayam/model/table/PresetTableModel.java
    oviyam/mayam/trunk/src/in/raster/mayam/model/table/ServerTableModel.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/DicomTagsReader.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/core/Configuration.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmRcv.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/core/TranscoderMain.java

Modified: oviyam/mayam/trunk/src/de/iftm/dcm4che/services/ConfigProperties.java
===================================================================
--- oviyam/mayam/trunk/src/de/iftm/dcm4che/services/ConfigProperties.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/de/iftm/dcm4che/services/ConfigProperties.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -100,7 +100,7 @@
             throw new IOException("Could not load configuration from " + url);
         } finally {
             if (in != null) {
-                try { in.close(); } catch (IOException ignore) {}
+                try { in.close(); } catch (IOException ignore) {ignore.printStackTrace();}
             }
         }
     }

Modified: oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageServiceAdapter.java
===================================================================
--- oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageServiceAdapter.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageServiceAdapter.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -343,7 +343,7 @@
         } finally {
             try {
                 fos.close();
-            } catch (Exception ignore) {}
+            } catch (Exception ignore) {ignore.printStackTrace();}
         }
     }
     

Modified: oviyam/mayam/trunk/src/in/raster/mayam/context/ApplicationContext.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/context/ApplicationContext.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/context/ApplicationContext.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -137,6 +137,7 @@
             fileOutputStream = new FileOutputStream(logFile, true);
             fileOutputStream.write(logMessage.getBytes());
         } catch (Exception ex) {
+           ex.printStackTrace();
         } finally {
             try {
                 fileOutputStream.close();

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/DestinationFinder.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/DestinationFinder.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/DestinationFinder.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -63,7 +63,7 @@
                 } else {
                     fileDest = importFileTranscodedDestination(file);
                 }
-            } catch (Exception e) {
+            } catch (Exception e) {e.printStackTrace();
             }
         } else {
             fileDest = file.getAbsolutePath();

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/ImportDelegate.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/ImportDelegate.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/ImportDelegate.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -140,7 +140,7 @@
             if (dis != null) {
                 try {
                     dis.close();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                     // ignore
                 }
             }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/JpegConvertorDelegate.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/JpegConvertorDelegate.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/JpegConvertorDelegate.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -195,13 +195,13 @@
             if (ios != null) {
                 try {
                     ios.close();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                     // ignore
                 }
                 if (writer != null) {
                     try {
                         writer.dispose();
-                    } catch (Exception e) {
+                    } catch (Exception e) {e.printStackTrace();
                         // ignore
                     }
                 }
@@ -227,7 +227,7 @@
                 if (extension.equalsIgnoreCase(".dcm")) {
                     outputFileName = inputDicomFile.getName().replace(extension, "");
                 }
-            } catch (StringIndexOutOfBoundsException e) {
+            } catch (StringIndexOutOfBoundsException e) {e.printStackTrace();
             }
             File outputJpegFile = new File(outputPath, outputFileName + ".jpg");
             ImageInputStream iis = ImageIO.createImageInputStream(inputDicomFile);
@@ -282,13 +282,13 @@
             if (ios != null) {
                 try {
                     ios.close();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                     // ignore
                 }
                 if (writer != null) {
                     try {
                         writer.dispose();
-                    } catch (Exception e) {
+                    } catch (Exception e) {e.printStackTrace();
                         // ignore
                     }
                 }
@@ -325,7 +325,7 @@
                 if (output != null) {
                     output.close();
                 }
-            } catch (IOException ex) {
+            } catch (IOException ex) {ex.printStackTrace();
                 //Logger.getLogger(MainScreen.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
@@ -353,13 +353,13 @@
             if (ios != null) {
                 try {
                     ios.close();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                     // ignore
                 }
                 if (writer != null) {
                     try {
                         writer.dispose();
-                    } catch (Exception e) {
+                    } catch (Exception e) {e.printStackTrace();
                         // ignore
                     }
                 }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/LocalizerDelegate.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/LocalizerDelegate.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/LocalizerDelegate.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -81,7 +81,7 @@
                             //}
                         }
                     } catch (Exception e) {
-                        //e.printStackTrace();
+                        e.printStackTrace();
                     }
                 }
             }
@@ -169,7 +169,7 @@
                             }
                         }
 
-                    } catch (NullPointerException e) {
+                    } catch (NullPointerException e) {e.printStackTrace();
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/NetworkQueueUpdateDelegate.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/NetworkQueueUpdateDelegate.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/NetworkQueueUpdateDelegate.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -128,6 +128,7 @@
                 try {
                     dis.close();
                 } catch (Exception e) {
+                    e.printStackTrace();
                     // ignore
                 }
             }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -176,10 +176,10 @@
                 img.setColumn(column);
                 img.setReferenceSOPInstanceUID(referencedSOPInstanceUID);
                 img.setFrameOfReferenceUID(frameOfReferenceUID);
-            } catch (NullPointerException e) {
-            } catch (RuntimeException e) {
+            } catch (NullPointerException e) {e.printStackTrace();
+            } catch (RuntimeException e) {e.printStackTrace();
             }
-        }catch(ConcurrentModificationException e){}
+        }catch(ConcurrentModificationException e){e.printStackTrace();}
         catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -187,7 +187,7 @@
                 iis.close();
                 iter = null;
                 reader.dispose();
-            } catch (Exception ex) {}
+            } catch (Exception ex) {ex.printStackTrace();}
         }
     }
 }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -366,7 +366,7 @@
                 initialPixelSpacingX = pixelSpacingX = Double.parseDouble(dataset.getString(
                         Tags.PixelSpacing, 1));
 
-            } catch (NullPointerException e) {
+            } catch (NullPointerException e) {e.printStackTrace();
             }
             int nWindow = cmParam.getNumberOfWindows();
             if (nWindow > 0) {
@@ -488,7 +488,7 @@
                 Graphics2D g2 = image.createGraphics();
                 g2.drawImage(loadedImage, 0, 0, null);
                 repaint();
-            } catch (RuntimeException e) {
+            } catch (RuntimeException e) {e.printStackTrace();
             }
         } catch (Exception e) {
             System.out.println("io exception");
@@ -1297,12 +1297,12 @@
             data = new BasicDicomObject();
             data = dis.readDicomObject();
 
-        } catch (IOException ex) {
+        } catch (IOException ex) {ex.printStackTrace();
             // Logger.getLogger(ModelUpdator.class.getName()).log(Level.SEVERE, null, ex);
         } finally {
             try {
                 dis.close();
-            } catch (IOException ex) {
+            } catch (IOException ex) {ex.printStackTrace();
                 //   Logger.getLogger(ModelUpdator.class.getName()).log(Level.SEVERE, null, ex);
             }
         }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -1034,7 +1034,7 @@
             for (int j = 0; j < ((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponentCount(); j++) {
                 try {
                     ((LayeredCanvas) ((JPanel) ApplicationContext.imgView.jTabbedPane1.getComponent(i)).getComponent(j)).imgpanel.storeAnnotation();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                     //Class cast exception because it is not a layered canvas
                 }
             }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/LayeredCanvas.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/LayeredCanvas.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/LayeredCanvas.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -277,7 +277,7 @@
             this.imgpanel.resizeHandler();
             this.textOverlay.resizeHandler();
             this.annotationPanel.resizeHandler();
-        } catch (Exception ex) {
+        } catch (Exception ex) {ex.printStackTrace();
         }
     }
 

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -194,7 +194,7 @@
                 imageIcon = null;
                 loadedImage = null;
 
-            } catch (Exception ex) {
+            } catch (Exception ex) {ex.printStackTrace();
                // Logger.getLogger(ThumbnailImage.class.getName()).log(Level.SEVERE, null, ex);
             }
         }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingImagePanel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -252,7 +252,7 @@
                 initialPixelSpacingX = pixelSpacingX = Double.parseDouble(dataset.getString(
                         Tags.PixelSpacing, 1));
 
-            } catch (NullPointerException e) {
+            } catch (NullPointerException e) {e.printStackTrace();
             }
             int nWindow = cmParam.getNumberOfWindows();
             if (nWindow > 0) {

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingLayeredCanvas.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingLayeredCanvas.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/WindowingLayeredCanvas.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -177,7 +177,7 @@
             this.canvas.resizeHandler();
             this.imgpanel.resizeHandler();
             this.textOverlay.resizeHandler();
-        } catch (Exception ex) {
+        } catch (Exception ex) {ex.printStackTrace();
         }
 
     }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/ExportDialog.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/ExportDialog.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/ExportDialog.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -41,7 +41,7 @@
 
 import in.raster.mayam.context.ApplicationContext;
 import in.raster.mayam.form.display.Display;
-import in.raster.mayam.form.dialog.ExportLocationChooser;
+//import in.raster.mayam.form.dialog.ExportLocationChooser;
 
 /**
  *

Modified: oviyam/mayam/trunk/src/in/raster/mayam/model/AEModel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/model/AEModel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/model/AEModel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -48,8 +48,7 @@
     private String hostName="";    
     private String aeTitle="";
     private int port=0; 
-    public AEModel() {
-    }
+   
     public AEModel(String serverName,String host,String aeTitle,int port)
     {
         this.serverName=serverName;

Modified: oviyam/mayam/trunk/src/in/raster/mayam/model/table/PresetTableModel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/model/table/PresetTableModel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/model/table/PresetTableModel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -124,7 +124,7 @@
 
                     row.setWindowLevel("" + level);
                     ApplicationContext.databaseRef.updatePresetValues(row);
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                 }
                 break;
             case 2:
@@ -132,7 +132,7 @@
                     int width = Integer.parseInt(aValue.toString());
                     row.setWindowWidth("" + width);
                     ApplicationContext.databaseRef.updatePresetValues(row);
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                 }
                 break;
         }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/model/table/ServerTableModel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/model/table/ServerTableModel.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/model/table/ServerTableModel.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -127,14 +127,14 @@
                 try {
                     row.setAeTitle(aValue.toString());
                     ApplicationContext.databaseRef.updateServerListValues(row);
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                 }
                 break;
             case 2:
                 try {
                     row.setHostName(aValue.toString());
                     ApplicationContext.databaseRef.updateServerListValues(row);
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                 }
                 break;
             case 3:
@@ -142,7 +142,7 @@
                     int port = Integer.parseInt(aValue.toString());
                     row.setPort("" + port);
                     ApplicationContext.databaseRef.updateServerListValues(row);
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                 }
                 break;
 

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/DicomTagsReader.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/DicomTagsReader.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/DicomTagsReader.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -119,7 +119,7 @@
                 dcmTags.setTagLength(tagLength);
                 dcmTags.setTagValue(dcmObject.getString(tag));
 
-            }catch(UnsupportedOperationException e){}
+            }catch(UnsupportedOperationException e){e.printStackTrace();}
             catch (Exception e) {
                 e.printStackTrace();
             }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/core/Configuration.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/core/Configuration.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/core/Configuration.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -82,7 +82,7 @@
                + url, e);
       } finally {
          if (in != null) {
-            try { in.close(); } catch (IOException ignore) {}
+            try { in.close(); } catch (IOException ignore) {ignore.printStackTrace();}
          }
       }
    }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmRcv.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmRcv.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmRcv.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -1119,7 +1119,7 @@
             int i = Integer.parseInt(s);
             if (i >= min && i <= max)
                 return i;
-        } catch (NumberFormatException e) {
+        } catch (NumberFormatException e) {e.printStackTrace();
             // parameter is not a valid integer; fall through to exit
         }
         exit(errPrompt);

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -850,7 +850,7 @@
             }
             try {
                 dcmsnd.initTLS();
-            } catch (Exception e) {
+            } catch (Exception e) {e.printStackTrace();
              //   System.err.println("ERROR: Failed to initialize TLS context:"
                //         + e.getMessage());
                // System.exit(2);
@@ -858,7 +858,7 @@
         }        
         try {
             dcmsnd.start();
-        } catch (Exception e) {
+        } catch (Exception e) {e.printStackTrace();
            // System.err.println("ERROR: Failed to start server for receiving " +
            //         "Storage Commitment results:" + e.getMessage());
            // System.exit(2);
@@ -867,7 +867,7 @@
             t1 = System.currentTimeMillis();
             try {
                 dcmsnd.open();
-            } catch (Exception e) {
+            } catch (Exception e) {e.printStackTrace();
               //  System.err.println("ERROR: Failed to establish association:"
                //         + e.getMessage());
               //  System.exit(2);
@@ -902,7 +902,7 @@
                 t1 = System.currentTimeMillis();
                 try {
                     dcmsnd.openToStgcmtAE();
-                } catch (Exception e) {
+                } catch (Exception e) {e.printStackTrace();
                   //  System.err.println("ERROR: Failed to establish association:"
                    //         + e.getMessage());
                    // System.exit(2);
@@ -1015,7 +1015,7 @@
             int i = Integer.parseInt(s);
             if (i >= min && i <= max)
                 return i;
-        } catch (NumberFormatException e) {
+        } catch (NumberFormatException e) {e.printStackTrace();
             // parameter is not a valid integer; fall through to exit
         }
         exit(errPrompt);

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/core/TranscoderMain.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/core/TranscoderMain.java	2010-07-17 13:28:26 UTC (rev 13755)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/core/TranscoderMain.java	2010-07-19 08:37:03 UTC (rev 13756)
@@ -201,7 +201,7 @@
                     return quality / 100.f;
                 }
             } catch (IllegalArgumentException e)
-            {}
+            {e.printStackTrace();}
             System.out.println(
                 MessageFormat.format(
                     rb.getString("ignoreQuality"),
@@ -222,7 +222,7 @@
                     return rate;
                 }
             } catch (IllegalArgumentException e)
-            {}
+            {e.printStackTrace();}
             System.out.println(
                 MessageFormat.format(
                     rb.getString("ignoreRate"),


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

Revision: 13761
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13761&view=rev
Author:   marcheschi
Date:     2010-07-19 17:15:08 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
clean up some code adding curly braces when needed and commented  some unused imports.
Nothing important

Modified Paths:
--------------
    oviyam/mayam/trunk/src/de/iftm/dcm4che/services/CDimseService.java
    oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageService.java
    oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/AEManagementDialog.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/shapes/SelectedShape.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java

Modified: oviyam/mayam/trunk/src/de/iftm/dcm4che/services/CDimseService.java
===================================================================
--- oviyam/mayam/trunk/src/de/iftm/dcm4che/services/CDimseService.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/de/iftm/dcm4che/services/CDimseService.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 package de.iftm.dcm4che.services;
 
-import java.io.File;
+//import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.Socket;
@@ -53,31 +53,31 @@
 
 import org.dcm4che.data.Command;
 import org.dcm4che.data.Dataset;
-import org.dcm4che.data.DcmDecodeParam;
-import org.dcm4che.data.DcmElement;
-import org.dcm4che.data.DcmEncodeParam;
+//import org.dcm4che.data.DcmDecodeParam;
+//import org.dcm4che.data.DcmElement;
+//import org.dcm4che.data.DcmEncodeParam;
 import org.dcm4che.data.DcmObjectFactory;
-import org.dcm4che.data.DcmParseException;
-import org.dcm4che.data.DcmParser;
+//import org.dcm4che.data.DcmParseException;
+//import org.dcm4che.data.DcmParser;
 import org.dcm4che.data.DcmParserFactory;
-import org.dcm4che.data.FileFormat;
+//import org.dcm4che.data.FileFormat;
 import org.dcm4che.dict.DictionaryFactory;
 import org.dcm4che.dict.Tags;
 import org.dcm4che.dict.UIDDictionary;
 import org.dcm4che.dict.UIDs;
-import org.dcm4che.dict.VRs;
+//import org.dcm4che.dict.VRs;
 import org.dcm4che.net.AAssociateAC;
 import org.dcm4che.net.AAssociateRQ;
 import org.dcm4che.net.ActiveAssociation;
 import org.dcm4che.net.Association;
 import org.dcm4che.net.AssociationFactory;
 import org.dcm4che.net.Dimse;
-import org.dcm4che.net.DataSource;
+//import org.dcm4che.net.DataSource;
 import org.dcm4che.net.FutureRSP;
 import org.dcm4che.net.PDU;
 import org.dcm4che.net.PresContext;
-import org.dcm4che.server.PollDirSrv;
-import org.dcm4che.server.PollDirSrvFactory;
+//import org.dcm4che.server.PollDirSrv;
+//import org.dcm4che.server.PollDirSrvFactory;
 import org.dcm4che.util.DcmURL;
 import org.dcm4che.util.SSLContextAdapter;
 

Modified: oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageService.java
===================================================================
--- oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageService.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/de/iftm/dcm4che/services/StorageService.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -37,45 +37,45 @@
  * ***** END LICENSE BLOCK ***** */
 package de.iftm.dcm4che.services;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+// import java.io.BufferedInputStream;
+// import java.io.File;
+// import java.io.FileInputStream;
+// import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+// import java.io.InputStream;
+// import java.io.OutputStream;
 import java.net.URL;
-import java.net.ConnectException;
-import java.text.MessageFormat;
+// import java.net.ConnectException;
+// import java.text.MessageFormat;
 import java.util.*;
 import java.text.ParseException;
 
 import org.dcm4che.data.Command;
-import org.dcm4che.data.Dataset;
-import org.dcm4che.data.DcmDecodeParam;
-import org.dcm4che.data.DcmElement;
-import org.dcm4che.data.DcmEncodeParam;
+//import org.dcm4che.data.Dataset;
+//import org.dcm4che.data.DcmDecodeParam;
+//import org.dcm4che.data.DcmElement;
+//import org.dcm4che.data.DcmEncodeParam;
 import org.dcm4che.data.DcmObjectFactory;
-import org.dcm4che.data.DcmParser;
+//import org.dcm4che.data.DcmParser;
 import org.dcm4che.data.DcmParserFactory;
-import org.dcm4che.data.FileFormat;
+//import org.dcm4che.data.FileFormat;
 import org.dcm4che.data.FileMetaInfo;
-import org.dcm4che.dict.Status;
+//import org.dcm4che.dict.Status;
 import org.dcm4che.dict.Tags;
 import org.dcm4che.dict.UIDs;
-import org.dcm4che.dict.VRs;
-import org.dcm4che.net.AAbort;
+//import org.dcm4che.dict.VRs;
+//import org.dcm4che.net.AAbort;
 import org.dcm4che.net.AcceptorPolicy;
 import org.dcm4che.net.ActiveAssociation;
 import org.dcm4che.net.AssociationFactory;
 import org.dcm4che.net.DcmServiceBase;
-import org.dcm4che.net.DcmServiceException;
+//import org.dcm4che.net.DcmServiceException;
 import org.dcm4che.net.DcmServiceRegistry;
 import org.dcm4che.net.Dimse;
 import org.dcm4che.server.DcmHandler;
 import org.dcm4che.server.Server;
 import org.dcm4che.server.ServerFactory;
-import org.dcm4che.util.BufferedOutputStream;
+//import org.dcm4che.util.BufferedOutputStream;
 import org.dcm4che.util.DcmProtocol;
 import org.dcm4che.util.SSLContextAdapter;
 

Modified: oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/delegate/SeriesListUpdator.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -44,11 +44,11 @@
 import in.raster.mayam.model.Series;
 import in.raster.mayam.model.Study;
 import java.io.File;
-import java.io.IOException;
+//import java.io.IOException;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -1719,8 +1719,8 @@
     public void mouseMoved(MouseEvent e) {
         mouseLocX2 = e.getX();
         mouseLocY2 = e.getY();
-        if (mousePressed) {
-        }
+       // if (mousePressed) {
+       // }
         if (probeFlag) {
             String probeParameter[] = new String[3];
             probeParameter[0] = "" + (int) Math.round(mouseLocX2 / this.scaleFactor);

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -726,7 +726,7 @@
                     echoStatus.setVisible(true);
                 }
             } catch (Exception e) {
-                System.out.println(e.getStackTrace());
+                e.printStackTrace();
             }
         } catch (Exception e) {
             System.out.println("Select a Server");

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ServerManager.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -286,7 +286,7 @@
                     echoStatus.setVisible(true);
                 }
             } catch (Exception e) {
-                System.out.println(e.getStackTrace());
+                e.printStackTrace();
             }
         } catch (Exception e) {
            e.printStackTrace();

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/AEManagementDialog.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/AEManagementDialog.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/dialog/AEManagementDialog.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -315,7 +315,7 @@
                         echoStatus.setVisible(true);
                     }
                 } catch (Exception e) {
-                    System.out.println(e.getStackTrace());
+                    e.printStackTrace();
                 }
             } else {
                 FieldValidator sd=new FieldValidator(this, true);

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/shapes/SelectedShape.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/shapes/SelectedShape.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/shapes/SelectedShape.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -48,7 +48,7 @@
  */
 public class SelectedShape extends Rectangle2D {
 
-    private String type="";
+   // private String type="";
 
     public SelectedShape() {
     }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/core/DcmSnd.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -963,7 +963,7 @@
     }
 
     private synchronized DicomObject waitForStgCmtResult() throws InterruptedException {
-        while (stgCmtResult == null) wait();
+        while (stgCmtResult == null) {wait();}
         return stgCmtResult;
     }
 

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java	2010-07-19 14:31:24 UTC (rev 13760)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java	2010-07-19 17:15:08 UTC (rev 13761)
@@ -40,7 +40,7 @@
 
 import in.raster.mayam.context.ApplicationContext;
 import in.raster.mayam.facade.ApplicationFacade;
-import in.raster.mayam.form.dialog.NumberFormatValidator;
+//import in.raster.mayam.form.dialog.NumberFormatValidator;
 import in.raster.mayam.model.AEModel;
 import in.raster.mayam.model.Instance;
 import in.raster.mayam.model.PresetModel;
@@ -62,7 +62,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Vector;
-import javax.swing.JOptionPane;
+//import javax.swing.JOptionPane;
 import org.dcm4che.dict.Tags;
 import org.dcm4che2.data.BasicDicomObject;
 import org.dcm4che2.data.DicomObject;


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

Revision: 14473
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=14473&view=rev
Author:   babuhussain
Date:     2010-12-01 07:12:48 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
MAYAM-5 : Add new look and feel option-New icon set has been replaced in imageview and selection tool diffentiation has been updated.theme has been adjusted.

Modified Paths:
--------------
    oviyam/mayam/trunk/src/NimRODThemeFile.theme
    oviyam/mayam/trunk/src/in/raster/mayam/form/AnnotationPanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/Canvas.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.form
    oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/LayeredCanvas.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.form
    oviyam/mayam/trunk/src/in/raster/mayam/form/QueryRetrive.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/SeriesPanel.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/TextOverlay.form
    oviyam/mayam/trunk/src/in/raster/mayam/form/TextOverlay.java
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Search.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/angle.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_overlay.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_selection.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/clear_all_annotation.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/delete_annotation.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/drop_down.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ellipse.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/export_series.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_horizontal.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_vertical.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/invert.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/layout.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/metadata_viewerpage.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/pan.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/probe.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rectangle.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/reset.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_left.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_right.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ruler.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/scout.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/stack.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/textoverlay.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/windowing.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomin.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomout.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/tab/component/ButtonTabComp.java

Added Paths:
-----------
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Cube3D.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Cut.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/DrawCircle.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/DrawLine.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Grid.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Move.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Movie.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ResetInteractor.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/RotateSurface.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ScreenShot.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Settings.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ZoomInOut.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ZoomInOut_1.png

Removed Paths:
-------------
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Search1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/Search2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/angle1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/angle2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_overlay1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_overlay2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_selection1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/annotation_selection2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/clear_all_annotation1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/clear_all_annotation2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/delete_annotation1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/delete_annotation2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/drop_down1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/drop_down2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ellipse1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ellipse2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/export_series1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/export_series2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_horizontal1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_horizontal2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_vertical1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/flip_vertical2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/invert1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/invert2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/layout1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/layout2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/metadata_viewerpage1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/metadata_viewerpage2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/pan1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/pan2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/probe1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/probe2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rectangle1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rectangle2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/reset1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/reset2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_left1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_left2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_right1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/rotate_right2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ruler1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/ruler2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/scout1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/scout2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/stack1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/stack2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/textoverlay1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/textoverlay2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/windowing1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/windowing2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomin1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomin2.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomout1.png
    oviyam/mayam/trunk/src/in/raster/mayam/form/images/zoomout2.png

Modified: oviyam/mayam/trunk/src/NimRODThemeFile.theme
===================================================================
--- oviyam/mayam/trunk/src/NimRODThemeFile.theme	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/NimRODThemeFile.theme	2010-12-01 07:12:48 UTC (rev 14473)
@@ -1,10 +1,10 @@
-nimrodlf.p1=#006666
-nimrodlf.p2=#006666
-nimrodlf.p3=#006666
-nimrodlf.s1=#858585
-nimrodlf.s2=#8F8F8F
-nimrodlf.s3=#999999
-nimrodlf.w=#FFFFFF
-nimrodlf.b=#000066
-nimrodlf.menuOpacity=195
+nimrodlf.p1=#000000
+nimrodlf.p2=#000000
+nimrodlf.p3=#000000
+nimrodlf.s1=#1F1F1F
+nimrodlf.s2=#292929
+nimrodlf.s3=#333333
+nimrodlf.w=#333333
+nimrodlf.b=#FF8A00
+nimrodlf.menuOpacity=73
 nimrodlf.frameOpacity=180

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/AnnotationPanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/AnnotationPanel.java	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/AnnotationPanel.java	2010-12-01 07:12:48 UTC (rev 14473)
@@ -238,7 +238,7 @@
             int pointY = evt.getY() - mousePointBoxSize / 2;
             int width = mousePointBoxSize;
             int height = mousePointBoxSize;
-            if (lineObject.intersects(pointX, pointY, width, height)) {               
+            if (lineObject.intersects(pointX, pointY, width, height)) {
                 lineObj.remove(t);
                 break;
             }
@@ -272,14 +272,14 @@
         while (ite.hasNext()) {
             AnnotationObj t = ite.next();
             Shape test = new Line2D.Float(t.getX1(), t.getY1(), t.getX2(), t.getY2());
-            if (test.contains(evt.getX(), evt.getY())) {              
+            if (test.contains(evt.getX(), evt.getY())) {
             }
         }
         Iterator<AnnotationObj> ite1 = rectObj.iterator();
-        while (ite1.hasNext()) {           
+        while (ite1.hasNext()) {
             AnnotationObj t = ite1.next();
             Shape test2 = new Rectangle2D.Float(t.getX1(), t.getY1(), t.getX2() - t.getX1(), t.getY2() - t.getY1());
-            if (test2.contains(evt.getX(), evt.getY())) {                
+            if (test2.contains(evt.getX(), evt.getY())) {
                 rectObj.remove(t);
                 break;
             }
@@ -307,23 +307,22 @@
         while (ite.hasNext()) {
             AnnotationObj t = ite.next();
             ShapeCoordinates shapeCoordinates = new ShapeCoordinates(t.getX1(), t.getY1(), t.getX2(), t.getY2());
-            int mousePointBoxSize=2;
+            int mousePointBoxSize = 2;
             Shape lineObject = new Line2D.Float(t.getX1(), t.getY1(), t.getX2(), t.getY2());
-            int pointX=evt.getX()-mousePointBoxSize/2;
-            int pointY=evt.getY()-mousePointBoxSize/2;
-                    int width=mousePointBoxSize;
-            int height=mousePointBoxSize;
-            if(lineObject.intersects(pointX,pointY, width, height))
-            {
+            int pointX = evt.getX() - mousePointBoxSize / 2;
+            int pointY = evt.getY() - mousePointBoxSize / 2;
+            int width = mousePointBoxSize;
+            int height = mousePointBoxSize;
+            if (lineObject.intersects(pointX, pointY, width, height)) {
                 Shape test = new Rectangle2D.Float(shapeCoordinates.getX(), shapeCoordinates.getY(), shapeCoordinates.getWidth(), shapeCoordinates.getHeight());
-                 int diffX = t.getX2() - t.getX1();
+                int diffX = t.getX2() - t.getX1();
                 int diffY = t.getY2() - t.getY1();
-                if ((diffX < 0 && diffY < 0) || (diffX > 0 && diffY > 0) ||(diffX==0&&diffY>0)||(diffY==0&&diffX>0)) {
+                if ((diffX < 0 && diffY < 0) || (diffX > 0 && diffY > 0) || (diffX == 0 && diffY > 0) || (diffY == 0 && diffX > 0)) {
                     selectedShapeOrientation = "left";
                 } else {
                     selectedShapeOrientation = "right";
                 }
-               boundingRect = test.getBounds();
+                boundingRect = test.getBounds();
                 seletedShape = test;
                 selectedShapeType = "line";
                 selectedShapeDisplayStringValue = t.getLength();
@@ -331,7 +330,7 @@
                 break;
             }
 
-            
+
         }
     }
 
@@ -440,6 +439,14 @@
         }
     }
 
+    public boolean isDeleteMeasurement() {
+        return this.deleteMeasurement;
+    }
+
+    public void setDeleteMeasurement(boolean deleteMeasurement) {
+        this.deleteMeasurement = deleteMeasurement;
+    }
+
     /**
      * This routine used to reset the selected measurement.
      */
@@ -491,6 +498,14 @@
         }
     }
 
+    public static boolean isMoveMeasurement() {
+        return moveMeasurement;
+    }
+
+    public static void setMoveMeasurement(boolean moveMeasurement) {
+        moveMeasurement = moveMeasurement;
+    }
+
     /**
      * This routine the used to reset the annotation overlay.
      */
@@ -851,10 +866,9 @@
     }
 
     public void stopPanning() {
-        if(tool.equalsIgnoreCase("panning"))
-        {
-        tool = "";        
-        this.layeredCanvas.imgpanel.tool = "";
+        if (tool.equalsIgnoreCase("panning")) {
+            tool = "";
+            this.layeredCanvas.imgpanel.tool = "";
         }
     }
 
@@ -879,12 +893,12 @@
         if (showAnnotation) {
             Graphics2D g = (Graphics2D) gs;
             g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
             if (this.layeredCanvas.imgpanel.isScaleFlag()) {
                 g.scale(this.layeredCanvas.imgpanel.getScaleFactor(), this.layeredCanvas.imgpanel.getScaleFactor());
             }
-            gs.setColor(Color.YELLOW);           
+            gs.setColor(Color.YELLOW);
             //Condition used to draw new line as per the line flag values and coordinates of the annotation mouse point
             if ((mouseLocX1 != -1 && mouseLocX2 != -1 && mouseLocY1 != -1 && mouseLocY2 != -1) && addLine) {
                 g.drawString("Length:" + calculateDiff((int) (mouseLocX1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocX2 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY2 / this.layeredCanvas.imgpanel.getScaleFactor())), (int) (mouseLocX1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) ((mouseLocY1 / this.layeredCanvas.imgpanel.getScaleFactor()) - 20));
@@ -924,7 +938,7 @@
             if ((mouseLocX1 != -1 && mouseLocX2 != -1 && mouseLocY1 != -1 && mouseLocY2 != -1) && addEllipse) {
 //           //Draws the strings such as area,mean,stddev for the current shape
                 ShapeCoordinates shapeCoordinates = new ShapeCoordinates((int) (mouseLocX1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocX2 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY2 / this.layeredCanvas.imgpanel.getScaleFactor()));
-                gs.drawString("Area:" + calculateOvalArea((int) (mouseLocX1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocX2 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY2 / this.layeredCanvas.imgpanel.getScaleFactor())) , shapeCoordinates.getX(), shapeCoordinates.getY() - 60);
+                gs.drawString("Area:" + calculateOvalArea((int) (mouseLocX1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY1 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocX2 / this.layeredCanvas.imgpanel.getScaleFactor()), (int) (mouseLocY2 / this.layeredCanvas.imgpanel.getScaleFactor())), shapeCoordinates.getX(), shapeCoordinates.getY() - 60);
                 gs.drawString("Mean:", shapeCoordinates.getX(), shapeCoordinates.getY() - 40);
                 gs.drawString("Std Dev:", shapeCoordinates.getX(), shapeCoordinates.getY() - 20);
                 gs.drawOval(shapeCoordinates.getX(), shapeCoordinates.getY(), shapeCoordinates.getWidth(), shapeCoordinates.getHeight());
@@ -949,24 +963,25 @@
             }
             // Selecting the annotations
             if (boundingRect != null) {
-                if(selectedShapeType.equalsIgnoreCase("line"))
+                if (selectedShapeType.equalsIgnoreCase("line")) {
                     drawHighlightLines(g, boundingRect);
-                else
-                drawHighlightSquares(g, boundingRect);
+                } else {
+                    drawHighlightSquares(g, boundingRect);
+                }
             }
             if (curCursor != null) {
                 setCursor(curCursor);
             }
-            if (seletedShape != null) {               
-                if (selectedShapeType.equalsIgnoreCase("line")) {                   
-                    gs.drawString("Length:" + selectedShapeDisplayStringValue , seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
+            if (seletedShape != null) {
+                if (selectedShapeType.equalsIgnoreCase("line")) {
+                    gs.drawString("Length:" + selectedShapeDisplayStringValue, seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
                     if (selectedShapeOrientation.equalsIgnoreCase("left")) {
                         gs.drawLine(seletedShape.getBounds().x, seletedShape.getBounds().y, seletedShape.getBounds().x + seletedShape.getBounds().width, seletedShape.getBounds().y + seletedShape.getBounds().height);
                     } else {
                         gs.drawLine(seletedShape.getBounds().x + seletedShape.getBounds().width, seletedShape.getBounds().y, seletedShape.getBounds().x, seletedShape.getBounds().y + seletedShape.getBounds().height);
                     }
-                   // gs.drawString("Length:" + selectedShapeDisplayStringValue + " cm", seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
-                   // g.draw(seletedShape);
+                    // gs.drawString("Length:" + selectedShapeDisplayStringValue + " cm", seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
+                    // g.draw(seletedShape);
                 } else if (selectedShapeType.equalsIgnoreCase("ellipse")) {
                     //Used to draw the area,mean and std dev values in the annotation panel                    
                     gs.drawString("Area:" + selectedShapeDisplayStringValue, seletedShape.getBounds().x, seletedShape.getBounds().y - 60);
@@ -974,8 +989,8 @@
                     gs.drawString("Std Dev:", seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
                     gs.drawOval(seletedShape.getBounds().x, seletedShape.getBounds().y, seletedShape.getBounds().width, seletedShape.getBounds().height);
 
-                } else {                   
-                    gs.drawString("Area:" + selectedShapeDisplayStringValue , seletedShape.getBounds().x, seletedShape.getBounds().y - 60);
+                } else {
+                    gs.drawString("Area:" + selectedShapeDisplayStringValue, seletedShape.getBounds().x, seletedShape.getBounds().y - 60);
                     gs.drawString("Mean:", seletedShape.getBounds().x, seletedShape.getBounds().y - 40);
                     gs.drawString("Std Dev:", seletedShape.getBounds().x, seletedShape.getBounds().y - 20);
                     g.draw(seletedShape);
@@ -1004,7 +1019,6 @@
         return showAnnotation;
     }
 
-
     /**
      * This routine used to draw the highlight square around the selected measurement.
      * @param g2D

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/Canvas.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/Canvas.java	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/Canvas.java	2010-12-01 07:12:48 UTC (rev 14473)
@@ -63,7 +63,6 @@
     private String columnLeft = "";
     private String rowTop = "";
     private String rowDown = "";
-   
 
     public Canvas(LayeredCanvas canvas) {
         initComponents();
@@ -126,13 +125,13 @@
             repaint();
         }
         if (this.focusGained) {
-            g.setColor(Color.YELLOW);
+            g.setColor(new Color(255, 138, 0));
         } else {
             g.setColor(Color.DARK_GRAY);
         }
         g.drawRect(0, 0, getWidth() - 1, getHeight() - 1);
         if (this.layeredCanvas.imgpanel != null) {
-            if (this.layeredCanvas.imgpanel.getPixelSpacingY() != -1&&this.layeredCanvas.imgpanel.getPixelSpacingY()!=0) {
+            if (this.layeredCanvas.imgpanel.getPixelSpacingY() != -1 && this.layeredCanvas.imgpanel.getPixelSpacingY() != 0) {
                 int viewScaleHeight = (int) ((int) (100 / this.layeredCanvas.imgpanel.getPixelSpacingY()) * this.layeredCanvas.imgpanel.getScaleFactor() * this.layeredCanvas.imgpanel.getCurrentScaleFactor());
                 int y1 = (this.getHeight() - viewScaleHeight) / 2;
                 int hx = 20;
@@ -373,8 +372,9 @@
         ApplicationContext.layeredCanvas = this.layeredCanvas;
         ApplicationContext.annotationPanel = this.layeredCanvas.annotationPanel;
         ApplicationContext.layeredCanvas.getCanvas().setSelectionColoring();
-        if(ApplicationContext.imageViewExist())
+        if (ApplicationContext.imageViewExist()) {
             ApplicationContext.imgView.getImageToolbar().refreshToolsDisplay();
+        }
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
     // End of variables declaration//GEN-END:variables

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImagePanel.java	2010-12-01 07:12:48 UTC (rev 14473)
@@ -242,7 +242,7 @@
     public ImagePanel(String dicomFileUrl, Canvas canvas) {
         this.dicomFileUrl = dicomFileUrl;
         this.canvas = canvas;
-        readDicomFile(new File(dicomFileUrl));       
+        readDicomFile(new File(dicomFileUrl));
         retriveTagInfo();
         initComponents();
         addlisteners();
@@ -303,8 +303,8 @@
         rescaleSlope = dataset.getString(Tags.RescaleSlope);
         rescaleIntercept = dataset.getString(Tags.RescaleIntercept);
         aspectRatio = dataset.getStrings(Tags.PixelAspectRatio);
-        try {           
-            currentInstanceNo = Integer.parseInt(dataset.getString(Tags.InstanceNumber));           
+        try {
+            currentInstanceNo = Integer.parseInt(dataset.getString(Tags.InstanceNumber));
         } catch (NumberFormatException e) {
             System.out.println("Instance Number format error ");
             currentInstanceNo = 1;
@@ -840,6 +840,17 @@
         }
     }
 
+    public void setWindowingToolsAsDefault() {
+        if (!(tool.equalsIgnoreCase("windowing"))) {
+            tool = "windowing";
+            System.out.println(" tool has been set as windowing");
+        }
+    }
+
+    public boolean isWindowingSelected() {
+        return (tool.equalsIgnoreCase("windowing"));
+    }
+
     /**
      * This routine used to get the dataset value of the current image box
      * @return
@@ -1208,6 +1219,10 @@
         }
     }
 
+    public boolean isStackSelected() {
+        return (tool.equalsIgnoreCase("stack"));
+    }
+
     public void setToolsToNull() {
         tool = "";
     }
@@ -1295,8 +1310,8 @@
             System.out.println("Windowing can't be applied");
         }
     }
-    public void repaintTextOverlay()
-    {
+
+    public void repaintTextOverlay() {
         this.getCanvas().getLayeredCanvas().textOverlay.repaint();
     }
 
@@ -1926,10 +1941,11 @@
     }
 
     public float getRescaleIntercept() {
-        if(rescaleIntercept!=null &&!rescaleIntercept.equalsIgnoreCase(""))
-        return Float.parseFloat(rescaleIntercept);
-        else
+        if (rescaleIntercept != null && !rescaleIntercept.equalsIgnoreCase("")) {
+            return Float.parseFloat(rescaleIntercept);
+        } else {
             return 0.0f;
+        }
     }
 
     public void setRescaleIntercept(String rescaleIntercept) {
@@ -1937,10 +1953,11 @@
     }
 
     public float getRescaleSlope() {
-        if(rescaleSlope!=null &&!rescaleSlope.equalsIgnoreCase(""))
-        return Float.parseFloat(rescaleSlope);
-        else
+        if (rescaleSlope != null && !rescaleSlope.equalsIgnoreCase("")) {
+            return Float.parseFloat(rescaleSlope);
+        } else {
             return 0.0f;
+        }
     }
 
     public void setRescaleSlope(String rescaleSlope) {
@@ -1987,7 +2004,7 @@
         return referencedSOPInstanceUID;
     }
 
-    private void designContext() {     
+    private void designContext() {
         ArrayList<Series> seriesList = ApplicationContext.databaseRef.getSeriesList(this.studyUID);
         JMenu menu;
         if ((this.studyDesc == null) || (this.studyDesc.equalsIgnoreCase(""))) {

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.form
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.form	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.form	2010-12-01 07:12:48 UTC (rev 14473)
@@ -66,26 +66,18 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/layout.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Layout"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="componentPopupMenu" type="javax.swing.JPopupMenu" editor="org.netbeans.modules.form.ComponentChooserEditor">
               <ComponentRef name="jPopupMenu1"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/layout2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/layout1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/layout1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -98,30 +90,16 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/windowing.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Windowing"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/windowing2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/windowing2.png"/>
-            </Property>
             <Property name="focusPainted" type="boolean" value="false"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/windowing1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/windowing1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -134,13 +112,11 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/drop_down.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Preset"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="componentPopupMenu" type="javax.swing.JPopupMenu" editor="org.netbeans.modules.form.ComponentChooserEditor">
               <ComponentRef name="jPopupMenu2"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/drop_down2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
@@ -153,13 +129,7 @@
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/drop_down1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/angle.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -188,23 +158,15 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/probe.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Probe"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/probe2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/probe1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/probe1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -217,26 +179,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/flip_vertical.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Vertical Flip"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_vertical2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_vertical1.png"/>
-            </Property>
-            <Property name="rolloverSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_vertical1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_vertical1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -249,23 +199,15 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/flip_horizontal.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Horizontal Flip"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_horizontal2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_horizontal1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/flip_horizontal1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -278,23 +220,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/rotate_left.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Rotate Left"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_left2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_left1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_left1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -307,23 +240,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/rotate_right.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Rotate Right"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_right2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_right1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rotate_right1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -336,23 +260,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/zoomin.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Zoom In"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomin2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomin1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomin1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -365,23 +280,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/zoomout.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Zoom Out"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomout2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomout1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/zoomout1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -394,29 +300,15 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/pan.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Pan"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/pan2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/pan2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/pan1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/pan1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -429,23 +321,15 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/invert.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Invert"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/invert2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/invert1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/invert1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -459,29 +343,15 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Ruler"/>
             <Property name="actionCommand" type="java.lang.String" value="ruler"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ruler2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ruler2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ruler1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ruler1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -495,29 +365,15 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Rectangle ROI"/>
             <Property name="actionCommand" type="java.lang.String" value="rectangle"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rectangle2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rectangle2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rectangle1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/rectangle1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -531,29 +387,15 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Elliptical ROI"/>
             <Property name="actionCommand" type="java.lang.String" value="ellipse"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ellipse2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ellipse2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ellipse1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/ellipse1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -567,21 +409,13 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Clear All Measurement"/>
             <Property name="actionCommand" type="java.lang.String" value="clearAll"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/clear_all_annotation2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/clear_all_annotation1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/clear_all_annotation1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
           </Properties>
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="clearAllMeasurementActionPerformed"/>
@@ -594,29 +428,15 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Delete Measurement"/>
             <Property name="actionCommand" type="java.lang.String" value="deleteMeasurement"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/delete_annotation2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/delete_annotation2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/delete_annotation1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/delete_annotation1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -630,30 +450,16 @@
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Measurement Selection"/>
             <Property name="actionCommand" type="java.lang.String" value="moveMeasurement"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_selection2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_selection2.png"/>
-            </Property>
             <Property name="doubleBuffered" type="boolean" value="true"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_selection1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_selection1.png"/>
-            </Property>
+            <Property name="requestFocusEnabled" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -666,26 +472,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/annotation_overlay.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Annotation Overlay"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_overlay2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_overlay1.png"/>
-            </Property>
-            <Property name="rolloverSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_overlay1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/annotation_selection1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -698,23 +492,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/textoverlay.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Text Overlay"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/textoverlay2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/textoverlay1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/textoverlay1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -727,23 +512,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/reset.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Reset"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/reset2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/reset1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/reset1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -756,23 +532,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/export_series.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Export"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/export_series2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/export_series1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/export_series1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -785,23 +552,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/metadata_viewerpage.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Meta Data"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/metadata_viewerpage2.png"/>
+            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="0" name="null"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/metadata_viewerpage1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/metadata_viewerpage1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -814,29 +572,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/stack.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Stack"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/stack2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/stack2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/stack1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/stack1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
@@ -849,29 +592,14 @@
               <Image iconType="3" name="/in/raster/mayam/form/images/scout.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="ScoutLine"/>
-            <Property name="borderPainted" type="boolean" value="false"/>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="toolsButtonGroup"/>
             </Property>
-            <Property name="contentAreaFilled" type="boolean" value="false"/>
-            <Property name="disabledIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/scout2.png"/>
-            </Property>
-            <Property name="disabledSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/scout2.png"/>
-            </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[45, 45]"/>
             </Property>
-            <Property name="rolloverEnabled" type="boolean" value="true"/>
-            <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/scout1.png"/>
-            </Property>
-            <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/in/raster/mayam/form/images/scout1.png"/>
-            </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>

Modified: oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-12-01 05:47:22 UTC (rev 14472)
+++ oviyam/mayam/trunk/src/in/raster/mayam/form/ImageToolbar.java	2010-12-01 07:12:48 UTC (rev 14473)
@@ -146,16 +146,12 @@
 
         layoutButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/layout.png"))); // NOI18N
         layoutButton.setToolTipText("Layout");
-        layoutButton.setBorderPainted(false);
         layoutButton.setComponentPopupMenu(jPopupMenu1);
-        layoutButton.setContentAreaFilled(false);
-        layoutButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/layout2.png"))); // NOI18N
+        layoutButton.setDisabledSelectedIcon(null);
         layoutButton.setFocusable(false);
         layoutButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         layoutButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        layoutButton.setRolloverEnabled(true);
-        layoutButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/layout1.png"))); // NOI18N
-        layoutButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/layout1.png"))); // NOI18N
+        layoutButton.setRequestFocusEnabled(false);
         layoutButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         layoutButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -166,18 +162,12 @@
 
         windowing.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/windowing.png"))); // NOI18N
         windowing.setToolTipText("Windowing");
-        windowing.setBorderPainted(false);
         toolsButtonGroup.add(windowing);
-        windowing.setContentAreaFilled(false);
-        windowing.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/windowing2.png"))); // NOI18N
-        windowing.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/windowing2.png"))); // NOI18N
         windowing.setFocusPainted(false);
         windowing.setFocusable(false);
         windowing.setHorizontalTextPosition(0);
         windowing.setPreferredSize(new java.awt.Dimension(45, 45));
-        windowing.setRolloverEnabled(true);
-        windowing.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/windowing1.png"))); // NOI18N
-        windowing.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/windowing1.png"))); // NOI18N
+        windowing.setRequestFocusEnabled(false);
         windowing.setVerticalTextPosition(3);
         windowing.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -188,18 +178,14 @@
 
         presetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/drop_down.png"))); // NOI18N
         presetButton.setToolTipText("Preset");
-        presetButton.setBorderPainted(false);
         presetButton.setComponentPopupMenu(jPopupMenu2);
-        presetButton.setContentAreaFilled(false);
-        presetButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/drop_down2.png"))); // NOI18N
+        presetButton.setDisabledSelectedIcon(null);
         presetButton.setFocusable(false);
         presetButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         presetButton.setMaximumSize(new java.awt.Dimension(12, 24));
         presetButton.setMinimumSize(new java.awt.Dimension(12, 24));
         presetButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        presetButton.setRolloverEnabled(true);
-        presetButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/drop_down1.png"))); // NOI18N
-        presetButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/angle.png"))); // NOI18N
+        presetButton.setRequestFocusEnabled(false);
         presetButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         presetButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -220,15 +206,11 @@
 
         probeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/probe.png"))); // NOI18N
         probeButton.setToolTipText("Probe");
-        probeButton.setBorderPainted(false);
-        probeButton.setContentAreaFilled(false);
-        probeButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/probe2.png"))); // NOI18N
+        probeButton.setDisabledSelectedIcon(null);
         probeButton.setFocusable(false);
         probeButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         probeButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        probeButton.setRolloverEnabled(true);
-        probeButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/probe1.png"))); // NOI18N
-        probeButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/probe1.png"))); // NOI18N
+        probeButton.setRequestFocusEnabled(false);
         probeButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         probeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -239,16 +221,10 @@
 
         verticalFlip.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_vertical.png"))); // NOI18N
         verticalFlip.setToolTipText("Vertical Flip");
-        verticalFlip.setBorderPainted(false);
-        verticalFlip.setContentAreaFilled(false);
-        verticalFlip.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_vertical2.png"))); // NOI18N
+        verticalFlip.setDisabledSelectedIcon(null);
         verticalFlip.setFocusable(false);
         verticalFlip.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         verticalFlip.setPreferredSize(new java.awt.Dimension(45, 45));
-        verticalFlip.setRolloverEnabled(true);
-        verticalFlip.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_vertical1.png"))); // NOI18N
-        verticalFlip.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_vertical1.png"))); // NOI18N
-        verticalFlip.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_vertical1.png"))); // NOI18N
         verticalFlip.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         verticalFlip.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -259,15 +235,11 @@
 
         horizontalFlip.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_horizontal.png"))); // NOI18N
         horizontalFlip.setToolTipText("Horizontal Flip");
-        horizontalFlip.setBorderPainted(false);
-        horizontalFlip.setContentAreaFilled(false);
-        horizontalFlip.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_horizontal2.png"))); // NOI18N
+        horizontalFlip.setDisabledSelectedIcon(null);
         horizontalFlip.setFocusable(false);
         horizontalFlip.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         horizontalFlip.setPreferredSize(new java.awt.Dimension(45, 45));
-        horizontalFlip.setRolloverEnabled(true);
-        horizontalFlip.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_horizontal1.png"))); // NOI18N
-        horizontalFlip.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/flip_horizontal1.png"))); // NOI18N
+        horizontalFlip.setRequestFocusEnabled(false);
         horizontalFlip.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         horizontalFlip.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -278,15 +250,10 @@
 
         leftRotate.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_left.png"))); // NOI18N
         leftRotate.setToolTipText("Rotate Left");
-        leftRotate.setBorderPainted(false);
-        leftRotate.setContentAreaFilled(false);
-        leftRotate.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_left2.png"))); // NOI18N
+        leftRotate.setDisabledSelectedIcon(null);
         leftRotate.setFocusable(false);
         leftRotate.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         leftRotate.setPreferredSize(new java.awt.Dimension(45, 45));
-        leftRotate.setRolloverEnabled(true);
-        leftRotate.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_left1.png"))); // NOI18N
-        leftRotate.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_left1.png"))); // NOI18N
         leftRotate.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         leftRotate.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -297,15 +264,10 @@
 
         rightRotate.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_right.png"))); // NOI18N
         rightRotate.setToolTipText("Rotate Right");
-        rightRotate.setBorderPainted(false);
-        rightRotate.setContentAreaFilled(false);
-        rightRotate.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_right2.png"))); // NOI18N
+        rightRotate.setDisabledSelectedIcon(null);
         rightRotate.setFocusable(false);
         rightRotate.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         rightRotate.setPreferredSize(new java.awt.Dimension(45, 45));
-        rightRotate.setRolloverEnabled(true);
-        rightRotate.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_right1.png"))); // NOI18N
-        rightRotate.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rotate_right1.png"))); // NOI18N
         rightRotate.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         rightRotate.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -316,15 +278,10 @@
 
         zoomin.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomin.png"))); // NOI18N
         zoomin.setToolTipText("Zoom In");
-        zoomin.setBorderPainted(false);
-        zoomin.setContentAreaFilled(false);
-        zoomin.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomin2.png"))); // NOI18N
+        zoomin.setDisabledSelectedIcon(null);
         zoomin.setFocusable(false);
         zoomin.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         zoomin.setPreferredSize(new java.awt.Dimension(45, 45));
-        zoomin.setRolloverEnabled(true);
-        zoomin.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomin1.png"))); // NOI18N
-        zoomin.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomin1.png"))); // NOI18N
         zoomin.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         zoomin.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -335,15 +292,10 @@
 
         zoomoutButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomout.png"))); // NOI18N
         zoomoutButton.setToolTipText("Zoom Out");
-        zoomoutButton.setBorderPainted(false);
-        zoomoutButton.setContentAreaFilled(false);
-        zoomoutButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomout2.png"))); // NOI18N
+        zoomoutButton.setDisabledSelectedIcon(null);
         zoomoutButton.setFocusable(false);
         zoomoutButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         zoomoutButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        zoomoutButton.setRolloverEnabled(true);
-        zoomoutButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomout1.png"))); // NOI18N
-        zoomoutButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/zoomout1.png"))); // NOI18N
         zoomoutButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         zoomoutButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -354,17 +306,11 @@
 
         panButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/pan.png"))); // NOI18N
         panButton.setToolTipText("Pan");
-        panButton.setBorderPainted(false);
         toolsButtonGroup.add(panButton);
-        panButton.setContentAreaFilled(false);
-        panButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/pan2.png"))); // NOI18N
-        panButton.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/pan2.png"))); // NOI18N
         panButton.setFocusable(false);
         panButton.setHorizontalTextPosition(0);
         panButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        panButton.setRolloverEnabled(true);
-        panButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/pan1.png"))); // NOI18N
-        panButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/pan1.png"))); // NOI18N
+        panButton.setRequestFocusEnabled(false);
         panButton.setVerticalTextPosition(3);
         panButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -375,15 +321,11 @@
 
         invert.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/invert.png"))); // NOI18N
         invert.setToolTipText("Invert");
-        invert.setBorderPainted(false);
-        invert.setContentAreaFilled(false);
-        invert.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/invert2.png"))); // NOI18N
+        invert.setDisabledSelectedIcon(null);
         invert.setFocusable(false);
         invert.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         invert.setPreferredSize(new java.awt.Dimension(45, 45));
-        invert.setRolloverEnabled(true);
-        invert.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/invert1.png"))); // NOI18N
-        invert.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/invert1.png"))); // NOI18N
+        invert.setRequestFocusEnabled(false);
         invert.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         invert.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -395,17 +337,11 @@
         rulerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ruler.png"))); // NOI18N
         rulerButton.setToolTipText("Ruler");
         rulerButton.setActionCommand("ruler");
-        rulerButton.setBorderPainted(false);
         toolsButtonGroup.add(rulerButton);
-        rulerButton.setContentAreaFilled(false);
-        rulerButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ruler2.png"))); // NOI18N
-        rulerButton.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ruler2.png"))); // NOI18N
         rulerButton.setFocusable(false);
         rulerButton.setHorizontalTextPosition(0);
         rulerButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        rulerButton.setRolloverEnabled(true);
-        rulerButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ruler1.png"))); // NOI18N
-        rulerButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ruler1.png"))); // NOI18N
+        rulerButton.setRequestFocusEnabled(false);
         rulerButton.setVerticalTextPosition(3);
         rulerButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -417,17 +353,11 @@
         rectangleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rectangle.png"))); // NOI18N
         rectangleButton.setToolTipText("Rectangle ROI");
         rectangleButton.setActionCommand("rectangle");
-        rectangleButton.setBorderPainted(false);
         toolsButtonGroup.add(rectangleButton);
-        rectangleButton.setContentAreaFilled(false);
-        rectangleButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rectangle2.png"))); // NOI18N
-        rectangleButton.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rectangle2.png"))); // NOI18N
         rectangleButton.setFocusable(false);
         rectangleButton.setHorizontalTextPosition(0);
         rectangleButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        rectangleButton.setRolloverEnabled(true);
-        rectangleButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rectangle1.png"))); // NOI18N
-        rectangleButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/rectangle1.png"))); // NOI18N
+        rectangleButton.setRequestFocusEnabled(false);
         rectangleButton.setVerticalTextPosition(3);
         rectangleButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -439,17 +369,11 @@
         ellipseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ellipse.png"))); // NOI18N
         ellipseButton.setToolTipText("Elliptical ROI");
         ellipseButton.setActionCommand("ellipse");
-        ellipseButton.setBorderPainted(false);
         toolsButtonGroup.add(ellipseButton);
-        ellipseButton.setContentAreaFilled(false);
-        ellipseButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ellipse2.png"))); // NOI18N
-        ellipseButton.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ellipse2.png"))); // NOI18N
         ellipseButton.setFocusable(false);
         ellipseButton.setHorizontalTextPosition(0);
         ellipseButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        ellipseButton.setRolloverEnabled(true);
-        ellipseButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ellipse1.png"))); // NOI18N
-        ellipseButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/ellipse1.png"))); // NOI18N
+        ellipseButton.setRequestFocusEnabled(false);
         ellipseButton.setVerticalTextPosition(3);
         ellipseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -461,13 +385,9 @@
         clearAllMeasurement.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/clear_all_annotation.png"))); // NOI18N
         clearAllMeasurement.setToolTipText("Clear All Measurement");
         clearAllMeasurement.setActionCommand("clearAll");
-        clearAllMeasurement.setBorderPainted(false);
-        clearAllMeasurement.setContentAreaFilled(false);
-        clearAllMeasurement.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/clear_all_annotation2.png"))); // NOI18N
+        clearAllMeasurement.setDisabledSelectedIcon(null);
         clearAllMeasurement.setPreferredSize(new java.awt.Dimension(45, 45));
-        clearAllMeasurement.setRolloverEnabled(true);
-        clearAllMeasurement.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/clear_all_annotation1.png"))); // NOI18N
-        clearAllMeasurement.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/clear_all_annotation1.png"))); // NOI18N
+        clearAllMeasurement.setRequestFocusEnabled(false);
         clearAllMeasurement.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 clearAllMeasurementActionPerformed(evt);
@@ -478,17 +398,11 @@
         deleteMeasurement.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/delete_annotation.png"))); // NOI18N
         deleteMeasurement.setToolTipText("Delete Measurement");
         deleteMeasurement.setActionCommand("deleteMeasurement");
-        deleteMeasurement.setBorderPainted(false);
         toolsButtonGroup.add(deleteMeasurement);
-        deleteMeasurement.setContentAreaFilled(false);
-        deleteMeasurement.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/delete_annotation2.png"))); // NOI18N
-        deleteMeasurement.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/delete_annotation2.png"))); // NOI18N
         deleteMeasurement.setFocusable(false);
         deleteMeasurement.setHorizontalTextPosition(0);
         deleteMeasurement.setPreferredSize(new java.awt.Dimension(45, 45));
-        deleteMeasurement.setRolloverEnabled(true);
-        deleteMeasurement.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/delete_annotation1.png"))); // NOI18N
-        deleteMeasurement.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/delete_annotation1.png"))); // NOI18N
+        deleteMeasurement.setRequestFocusEnabled(false);
         deleteMeasurement.setVerticalTextPosition(3);
         deleteMeasurement.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -500,18 +414,12 @@
         moveMeasurement.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection.png"))); // NOI18N
         moveMeasurement.setToolTipText("Measurement Selection");
         moveMeasurement.setActionCommand("moveMeasurement");
-        moveMeasurement.setBorderPainted(false);
         toolsButtonGroup.add(moveMeasurement);
-        moveMeasurement.setContentAreaFilled(false);
-        moveMeasurement.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection2.png"))); // NOI18N
-        moveMeasurement.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection2.png"))); // NOI18N
         moveMeasurement.setDoubleBuffered(true);
         moveMeasurement.setFocusable(false);
         moveMeasurement.setHorizontalTextPosition(0);
         moveMeasurement.setPreferredSize(new java.awt.Dimension(45, 45));
-        moveMeasurement.setRolloverEnabled(true);
-        moveMeasurement.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection1.png"))); // NOI18N
-        moveMeasurement.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection1.png"))); // NOI18N
+        moveMeasurement.setRequestFocusEnabled(false);
         moveMeasurement.setVerticalTextPosition(3);
         moveMeasurement.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -522,16 +430,10 @@
 
         annotationVisibility.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_overlay.png"))); // NOI18N
         annotationVisibility.setToolTipText("Annotation Overlay");
-        annotationVisibility.setBorderPainted(false);
-        annotationVisibility.setContentAreaFilled(false);
-        annotationVisibility.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_overlay2.png"))); // NOI18N
+        annotationVisibility.setDisabledSelectedIcon(null);
         annotationVisibility.setFocusable(false);
         annotationVisibility.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         annotationVisibility.setPreferredSize(new java.awt.Dimension(45, 45));
-        annotationVisibility.setRolloverEnabled(true);
-        annotationVisibility.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_overlay1.png"))); // NOI18N
-        annotationVisibility.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_overlay1.png"))); // NOI18N
-        annotationVisibility.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/annotation_selection1.png"))); // NOI18N
         annotationVisibility.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         annotationVisibility.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -542,15 +444,10 @@
 
         textOverlay.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/textoverlay.png"))); // NOI18N
         textOverlay.setToolTipText("Text Overlay");
-        textOverlay.setBorderPainted(false);
-        textOverlay.setContentAreaFilled(false);
-        textOverlay.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/textoverlay2.png"))); // NOI18N
+        textOverlay.setDisabledSelectedIcon(null);
         textOverlay.setFocusable(false);
         textOverlay.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         textOverlay.setPreferredSize(new java.awt.Dimension(45, 45));
-        textOverlay.setRolloverEnabled(true);
-        textOverlay.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/textoverlay1.png"))); // NOI18N
-        textOverlay.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/textoverlay1.png"))); // NOI18N
         textOverlay.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         textOverlay.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
@@ -561,15 +458,10 @@
 
         reset.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/reset.png"))); // NOI18N
         reset.setToolTipText("Reset");
-        reset.setBorderPainted(false);
-        reset.setContentAreaFilled(false);
-        reset.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/reset2.png"))); // NOI18N
+        reset.setDisabledSelectedIcon(null);
         reset.setFocusable(false);
         reset.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         reset.setPreferredSize(new java.awt.Dimension(45, 45));
-        reset.setRolloverEnabled(true);
-        reset.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/reset1.png"))); // NOI18N
-        reset.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/reset1.png"))); // NOI18N
         reset.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         reset.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -580,15 +472,10 @@
 
         exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/export_series.png"))); // NOI18N
         exportButton.setToolTipText("Export");
-        exportButton.setBorderPainted(false);
-        exportButton.setContentAreaFilled(false);
-        exportButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/export_series2.png"))); // NOI18N
+        exportButton.setDisabledSelectedIcon(null);
         exportButton.setFocusable(false);
         exportButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         exportButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        exportButton.setRolloverEnabled(true);
-        exportButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/export_series1.png"))); // NOI18N
-        exportButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/export_series1.png"))); // NOI18N
         exportButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         exportButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -599,15 +486,10 @@
 
         metaDataButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/metadata_viewerpage.png"))); // NOI18N
         metaDataButton.setToolTipText("Meta Data");
-        metaDataButton.setBorderPainted(false);
-        metaDataButton.setContentAreaFilled(false);
-        metaDataButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/metadata_viewerpage2.png"))); // NOI18N
+        metaDataButton.setDisabledSelectedIcon(null);
         metaDataButton.setFocusable(false);
         metaDataButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         metaDataButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        metaDataButton.setRolloverEnabled(true);
-        metaDataButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/metadata_viewerpage1.png"))); // NOI18N
-        metaDataButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/metadata_viewerpage1.png"))); // NOI18N
         metaDataButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         metaDataButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -618,17 +500,10 @@
 
         stackButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/stack.png"))); // NOI18N
         stackButton.setToolTipText("Stack");
-        stackButton.setBorderPainted(false);
         toolsButtonGroup.add(stackButton);
-        stackButton.setContentAreaFilled(false);
-        stackButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/stack2.png"))); // NOI18N
-        stackButton.setDisabledSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/stack2.png"))); // NOI18N
         stackButton.setFocusable(false);
         stackButton.setHorizontalTextPosition(0);
         stackButton.setPreferredSize(new java.awt.Dimension(45, 45));
-        stackButton.setRolloverEnabled(true);
-        stackButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/stack1.png"))); // NOI18N
-        stackButton.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/stack1.png"))); // NOI18N
         stackButton.setVerticalTextPosition(3);
         stackButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -639,17 +514,10 @@
 
         scoutButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/in/raster/mayam/form/images/scout.png"))); // NOI18N
         scoutButton.setToolTipText("ScoutLine");

@@ Diff output truncated at 100000 characters. @@

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

Revision: 14850
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=14850&view=rev
Author:   babuhussain
Date:     2011-02-05 11:09:10 +0000 (Sat, 05 Feb 2011)

Log Message:
-----------
MAYAM-86 : Total number of study level instance to be displayed - Resolved.

Modified Paths:
--------------
    oviyam/mayam/trunk/src/in/raster/mayam/model/StudyModel.java
    oviyam/mayam/trunk/src/in/raster/mayam/model/table/StudyListModel.java
    oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java
    oviyam/mayam/trunk/src/resources/CDimseService.cfg

Modified: oviyam/mayam/trunk/src/in/raster/mayam/model/StudyModel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/model/StudyModel.java	2011-02-05 07:35:54 UTC (rev 14849)
+++ oviyam/mayam/trunk/src/in/raster/mayam/model/StudyModel.java	2011-02-05 11:09:10 UTC (rev 14850)
@@ -1,41 +1,41 @@
 /* ***** BEGIN LICENSE BLOCK *****
-* Version: MPL 1.1/GPL 2.0/LGPL 2.1
-*
-* The contents of this file are subject to the Mozilla Public License Version
-* 1.1 (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-* http://www.mozilla.org/MPL/
-*
-* Software distributed under the License is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-* for the specific language governing rights and limitations under the
-* License.
-*
-*
-* The Initial Developer of the Original Code is
-* Raster Images
-* Portions created by the Initial Developer are Copyright (C) 2009-2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-* Babu Hussain A
-* Meer Asgar Hussain B
-* Prakash J
-* Suresh V
-*
-* Alternatively, the contents of this file may be used under the terms of
-* either the GNU General Public License Version 2 or later (the "GPL"), or
-* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-* in which case the provisions of the GPL or the LGPL are applicable instead
-* of those above. If you wish to allow use of your version of this file only
-* under the terms of either the GPL or the LGPL, and not to allow others to
-* use your version of this file under the terms of the MPL, indicate your
-* decision by deleting the provisions above and replace them with the notice
-* and other provisions required by the GPL or the LGPL. If you do not delete
-* the provisions above, a recipient may use your version of this file under
-* the terms of any one of the MPL, the GPL or the LGPL.
-*
-* ***** END LICENSE BLOCK ***** */
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * The Initial Developer of the Original Code is
+ * Raster Images
+ * Portions created by the Initial Developer are Copyright (C) 2009-2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Babu Hussain A
+ * Meer Asgar Hussain B
+ * Prakash J
+ * Suresh V
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package in.raster.mayam.model;
 
 import org.dcm4che.data.Dataset;
@@ -58,29 +58,34 @@
     private String studyDescription;
     private String modalitiesInStudy;
     private String studyUID;
-    private String []modality;
-    
+    private String[] modality;
+    private String studyLevelInstances;
+
     public StudyModel() {
     }
-     public StudyModel(Dataset dataSet) {
+
+    public StudyModel(Dataset dataSet) {
         studyUID = dataSet.getString(Tags.StudyInstanceUID);
         studyDescription = dataSet.getString(Tags.StudyDescription) != null ? dataSet.getString(Tags.StudyDescription) : "";
         studyDate = dataSet.getString(Tags.StudyDate) != null ? dataSet.getString(Tags.StudyDate) : "unknown";
-        modality=dataSet.getStrings(Tags.ModalitiesInStudy) != null ? dataSet.getStrings(Tags.ModalitiesInStudy):null ;
-        if(modality!=null)
-        for(int i=0;i<modality.length;i++)
-        {
-            if(i==0)
-            modalitiesInStudy=modality[i];
-            else
-            modalitiesInStudy+="\\"+modality[i];
+        modality = dataSet.getStrings(Tags.ModalitiesInStudy) != null ? dataSet.getStrings(Tags.ModalitiesInStudy) : null;
+        if (modality != null) {
+            for (int i = 0; i < modality.length; i++) {
+                if (i == 0) {
+                    modalitiesInStudy = modality[i];
+                } else {
+                    modalitiesInStudy += "\\" + modality[i];
+                }
+            }
         }
-       // modalitiesInStudy = dataSet.getString(Tags.ModalitiesInStudy) != null ? dataSet.getString(Tags.ModalitiesInStudy) : "";
+        // modalitiesInStudy = dataSet.getString(Tags.ModalitiesInStudy) != null ? dataSet.getString(Tags.ModalitiesInStudy) : "";
         patientName = dataSet.getString(Tags.PatientName) != null ? dataSet.getString(Tags.PatientName) : "";
-        patientId= dataSet.getString(Tags.PatientID) != null ? dataSet.getString(Tags.PatientID) : "";
-        dob= dataSet.getString(Tags.PatientBirthDate) != null ? dataSet.getString(Tags.PatientBirthDate) : "";
-        accessionNo= dataSet.getString(Tag.AccessionNumber) != null ? dataSet.getString(Tag.AccessionNumber) : "";
+        patientId = dataSet.getString(Tags.PatientID) != null ? dataSet.getString(Tags.PatientID) : "";
+        dob = dataSet.getString(Tags.PatientBirthDate) != null ? dataSet.getString(Tags.PatientBirthDate) : "";
+        accessionNo = dataSet.getString(Tag.AccessionNumber) != null ? dataSet.getString(Tag.AccessionNumber) : "";
+        studyLevelInstances = dataSet.getString(Tag.NumberOfStudyRelatedInstances) != null ? dataSet.getString(Tag.NumberOfStudyRelatedInstances) : "";
     }
+
     public String getAccessionNo() {
         return accessionNo;
     }
@@ -113,8 +118,6 @@
         this.dob = dob;
     }
 
-    
-
     public String getPatientId() {
         return patientId;
     }
@@ -146,4 +149,12 @@
     public void setStudyDescription(String studyDescription) {
         this.studyDescription = studyDescription;
     }
+
+    public String getStudyLevelInstances() {
+        return studyLevelInstances;
+    }
+
+    public void setStudyLevelInstances(String studyLevelInstances) {
+        this.studyLevelInstances = studyLevelInstances;
+    }
 }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/model/table/StudyListModel.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/model/table/StudyListModel.java	2011-02-05 07:35:54 UTC (rev 14849)
+++ oviyam/mayam/trunk/src/in/raster/mayam/model/table/StudyListModel.java	2011-02-05 11:09:10 UTC (rev 14850)
@@ -50,8 +50,8 @@
  */
 public class StudyListModel extends AbstractTableModel {
 
-    String columnName[] = {"Patient ID", "Patient Name", "Date of Birth", "Accession Number", "Study Date", "Study Description", "Modality"};
-    Class columnType[] = {String.class, String.class, String.class, String.class, String.class, String.class, String.class};
+    String columnName[] = {"Patient ID", "Patient Name", "Date of Birth", "Accession Number", "Study Date", "Study Description", "Modality", "Instance Count"};
+    Class columnType[] = {String.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class};
     Vector studyList;
 
     public StudyListModel() {
@@ -98,6 +98,8 @@
                 return row.getStudyDescription();
             case 6:
                 return row.getModalitiesInStudy();
+            case 7:
+                return row.getStudyLevelInstances();
             case 8:
                 return row.getStudyUID();
         }

Modified: oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java
===================================================================
--- oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java	2011-02-05 07:35:54 UTC (rev 14849)
+++ oviyam/mayam/trunk/src/in/raster/mayam/util/database/DatabaseHandler.java	2011-02-05 11:09:10 UTC (rev 14850)
@@ -387,6 +387,7 @@
                 st.setStudyDescription(rs.getString("StudyDescription").equalsIgnoreCase("null") ? "" : rs.getString("StudyDescription"));
                 st.setStudyUID(rs.getString("StudyInstanceUID"));
                 st.setModalitiesInStudy(rs.getString("ModalityInStudy"));
+                st.setStudyLevelInstances("" + getStudyLevelInstance(st.getStudyUID()));
 
                 String sql2 = "select PatientName,PatientBirthDate from patient where PatientId='" + rs.getString("PatientId") + "'";
                 ResultSet rs1 = conn.createStatement().executeQuery(sql2);

Modified: oviyam/mayam/trunk/src/resources/CDimseService.cfg
===================================================================
--- oviyam/mayam/trunk/src/resources/CDimseService.cfg	2011-02-05 07:35:54 UTC (rev 14849)
+++ oviyam/mayam/trunk/src/resources/CDimseService.cfg	2011-02-05 11:09:10 UTC (rev 14850)
@@ -81,6 +81,7 @@
 key.StudyTime = 
 key.ReferringPhysicianName =
 key.AccessionNumber=
+key.NumberOfStudyRelatedInstances=
 
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<


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