Changeset f2f5413 in sasmodels

Timestamp:

Apr 14, 2017 8:48:18 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, 630156b

Parents:

63a7fe8

Message:

allow viewing of rst or html files with qt/wx

File:

• sasmodels/rst2html.py (modified) (3 diffs)

sasmodels/rst2html.py

@@ -155 +155 @@
     return frame
 
+def view_html_wxapp(html, url=""):
+    import wx  # type: ignore
+    app = wx.App()
+    frame = wxview(html, url)
+    app.MainLoop()
+
+def view_url_wxapp(url):
+    import wx  # type: ignore
+    from wx.html2 import WebView
+    app = wx.App()
+    frame = wx.Frame(None, -1, size=(850, 540))
+    view = WebView.New(frame)
+    view.LoadURL(url)
+    frame.Show()
+    app.MainLoop()
+
 def qtview(html, url=""):
     try:
@@ -167 +183 @@
     return helpView
 
-def view_html_wxapp(html, url=""):
-    import wx  # type: ignore
-    app = wx.App()
-    frame = wxview(html, url)
-    app.MainLoop()
-
 def view_html_qtapp(html, url=""):
     import sys
@@ -183 +193 @@
     sys.exit(app.exec_())
 
-def view_rst_app(filename, qt=False):
+def view_url_qtapp(url):
+    import sys
+    try:
+        from PyQt5.QtWidgets import QApplication
+    except ImportError:
+        from PyQt4.QtGui import QApplication
+    app = QApplication([])
+    try:
+        from PyQt5.QtWebKitWidgets import QWebView
+        from PyQt5.QtCore import QUrl
+    except ImportError:
+        from PyQt4.QtWebkit import QWebView
+        from PyQt4.QtCore import QUrl
+    frame = QWebView()
+    frame.load(QUrl(url))
+    frame.show()
+    sys.exit(app.exec_())
+
+def view_help(filename, qt=False):
     import os
-    html = load_rst_as_html(filename)
-    url="file://"+os.path.abspath(filename)+"/"
-    if qt:
-        view_html_qtapp(html, url)
+    url="file:///"+os.path.abspath(filename).replace("\\","/")
+    if filename.endswith('.rst'):
+        html = load_rst_as_html(filename)
+        if qt:
+            view_html_qtapp(html, url)
+        else:
+            view_html_wxapp(html, url)
     else:
-        view_html_wxapp(html, url)
+        if qt:
+            view_url_qtapp(url)
+        else:
+            view_url_wxapp(url)
 
 if __name__ == "__main__":
     import sys
-    view_rst_app(sys.argv[1], qt=True)
-
+    view_help(sys.argv[1], qt=True)
+