Changeset 1020 for branches/bioformats-omero

Timestamp:

10/09/06 14:11:06 (2 years ago)

Author:

TheBrain

Message:

Weekly update. Fixed package name, added new +/- buttons, added a cancel feature, updated the statusbar with additional feedback, added the new macintosh quaqua look and feel for the image browser.

Location:

branches/bioformats-omero/src/ome/formats

Files:

• OMEROMetadataStore.java (modified) (4 diffs)
• importer (added)
• importer/About.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/About.java) (1 diff)
• importer/Actions.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/Actions.java) (1 diff)
• importer/ETable.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ETable.java) (1 diff)
• importer/FileAndDatasetContainer.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/FileAndDatasetContainer.java) (1 diff)
• importer/FileQueueChooser.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/FileQueueChooser.java) (8 diffs)
• importer/FileQueueHandler.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/FileQueueHandler.java) (8 diffs)
• importer/FileQueueTable.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/FileQueueTable.java) (9 diffs)
• importer/FindAccessory.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/FindAccessory.java) (1 diff)
• importer/ImportDialog.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ImportDialog.java) (1 diff)
• importer/ImportFixture.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ImportFixture.java) (1 diff)
• importer/ImportHandler.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ImportHandler.java) (10 diffs)
• importer/ImportLibrary.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ImportLibrary.java) (2 diffs)
• importer/LogAppender.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/LogAppender.java) (1 diff)
• importer/LogAppenderProxy.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/LogAppenderProxy.java) (1 diff)
• importer/LoginDialog.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/LoginDialog.java) (1 diff)
• importer/LoginHandler.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/LoginHandler.java) (5 diffs)
• importer/Main.java (added)
• importer/ProjectCreator.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/ProjectCreator.java) (1 diff)
• importer/StatusBar.java (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/StatusBar.java) (2 diffs)
• importer/about.txt (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/about.txt)
• importer/readers.txt (copied) (copied from branches/bioformats-omero/src/ome/formats/testclient/readers.txt)

branches/bioformats-omero/src/ome/formats/OMEROMetadataStore.java

@@ -70 +70 @@
 import ome.parameters.Parameters;
 import ome.system.Login;
+import ome.system.Server;
 import ome.system.ServiceFactory;
 import ome.util.builders.PojoOptions;
@@ -106 +107 @@
     private Pixels         pixels = new Pixels();
     
+    private Experimenter    exp;
+    
     /**
      * Creates a new instance.
@@ -127 +130 @@
                 username, maskedPswd, host, port));
         
-        // Store the information collected by the login dialog into system
-        // properties
-        Properties p = System.getProperties();
-        p.setProperty("omero.user", username);
-        p.setProperty("omero.pass", password);
-        p.setProperty("server.host", host);
-        p.setProperty("server.port", port);
-        p.setProperty("omero.rootpass", "");
- 
-
         // Attempt to log in
         try
         {
+            Server server = new Server(host, Integer.parseInt(port));
             Login login = new Login(username, password);
             // Instantiate our service factory
-            sf = new ServiceFactory(login);
+            sf = new ServiceFactory(server, login);
 
             // Now initialize all our services
             iQuery = sf.getQueryService();
             iUpdate = sf.getUpdateService();
-            pservice = sf.createRawPixelsStore();            
+            pservice = sf.createRawPixelsStore();
+            
+            exp = iQuery.findByString(Experimenter.class, "omeName", username);
         } catch (Throwable t)
         {
@@ -706 +702 @@
     public List<Project> getProjects()
     {
-        return (List<Project>) iQuery.findAll(Project.class, null);
+        List l = iQuery.findAllByQuery(
+                "from Project as p where p.details.owner.id = :id", 
+                new Parameters().addId(exp.getId()));
+        return (List<Project>) l;
     }
     

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

@@ -32 +32 @@
 // Chris Allan. Brian Loranger, and Eric Kjellman.
 
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.awt.Component;

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

@@ -1 @@
-package ome.formats.testclient;
+package ome.formats.importer;
 
 

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

@@ -4 +4 @@
  */
 
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.awt.*;

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

@@ -1 @@
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.io.File;

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

@@ -1 @@
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.awt.Component;
 import java.awt.Container;
+import java.awt.FileDialog;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Stack;
 import java.util.Vector;
@@ -27 +30 @@
 
     private Preferences    userPrefs = 
-        Preferences.userNodeForPackage(TestClient.class);
+        Preferences.userNodeForPackage(Main.class);
     
     private String savedDirectory = userPrefs.get("savedDirectory", "");
@@ -37 +40 @@
     
     private Component fileList = null;
+    
+    private Boolean inSetSelect = true;
     
     ImageReader reader = new ImageReader();
@@ -56 +61 @@
         //this.setAccessory(new FindAccessory(this));
         
+        int readerFFSize = reader.getFileFilters().length;
         /** Gets a JFileChooser that recognizes accepted file types. */
-        FileFilter[] ff = reader.getFileFilters();
-        
-        ff = ComboFileFilter.sortFilters(ff);
+        
+        
+        
+        FileFilter[] ff = new FileFilter[readerFFSize + 5];
+        System.arraycopy(ComboFileFilter.sortFilters(
+                reader.getFileFilters()), 0, ff, 0, readerFFSize);
+        ff[readerFFSize] = new DashFileFilter();
+        ff[readerFFSize + 1] = new R3DNewFileFilter();
+        ff[readerFFSize + 2] = new R3DOldFileFilter();
+        ff[readerFFSize + 3] = new D3DNewFileFilter();
+        ff[readerFFSize + 4] = new D3DOldFileFilter();
+        
+        
+        
+        
+        
+        //ff = ComboFileFilter.sortFilters(ff);
         FileFilter combo = null;
         if (ff.length > 1)
@@ -79 +99 @@
         if (fileListObjects.length > 0 && !laf.contains("Windows")) {
             fileList = fileListObjects[0];
-            fileList.addMouseListener(new MouseCommand());
-        }
-    }
-
+            MouseCommand mc = new MouseCommand();
+            fileList.addMouseListener(mc);
+        }
+    }
+    
     // Get all JLists and JTables if the LAF uses lists/tables
     protected Component[] getFileListObjects(JFileChooser fc) {
@@ -111 +132 @@
     }
 
-// ----- Main class used for testing ------    
+// ----- Utility Classes -----    
+    
+    class MouseCommand implements MouseListener
+    {
+        public void mousePressed(MouseEvent evt) {
+            Object src = evt.getSource();
+     
+            if (src == fileList) {
+                if (evt.getModifiers() != InputEvent.BUTTON1_MASK) return;                               
+                File[] arr = getSelectedFiles();
+                if (evt.getClickCount() > 1 && arr.length == 1 && arr[0].isFile())
+                {
+                    approveSelection();
+                }
+
+            }
+        }
+        
+        public void mouseReleased(MouseEvent evt) {}
+        public void mouseClicked(MouseEvent evt) {}
+        public void mouseEntered(MouseEvent evt) {}
+        public void mouseExited(MouseEvent evt) {}
+    }
+
+    class DashFileFilter extends javax.swing.filechooser.FileFilter
+    {
+
+        @Override
+        public boolean accept(File f)
+        {
+           return true;
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "-------------------------";
+        }
+        
+    }
+    
+    class R3DNewFileFilter extends javax.swing.filechooser.FileFilter
+    {
+        @Override
+        public boolean accept(File f)
+        {
+           return f.isDirectory() || f.getName().toLowerCase().endsWith("r3d.dv");
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Deltavision Files - Raw (*R3D.dv)";
+        }  
+    }
+    
+    class D3DNewFileFilter extends javax.swing.filechooser.FileFilter
+    {
+        @Override
+        public boolean accept(File f)
+        {
+           return f.isDirectory() || f.getName().toLowerCase().endsWith("r3d_d3d.dv");
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Deltavision Files - Decon'd (*r3d_d3d.dv)";
+        }  
+    }
+  
+    class R3DOldFileFilter extends javax.swing.filechooser.FileFilter
+    {
+        @Override
+        public boolean accept(File f)
+        {
+           return f.isDirectory() || f.getName().toLowerCase().endsWith(".r3d");
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Deltavision Files - Raw (*.r3d)";
+        }  
+    }
+    
+    class D3DOldFileFilter extends javax.swing.filechooser.FileFilter
+    {
+        @Override
+        public boolean accept(File f)
+        {
+           return f.isDirectory() || f.getName().toLowerCase().endsWith(".r3d_d3d");
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Deltavision Files - Decon'd (*.r3d_d3d)";
+        }  
+    }
+    
+    // ----- Main class used for testing ------    
     
     public static void main(String[] args)
     {
+       
         String laf = UIManager.getSystemLookAndFeelClassName() ;
+        laf = "ch.randelshofer.quaqua.QuaquaLookAndFeel";
         //laf = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
         //laf = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
@@ -121 +245 @@
         //laf = "javax.swing.plaf.metal.MetalLookAndFeel";
         
+        System.err.println(laf);
+        
         try {
             UIManager.setLookAndFeel(laf);
         } catch (Exception e) 
         { System.err.println(laf + " not supported."); }
-        
-        FileQueueChooser c = new FileQueueChooser();   
+        System.err.println("laf: " + UIManager.getLookAndFeel());
+        
+        FileQueueChooser c = new FileQueueChooser();
+        
         JFrame f = new JFrame(); 
+        c.setMultiSelectionEnabled(true);
+        
         f.getContentPane().add(c);
         f.setVisible(true);
@@ -133 +263 @@
         f.pack();
     }
-    
-// ----- Utility Classes -----    
-    
-    class MouseCommand implements MouseListener
-    {
-        public void mousePressed(MouseEvent evt) {
-            Object src = evt.getSource();
-     
-            if (src == fileList) {
-                if (evt.getModifiers() != InputEvent.BUTTON1_MASK) return;
-                File[] arr = getSelectedFiles();
-                if (evt.getClickCount() == 2 && arr.length == 1 && arr[0].isFile())
-                {
-                    approveSelection();
-                }
-
-            }
-        }
-        
-        public void mouseReleased(MouseEvent evt) {}
-        public void mouseClicked(MouseEvent evt) {}
-        public void mouseEntered(MouseEvent evt) {}
-        public void mouseExited(MouseEvent evt) {}        
-    }
+
 }

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

@@ -28 +28 @@
  */
 
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.awt.BorderLayout;
@@ -58 +58 @@
 
     private Preferences    userPrefs = 
-        Preferences.userNodeForPackage(TestClient.class);
+        Preferences.userNodeForPackage(Main.class);
     
     private String savedDirectory = userPrefs.get("savedDirectory", "");
@@ -65 +65 @@
     private OMEROMetadataStore  store;
     private ChannelSeparator    reader;
-    private TestClient          viewer;
+    private Main          viewer;
     
     FileQueueChooser fileChooser = null;
@@ -71 +71 @@
 
     
-    FileQueueHandler(TestClient viewer)
+    FileQueueHandler(Main viewer)
     {        
         this.viewer = viewer;
@@ -99 +99 @@
                 fileChooser, qTable);
 
-        splitPane.setResizeWeight(0.1);
+        //splitPane.setResizeWeight(0.1);
         
         add(splitPane, BorderLayout.CENTER);
@@ -149 +149 @@
                 }
 
-            ImportDialog dialog = 
-                new ImportDialog(viewer, "Import into OMERO", true, store);
-            if (dialog.cancelled == true || dialog.dataset == null) return;
-            
-            for (File f : files)
-            {
-                addFileToQueue(f, dialog.dataset, 
-                        dialog.dataset.getName(), dialog.project.getName());
-            }
+                Boolean fileSelected = false;
+                for (File f : files)
+                {
+                    if (f.isFile() == true) fileSelected = true;
+                }
+                
+                if (fileSelected == true)
+                {
+                    ImportDialog dialog = 
+                        new ImportDialog(viewer, "Import into OMERO", true, store);
+                    if (dialog.cancelled == true || dialog.dataset == null) return;                    
+                    for (File f : files)
+                    {
+                        addFileToQueue(f, dialog.dataset, 
+                                dialog.dataset.getName(), dialog.project.getName());
+                    }
+                }
         }
         if (prop.equals(Actions.REMOVE))
@@ -179 +187 @@
         if (prop.equals(Actions.IMPORT))
         {   
-            FileAndDatasetContainer[] fads = qTable.getFilesAndDataset();
-
-            if (fads != null)
+            if (qTable.importing == false)
             {
-                if (store == null)
-                    store = viewer.loginHandler.getMetadataStore();
-                importHandler = 
-                    new ImportHandler(viewer, qTable, store, reader, fads);
-
+                FileAndDatasetContainer[] fads = qTable.getFilesAndDataset();
+
+                if (fads != null)
+                {
+                    if (store == null)
+                        store = viewer.loginHandler.getMetadataStore();
+                    importHandler = 
+                        new ImportHandler(viewer, qTable, store, reader, fads);
+
+                }
+                qTable.importing = true;
+            } else {
+                qTable.cancel = true;
+                qTable.importing = false;
+                qTable.importBtn.setText("Wait...");
+                qTable.importBtn.setEnabled(false);
+                viewer.statusBar.setStatusIcon("gfx/import_cancelling_16.png",
+                        "Cancelling import... please wait.");
             }
         }
@@ -203 +222 @@
         
         row.add(file);
-        row.add(dName + "/" + project);
+        row.add(project + "/" + dName);
         row.add("added");
         row.add(dataset);

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

@@ -1 @@
-package ome.formats.testclient;
+package ome.formats.importer;
 
 import java.awt.Color;
@@ -47 +47 @@
     private static final long serialVersionUID = -4239932269937114120L;
 
+
     JButton           addBtn;
     JButton           removeBtn;
@@ -53 +54 @@
     private int row;
     private int maxPlanes;
+    public boolean cancel = false;
+    public boolean importing = false;
     
     FileQueueTable() {
@@ -61 +64 @@
         
         // Size of the add/remove buttons (which are square).
-        int buttonSize = 42;
+        int buttonSize = 36;
         // Add graphic for add button
-        String addIcon = "gfx/2rightarrow.png";
+        String addIcon = "gfx/add.png";
         // Remove graphics for remove button
-        String removeIcon = "gfx/2leftarrow.png";
+        String removeIcon = "gfx/remove.png";
         
         // Width of the status columns
@@ -73 +76 @@
         // Start layout here
         setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-        setBorder(BorderFactory.createEmptyBorder(15,5,15,5));
+        setBorder(BorderFactory.createEmptyBorder(15,5,4,5));
         
         JPanel buttonPanel = new JPanel();
@@ -82 +85 @@
         addBtn.setMaximumSize(new Dimension(buttonSize, buttonSize));
         addBtn.setPreferredSize(new Dimension(buttonSize, buttonSize));
+        addBtn.setMinimumSize(new Dimension(buttonSize, buttonSize));
         addBtn.setSize(new Dimension(buttonSize, buttonSize));
         addBtn.setActionCommand(Actions.ADD);
@@ -89 +93 @@
         removeBtn.setMaximumSize(new Dimension(buttonSize, buttonSize));
         removeBtn.setPreferredSize(new Dimension(buttonSize, buttonSize));
-        removeBtn.setSize(new Dimension(36, 36));
+        removeBtn.setMinimumSize(new Dimension(buttonSize, buttonSize));
+        removeBtn.setSize(new Dimension(buttonSize, buttonSize));
         removeBtn.setActionCommand(Actions.REMOVE);
         removeBtn.addActionListener(this);
@@ -196 +201 @@
             button = new JButton(name);
         } else {
-            java.net.URL imgURL = TestClient.class.getResource(image);
+            java.net.URL imgURL = Main.class.getResource(image);
             if (imgURL != null)
             {
@@ -239 +244 @@
         {
             queue.clearSelection();
-            firePropertyChange(Actions.IMPORT, false, true);
+
+                firePropertyChange(Actions.IMPORT, false, true); 
         }
     }

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

@@ -1 @@
-package ome.formats.testclient;
+package ome.formats.importer;
 
 /*