Changeset 5609

Timestamp:

09/12/08 13:33:44 (2 months ago)

Author:

jburel

Message:

Fixed layout problem and clean code

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/dataBrowser/DataBrowserAgent.java (modified) (1 diff)
• agents/dataBrowser/ThumbnailsManager.java (modified) (1 diff)
• agents/dataBrowser/browser/BrowserModel.java (modified) (2 diffs)
• agents/dataBrowser/layout/LayoutFactory.java (modified) (3 diffs)
• agents/dataBrowser/layout/LayoutUtils.java (modified) (2 diffs)
• agents/dataBrowser/layout/SquaryLayout.java (modified) (1 diff)
• agents/dataBrowser/util/FilteringDialog.java (modified) (3 diffs)
• agents/dataBrowser/view/DataBrowser.java (modified) (1 diff)
• agents/dataBrowser/view/DataBrowserModel.java (modified) (2 diffs)
• agents/dataBrowser/view/ProjectsModel.java (modified) (1 diff)
• agents/imviewer/browser/Browser.java (modified) (2 diffs)
• agents/imviewer/browser/BrowserComponent.java (modified) (2 diffs)
• agents/imviewer/browser/BrowserModel.java (modified) (1 diff)
• agents/imviewer/util/proj/ProjectionDialog.java (modified) (11 diffs)
• agents/imviewer/util/proj/ProjectionRef.java (modified) (3 diffs)
• agents/imviewer/view/ControlPane.java (modified) (5 diffs)
• agents/imviewer/view/ImViewerComponent.java (modified) (4 diffs)
• agents/imviewer/view/ImViewerModel.java (modified) (2 diffs)
• agents/imviewer/view/ToolBar.java (modified) (1 diff)
• agents/treeviewer/TimeIntervalsLoader.java (modified) (1 diff)
• agents/treeviewer/actions/CreateTopContainerAction.java (modified) (5 diffs)
• agents/treeviewer/view/ToolBar.java (modified) (1 diff)
• env/data/OMEROGateway.java (modified) (1 diff)
• env/data/OmeroImageServiceImpl.java (modified) (5 diffs)
• env/data/model/ProjectionParam.java (modified) (4 diffs)
• util/image/geom/Factory.java (modified) (2 diffs)
• util/ui/UIUtilities.java (modified) (5 diffs)
• util/ui/login/ScreenLogin.java (modified) (5 diffs)
• util/ui/search/QuickSearch.java (modified) (1 diff)
• util/ui/search/SearchPanel.java (modified) (3 diffs)

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

@@ -37 +37 @@
 import org.openmicroscopy.shoola.agents.dataBrowser.view.DataBrowserFactory;
 import org.openmicroscopy.shoola.agents.events.iviewer.RndSettingsCopied;
-import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
-import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewerFactory;
 import org.openmicroscopy.shoola.env.Agent;
 import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.env.config.Registry;
-import org.openmicroscopy.shoola.env.data.events.SaveEventRequest;
 import org.openmicroscopy.shoola.env.event.AgentEvent;
 import org.openmicroscopy.shoola.env.event.AgentEventListener;
 import org.openmicroscopy.shoola.env.event.EventBus;
-
 import pojos.ExperimenterData;
 

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

@@ -82 +82 @@
     private Map<Long, Set>      thumbProviders;
 
+    /**
+     * Creates a new instance.
+     * 
+     * @param wells The nodes hosting the wells to display.
+     */
     public ThumbnailsManager(Collection<ImageDisplay> wells)
     {

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

@@ -126 +126 @@
             Set children = node.getChildrenDisplay();
             if (children == null) return;
+            //desktop.removeAll();
             Iterator i = children.iterator();
             ImageDisplay child;
@@ -152 +153 @@
             Set nodes = rootDisplay.getChildrenDisplay();
             Iterator i = nodes.iterator();
-            while (i.hasNext()) {
+            while (i.hasNext()) 
                         originalNodes.add((ImageDisplay) i.next());
-                }
         }
         

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

@@ -79 +79 @@
             case PLATE_LAYOUT:
                 return new PlateLayout();
-                
             default:
                 throw new IllegalArgumentException("Unsupported layout type: "+
@@ -91 +90 @@
      * @return See above.
      */
-    public static Layout createPlateLayout()
-    {
-        return new PlateLayout(); 
-    }
+    public static Layout createPlateLayout() { return new PlateLayout(); }
     
     /**
@@ -107 +103 @@
     { 
         return createLayout(getDefaultLayoutIndex(), sorter, itemsPerRow); 
+    }
+    
+    /**
+     * Returns the default layout.
+     * 
+     * @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)
+    { 
+        return createLayout(getDefaultLayoutIndex(), sorter, 
+                                        LayoutUtils.DEFAULT_PER_ROW); 
     }
     

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

@@ -63 +63 @@
 
         /** The default number of items per row. */
-        private static final int        DEFAULT_PER_ROW = 10;
+        public static final int DEFAULT_PER_ROW = 10;
         
         /**
@@ -218 +218 @@
                 
         l = sorter.sort(l);
-        if (itemsPerRow > 1) n = itemsPerRow;
-        
+        if (itemsPerRow >= 1) n = itemsPerRow; 
         else {
                 n = l.size();

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

@@ -209 +209 @@
         }
         Object object = n.getHierarchyObject();
-        
         DataObject ho = (DataObject) object;
         Class klass = object.getClass();

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/util/FilteringDialog.java

@@ -43 +43 @@
 import java.util.List;
 import javax.swing.Box;
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -270 +271 @@
                 ratingOptions = new JComboBox(RATING);
                 rating = new RatingComponent(5, RatingComponent.HIGH_SIZE);
-                fromDate = UIUtilities.createDatePicker();
-                toDate = UIUtilities.createDatePicker();
+                fromDate = UIUtilities.createDatePicker(false);
+                toDate = UIUtilities.createDatePicker(false);
                 tagsArea = new JTextField();
                 tagsArea.setColumns(15);
@@ -383 +384 @@
         private JPanel buildCalendarPane()
         {
+                JPanel date = new JPanel();
+                date.add(UIUtilities.setTextFont("From: "));
+                date.add(fromDate);
+                date.add(UIUtilities.setTextFont("To: "));
+                date.add(toDate);
                 JPanel p = new JPanel();
+                p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS));
                 p.add(calendarBox);
-                p.add(UIUtilities.setTextFont("From: "));
-                p.add(fromDate);
-                p.add(UIUtilities.setTextFont("To: "));
-                p.add(toDate);
+                p.add(date);
                 return UIUtilities.buildComponentPanel(p, 0, 0);
         }

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

@@ -449 +449 @@
         public void setComponentTitle(String title);
         
-        public void viewField(int selectedIndex);
+        /**
+         * Views the selected well sample field while browsing a plate.
+         * 
+         * @param field The index of the field.
+         */
+        public void viewField(int field);
         
 }

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

@@ -52 +52 @@
 import org.openmicroscopy.shoola.agents.dataBrowser.layout.Layout;
 import org.openmicroscopy.shoola.agents.dataBrowser.layout.LayoutFactory;
+import org.openmicroscopy.shoola.agents.dataBrowser.layout.LayoutUtils;
 import org.openmicroscopy.shoola.agents.dataBrowser.visitor.ResetThumbnailVisitor;
 import org.openmicroscopy.shoola.agents.util.ViewerSorter;
@@ -185 +186 @@
                 //Do initial layout and set the icons.
         if (browser.getSelectedLayout() == null) {
-                Layout layout = LayoutFactory.createLayout(type, sorter, 1);
+                Layout layout = LayoutFactory.createLayout(type, sorter, 
+                                LayoutUtils.DEFAULT_PER_ROW);
             browser.setSelectedLayout(layout);
         }

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

@@ -25 +25 @@
 
 //Java imports
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
-import org.openmicroscopy.shoola.agents.dataBrowser.DataBrowserLoader;
-import org.openmicroscopy.shoola.agents.dataBrowser.ThumbnailLoader;
-import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageDisplay;
-import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageNode;
+
 
 //Third-party libraries
 
 //Application-internal dependencies
-import pojos.ImageData;
+import org.openmicroscopy.shoola.agents.dataBrowser.DataBrowserLoader;
+import org.openmicroscopy.shoola.agents.dataBrowser.browser.ImageDisplay;
 import pojos.ProjectData;
 

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

@@ -59 +59 @@
     extends ObservableComponent
 {
-        /** 
-         * Factor use to determine the size of the annotate image
-         * w.r.t the rendered image.
-         */
-        //public static final int       MAX_RATIO = 10;
         
     /**
@@ -118 +113 @@
      * Sets the zoom factor.
      * 
-     * @param factor    The zoom factor to set.
-     */
-    public void setZoomFactor(double factor);
+     * @param factor The zoom factor to set.
+     * @param reset      Pass <code>true</code> to reset the magnification factor.
+     *                           <code>false</code> to set it.
+     */
+    public void setZoomFactor(double factor, boolean reset);
     
     /**

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/browser/BrowserComponent.java

@@ -198 +198 @@
     /** 
      * Implemented as specified by the {@link Browser} interface.
-     * @see Browser#setZoomFactor(double)
-     */
-    public void setZoomFactor(double factor)
+     * @see Browser#setZoomFactor(double, boolean)
+     */
+    public void setZoomFactor(double factor, boolean reset)
     {
         if (factor != -1) {
@@ -222 +222 @@
         }
         model.setZoomFactor(factor);
-        view.zoomImage();  
+        if (!reset) view.zoomImage();  
     }
 

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

@@ -527 +527 @@
         if (renderedImage == null) return;
         if (zoomFactor != ZoomAction.DEFAULT_ZOOM_FACTOR) 
-            displayedImage = Factory.magnifyImage(renderedImage, zoomFactor, 0);
+            displayedImage = Factory.magnifyImage(renderedImage, zoomFactor, 0);//Factory.magnifyImage(zoomFactor, renderedImage);
+        //Factory.magnifyImage(renderedImage, zoomFactor, 0);
         else displayedImage = renderedImage;
     }

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialog.java

@@ -34 +34 @@
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -54 +55 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.imviewer.IconManager;
+import org.openmicroscopy.shoola.agents.imviewer.view.ImViewer;
 import org.openmicroscopy.shoola.util.ui.TitlePanel;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
@@ -87 +89 @@
         public static final String              LOAD_DATASETS_PROPERTY = "loadDatasets";
         
+        private static final Map<Integer, String>       PROJECTIONS;
+        
         /** The maximum number of z-sections. */
-        private int                        maxZ;
+        private int                             maxZ;
         
         /** The maximum number of timepoints. */
-        private int                        maxT;
+        private int                             maxT;
     
         /** The pixels type of the original image. */
-        private String                             pixelsType;
+        private String                                  pixelsType;
         
         /** Component hosting a two knobs slider and text field. */
-        private TextualTwoKnobsSlider  textualSlider;
+        private TextualTwoKnobsSlider   textualSlider;
         
         /** The type of projection. */
-        private Map<Integer, Integer>  projectionType;
+        private Map<Integer, Integer>   projectionType;
 
         /** Project the selected z-sections for the currently selected timepoint. */
-        private JButton                            previewButton;
+        private JButton                                 previewButton;
         
         /** Project the selected z-sections of the whole image. */
-        private JButton                            projectionButton;
+        private JButton                                 projectionButton;
         
          /** The bar notifying the user for the data retrieval progress. */
-    private JProgressBar           progressBar;
+    private JProgressBar                progressBar;
     
     /** The reference object hosting the parameters used to project. */
-    private ProjectionRef                  ref;
+    private ProjectionRef                       ref;
     
     /** The label displaying the status. */
-    private JLabel                                 statusLabel;
+    private JLabel                                      statusLabel;
     
     /** The type of supported projections. */
-    private JComboBox                      types;
+    private JComboBox                           types;
     
     /** The UI delegate. */
-    private ProjectionUI           uiDelegate;
+    private ProjectionUI                uiDelegate;
     
     /** Sets the stepping for the mapping. */
-    private JSpinner                       frequency;
+    private JSpinner                            frequency;
     
     /** The name of the image. */
@@ -138 +142 @@
         private ProjectionDialogControl controller;
         
+        static {
+                PROJECTIONS = new LinkedHashMap<Integer, String>();
+                PROJECTIONS.put(ImViewer.MAX_INTENSITY, "Maximum Intensity");
+                PROJECTIONS.put(ImViewer.MEAN_INTENSITY, "Mean Intensity");
+                PROJECTIONS.put(ImViewer.SUM_INTENSITY, "Sum Intensity");
+        }
+
         /** Collects and stores the parameters used for projection. */
         private void fillProjectionRef()
@@ -153 +164 @@
          * Initializes the components composing the display. 
          * 
-         * @param projections The projection supported.
          * @param background  The background color.
          */
-        private void initComponents(Map<Integer, String> projections, 
-                                           Color background)
+        private void initComponents(Color background)
         {
                 frequency = new JSpinner(new SpinnerNumberModel(1, 1, maxZ, 1));
@@ -181 +190 @@
         statusLabel = new JLabel();
         
-        String[] names = new String[projections.size()];
+        String[] names = new String[PROJECTIONS.size()];
         int index = 0;
-        Iterator<Integer> i = projections.keySet().iterator();
+        Iterator<Integer> i = PROJECTIONS.keySet().iterator();
         projectionType = new HashMap<Integer, Integer>();
         int j;
@@ -189 +198 @@
                         j = i.next();
                         projectionType.put(index, j);
-                        names[index] = projections.get(j);
+                        names[index] = PROJECTIONS.get(j);
                         index++;
                 }
@@ -296 +305 @@
          * 
          * @param owner       The owner of the dialog.
-         * @param projections The type of projection.
          * @param maxZ        The number of optical sections.
          * @param maxT            The number of timepoints.
@@ -305 +313 @@
          * @param imageHeight  The width of the original image.
          */
-        public ProjectionDialog(JFrame owner, Map<Integer, String> projections, 
-                                     int maxZ, int maxT, String pixelsType, 
+        public ProjectionDialog(JFrame owner, int maxZ, int maxT, String pixelsType, 
                                      Color background, String imageName, 
                                      int imageWidth, int imageHeight)
@@ -316 +323 @@
                 this.pixelsType = pixelsType;
                 this.imageName = imageName;
-                initComponents(projections, background);
+                initComponents(background);
                 buildGUI();
                 Dimension d = new Dimension(imageWidth, imageHeight);
@@ -405 +412 @@
         {
                 fillProjectionRef();
+                ref.setImageDescription("Projection type: "+
+                                PROJECTIONS.get(ref.getType()));
                 ref.setAllChannels(allChannels);
                 ref.setDatasets(datasets);

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionRef.java

@@ -76 +76 @@
         private String            name;
         
+        /** The description of the projected image. */
+        private String                    description;
+        
         /** 
          * Project all channels if <code>true</code>, project the active channels
@@ -181 +184 @@
         
         /**
+         * Sets the description of the projected image.
+         * 
+         * @param description The value to set.
+         */
+        void setImageDescription(String description)
+        { 
+                this.description = description;
+        }
+        
+        /**
          * Sets the collection of datasets to add the image to.
          * 
@@ -205 +218 @@
         
         /**
+         * Returns the description of the projected image.
+         * 
+         * @return See above.
+         */
+        public String getImageDescription() { return description; }
+        
+        /**
          * Returns the collection of datasets to add the image to.
          * 

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ControlPane.java

@@ -413 +413 @@
     
     /**
+     * Builds a tool bar hosting the passed button.
+     * 
+     * @param button The button to add.
+     * @return See above
+     */
+    private JToolBar createMovieButtonBar(JButton button)
+    {
+        JToolBar bar = new JToolBar();
+        bar.setFloatable(false);
+        bar.setRollover(true);
+        bar.setBorder(null);
+        bar.add(button);
+        return bar;
+    }
+    
+    /**
      * Helper method to create a panel hosting the passed slider.
      * 
@@ -424 +440 @@
         pane.setLayout(new TableLayout(tl));