Changeset d90f91b in sasview for src/sas/perspectives/calculator

Timestamp:

Feb 18, 2015 5:10:32 PM (10 years ago)

Author:

butler

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cbe8c5c

Parents:

7d32aaf

Message:

Fix Image Viewer Help to point to new documentation. I believe this is
the last place that help is called from current GUI.

File:

• src/sas/perspectives/calculator/image_viewer.py (modified) (2 diffs)

src/sas/perspectives/calculator/image_viewer.py

@@ -16 +16 @@
 from sas.dataloader.data_info import Detector
 from sas.dataloader.manipulations import reader2D_converter
+from sas.guiframe.documentation_window import DocumentationWindow
+
 _BOX_WIDTH = 60
 IS_WIN = True
@@ -138 +140 @@
 
     def on_help(self, event):    
-        """
-        Image Viewer help panel
-        """
-        from sas.perspectives.calculator.help_panel import  HelpWindow
-        # Get models help model_function path
-        import sas.perspectives.calculator as calmedia
-
-        media = calmedia.get_data_path(media='media')
-        path = os.path.join(media,"load_image_help.html") 
-        name = "Image Viewer"
-        frame = HelpWindow(self, -1, title=' Help: Image Viewer',  
-                           pageToOpen=path, size=(640, 450))   
-        try: 
-            frame.splitter.DetachWindow(frame.lpanel)
-            # Display only the right side one
-            frame.lpanel.Hide() 
-            frame.Show(True)
-        except:
-            frame.Destroy() 
-            msg = 'Display Error\n'
-            info = "Info"
-            wx.MessageBox(msg, info)
+        """       
+        Bring up Image Viewer Documentation from the image viewer window 
+        whenever the help menu item "how to" is clicked. Calls 
+        DocumentationWindow with the path of the location within the
+        documentation tree (after /doc/ ....".  
+        
+        :param evt: Triggers on clicking "how to" in help menu
+        """
+                
+        _TreeLocation = "user/perspectives/calculator/image_viewer_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Image Viewer Help")
+        
             
 class SetDialog(wx.Dialog):