Changeset 1007 for branches/bioformats-omero

Timestamp:

10/03/06 11:32:29 (2 years ago)

Author:

TheBrain

Message:

New import queue completed.

Location:

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

Files:

• FileQueueHandler.java (modified) (5 diffs)
• FileQueueTable.java (modified) (15 diffs)
• FindAccessory.java (added)
• ImportDialog.java (modified) (2 diffs)
• ImportHandler.java (modified) (11 diffs)
• gfx/2leftarrow.png (added)
• gfx/2rightarrow.png (added)
• gfx/desktop.png (added)
• gfx/drive.png (added)
• gfx/home.png (added)
• gfx/import_done_16.png (added)
• gfx/import_icon_16.png (added)
• readers.txt (added)

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

@@ -130 +130 @@
             if (dialog.cancelled == true || dialog.dataset == null) return;
             
-            addFileToQueue(file, dialog.dataset);
+            addFileToQueue(file, dialog.dataset,
+                    dialog.dataset.getName(), dialog.project.getName());
         }
     }
@@ -140 +141 @@
         {
             files = fileChooser.getSelectedFiles();
-            
             
             if (store == null)
@@ -155 +155 @@
             for (File f : files)
             {
-                addFileToQueue(f, dialog.dataset);
+                addFileToQueue(f, dialog.dataset, 
+                        dialog.dataset.getName(), dialog.project.getName());
             }
         }
         if (prop.equals(Actions.REMOVE))
         {
-            rows = qTable.queue.getSelectedRows();
-            
-            while (rows.length > 0)
+            if (qTable.importBtn.isEnabled())
             {
-                removeFileFromQueue(rows[0]);
                 rows = qTable.queue.getSelectedRows();
+                
+                while (rows.length > 0)
+                {
+                    if (qTable.queue.getValueAt(rows[0], 2) == "added")
+                    {
+                        removeFileFromQueue(rows[0]);
+                        rows = qTable.queue.getSelectedRows();                    
+                    }
+                }                
             }
-        }
+
+        }
+        
         if (prop.equals(Actions.IMPORT))
         {   
@@ -176 +185 @@
                 if (store == null)
                     store = viewer.loginHandler.getMetadataStore();
-                importHandler = new ImportHandler(viewer, store, reader, fads);
+                importHandler = 
+                    new ImportHandler(viewer, qTable, store, reader, fads);
+
             }
         }
@@ -187 +198 @@
     
    
-    private void addFileToQueue(File file, Dataset dataset)
+    private void addFileToQueue(File file, Dataset dataset, String dName, String project)
     {
         Vector row = new Vector();
         
         row.add(file);
+        row.add(dName + "/" + project);
+        row.add("added");
         row.add(dataset);
-        row.add("pending");
         qTable.table.addRow(row); 
-        qTable.importBtn.setEnabled(true);
+        if (qTable.table.getRowCount() == 1)
+            qTable.importBtn.setEnabled(true);
     }
     

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

@@ -10 +10 @@
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.util.ArrayList;
 
 import javax.swing.BorderFactory;
@@ -24 +25 @@
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -48 +51 @@
     JButton           importBtn;
     
+    private int row;
+    private int maxPlanes;
+    
     FileQueueTable() {
 
@@ -62 +68 @@
         
         // Width of the status columns
-        int statusWidth = 70;
+        int statusWidth = 100;
 
 // ----- GUI Layout Elements -----
@@ -119 +125 @@
         cModel.getColumn(1).setCellRenderer(new TextCellCenter());
         cModel.getColumn(2).setCellRenderer(new TextCellCenter());            
-
         
         // Set the width of the status column
@@ -126 +131 @@
         statusColumn.setMaxWidth(statusWidth);
         statusColumn.setMinWidth(statusWidth);
+              
+
+        SelectionListener listener = new SelectionListener(queue);
+        queue.getSelectionModel().addListSelectionListener(listener);
+        queue.getColumnModel().getSelectionModel()
+            .addListSelectionListener(listener);
+        
+        TableColumnModel tcm = queue.getColumnModel();
+        TableColumn column = tcm.getColumn(3);
+        tcm.removeColumn(column);
         
         // Add the table to the scollpane
@@ -145 +160 @@
     }
     
+    public void setProgressInfo(int row, int maxPlanes)
+    {
+        this.row = row;
+        this.maxPlanes = maxPlanes;
+    }
+ 
+    public void setProgressPending(int row)
+    {
+        if (table.getValueAt(row, 2).equals("added"))
+            table.setValueAt("pending", row, 2);    
+    }
+    
+    public void setProgress(int step)
+    {
+        String text = step + "/" + maxPlanes;
+        table.setValueAt(text, row, 2);   
+    }
+    
+    public void setProgressDone(int row)
+    {
+        table.setValueAt("done", row, 2); 
+    }
+    
+    public int getMaximum()
+    {
+        return maxPlanes;
+    }
+        
     static JButton addButton(String name, String image, String tooltip)
     {
@@ -173 +216 @@
         {
             File file = new File(table.getValueAt(i, 0).toString());
-            Dataset dataset = (Dataset) table.getValueAt(i, 1);
-            
-            fads[i] = new FileAndDatasetContainer(file, dataset);
+            try {
+                Dataset dataset = (Dataset) table.getValueAt(i, 3);
+                fads[i] = new FileAndDatasetContainer(file, dataset);            }
+            catch (ArrayIndexOutOfBoundsException e) {}
+
         }
         return fads;
@@ -193 +238 @@
         if (src == importBtn)
         {
+            queue.clearSelection();
             firePropertyChange(Actions.IMPORT, false, true);
         }
     }
-    
-    class QueueTableModel extends DefaultTableModel implements TableModelListener {
+
+    class QueueTableModel 
+        extends DefaultTableModel 
+        implements TableModelListener {
         
         private static final long serialVersionUID = 1L;
-        private String[] columnNames = {"Files in Queue", "Project/Dataset", "Status"};
-        private Object[][] files = null;
+        private String[] columnNames = {"Files in Queue", "Project/Dataset", "Status", "DatasetNum"};
 
         public void tableChanged(TableModelEvent arg0) { }
@@ -211 +258 @@
         public boolean isCellEditable(int row, int col) { return false; }
         
-        public void setValueAt(Object value, int row, int col)
-        {
-            files[row][col] = value;
-            fireTableCellUpdated(row,col);
-        }
+        public boolean rowSelectionAllowed() { return false; }
     }
  
@@ -242 +285 @@
             // Set tool tip if desired
             setToolTipText((String)value);
+            
+            setEnabled(table == null || table.isEnabled());
+                        
+            super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
     
             // Since the renderer is a component, return itself
@@ -254 +301 @@
     }
     
-    class LeftDotRenderer extends DefaultTableCellRenderer
+    class LeftDotRenderer 
+        extends DefaultTableCellRenderer
     {
         public Component getTableCellRendererComponent(
@@ -295 +343 @@
     
     public class TextCellCenter
-    extends DefaultTableCellRenderer 
+        extends DefaultTableCellRenderer 
     {
         // This method is called each time a column header
@@ -309 +357 @@
             setFont(UIManager.getFont("TableCell.font"));
             setHorizontalAlignment(DefaultTableCellRenderer.CENTER);
-
+            
             // Since the renderer is a component, return itself
             return this;
@@ -315 +363 @@
     }
 
+    public class SelectionListener 
+        implements ListSelectionListener {
+        JTable table;
+    
+        // It is necessary to keep the table since it is not possible
+        // to determine the table from the event's source
+        SelectionListener(JTable table) {
+            this.table = table;
+        }
+        public void valueChanged(ListSelectionEvent e) {
+            // If cell selection is enabled, both row and column change events are fired
+            if (e.getSource() == table.getSelectionModel()
+                  && table.getRowSelectionAllowed()) {
+                // Column selection changed
+                int first = e.getFirstIndex();
+                int last = e.getLastIndex();
+                dselectRow(first, last);
+            } else if (e.getSource() == table.getColumnModel().getSelectionModel()
+                   && table.getColumnSelectionAllowed() ){
+                // Row selection changed
+                int first = e.getFirstIndex();
+                int last = e.getLastIndex();
+                dselectRow(first, last);
+            }
+    
+            if (e.getValueIsAdjusting()) {
+                // The mouse button has not yet been released
+            }
+        }
+        
+        private void dselectRow(int first, int last)
+        {
+            for (int i = first; i <= last; i++ )
+            {
+                try
+                {
+                    if (!table.getValueAt(i, 2).equals("added") 
+                            && table.getSelectionModel().isSelectedIndex(i))
+                    {
+                        table.getSelectionModel().removeSelectionInterval(i, i);
+                        table.clearSelection();
+                    }                    
+                } catch (ArrayIndexOutOfBoundsException e)
+                {
+                    
+                }
+            }
+        }
+    }
+        
     public static void main (String[] args) {
 

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

@@ -73 +73 @@
 
     public  Dataset dataset;
+    public  Project project;
+    
     public  DatasetItem[] datasetItems = null;
     public  ProjectItem[] projectItems = null;
@@ -329 +331 @@
             cancelled = false;
             dataset = ((DatasetItem) dbox.getSelectedItem()).getDataset();
+            project = ((ProjectItem) pbox.getSelectedItem()).getProject();
             userPrefs.putLong("savedProject", 
                     ((ProjectItem) pbox.getSelectedItem()).getId());

branches/bioformats-omero/src/ome/formats/testclient/ImportHandler.java

@@ -35 +35 @@
 import java.util.Date;
 
+import javax.swing.JTable;
 import javax.swing.ProgressMonitor;
 
 import loci.formats.IFormatReader;
 import ome.formats.OMEROMetadataStore;
+import ome.formats.testclient.FileQueueTable.SelectionListener;
 
 import org.apache.commons.logging.Log;
@@ -57 +59 @@
     private TestClient      viewer;
 
-    private ProgressMonitor monitor;
+    //private ProgressMonitor monitor;
+    
+    private FileQueueTable  qTable;
 
     private static Log      log = LogFactory.getLog(ImportHandler.class);
@@ -63 +67 @@
     private OMEROMetadataStore store;
 
-    public ImportHandler(TestClient viewer, OMEROMetadataStore store,
+    public ImportHandler(TestClient viewer, FileQueueTable qTable, OMEROMetadataStore store,
             IFormatReader reader, FileAndDatasetContainer[] fads)
     {
@@ -69 +73 @@
         this.library = new ImportLibrary(store, reader, fads);
         this.store = store;
+        this.qTable = qTable;
 
         new Thread()
@@ -93 +98 @@
         Date date = null;
 
-        monitor = new ProgressMonitor(viewer, null, null, 0, 0);
+        //monitor = new ProgressMonitor(viewer, null, null, 0, 0);
 
         // record initial timestamp and record total running time for the import
@@ -107 +112 @@
         
         FileAndDatasetContainer[] fads = library.getFilesAndDatasets();
-        for (int i = 0; i < fads.length; i ++)
-        {
-            String filename = fads[i].file.getAbsolutePath();
-            viewer.appendToOutputLn("> [" + i + "] Importing \"" + filename
-                    + "\"");
-            
-            library.setDataset(fads[i].dataset);
-            importImage(fads[i].file, i, library.getFilesAndDatasets().length);
-            
-            i++;
+        qTable.importBtn.setEnabled(false);
+
+        for(int i = 0; i < fads.length; i++)
+        {
+            qTable.setProgressPending(i);
         }
-
+        
+        for (int i = 0; i < fads.length; i++)
+        {
+            if (qTable.table.getValueAt(i, 2).equals("pending"))
+            {
+                String filename = fads[i].file.getAbsolutePath();
+                viewer.appendToOutputLn("> [" + i + "] Importing \"" + filename
+                        + "\"");
+                
+                library.setDataset(fads[i].dataset);
+                importImage(fads[i].file, i, library.getFilesAndDatasets().length);                
+            }
+        }
+        qTable.importBtn.setEnabled(true);
+        
         viewer.statusBar.setProgress(false, 0, "");
-        monitor.close();
+        //monitor.close();
         viewer.statusBar.setStatusIcon("gfx/import_done_16.png", "Import complete.");
 
@@ -164 +178 @@
         viewer.statusBar.setProgressValue(index);
         
-        monitor.setNote("<html>Importing the following file [" + (index + 1)
-                + " of " + total + "] into your OMERO server: <br><br>'"
-                + shortName + "'<br><br></html>");
-        monitor.setMaximum(count);
-        resetProgressMonitor();
-        monitor.setProgress(monitor.getMinimum());
+        //monitor.setNote("<html>Importing the following file [" + (index + 1)
+        //        + " of " + total + "] into your OMERO server: <br><br>'"
+        //        + shortName + "'<br><br></html>");
+        //monitor.setMaximum(count);
+        //resetProgressMonitor();
+        //monitor.setProgress(monitor.getMinimum());
 
         viewer.appendToOutput("> [" + index + "] Importing metadata for "
@@ -181 +195 @@
                 + "image \"" + shortName + "\"... ");
 
+        qTable.setProgressInfo(index, count);
+        
         viewer.appendToOutput("> Importing plane: ");
         library.importData(pixId, fileName, new ImportLibrary.Step()
@@ -188 +204 @@
             public void step(int i)
             {
-                if (i < monitor.getMaximum()) 
-                {
-                    
-                    monitor.setProgress(i);         
+                if (i < qTable.getMaximum()) 
+                {   
+                    //monitor.setProgress(i);
+                    qTable.setProgress(i);
                 }
                 if ((i % 10) == 0 || i == 1) viewer.appendToOutput(i + "");
@@ -204 +220 @@
         viewer.appendToOutputLn("> [" + index
                 + "] Image imported successfully!");
+
+        //System.err.println(qTable.table.getRowCount());
+        qTable.setProgressDone(index);
         
     }
@@ -223 +242 @@
     }
 
-    /**
-     * *cough* Nasty hack to get around the private "lastDisp" field semantics
-     * (field visibility) of the progress monitor. *cough*
-     */
-    private void resetProgressMonitor()
-    {
-        try
-        {
-            Class klass = monitor.getClass();
-            Field[] fields = klass.getDeclaredFields();
-           
-            for (Field field : fields)
-            {
-                if (field.getName().equals("lastDisp"))
-                {
-                    field.setAccessible(true);
-                    field.setInt(monitor, 0);
-                }               
-            }
-        } catch (Exception e)
-        {
-            e.printStackTrace();
-            // Eat it.
-        }
-    }
+//    /**
+//     * *cough* Nasty hack to get around the private "lastDisp" field semantics
+//     * (field visibility) of the progress monitor. *cough*
+//     */
+//    private void resetProgressMonitor()
+//    {
+//        try
+//        {
+//            Class klass = monitor.getClass();
+//            Field[] fields = klass.getDeclaredFields();
+//           
+//            for (Field field : fields)
+//            {
+//                if (field.getName().equals("lastDisp"))
+//                {
+//                    field.setAccessible(true);
+//                    field.setInt(monitor, 0);
+//                }               
+//            }
+//        } catch (Exception e)
+//        {
+//            e.printStackTrace();
+//            // Eat it.
+//        }
+//    }
 }