Changeset 90662e6 in sasview

Timestamp:

Jun 5, 2015 9:22:28 AM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

41eee5f

Parents:

5ac0a7a

Message:

Minor clean up to understand what's going on

File:

• src/sas/guiframe/documentation_window.py (modified) (4 diffs)

src/sas/guiframe/documentation_window.py

@@ -2 +2 @@
 import logging
 import wx
-from wx import Frame
 import webbrowser
-wx_supports_html2 = float(wx.__version__[:3]) >= 2.9
-if wx_supports_html2:
+
+wx_supports_html2 = True
+try:
     import wx.html2 as html
-else:
-    import wx.html as html
+except:
+    wx_supports_html2 = False
+
 from gui_manager import get_app_dir
 
-PATH_APP = get_app_dir() 
 
-class DocumentationWindow(Frame):
+class DocumentationWindow(wx.Frame):
     def __init__(self, parent, id, path, title, size=(850, 540)):
-        Frame.__init__(self, parent, id, title, size=size)
+        wx.Frame.__init__(self, parent, id, title, size=size)
 
         SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
@@ -24 +24 @@
             # bothering to worry about docs when running using the old
             # (non - run.py) way.
-            docs_path = os.path.join(PATH_APP, "doc")
+            docs_path = os.path.join(get_app_dir(), "doc")
 
         file_path = "file:///" + docs_path + "/" + path
 
-        if not os.path.exists(docs_path):
+        if not os.path.exists(file_path):
             logging.error("Could not find Sphinx documentation at %s \
-            -- has it been built?", docs_path)
+            -- has it been built?", file_path)
         elif wx_supports_html2:
             # Complete HTML/CSS support!
@@ -37 +37 @@
             self.Show()
         else: 
+            logging.error("No html2 support, popping up a web browser")
             #For cases that do not build against current version dependency
             # Wx 3.0 we provide a webbrowser call - this is particularly for 
@@ -43 +44 @@
             webbrowser.open_new_tab(file_path)
 
- 
+def main():
+    app = wx.App()
+    DocumentationWindow(None, -1, "index.html", "Documentation",)
+    app.MainLoop()
+
+if __name__ == '__main__':
+    main()