Changeset 1072 for branches/bioformats-omero

Timestamp:

11/10/06 10:40:46 (2 years ago)

Author:

TheBrain

Message:

- Changed the way the splashscreen and about box works, centralizing the resources and planning for some
future development.
- Fixed a bug which prevented the partial name filter from working under windows
- changed all \ slashes / slashed in file path names. This was done to help homogenize file names used within
omero and facilitate sort-by-name and future search features
- changed the name of sevaral terms used in the importer to clarify their meaning.

Location:

branches/bioformats-omero/src/ome/formats/importer

Files:

• About.java (modified) (1 diff)
• FileQueueHandler.java (modified) (3 diffs)
• FileQueueTable.java (modified) (1 diff)
• ImportDialog.java (modified) (6 diffs)
• Main.java (modified) (4 diffs)
• Splasher.java (modified) (1 diff)

branches/bioformats-omero/src/ome/formats/importer/About.java

@@ -54 +54 @@
     private static String msg;
 
-    public static void show(Component c)
+    public static void show(Component c, boolean useSplashScreen)
     {
 
-//        SplashWindow.splash(Splasher.class.getResource("gfx/Splash.png"));
+        if (useSplashScreen == true)
+        {
+            SplashWindow.splash(Splasher.class.getResource(Main.splash));
+        } else
+        {
 
-        if (title == null)
-        {
-            StringBuffer sb = new StringBuffer();
-            try
+            if (title == null)
             {
-                InputStream is = About.class.getResourceAsStream("about.txt");
-                if (is == null)
+                StringBuffer sb = new StringBuffer();
+                try
                 {
-                    title = "About";
-                    msg = "Error: version information not found";
-                } else
+                    InputStream is = About.class.getResourceAsStream("about.txt");
+                    if (is == null)
+                    {
+                        title = "About";
+                        msg = "Error: version information not found";
+                    } else
+                    {
+                        BufferedReader in = new BufferedReader(
+                                new InputStreamReader(is));
+                        while (true)
+                        {
+                            String line = in.readLine();
+                            if (line == null) break;
+                            if (title == null) title = "About " + line;
+                            else
+                                sb.append("\n");
+                            sb.append(line);
+                        }
+                        in.close();
+                        msg = sb.toString();
+                    }
+                } catch (IOException exc)
                 {
-                    BufferedReader in = new BufferedReader(
-                            new InputStreamReader(is));
-                    while (true)
-                    {
-                        String line = in.readLine();
-                        if (line == null) break;
-                        if (title == null) title = "About " + line;
-                        else
-                            sb.append("\n");
-                        sb.append(line);
-                    }
-                    in.close();
-                    msg = sb.toString();
+                    if (title == null) title = "About";
+                    msg = "Error: could not read version information";
                 }
-            } catch (IOException exc)
-            {
-                if (title == null) title = "About";
-                msg = "Error: could not read version information";
             }
+            JOptionPane.showMessageDialog(c, msg, title,
+                    JOptionPane.INFORMATION_MESSAGE);    
         }
-        JOptionPane.showMessageDialog(c, msg, title,
-                JOptionPane.INFORMATION_MESSAGE);
     }
 
     public static void main(String[] args)
     {
-        show(null);
+        show(null, false);
         System.exit(0);
     }

branches/bioformats-omero/src/ome/formats/importer/FileQueueHandler.java

@@ -300 +300 @@
     private String getImageName(File file, Boolean useFullPath, int numOfDirectories)
     {
-       if (useFullPath == true) return file.toString();
+       // standardize the format of files from window '\' to unix '/' 
+       String path = file.getAbsolutePath().replace( '\\', '/' );
+        
+       if (useFullPath == true) return path;
        else if (numOfDirectories == 0) return file.getName();      
        else 
        {
-           String[] directories = splitDirectories(file);
+           String[] directories = splitDirectories(path);
            if (numOfDirectories > directories.length - 1) 
                numOfDirectories = directories.length - 1;
@@ -314 +317 @@
            for (int i = start; i < directories.length - 1; i++)
            {
+               //viewer.appendToDebugLn(directories[i]);
                if (directories[i].length() != 0)
-                   fileName = fileName + File.separator + directories[i];
+               {
+                   if (i == start)
+                   {
+                       fileName = directories[i];
+                   } else
+                   {
+                       fileName = fileName + "/" + directories[i];                       
+                   }
+               }
            }
 
-           fileName = fileName + File.separator + file.getName();           
+           fileName = fileName + "/" + file.getName();  
+           
            return fileName;
        }
@@ -324 +337 @@
 
     // Split the directories by file seperator character ("/" or "\")
-    private String[] splitDirectories(File file)
-    {
-        String[] fields = file.getAbsolutePath().split(File.separator);
+    private String[] splitDirectories(String path)
+    {
+        //viewer.appendToDebugLn(path);
+        String[] fields = path.split("/");
+        Integer length = fields.length;
+        //viewer.appendToDebugLn(length.toString());
+       
         
         return fields;

branches/bioformats-omero/src/ome/formats/importer/FileQueueTable.java

@@ -188 +188 @@
     public void setProgressPrepping(int row)
     {
-        table.setValueAt("prepping", row, 2); 
+        table.setValueAt("importing", row, 2); 
     }
 

branches/bioformats-omero/src/ome/formats/importer/ImportDialog.java

@@ -38 +38 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -67 +69 @@
 import javax.swing.text.StyledDocument;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import ome.formats.OMEROMetadataStore;
 import ome.model.containers.Dataset;
@@ -100 +105 @@
 
     public boolean    cancelled = true;
+    
+    /** Logger for this class. */
+    @SuppressWarnings("unused")
+    private static Log          log     = LogFactory.getLog(ImportDialog.class);
     
     public OMEROMetadataStore store;
@@ -155 +164 @@
         namedPanel.add(partPathButton, c);
 
-       JPanel plainPanel = addPlainPanel(namedPanel, c);
+        JPanel plainPanel = addPlainPanel(namedPanel, c);
         numOfDirectoriesField = addEntryField(plainPanel, 
-                "" , "0", " leading directories", 0, 
-                "Add this number of leading directories to the file names",
+                "" , "0", " directories", 0, 
+                "Add this number of directories to the file names",
                 3);
         
-        
-        archiveImage = addCheckBox(this, "Also store the original image file(s)", c);
+//        // focus on the partial path button if you enter the numofdirfield
+//        numOfDirectoriesField.addFocusListener(new FocusListener() {
+//            public void focusGained(FocusEvent e) {
+//                partPathButton.setSelected(true);
+//            }
+//
+//            public void focusLost(FocusEvent e) {}
+//        });
+        
+        archiveImage = addCheckBox(this, "Also archive the original image file(s)", c);
         archiveImage.setSelected(true);
         
@@ -435 +452 @@
         {
             cancelled = false;
+            importBtn.requestFocus();
             numOfDirectories = numOfDirectoriesField.getValue();
             dataset = ((DatasetItem) dbox.getSelectedItem()).getDataset();
@@ -548 +566 @@
                 }
                 super.insertString(offs, new String(result, 0, j), a);
+                
+                
             }
+            
         }
 

branches/bioformats-omero/src/ome/formats/importer/Main.java

@@ -76 +76 @@
     /** The data of the last release date. */
     public static String        releaseDate      
-         = "2006-10-31 15:49:07 +0000 (Tue, 31 Oct 2006)";
+         = "2006-11-06 13:06:59 +0000 (Mon, 06 Nov 2006)";
 
     /** The repository revision. */
@@ -92 +92 @@
     // -- Constants --
 
-    private final static String TITLE            = "OMERO Data Importer";
-    
+    private final static String TITLE            = "OMERO Importer";
+    public final static String splash           = "gfx/Splash.png";
+    private final static boolean useSplashScreenAbout   = false;
+     
     private final static int width = 980;
     private final static int height = 580;
@@ -278 +280 @@
     }
 
+    /**
+     * @param s This method appends data to the output window.
+     */
+    public void appendToDebug(String s)
+    {
+        try
+        {
+            StyledDocument doc = (StyledDocument) debugTextPane.getDocument();
+            Style style = doc.addStyle("StyleName", null);
+            StyleConstants.setForeground(style, Color.black);
+            StyleConstants.setFontFamily(style, "SansSerif");
+            StyleConstants.setFontSize(style, 12);
+            StyleConstants.setBold(style, false);
+
+            doc.insertString(doc.getLength(), s, style);
+        } catch (BadLocationException e) {}
+    }
+
+    /**
+     * @param s Append to the output window and add a line return
+     */
+    public void appendToDebugLn(String s)
+    {
+        appendToDebug(s + "\n");
+    }
+    
     public void actionPerformed(ActionEvent e)
     {
@@ -306 +334 @@
             // HACK - JOptionPane prevents shutdown on dispose
             setDefaultCloseOperation(EXIT_ON_CLOSE);
-            About.show(this.getContentPane());
+            About.show(this.getContentPane(), useSplashScreenAbout);
         }
     }

branches/bioformats-omero/src/ome/formats/importer/Splasher.java

@@ -48 +48 @@
         
 
-        SplashWindow.splash(Splasher.class.getResource("gfx/Splash.png"));
+        SplashWindow.splash(Splasher.class.getResource(Main.splash));
         try
         {