Changeset 3db44fb in sasview for src/sas/guiframe

Timestamp:

Jun 7, 2015 9:33:19 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:

4b5fe655

Parents:

f06bbf5

Message:

1) Fixed second issue that was caused by the recent cleanup of
DocumentationWindow?: loading html at anchor point for context help
(broken). In order to preserve the cleanup, the class was refactored to
take another parameter: html instruction string. This keeps it general
to accept not only the # anchor but alos queries of all sorts in the
future. Thus all modules using this class were also edited to match.

2) in process of editing the dozen or so instances did a bit of code
cleanup and pylint cleanup.

Location:

src/sas/guiframe

Files:

• documentation_window.py (modified) (3 diffs)
• gui_manager.py (modified) (2 diffs)

src/sas/guiframe/documentation_window.py

@@ -15 +15 @@
 
 class DocumentationWindow(wx.Frame):
-    def __init__(self, parent, id, path, title, size=(850, 540)):
+    def __init__(self, parent, id, path, url_instruction, title, size=(850, 540)):
         wx.Frame.__init__(self, parent, id, title, size=size)
 
@@ -28 +28 @@
 
         file_path = os.path.join(docs_path, path)
-        url = "file:///" + urllib.quote(file_path,'\:')
+        url = "file:///" + urllib.quote(file_path,'\:')+ url_instruction
 
         if not os.path.exists(file_path):
@@ -48 +48 @@
 def main():
     app = wx.App()
-    DocumentationWindow(None, -1, "index.html", "Documentation",)
+    DocumentationWindow(None, -1, "index.html", "", "Documentation",)
     app.MainLoop()
 

src/sas/guiframe/gui_manager.py

@@ -44 +44 @@
 from sas.dataloader.loader import Loader
 from matplotlib import _pylab_helpers
+from documentation_window import DocumentationWindow
 
 def get_app_dir():
@@ -2165 +2166 @@
         # Running SasView "in-place" using run.py means the docs will be in a
         # different place than they would otherwise.
-        from documentation_window import DocumentationWindow
-        DocumentationWindow(self, -1, "index.html", "General Help")
+        DocumentationWindow(self, -1, "index.html", "", "SasView Documentation")
 
     def set_manager(self, manager):