Changeset 5683

Timestamp:

10/13/08 16:29:16 (5 weeks ago)

Author:

jburel

Message:

Set size of the cache

Location:

trunk/SRC/org/openmicroscopy/shoola/env/rnd

Files:

• RenderingControl.java (modified) (1 diff)
• RenderingControlProxy.java (modified) (8 diffs)

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

@@ -33 +33 @@
 
 //Application-internal dependencies
-import omero.model.Pixels;
 import omero.romio.PlaneDef;
 import org.openmicroscopy.shoola.env.data.DSOutOfServiceException;
 import org.openmicroscopy.shoola.env.data.model.ChannelMetadata;
-
 import pojos.PixelsData;
 

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

@@ -120 +120 @@
     private int                                         cacheSize;
     
+    /** The size of the image. */
+    private int                                         imageSize;
+    
     /**
      * Helper method to handle exceptions thrown by the connection library.
@@ -198 +201 @@
     private void invalidateCache()
     {
-        if (cacheID >= 0){
+        if (cacheID >= 0)
                  context.getCacheService().clearCache(cacheID);
-        }
     }
     
@@ -235 +237 @@
         }
         */
-        if (pDef.slice == omero.romio.XY.value) 
+        if (pDef.slice == omero.romio.XY.value) {
                 cacheID = context.getCacheService().createCache(
-                                                        CacheService.IN_MEMORY);
+                                        CacheService.IN_MEMORY, cacheSize/imageSize);
+        }
+                
     }
   
@@ -396 +400 @@
                         
                         byte[] values = servant.renderCompressed(pDef);
+                        imageSize = values.length;
                         initializeCache(pDef);
                         cache(pDef, values);
@@ -441 +446 @@
                     break;
             }
+            imageSize = 3*buf.length;
             initializeCache(pDef);
             img = Factory.createImage(buf, 32, sizeX1, sizeX2);
@@ -551 +557 @@
             models = servant.getAvailableModels();
             cacheID = -1;
-            
+            imageSize = 1;
             this.compression = compression;
             if (rndDef == null) {
@@ -689 +695 @@
          * Resets the size of the cache.
          * 
-         * @param size The size of the cache.
+         * @param size The size, in bytes, of the cache.
          */
         void setCacheSize(int size)
         {
-                context.getCacheService().setCacheSize(cacheID, size);
+                if (imageSize == 0) imageSize = 1;
+                context.getCacheService().setCacheSize(cacheID, size/imageSize);
         }
         
@@ -1460 +1467 @@
         {
                 List<Integer> active = new ArrayList<Integer>();
-                for (int i = 0; i < getPixelsDimensionsC(); i++) {
+                for (int i = 0; i < getPixelsDimensionsC(); i++) 
                         if (isActive(i)) active.add(new Integer(i));
-                }
                 return active;
         }