Changeset 2307 for branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/OMEROMetadataStore.java

Timestamp:

03/21/08 13:53:11 (8 months ago)

Author:

brain

Message:

closing out old tickets. Fixing a few bugs

Files:

• branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/OMEROMetadataStore.java (modified) (4 diffs)

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/OMEROMetadataStore.java

@@ -150 +150 @@
             // Instantiate our service factory
             sf = new ServiceFactory(server, login);
-
-            // Now initialize all our services
-            iQuery = sf.getQueryService();
-            iUpdate = sf.getUpdateService();
-            pservice = sf.createRawPixelsStore();
-            rawFileStore = sf.createRawFileStore();
-            iInfo = sf.getRepositoryInfoService();
+            
+            InitializeServices(sf);
             
             exp = iQuery.findByString(Experimenter.class, "omeName", username);
@@ -184 +179 @@
         {
             // Now initialize all our services
-            iQuery = sf.getQueryService();
-            iUpdate = sf.getUpdateService();
-            pservice = sf.createRawPixelsStore();
+            InitializeServices(sf);
+            
         } catch (Throwable t)
         {
             throw new Exception(t);
         }
+    }
+    
+    
+    /**
+     * Private class used by constructor to initialze the services of the service factory.
+     * 
+     * @param factory a non-null, active {@link ServiceFactory}
+     */
+    private void InitializeServices(ServiceFactory sf)
+    {
+        // Now initialize all our services
+        iQuery = sf.getQueryService();
+        iUpdate = sf.getUpdateService();
+        pservice = sf.createRawPixelsStore();
+        rawFileStore = sf.createRawFileStore();
+        iInfo = sf.getRepositoryInfoService();
     }
 
@@ -1256 +1266 @@
                 channels.get(logicalChannelIndex).getLogicalChannel();
             lc.setExcitationWave(exWave);
+            if (lc.getPhotometricInterpretation() == null)
+            {
+                log.debug("Setting Photometric iterpretation to monochrome");
+                PhotometricInterpretation pi = (PhotometricInterpretation) 
+                    getEnumeration(PhotometricInterpretation.class, "Monochrome");
+                lc.setPhotometricInterpretation(pi);
+            }
         }
         }
@@ -1279 +1296 @@
                 channels.get(logicalChannelIndex).getLogicalChannel();
             lc.setEmissionWave(emWave);
+            if (lc.getPhotometricInterpretation() == null)
+            {
+                log.debug("Setting Photometric iterpretation to monochrome");
+                PhotometricInterpretation pi = (PhotometricInterpretation) 
+                    getEnumeration(PhotometricInterpretation.class, "Monochrome");
+                lc.setPhotometricInterpretation(pi);
+            }
         }
         }