Changeset 2287 for branches

Timestamp:

03/03/08 15:55:20 (9 months ago)

Author:

brain

Message:

New changes to support channel Em and Ex wavelengths

Location:

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

Files:

• OMEROMetadataStore.java (modified) (1 diff)
• importer/FileQueueHandler.java (modified) (1 diff)

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

@@ -736 +736 @@
                         imageIndex, pixelsIndex, sizeC));
         Pixels p = getPixels(imageIndex, pixelsIndex);
+        if (p.getSizeC() != null && sizeC != null && p.getSizeC().equals(sizeC))
+        {
+            log.debug("Not resetting channels.");
+            return;
+        }
         p.setSizeC(sizeC);
         List<Channel> channels = p.getChannels();

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

@@ -46 +46 @@
     
     @SuppressWarnings("unused")
-    public ImportHandler       importHandler;
+    public ImportHandler       importHandler;f
     private OMEROMetadataStore  store;