Changeset 5630

Timestamp:

09/26/08 09:22:10 (8 weeks ago)

Author:

jburel

Message:

Option to launch a viewer with newly created projected image.

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer

Files:

• RenderingSettingsCreator.java (modified) (5 diffs)
• view/ImViewer.java (modified) (1 diff)
• view/ImViewerComponent.java (modified) (5 diffs)
• view/ImViewerModel.java (modified) (1 diff)

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

@@ -36 +36 @@
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
 import org.openmicroscopy.shoola.env.rnd.RndProxyDef;
+import pojos.ImageData;
+
 /** 
+ * Creates rendering settings for the passed projected image.
+ * This class calls <code>createRndSetting</code> method in the
+ * <code>ImViewerView</code>.
  * 
  *
@@ -53 +58 @@
 {
         
-        /** The ID of the projected pixels set. */
-    private long                pixelsID;
+        /** The projected image. */
+    private ImageData           image;
     
     /** The rendering settings to copy i.e. setting of the original image. */
-    private RndProxyDef         rndToCopy;
+    private RndProxyDef         rndToCopy;
     
     /** Collection of channel's indexes. */
@@ -70 +75 @@
      * @param viewer    The view this loader is for.
      *                  Mustn't be <code>null</code>.
-     * @param pixelsID  The id of the pixels set.
+     * @param image     The projected image.
      * @param rndToCopy The rendering settings of the original image.
      * @param indexes   Collection of channel's indexes. 
      *                                  Mustn't be <code>null</code>.
      */
-    public RenderingSettingsCreator(ImViewer viewer, long pixelsID, 
+    public RenderingSettingsCreator(ImViewer viewer, ImageData image, 
                                                                 RndProxyDef rndToCopy, 
                                                                 List<Integer> indexes)
     {
         super(viewer);
-        this.pixelsID = pixelsID;
+        if (image == null)
+                throw new IllegalArgumentException("No image specified.");
+        this.image = image;
         this.rndToCopy = rndToCopy;
         this.indexes = indexes;
@@ -91 +98 @@
     public void load()
     {
-       handle = ivView.createRndSetting(pixelsID, rndToCopy, indexes, this);
+       handle = ivView.createRndSetting(image.getDefaultPixels().getId(), 
+                   rndToCopy, indexes, this);
     }
 
@@ -107 +115 @@
     {
         if (viewer.getState() == ImViewer.DISCARDED) return;  //Async cancel.
-        viewer.setProjectedRenderingSettings((Boolean) result);
+        viewer.setProjectedRenderingSettings((Boolean) result, image);
     }
     

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

@@ -896 +896 @@
          * Sets the settings created for the projected image.
          * 
-         * @param result The value to set.
-         */
-        public void setProjectedRenderingSettings(Boolean result);
+         * @param result        The value to set.
+         * @param image         The projected image.
+         */
+        public void setProjectedRenderingSettings(Boolean result, ImageData image);
         
 }

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

@@ -55 +55 @@
 import org.openmicroscopy.shoola.agents.events.iviewer.MeasurementTool;
 import org.openmicroscopy.shoola.agents.events.iviewer.SaveRelatedData;
+import org.openmicroscopy.shoola.agents.events.iviewer.ViewImage;
 import org.openmicroscopy.shoola.agents.events.iviewer.ViewerState;
 import org.openmicroscopy.shoola.agents.imviewer.ImViewerAgent;
@@ -364 +365 @@
                 } else if (option == MessageBox.CANCEL) return false;
                 return true;
+        }
+        
+
+        /**
+         * Notifies that the projected image has been created an asks if the 
+         * user wants to launch a viewer with the projected image.
+         * 
+         * @param message       The message to display.
+         * @param image         The projected image.
+         */
+        private void notifyProjection(String message, ImageData image)
+        {
+                String text = message;
+                text += "\n Do you want to launch a viewer with the projected image.";
+                
+                MessageBox msg = new MessageBox(view, "Projection", text);
+                int option = msg.centerMsgBox();
+                if (option == MessageBox.YES_OPTION) {
+                        EventBus bus = ImViewerAgent.getRegistry().getEventBus();
+                        bus.post(new ViewImage(image, null));
+                }
         }
         
@@ -2514 +2536 @@
                 model.fireContainersLoading();
         }
-
+        
         /** 
          * Implemented as specified by the {@link ImViewer} interface.
@@ -2534 +2556 @@
                 if (projection.isApplySettings()) {
                         projection.setStatus("Applying Rendering settings", false);
-                        model.firePojectedRndSettingsCreation(indexes,
-                                        image.getDefaultPixels().getId());
+                        model.firePojectedRndSettingsCreation(indexes, image);
                         fireStateChange();
                 } else {
-                        message = "The projected image has been successfully created.";
-                        un.notifyInfo("Projection", message);
+                        notifyProjection("The projected image has been " +
+                                        "successfully created.", image);
                         projection.setVisible(false);
                         projection.dispose();
@@ -2548 +2569 @@
         /** 
          * Implemented as specified by the {@link ImViewer} interface.
-         * @see ImViewer#setProjectedRenderingSettings(Boolean)
-         */
-        public void setProjectedRenderingSettings(Boolean result)
-        {
-                UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+         * @see ImViewer#setProjectedRenderingSettings(Boolean, ImageData)
+         */
+        public void setProjectedRenderingSettings(Boolean result, ImageData image)
+        {
                 String message;
                 if (result)
-                        message = "The rendering setting of the projected image have " +
-                                        "been successfully copied.";
+                        message = "The projected image and the rendering settings \n have" +
+                                        " been successfully created.";
                 else
                         message = "An error has occurred while copying the " +
-                        "rendering setting of the projected image.";
-                un.notifyInfo("Projection", message);
+                        "rendering settings of the projected image.";
+                notifyProjection(message, image);
                 projection.setVisible(false);
                 projection.dispose();

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

@@ -1417 +1417 @@
          * for the pixels set.
          * 
-         * @param indexes  The indexes of the projected channels.
-         * @param pixelsID The id of the pixels set.
-         */
-        void firePojectedRndSettingsCreation(List<Integer> indexes, long pixelsID)
+         * @param indexes       The indexes of the projected channels.
+         * @param image         The projected image.
+         */
+        void firePojectedRndSettingsCreation(List<Integer> indexes, ImageData image)
         {
                 RndProxyDef def = currentRndControl.getRndSettingsCopy();
                 RenderingSettingsCreator l = new RenderingSettingsCreator(component, 
-                                pixelsID, def, indexes);
+                                image, def, indexes);
                 l.load();
         }