Changeset 4748

Timestamp:

02/08/07 17:15:25 (22 months ago)

Author:

jburel

Message:

Fixed timeout problem and problem when user minimizes the Viewer

Location:

trunk

Files:

• OMERO.insight_Changelogs.txt (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/imviewer/rnd/RendererControl.java (modified) (5 diffs)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/DOBasic.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/EditorUI.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/EditorUtil.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (1 diff)

trunk/OMERO.insight_Changelogs.txt

@@ -7 +7 @@
   maintained at an OMERO server site. OMERO.insight is completely written in 
   Java.
+--------------------------------------------------------------------------------
+Last updated: 08/02/2007
+Version: Beta 1.1
+
+Changes: 
+ - Container/Viewer: Handle timeout problems of Thumbnail service and rendering
+ service.cf. ticket#235
+ - Viewer: Iconify/de-iconify issue cf. ticket#236
 --------------------------------------------------------------------------------
 Last updated: 23/01/2007

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/rnd/RendererControl.java

@@ -46 +46 @@
 import org.openmicroscopy.shoola.agents.imviewer.actions.ResetSettingsAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.ReverseIntensityAction;
+import org.openmicroscopy.shoola.agents.imviewer.actions.RndAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.SaveSettingsAction;
 import org.openmicroscopy.shoola.agents.imviewer.util.ChannelToggleButton;
@@ -106 +107 @@
      * is regarded as the Model.
      */
-    private Renderer    model;
+    private Renderer                            model;
     
     /** Reference to the View. */
-    private RendererUI  view;
+    private RendererUI                          view;
     
     /** Maps actions ids onto actual <code>Action</code> object. */
-    private Map         actionsMap;
+    private Map<Integer, RndAction>     actionsMap;
+    
+    /**
+     * Flag indicating if the node was visible or not.
+     */
+    private boolean             visibility;
     
     /** Helper method to create all the UI actions. */
@@ -138 +144 @@
             public void windowClosing(WindowEvent e)
             {
+                visibility = false;
                 view.setVisible(false);
             }
@@ -151 +158 @@
     RendererControl()
     {
-        actionsMap = new HashMap();
+        actionsMap = new HashMap<Integer, RndAction>();
     }
     
@@ -257 +264 @@
             model.setSelectedChannel(v);
         } else if (name.equals(ImViewer.ICONIFIED_PROPERTY)) {
-            if (((Boolean) evt.getNewValue()).booleanValue()) view.iconify();
-            //else view.deIconify();
+            if (((Boolean) evt.getNewValue()).booleanValue()) {
+                if (view.isVisible()) {
+                        visibility = true;
+                }
+                view.setVisible(false);
+                //view.iconify();
+            } else {
+                if (visibility) view.setVisible(true);
+                //if (view.getExtendedState() == Frame.ICONIFIED)
+                //      view.deIconify();
+            }
+                //if (view.isVisible()) view.setVisible(false);
         } else if (name.equals(Renderer.INPUT_INTERVAL_PROPERTY)) {
             view.setInputInterval();

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/DOBasic.java

@@ -272 +272 @@
         setLayout(new BorderLayout());
         add(buildContentPanel(), BorderLayout.NORTH);
-        if (model.isAnnotatable()) 
+        if (model.isAnnotatable() && 
+                        model.getEditorType() == Editor.PROPERTIES_EDITOR) 
             add(tabbedPane, BorderLayout.CENTER);
     }

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/EditorUI.java

@@ -717 +717 @@
                 if (c instanceof DOInfo && ho instanceof ImageData) {
                     ImageData img = (ImageData) ho;
-                    Map details = 
-                        EditorUtil.transformPixelsData(img.getDefaultPixels());
+                    Map<String, String> details = 
+                         EditorUtil.transformPixelsData(img.getDefaultPixels());
                     List waves = model.getChannelsData();
                     if (waves == null) return;

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/editors/EditorUtil.java

@@ -104 +104 @@
      *                  the corresponding fields' values.
      */
-    static Map transformExperimenterData(ExperimenterData data)
+    static Map<String, String> transformExperimenterData(ExperimenterData data)
     {
-        LinkedHashMap details = new LinkedHashMap(3);
+        LinkedHashMap<String, String> details = 
+                                                                new LinkedHashMap<String, String>(3);
         if (data == null) {
             details.put(NAME, "");
@@ -134 +135 @@
      *                  the corresponding fields' values.
      */
-    static Map transformPixelsData(PixelsData data)
+    static Map<String, String> transformPixelsData(PixelsData data)
     {
-        LinkedHashMap details = new LinkedHashMap(9);
+        LinkedHashMap<String, String> details = 
+                                                        new LinkedHashMap<String, String>(9);
         if (data == null) {
             details.put(SIZE_X, "");
@@ -176 +178 @@
      *                  the corresponding fields' values.
      */
-    static Map transformGroup(GroupData data)
+    static Map<String, String> transformGroup(GroupData data)
     {
-        HashMap details = new HashMap(2);
+        HashMap<String, String> details = new HashMap<String, String>(2);
         if (data == null) {
             details.put(NAME, "");

trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -875 +875 @@
                                                 new Integer(sizeY));
         } catch (Throwable t) {
-                if (t instanceof EJBException | t instanceof RuntimeException) {
+                if (t instanceof EJBException || 
+                                t.getCause() instanceof IllegalStateException) {
                         thumbnailService = null;
                         throw new DSOutOfServiceException(