Changeset 5621

Timestamp:

09/19/08 18:18:25 (2 months ago)

Author:

jburel

Message:

Clean up code

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/metadata/browser/Browser.java (modified) (1 diff)
• env/rnd/RenderingControlProxy.java (modified) (10 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/metadata/browser/Browser.java

@@ -32 +32 @@
 
 //Application-internal dependencies
-import org.openmicroscopy.shoola.env.data.util.StructuredDataResults;
 import org.openmicroscopy.shoola.util.ui.component.ObservableComponent;
 

trunk/SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java

@@ -51 +51 @@
 import omeis.providers.re.RenderingEngine;
 import omeis.providers.re.data.PlaneDef;
-
 import org.openmicroscopy.shoola.env.cache.CacheService;
 import org.openmicroscopy.shoola.env.config.Registry;
@@ -207 +206 @@
     private void eraseCache()
     {
-        /*
-        if (xyCache == null) return;
-        invalidateCache();
-        xyCache = null;
-        CachingService.eraseXYCache(pixs.getId()); 
-        */
         invalidateCache();
         context.getCacheService().removeCache(cacheID);
@@ -271 +264 @@
     }
     
+        /**
+         * Returns if <code>true</code> if one of the channels is of the specified
+         * color, <code>false</code> otherwise.
+         * 
+         * @param red   The red component in the range [0, 255] in the default sRGB
+         *                              space.
+         * @param green The green component in the range [0, 255] in the default 
+         *                              sRGB space.
+         * @param blue  The blue component in the range [0, 255] in the default sRGB
+         *                              space.
+         * @return See above.
+         */
+        private boolean isRightColor(int red, int green, int blue)
+        {
+                for (int i = 0; i < getPixelsDimensionsC(); i++) {
+                        if (isActive(i)) {
+                                if (isRightChannelColor(i, red, green, blue))
+                                        return true;
+                        }
+                }
+                return false;
+        }
+        
+        /**
+         * Returns if <code>true</code> if the channel is of the specified
+         * color, <code>false</code> otherwise.
+         * 
+         * @param index The index of the channel.
+         * @param red   The red component in the range [0, 255] in the default sRGB
+         *                              space.
+         * @param green The green component in the range [0, 255] in the default 
+         *                              sRGB space.
+         * @param blue  The blue component in the range [0, 255] in the default sRGB
+         *                              space.
+         * @return See above.
+         */
+        private boolean isRightChannelColor(int index, int red, int green, int blue)
+        {
+                int[] rgba = rndDef.getChannel(index).getRGBA();
+                return (rgba[0] == red && rgba[1] == green && rgba[2] == blue);
+        }
+        
     /** Initializes the cached rendering settings to speed up process. */
     private void initialize()
@@ -1064 +1099 @@
      * @see RenderingControl#hasActiveChannelBlue()
      */
-        public boolean hasActiveChannelBlue()
-        {
-                int[] rgba;
-                for (int i = 0; i < getPixelsDimensionsC(); i++) {
-                        if (isActive(i)) {
-                                rgba = rndDef.getChannel(i).getRGBA();
-                                if (rgba[0] == 0 && rgba[1] == 0 && rgba[2] == 255)
-                                        return true;
-                        }
-                }
-                return false;
-        }
+        public boolean hasActiveChannelBlue() { return isRightColor(0, 0, 255); }
 
         /** 
@@ -1081 +1105 @@
      * @see RenderingControl#hasActiveChannelGreen()
      */
-        public boolean hasActiveChannelGreen()
-        {
-                int[] rgba;
-                for (int i = 0; i < getPixelsDimensionsC(); i++) {
-                        if (isActive(i)) {
-                                rgba = rndDef.getChannel(i).getRGBA();
-                                if (rgba[0] == 0 && rgba[1] == 255 && rgba[2] == 0)
-                                        return true;
-                        }
-                }
-                return false;
-        }
-
+        public boolean hasActiveChannelGreen() { return isRightColor(0, 255, 0); }
+        
         /** 
      * Implemented as specified by {@link RenderingControl}. 
      * @see RenderingControl#hasActiveChannelRed()
      */
-        public boolean hasActiveChannelRed()
-        {
-                int[] rgba;
-                for (int i = 0; i < getPixelsDimensionsC(); i++) {
-                        if (isActive(i)) {
-                                rgba = rndDef.getChannel(i).getRGBA();
-                                if (rgba[0] == 255 && rgba[1] == 0 && rgba[2] == 0)
-                                        return true;
-                        }
-                }
-                return false;
-        }
+        public boolean hasActiveChannelRed() { return isRightColor(255, 0, 0); }
         
         /** 
@@ -1118 +1120 @@
         {
                 if (index < 0 || index > getPixelsDimensionsC()) return false;
-                int[] rgba = rndDef.getChannel(index).getRGBA();
-                return (rgba[0] == 255 && rgba[1] == 0 && rgba[2] == 0);
+                return isRightChannelColor(index, 255, 0, 0);
         }
         
@@ -1129 +1130 @@
         {
                 if (index < 0 || index > getPixelsDimensionsC()) return false;
-                int[] rgba = rndDef.getChannel(index).getRGBA();
-                return (rgba[0] == 0 && rgba[1] == 0 && rgba[2] == 255);
+                return isRightChannelColor(index, 0, 0, 255);
         }
         
@@ -1140 +1140 @@
         {
                 if (index < 0 || index > getPixelsDimensionsC()) return false;
-                int[] rgba = rndDef.getChannel(index).getRGBA();
-                return (rgba[0] == 0 && rgba[1] == 255 && rgba[2] == 0);
+                return isRightChannelColor(index, 0, 255, 0);
         }
 
@@ -1238 +1237 @@
         {
                 if (pixels == null) return false;
+                DataServicesFactory.isSessionAlive(context);
                 if (getPixelsDimensionsC() != pixels.getSizeC().intValue())
                         return false;
@@ -1345 +1345 @@
                         setActive(j.next(), true);
                 BufferedImage img;
-                
-                
-                
+
         if (isCompressed()) 
                 img = renderProjectedCompressed(startZ, endZ, stepping, type);