Changeset 5528

Timestamp:

07/04/08 13:41:43 (2 months ago)

Author:

jburel

Message:

First implementation of the projection.
The preview is only available for now.

Location:

trunk

Files:

• LIB/common-3.0-Beta3.jar (modified) (previous)
• LIB/model-psql-3.0-Beta3.jar (modified) (previous)
• SRC/org/openmicroscopy/shoola/agents/imviewer/ContainerLoader.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/DataLoader.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/IconManager.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/ProjectionSaver.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/actions/ProjectionAction.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/actions/RendererAction.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/browser/Browser.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/browser/BrowserComponent.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/graphx/projection12.png (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/graphx/projection16.png (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/graphx/projection48.png (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionCanvas.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialog.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialogControl.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionRef.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionSavingDialog.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionUI.java (added)
• SRC/org/openmicroscopy/shoola/agents/imviewer/util/saver/ImgSaver.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewer.java (modified) (4 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerComponent.java (modified) (7 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java (modified) (10 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerModel.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerUI.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/view/ToolBar.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/view/DeleteDialog.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (4 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageService.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OmeroImageServiceImpl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/views/ImageDataView.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/views/ImageDataViewImpl.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/data/views/calls/ProjectionSaver.java (added)
• SRC/org/openmicroscopy/shoola/env/data/views/calls/RelatedContainersLoader.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/PixelsServicesFactory.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControl.java (modified) (4 diffs)
• SRC/org/openmicroscopy/shoola/env/rnd/RenderingControlProxy.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/util/ui/filechooser/CreateFolderDialog.java (modified) (5 diffs)
• SRC/org/openmicroscopy/shoola/util/ui/filechooser/FileChooser.java (modified) (1 diff)
• TEST/org/openmicroscopy/shoola/env/data/NullRenderingService.java (modified) (2 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/DataLoader.java

@@ -39 +39 @@
 import org.openmicroscopy.shoola.env.data.views.MetadataHandlerView;
 import org.openmicroscopy.shoola.env.log.LogMessage;
-
 import pojos.ExperimenterData;
 
 /** 
- * 
+ * Parent of all classes that load data asynchronously for a {@link ImViewer}.
+ * All these classes invoke methods of the {@link DataHandlerView},
+ * {@link MetadataHandlerView} or {@link ImageDataView},
+ * which this class makes available through a <code>protected</code> field.
+ * Also, this class extends {@link DSCallAdapter} so that subclasses
+ * automatically become observers to an asynchronous call.  This class provides
+ * default implementations of some of the callbacks to notify the 
+ * {@link ImViewer} of the progress and the user in the case of errors. 
+ * Subclasses should at least implement the <code>handleResult</code> method 
+ * to feed the {@link ImViewer} back with the results.
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;

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

@@ -234 +234 @@
     public static int           SET_RND_SETTINGS = 57;
     
+    /** The <code>Projection</code> icon. */
+    public static int           PROJECTION = 58;
+    
+    /** The <code>Projection 48</code> icon. */
+    public static int           PROJECTION_48 = 59;
+    
+    /** The <code>Projection 12</code> icon. */
+    public static int           PROJECTION_12 = 60;
+    
     /** 
      * The maximum ID used for the icon IDs.
      * Allows to correctly build arrays for direct indexing. 
      */
-    private static int          MAX_ID = 57;
+    private static int          MAX_ID = 60;
     
     /** Paths of the icon files. */
@@ -303 +312 @@
         relPaths[HISTORY_CLEAR_12] = "nuvola_history_clear12.png";
         relPaths[SET_RND_SETTINGS] = "nuvola_redo16.png";
+        relPaths[PROJECTION] = "projection16.png";
+        relPaths[PROJECTION_48] = "projection48.png"; 
+        relPaths[PROJECTION_12] = "projection12.png"; 
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/actions/RendererAction.java

@@ -72 +72 @@
         super(model, NAME);
         putValue(Action.SHORT_DESCRIPTION, 
+                        
                 UIUtilities.formatToolTipText(DESCRIPTION));
         IconManager icons = IconManager.getInstance();

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

@@ -332 +332 @@
         public double getGridRatio();
 
+        /**
+         * Returns the background color of the canvas.
+         * 
+         * @return See above.
+         */
+        public Color getBackgroundColor();
+        
         public void initializeMagnificationFactor(double f);
         

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

@@ -350 +350 @@
         }
 
+        /** 
+     * Implemented as specified by the {@link Browser} interface.
+     * @see Browser#getBackgroundColor()
+     */
+        public Color getBackgroundColor()
+        {
+                return model.getBackgroundColor();
+        }
+        
     /** 
      * Implemented as specified by the {@link Browser} interface.

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/util/saver/ImgSaver.java

@@ -46 +46 @@
 import org.openmicroscopy.shoola.agents.imviewer.util.ImagePaintingFactory;
 import org.openmicroscopy.shoola.agents.imviewer.view.ImViewer;
+import org.openmicroscopy.shoola.agents.util.EditorUtil;
 import org.openmicroscopy.shoola.env.ui.UserNotifier;
 import org.openmicroscopy.shoola.util.filter.file.TIFFFilter;
@@ -287 +288 @@
     String getPartialImageName()
     { 
-        String originalName = model.getImageName();
-        String name = originalName;
-        String[] l = UIUtilities.splitString(originalName);
-        if (l != null) {
-                 int n = l.length;
-             if (n >= 1) name = l[n-1]; 
-        }
-                
-        if (Pattern.compile(".").matcher(name).find()) {
-                l = name.split("\\.");
-                if (l.length >= 1) {
-                        name = "";
-                        int n = l.length-1;
-                        for (int i = 0; i < n; i++) {
-                                name += l[i];
-                                if (i < (n-1)) name += ".";
-                        }
-                }
-        }
-        return name;
+        return EditorUtil.removeFileExtension(model.getImageName());
     }
     

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

@@ -30 +30 @@
 import java.awt.Point;
 import java.awt.image.BufferedImage;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -39 +40 @@
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.agents.imviewer.util.proj.ProjectionRef;
 import org.openmicroscopy.shoola.env.data.model.ChannelMetadata;
 import org.openmicroscopy.shoola.env.rnd.RenderingControl;
@@ -44 +46 @@
 import org.openmicroscopy.shoola.util.ui.component.ObservableComponent;
 import pojos.ExperimenterData;
+import pojos.ImageData;
 
 /** 
@@ -835 +838 @@
         /** Sets the original rendering settings. */
         public void setOriginalRndSettings();
+
+        /** Shows the projection dialog and preview. */
+        public void showProjection();
+
+        /**
+         * Projects a selected portion of the optical sections 
+         * for the currently selected timepoint and active channel.
+         * 
+         * @param ref Object containing the projection parameters.
+         */
+        public void projectionPreview(ProjectionRef ref);
+
+        /**
+         * Projects the whole image according the projection parameters.
+         * 
+         * @param ref Object containing the projection parameters.
+         */
+        public void projectImage(ProjectionRef ref);
+
+        /**
+         * Sets the containers contained the image.
+         * 
+         * @param containers The collection to set.
+         */
+        public void setContainers(Collection containers);
+
+        /** Loads the containers containing the image. */
+        public void loadContainers();
+        
+        /**
+         * Sets the projected preview image.
+         * 
+         * @param image The value to display.
+         */
+        public void setRenderProjected(BufferedImage image);
+        
+        /**
+         * Sets the newly created projected image.
+         * 
+         * @param image The projected image.
+         */
+        public void setProjectedImage(ImageData image);
         
 }

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

@@ -35 +35 @@
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -60 +62 @@
 import org.openmicroscopy.shoola.agents.imviewer.util.HistoryItem;
 import org.openmicroscopy.shoola.agents.imviewer.util.PreferencesDialog;
+import org.openmicroscopy.shoola.agents.imviewer.util.proj.ProjectionDialog;
+import org.openmicroscopy.shoola.agents.imviewer.util.proj.ProjectionRef;
 import org.openmicroscopy.shoola.agents.imviewer.util.UnitBarSizeDialog;
 import org.openmicroscopy.shoola.agents.imviewer.util.player.MoviePlayerDialog;
@@ -80 +84 @@
 import org.openmicroscopy.shoola.util.ui.component.AbstractComponent;
 import pojos.ExperimenterData;
+import pojos.ImageData;
 
 /** 
@@ -116 +121 @@
         static final String                                             ANNOTATION = "The annotations";
         
-        /** The message if rendering setting to annotation. */
-        static final String                                             RATING = "The rating";
-        
         /** The Model sub-component. */
         private ImViewerModel                           model;
@@ -149 +151 @@
         private boolean                                                 saveBeforeCopy;
 
+        /** The possible projections options. */
+        private Map<Integer, String>                    projections;
+        
+        /** The projection dialog. */
+        private ProjectionDialog                                projection;
+        
         /** Creates an history item. */
         private void createHistoryItem()
@@ -733 +741 @@
                                         pref.isHistory()) {
                                         if (image != null)
-                                                view.setRestoreSize(image.getWidth(), image.getHeight());
+                                                view.setRestoreSize(image.getWidth(), 
+                                                                image.getHeight());
                                         //boolean oldValue = view.isHistoryShown();
                                         view.showHistory(true);
@@ -2399 +2408 @@
         }
 
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#showProjection()
+         */
+        public void showProjection()
+        {
+                if (model.getState() == DISCARDED)
+                        throw new IllegalArgumentException("This method cannot be invoked" +
+                                        " in the DISCARDED state.");
+                if (projections == null) {
+                        projections = new LinkedHashMap<Integer, String>();
+                        projections.put(RenderingControl.MAX_INTENSITY, 
+                                        "Maximum Intensity");
+                        projections.put(RenderingControl.MEAN_INTENSITY, 
+                                        "Mean Intensity");
+                        projections.put(RenderingControl.SUM_INTENSITY, 
+                                        "Sum Intensity");
+                }
+                if (projection == null) {
+                        projection = new ProjectionDialog(view, projections,
+                                                                        model.getMaxZ()+1, 
+                                                                        model.getBrowser().getBackgroundColor(),
+                                                                        model.getImageName(), 
+                                                                        model.getOriginalImage());
+                        projection.addPropertyChangeListener(controller);
+                        projection.setProjectedImage(model.getOriginalImage());
+                        UIUtilities.incrementRelativeToAndShow(view.getBounds(), 
+                                        projection);
+                } else {
+                        projection.setVisible(true);
+                }
+        }
+
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#projectImage(ProjectionRef)
+         */
+        public void projectImage(ProjectionRef ref)
+        {
+                if (model.getState() == DISCARDED)
+                        throw new IllegalArgumentException("This method cannot be invoked" +
+                                        " in the DISCARDED state.");
+                if (projection == null) return;
+                if (!projection.isVisible()) return;
+                UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+                un.notifyInfo("Projection preview", "Not yet implemented");
+                projection.setVisible(false);
+                projection.dispose();
+                projection = null;
+                //model.fireProjectImage(ref);
+        }
+
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#setRenderProjected(BufferedImage)
+         */
+        public void setRenderProjected(BufferedImage image)
+        {
+                if (image == null) {
+                        UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+                        un.notifyInfo("Projection preview", "An error has occurred " +
+                                        "while projecting the data.");
+                }
+                projection.setProjectedImage(image);
+        }
+        
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#projectionPreview(ProjectionRef)
+         */
+        public void projectionPreview(ProjectionRef ref)
+        {
+                if (model.getState() == DISCARDED)
+                        throw new IllegalArgumentException("This method cannot be invoked" +
+                                        " in the DISCARDED state.");
+                if (projection == null) return;
+                if (!projection.isVisible()) return;
+                
+                /*
+                BufferedImage img = null;
+                try {
+                        img = model.renderProjected(ref.getStartZ(), ref.getEndZ(), 
+                                                                        ref.getStepping(), ref.getType());
+                } catch (Exception e) {
+                        projection.setProjectedImage(null);
+                        UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+                        un.notifyInfo("Projection preview", "An error has occurred " +
+                                        "while projecting the data.");
+                }
+                projection.setProjectedImage(img);
+                */
+                model.fireRenderProjected(ref);
+        }
+
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#setContainers(Collection)
+         */
+        public void setContainers(Collection containers)
+        {
+                if (model.getState() == DISCARDED)
+                        throw new IllegalArgumentException("This method cannot be invoked" +
+                                        " in the DISCARDED state.");
+                if (projection == null) return;
+                if (!projection.isVisible()) return;
+                projection.setContainers(containers);
+        }
+
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#loadContainers()
+         */
+        public void loadContainers()
+        {
+                if (model.getState() == DISCARDED)
+                        throw new IllegalArgumentException("This method cannot be invoked" +
+                                        " in the DISCARDED state.");
+                if (projection == null) return;
+                if (!projection.isVisible()) return;
+                model.fireContainersLoading();
+        }
+
+        /** 
+         * Implemented as specified by the {@link ImViewer} interface.
+         * @see ImViewer#setProjectedImage(ImageData)
+         */
+        public void setProjectedImage(ImageData image)
+        {
+                UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+                String message;
+                if (image == null) 
+                        message = "An error has occurred while creating the " +
+                                        "projected image.";
+                else message = "The image, "+image.getName() +" has been successfully "
+                       +"created";
+                un.notifyInfo("Projection", message);
+                projection.setVisible(false);
+                projection.dispose();
+                projection = null;
+        }
+
 }

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

@@ -70 +70 @@
 import org.openmicroscopy.shoola.agents.imviewer.actions.PlayMovieAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.PreferencesAction;
+import org.openmicroscopy.shoola.agents.imviewer.actions.ProjectionAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.ROIToolAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.RendererAction;
@@ -93 +94 @@
 import org.openmicroscopy.shoola.agents.imviewer.util.InfoDialog;
 import org.openmicroscopy.shoola.agents.imviewer.util.player.MoviePlayerDialog;
+import org.openmicroscopy.shoola.agents.imviewer.util.proj.ProjectionDialog;
+import org.openmicroscopy.shoola.agents.imviewer.util.proj.ProjectionRef;
 import org.openmicroscopy.shoola.agents.util.tagging.view.Tagger;
 import org.openmicroscopy.shoola.env.data.model.ChannelMetadata;
@@ -300 +303 @@
          */
         static final Integer     SET_ORIGINAL_RND_SETTINGS = new Integer(62);
+        
+        /** Identifies the <code>Projection</code> action. */
+        static final Integer     PROJECTION = new Integer(63);
         
         /** 
@@ -398 +404 @@
                 actionsMap.put(SET_ORIGINAL_RND_SETTINGS, 
                                                 new SetOriginalRndSettingsAction(model));
+                actionsMap.put(PROJECTION, new ProjectionAction(model));
         }
 
@@ -729 +736 @@
         public void propertyChange(PropertyChangeEvent pce)
         {
-                String propName = pce.getPropertyName(); 
-                if (ImViewer.Z_SELECTED_PROPERTY.equals(propName)) {
+                String pName = pce.getPropertyName(); 
+                if (ImViewer.Z_SELECTED_PROPERTY.equals(pName)) {
                         view.setZSection(((Integer) pce.getNewValue()).intValue());
-                } else if (ImViewer.T_SELECTED_PROPERTY.equals(propName)) {
+                } else if (ImViewer.T_SELECTED_PROPERTY.equals(pName)) {
                         view.setTimepoint(((Integer) pce.getNewValue()).intValue());
-                } else if (ChannelButton.CHANNEL_SELECTED_PROPERTY.equals(propName)) {
+                } else if (ChannelButton.CHANNEL_SELECTED_PROPERTY.equals(pName)) {
                         Map map = (Map) pce.getNewValue();
                         if (map == null) return;
@@ -745 +752 @@
                                                 ((Boolean) map.get(index)).booleanValue());
                         }
-                } else if (LoadingWindow.CLOSED_PROPERTY.equals(propName)) {
+                } else if (LoadingWindow.CLOSED_PROPERTY.equals(pName)) {
                         model.discard();
-                } else if (Renderer.RENDER_PLANE_PROPERTY.equals(propName)) {
+                } else if (Renderer.RENDER_PLANE_PROPERTY.equals(pName)) {
                         model.renderXYPlane();
-                } else if (Renderer.SELECTED_CHANNEL_PROPERTY.equals(propName)) {
+                } else if (Renderer.SELECTED_CHANNEL_PROPERTY.equals(pName)) {
                         if (model.getColorModel().equals(ImViewer.GREY_SCALE_MODEL)) {
                                 int c = ((Integer) pce.getNewValue()).intValue();
@@ -756 +763 @@
                                 model.displayChannelMovie();
                         }
-                } else if (ChannelButton.INFO_PROPERTY.equals(propName)) {
+                } else if (ChannelButton.INFO_PROPERTY.equals(pName)) {
                         int index = ((Integer) pce.getNewValue()).intValue();
                         ChannelMetadata data = model.getChannelMetadata(index);
@@ -768 +775 @@
                                                 "selected channel.");
                         }
-                } else if (ChannelButton.CHANNEL_COLOR_PROPERTY.equals(propName) ||
-                                ChannelColorMenuItem.CHANNEL_COLOR_PROPERTY.equals(propName)) {
+                } else if (ChannelButton.CHANNEL_COLOR_PROPERTY.equals(pName) ||
+                                ChannelColorMenuItem.CHANNEL_COLOR_PROPERTY.equals(pName)) {
                         colorPickerIndex = ((Integer) pce.getNewValue()).intValue();
                         showColorPicker(colorPickerIndex);
-                } else if (ColourPicker.COLOUR_PROPERTY.equals(propName)) { 
+                } else if (ColourPicker.COLOUR_PROPERTY.equals(pName)) { 
                         Color c = (Color) pce.getNewValue();