Changeset 5345

Timestamp:

04/11/08 08:21:31 (7 months ago)

Author:

jburel

Message:

Add various options e.g. number of images per row

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser

Files:

• DataFilter.java (modified) (1 diff)
• DataObjectCreator.java (added)
• IconManager.java (modified) (2 diffs)
• browser/Browser.java (modified) (3 diffs)
• browser/BrowserComponent.java (deleted)
• browser/BrowserModel.java (modified) (5 diffs)
• graphx/eclipse_external_tools16.png (added)
• graphx/nuvola_filenew16.png (added)
• graphx/roll_over_image16.png (added)
• layout/FlatLayout.java (modified) (2 diffs)
• layout/Layout.java (modified) (1 diff)
• layout/LayoutFactory.java (modified) (3 diffs)
• layout/LayoutUtils.java (modified) (4 diffs)
• layout/SquaryLayout.java (modified) (5 diffs)
• view/DataBrowser.java (modified) (2 diffs)
• view/DataBrowserComponent.java (modified) (4 diffs)
• view/DataBrowserControl.java (modified) (2 diffs)
• view/DataBrowserFactory.java (modified) (1 diff)
• view/DataBrowserModel.java (modified) (5 diffs)
• view/DataBrowserToolBar.java (modified) (9 diffs)
• view/DataBrowserUI.java (modified) (2 diffs)
• view/ImageTable.java (modified) (4 diffs)
• view/ImageTableNode.java (modified) (1 diff)
• view/ImageTableView.java (modified) (1 diff)
• view/ImagesModel.java (modified) (2 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/DataFilter.java

@@ -138 +138 @@
                 viewer.setFilteredNodes(filteredNodes);
         }
-        
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/IconManager.java

@@ -109 +109 @@
     public static int                   ANNOTATION_8 = 19;
     
+    /** The <code>Manager</code> icon. */
+    public static int                   MANAGER = 20;
+    
+    /** The <code>Manager</code> icon. */
+    public static int                   ROLL_OVER = 21;
+    
+    /** The <code>Create</code> icon. */
+    public static int           CREATE = 22;
+    
     /** 
      * The maximum ID used for the icon IDs.
      * Allows to correctly build arrays for direct indexing. 
      */
-    private static int          MAX_ID = 19;
+    private static int          MAX_ID = 22;
     
     /** Paths of the icon files. */
@@ -140 +149 @@
         relPaths[TRANSPARENT] = "eclipse_transparent16.png";
         relPaths[ANNOTATION_8] = "nuvola_knotes8.png";
+        relPaths[MANAGER] = "eclipse_external_tools16.png";
+        relPaths[ROLL_OVER] = "roll_over_image16.png";
+        relPaths[CREATE] = "nuvola_filenew16.png"; 
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/browser/Browser.java

@@ -36 +36 @@
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.agents.dataBrowser.layout.Layout;
 import org.openmicroscopy.shoola.util.ui.component.ObservableComponent;
 import pojos.DataObject;
@@ -207 +208 @@
         
         /**
-         * Sets the layout index.
-         * 
-         * @param index The index of the layout.
-         */
-        public void setSelectedLayout(int index);
-        
-        /**
-         * Returns the index of the selected layout.
-         * 
-         * @return See above.
-         */
-        public int getSelectedLayout();
+         * Sets the selected layout.
+         * 
+         * @param layout The layout.
+         */
+        public void setSelectedLayout(Layout layout);
         
         /**
@@ -349 +343 @@
         public List<ImageNode> getVisibleImageNodes();
         
+        public Layout getSelectedLayout();
+        
 }

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/browser/BrowserModel.java

@@ -38 +38 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.dataBrowser.Colors;
+import org.openmicroscopy.shoola.agents.dataBrowser.layout.Layout;
 import org.openmicroscopy.shoola.agents.dataBrowser.layout.LayoutFactory;
 import org.openmicroscopy.shoola.agents.dataBrowser.visitor.NodesFinder;
@@ -87 +88 @@
         private RootDisplay             rootDisplay;
         
-        /** The index of the selected layout. */
-        private int                     selectedLayout;
+        /** The selected layout. */
+        private Layout                  selectedLayout;
         
         /**
@@ -389 +390 @@
         /**
          * Implemented as specified by the {@link Browser} interface.
-         * @see Browser#setSelectedLayout(int)
-         */
-        public void setSelectedLayout(int index)
-        {
-            int oldIndex = selectedLayout;
-            switch (index) {
+         * @see Browser#setSelectedLayout(Layout)
+         */
+        public void setSelectedLayout(Layout layout)
+        {
+                if (layout == null) return;
+                Layout oldLayout = selectedLayout;
+            switch (layout.getIndex()) {
                 case LayoutFactory.SQUARY_LAYOUT:
                 case LayoutFactory.FLAT_LAYOUT:  
-                    selectedLayout = index;
+                    selectedLayout = layout;
                     break;
-                default:
-                    selectedLayout = LayoutFactory.SQUARY_LAYOUT;
             }
-            firePropertyChange(LAYOUT_PROPERTY, new Integer(oldIndex), 
-                            new Integer(selectedLayout));
+            firePropertyChange(LAYOUT_PROPERTY, oldLayout, selectedLayout);
         }
         
@@ -410 +409 @@
          * @see Browser#getSelectedLayout()
          */
-        public int getSelectedLayout() { return selectedLayout; }
+        public Layout getSelectedLayout() { return selectedLayout; }
         
         /**
@@ -469 +468 @@
             desktop.removeAll();
             Iterator i;
-            if (selectedLayout == LayoutFactory.SQUARY_LAYOUT) {
-                i = rootChildren.iterator();
-                ImageDisplay child;
-                while (i.hasNext()) {
-                    child = (ImageDisplay) i.next();
-                    desktop.add(child);
-                    addToDesktop(child);
-                }
-            } else if (selectedLayout == LayoutFactory.FLAT_LAYOUT) {
-                i = getImageNodes().iterator();
-                while (i.hasNext()) 
-                    desktop.add((ImageDisplay) i.next());    
-            }
+            switch (selectedLayout.getIndex()) {
+                        case LayoutFactory.SQUARY_LAYOUT:
+                                 i = rootChildren.iterator();
+                                ImageDisplay child;
+                                while (i.hasNext()) {
+                                    child = (ImageDisplay) i.next();
+                                    desktop.add(child);
+                                    addToDesktop(child);
+                                }
+                                break;
+        
+                        case LayoutFactory.FLAT_LAYOUT:
+                                 i = getImageNodes().iterator();
+                                while (i.hasNext()) 
+                                    desktop.add((ImageDisplay) i.next());   
+                }
             rootDisplay.setCursor(
                     Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/FlatLayout.java

@@ -77 +77 @@
     private Set                         oldNodes;
     
+    /** The number of items per row. */
+    private int                         itemsPerRow;
+    
     /**
      * Package constructor so that objects can only be created by the
@@ -137 +140 @@
      */
         public void setOldNodes(Set oldNodes) { this.oldNodes = oldNodes; }
+
+    /**
+     * Implemented as specified by the {@link Layout} interface.
+     * @see Layout#setImagesPerRow(int)
+     */
+        public void setImagesPerRow(int number) { itemsPerRow = number; }
    
 }

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/Layout.java

@@ -74 +74 @@
      */
     public void setOldNodes(Set oldNodes);
+    
+    /**
+     * Sets the number of images per row.
+     * 
+     * @param number The value to set.
+     */
+    public void setImagesPerRow(int number);
+    
 }

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/LayoutFactory.java

@@ -56 +56 @@
      * Creates the specified layout.
      * 
-     * @param type      One of the constants defined by this class.
-     * @param sorter    Class used to sort the nodes by date or alphabetically. 
+     * @param type              One of the constants defined by this class.
+     * @param sorter            Class used to sort the nodes by date or 
+     *                                          alphabetically. 
+     * @param itemsPerRow       The number of items oer row.
      * @return          A layout object for the given layout <code>type</code>.
      * @throws IllegalArgumentException If <code>type</code> is not one of
      *          the constants defined by this class.
      */
-    public static Layout createLayout(int type, ViewerSorter sorter)
+    public static Layout createLayout(int type, ViewerSorter sorter, int
+                itemsPerRow)
     {
         if (sorter == null)
@@ -68 +71 @@
         switch (type) {
             case SQUARY_LAYOUT:
-                return new SquaryLayout(sorter);
+                return new SquaryLayout(sorter, itemsPerRow);
             case FLAT_LAYOUT:
                 return new FlatLayout(sorter);
@@ -80 +83 @@
      * Returns the default layout.
      * 
-     * @param sorter Class used to sort the nodes by date or alphabetically. 
+     * @param sorter            Class used to sort the nodes by date or 
+     *                                          alphabetically.
+     * @param itemsPerRow       The number of images per row. 
      * @return See above.
      */
-    public static Layout getDefaultLayout(ViewerSorter sorter)
+    public static Layout getDefaultLayout(ViewerSorter sorter, int itemsPerRow)
     { 
-        return createLayout(getDefaultLayoutIndex(), sorter); 
+        return createLayout(getDefaultLayoutIndex(), sorter, itemsPerRow); 
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/LayoutUtils.java

@@ -162 +162 @@
         n = (int) Math.floor(Math.sqrt(n))+1;
         Dimension d;
+        
         try {
             for (int i = 0; i < n; ++i) {
@@ -187 +188 @@
      * in the parent <code>node</code>.
      * 
-     * @param node The parent node. Mustn't be <code>null</code>.
-     * @param sorter The sorter.
-     */
-    static void doSquareGridLayout(ImageDisplay node, ViewerSorter sorter)
+     * @param node                      The parent node. Mustn't be <code>null</code>.
+     * @param sorter            The sorter.
+     * @param itemsPerRow       The number of items per row.
+     */
+    static void doSquareGridLayout(ImageDisplay node, ViewerSorter sorter, int
+                                                                itemsPerRow)
     {
         //First find out the max dim among children.
@@ -209 +212 @@
         List l = new ArrayList();
         for (int i = 0; i < comps.length; i++) {
-                        if (comps[i] instanceof ImageDisplay) {
+                        if (comps[i] instanceof ImageDisplay)
                                 l.add(comps[i]);
-                        }
                 }
-        n = l.size();
-        n = (int) Math.floor(Math.sqrt(n))+1;  //See note.
+        //l = sorter.sort(l);
+        if (itemsPerRow > 1) {
+                n = itemsPerRow;
+        } else {
+                n = l.size();
+                n = (int) Math.floor(Math.sqrt(n))+1;  //See note.
+        }
+       
         
         //Finally do layout.
@@ -222 +230 @@
         
         ImageDisplay child;
-        
-        
-        
-        
         Iterator children = l.iterator();
         try {

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/layout/SquaryLayout.java

@@ -82 +82 @@
     /** Collection of nodes previously layed out. */
     private Set                         oldNodes;
+    
+    /** The number of items per row. */
+    private int                         itemsPerRow;
     
     /** Maximum width of the BrowserView.*/
@@ -221 +224 @@
      * {@link LayoutFactory}.
      * 
-     * @param sorter A {@link ViewerSorter sorter} to order nodes.
-     */
-    SquaryLayout(ViewerSorter sorter)
+     * @param sorter            A {@link ViewerSorter sorter} to order nodes.
+     * @param itemsPerRow       The number of items per row.
+     */
+    SquaryLayout(ViewerSorter sorter, int itemsPerRow)
     {
         setBrowserSize();
         this.sorter = sorter;
+        this.itemsPerRow = itemsPerRow;
     }
 
@@ -243 +248 @@
             }
                 if (node.containsImages()) 
-                        LayoutUtils.doSquareGridLayout(node, sorter);
+                        LayoutUtils.doSquareGridLayout(node, sorter, itemsPerRow);
                 else visitContainerNode(node);
         } else {
@@ -274 +279 @@
                 }
                 if (node.containsImages()) 
-                        LayoutUtils.doSquareGridLayout(node, sorter);
+                        LayoutUtils.doSquareGridLayout(node, sorter, itemsPerRow);
                 else visitContainerNode(node);
                 }
@@ -310 +315 @@
      */
         public void setOldNodes(Set oldNodes) { this.oldNodes = oldNodes; }
+        
+    /**
+     * Implemented as specified by the {@link Layout} interface.
+     * @see Layout#setImagesPerRow(int)
+     */
+        public void setImagesPerRow(int number) { itemsPerRow = number; }
 
 }

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowser.java

@@ -58 +58 @@
 
         /** Loads the thumbnails when we have <code>100</code> or less values. */
-        public static final int                 MAX_ENTRIES = 1;
-        
-        
-        public static final int                 ANNOTATE_SELECTION = 100;
-        
-        public static final int                 ANNOTATE_IMAGES = 101;
-        
-        public static final int                 ANNOTATE_CHILDREN = 102;
+        public static final int                 MAX_ENTRIES = 100;
         
         /** Indicates to lay out the nodes as thumbnails. */
@@ -231 +224 @@
         public void setFilteredNodes(List<DataObject> objects);
 
+        /**
+         * Filters the images.
+         * 
+         * @param context The filtering context.
+         */
         public void filterByContext(FilterContext context);
         
-        public void annotate(int index);
-
+        /** Loads the existing tags. */
         public void loadExistingTags();
 
+        /**
+         * Sets the existing tags.
+         * 
+         * @param collection The collection to set.
+         */
         public void setExistingTags(Collection collection);
         

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserComponent.java

@@ -28 +28 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import javax.swing.JComponent;
 
@@ -44 +42 @@
 import org.openmicroscopy.shoola.agents.dataBrowser.visitor.NodesFinder;
 import org.openmicroscopy.shoola.agents.dataBrowser.visitor.RegexFinder;
-import org.openmicroscopy.shoola.agents.metadata.MetadataViewerAgent;
 import org.openmicroscopy.shoola.env.data.util.FilterContext;
-import org.openmicroscopy.shoola.env.event.EventBus;
 import org.openmicroscopy.shoola.env.ui.UserNotifier;
 import org.openmicroscopy.shoola.util.ui.RegExFactory;
 import org.openmicroscopy.shoola.util.ui.component.AbstractComponent;
 import pojos.DataObject;
-import pojos.ImageData;
 
 /** 
@@ -159 +154 @@
         {
                 Object object = node.getHierarchyObject();
-                if (object instanceof DataObject) 
-                        firePropertyChange(SELECTED_NODE_DISPLAY_PROPERTY, null, object);
+                List<Object> objects = new ArrayList<Object>();
+                 objects.add(object);
+                if (object instanceof DataObject) {
+                        ImageDisplay p = node.getParentDisplay();
+                        Object parent = p.getHierarchyObject();
+                        if (!(parent instanceof DataObject))
+                                parent = model.getParent();
+                        objects.add(parent);
+                }
+                firePropertyChange(SELECTED_NODE_DISPLAY_PROPERTY, null, objects);
         }
 
@@ -321 +324 @@
                 fireStateChange();
         }
-        
-        /**
-         * Implemented as specified by the {@link DataBrowser} interface.
-         * @see DataBrowser#annotate(int)
-         */
-        public void annotate(int index)
-        {
-                Browser browser = model.getBrowser();
-                Collection nodes = null;
-                switch (index) {
-                        case ANNOTATE_CHILDREN:
-                                
-                                //TODO
-                        case ANNOTATE_IMAGES:
-                                nodes = browser.getVisibleImages();
-                        case ANNOTATE_SELECTION:
-                                Set display = browser.getSelectedDisplays();
-                                if (display != null) {
-                                        Iterator i = display.iterator();
-                                        ImageDisplay node;
-                                        nodes = new HashSet();
-                                        Object ho;
-                                        while (i.hasNext()) {
-                                                node = (ImageDisplay) i.next();
-                                                ho = node.getHierarchyObject();
-                                                if (ho instanceof ImageData) {
-                                                        nodes.add(ho);
-                                                }
-                                        }
-                                }
-                                break;
-        
-                        default:
-                                throw new IllegalArgumentException("Annotation index " +
-                                                                                                "not supported.");
-                }
-                EventBus bus = MetadataViewerAgent.getRegistry().getEventBus();
-                System.err.println(nodes);
-                //if (nodes != null)
-                //      bus.post(new ViewMetadata(nodes));
-        }
 
         /**

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserControl.java

@@ -136 +136 @@
         }
         
-        /** 
-         * Forwards call the {@link DataBrowser model}.
-         * 
-         *  @param index One the annotation contants defined by {@link DataBrowser}.
-         */
-        void annotate(int index) { model.annotate(index); }
-        
         /**
          * Loads data, filters nodes or sets the selected node.
@@ -162 +155 @@
                         model.loadExistingTags();
                 } else if (Browser.ROLL_OVER_PROPERTY.equals(name)) {
-                        
             if (view.isRollOver()) {
-