Changeset 1641

Timestamp:

06/14/07 19:55:41 (18 months ago)

Author:

TheBrain

Message:

Version beta 2.0 release.

Location:

trunk/components/bioformats-omero/src/ome/formats

Files:

• OMEROMetadataStore.java (modified) (2 diffs)
• importer/FileQueueTable.java (modified) (1 diff)
• importer/ImportFixture.java (modified) (1 diff)
• importer/ImportHandler.java (modified) (1 diff)
• importer/ImportLibrary.java (modified) (3 diffs)
• importer/Main.java (modified) (3 diffs)
• importer/OMEROWrapper.java (modified) (1 diff)

trunk/components/bioformats-omero/src/ome/formats/OMEROMetadataStore.java

@@ -153 +153 @@
         }
     }
-
-    
     
     /**
@@ -261 +259 @@
         return enumeration;
     }
-
+    
     /*
      * (non-Javadoc)

trunk/components/bioformats-omero/src/ome/formats/importer/FileQueueTable.java

@@ -230 +230 @@
     }
     
-        public void setImportProgress(int step)
-    {
-        String text = step + "/" + maxPlanes;
+        public void setImportProgress(int count, int series, int step)
+    {
+        String text;
+        if (count > 1)
+            text = series + 1 + "/" + count + ": " + step + "/" + maxPlanes;
+        else
+            text = step + "/" + maxPlanes;
         table.setValueAt(text, row, 2);   
     }

trunk/components/bioformats-omero/src/ome/formats/importer/ImportFixture.java

@@ -156 +156 @@
 
             @Override
-            public void step(int n)
+            public void step(int series, int n)
             {}
         });

trunk/components/bioformats-omero/src/ome/formats/importer/ImportHandler.java

@@ -260 +260 @@
 
                 @Override
-                public void step(int i)
-                {
-                    if (i < qTable.getMaximum()) 
+                public void step(int series, int step)
+                {
+                    if (step <= qTable.getMaximum()) 
                     {   
-                        qTable.setImportProgress(i);
+                        qTable.setImportProgress(reader.getSeriesCount(), series, step);
                     }
                 }

trunk/components/bioformats-omero/src/ome/formats/importer/ImportLibrary.java

@@ -72 +72 @@
     {
 
-        public abstract void step(int n);
+        public abstract void step(int series, int step);
     }
 
@@ -216 +216 @@
         {
             String name = imageName;
-            if (reader.isLeicaReader())
-            {
-                name += " [" + reader.getSeriesName(series) + "]";
-            }
+            String seriesName = reader.getImageName(series);
+            
+
+            if (seriesName != null)
+                name += " [" + seriesName + "]";
 
             pix.getImage().setName(name);
@@ -293 +294 @@
                                                            arrayBuf).getData();
                         arrayBuf = swapIfRequired(buf, fileName);
-                        step.step(i);
+                        step.step(series, i);
                         store.setPlane(pixId, arrayBuf, z, c, t);
                         i++;

trunk/components/bioformats-omero/src/ome/formats/importer/Main.java

@@ -27 +27 @@
 import java.awt.event.WindowListener;
 
-import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -39 +38 @@
 import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
@@ -57 +55 @@
     private static final long   serialVersionUID = 1228000122345370913L;
 
-    public static String        versionText = "Beta 1.1";
+    public static String        versionText = "Beta 2.0";
     
     /** The data of the last release date. */
     public static String        releaseDate      
-         = "2007-02-28 11:02:43 +0000 (Wed, 28 Feb 2007";
+         = "2007-06-06 15:18:13 +0100 (Wed, 06 Jun 2007)";
 
     /** The repository revision. */

trunk/components/bioformats-omero/src/ome/formats/importer/OMEROWrapper.java

@@ -79 +79 @@
     }
     
-    public String getSeriesName(int series)
+    public String getImageName(int series)
     {
-        LeicaReader r = (LeicaReader) iReader.getReader();
-        return r.getSeriesName(series);
+
+        
+        if (reader.getSeriesCount() > 1)
+        {
+            List<Pixels> p = (List<Pixels>)iReader.getMetadataStoreRoot();
+            String name = p.get(series).getImage().getName(); 
+            return name == null ? "" + series : name;
+        }
+        return null;
     }