Changeset 4380c03 in sasview

Timestamp:

Feb 18, 2015 9:49:10 AM (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:

82221a9e

Parents:

69032d4

Message:

magnetic angles help now points to new documentation

File:

• src/sas/perspectives/fitting/basepage.py (modified) (2 diffs)

src/sas/perspectives/fitting/basepage.py

@@ -2963 +2963 @@
     def _on_mag_help(self, event):    
         """
-        Magnetic angles help panel
-        """
-        from sas.perspectives.fitting.help_panel import  HelpWindow
-        # Get models help model_function path
-        #import sas.perspectives.fitting as fitmedia
-        from sas.models import get_data_path
-
-        media = get_data_path(media='media')
-        path = os.path.join(media, "mag_pic.html") 
-        name = "Polar/Magnetic Angles"
-        frame = HelpWindow(None, -1,  
-                           title=' Help: Polarization/Magnetization Angles',  
-                           pageToOpen=path, size=(865, 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 Magnetic Angle definition bmp image whenever the ? button 
+        is clicked. Calls DocumentationWindow with the path of the location 
+        within the documentation tree (after /doc/ ....". When using old 
+        versions of Wx When (i.e. before 2.9 and therefore not part of release
+        versions distributed via installer) it brings up an image viewer
+        box which allows the user to click through the rest of the images in 
+        the directory.  Not ideal but probably better than alternative which
+        would bring up the entire discussion of how magnetic models work? 
+        Specially since it is not likely to be accessed.  The normal release
+        versions bring up the normal image box.
+        
+        :param evt: Triggers on clicking ? in Magnetic Angles? box
+        """
+        
+        from sas.guiframe.documentation_window import DocumentationWindow
+        
+        _TreeLocation = "_images/M_angles_pic.bmp"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Magnetic Angle Defintions")
+ 
     def _on_mag_on(self, event):    
         """
@@ -3018 +3014 @@
     def on_pd_help_clicked(self, event):
         """
-        Bring up Polydispersit Documentation whenever the ? button is clicked. 
+        Bring up Polydispersity Documentation whenever the ? button is clicked. 
         Calls DocumentationWindow with the path of the location within the
-        documentation tree (after /doc/ ...."
+        documentation tree (after /doc/ ....".  Note that when using old 
+        versions of Wx (before 2.9) and thus not the release version of 
+        istallers, the help comes up at the top level of the file as 
+        webbrowser does not pass anything past the # to the browser when it is
+        running "file:///...."
         
         :param evt: Triggers on clicking ? in polydispersity box