Changeset c4e3215 in sasmodels

Timestamp:

Apr 4, 2017 5:26:07 PM (8 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, 01e551a

Parents:

f68e2a5

Message:

sascomp: use qt to render -html (mathjax+qt works better on Windows)

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• generate.py (modified) (1 diff)
• rst2html.py (modified) (2 diffs)

sasmodels/compare.py

@@ -1150 +1150 @@
     show html docs for the model
     """
-    import wx  # type: ignore
-    from .generate import view_html_from_info
-    app = wx.App() if wx.GetApp() is None else None
-    view_html_from_info(opts['def'][0])
-    if app: app.MainLoop()
-
+    import os
+    from .generate import make_html
+    from . import rst2html
+
+    info = opts['def'][0]
+    html = make_html(info)
+    path = os.path.dirname(info.filename)
+    url = "file://"+path.replace("\\","/")[2:]+"/"
+    rst2html.view_html_qtapp(html, url)
 
 def explore(opts):

sasmodels/generate.py

@@ -928 +928 @@
     from . import rst2html
     url = "file://"+dirname(info.filename)+"/"
-    rst2html.wxview(make_html(info), url=url)
+    rst2html.view_html(make_html(info), url=url)
 
 def demo_time():

sasmodels/rst2html.py

@@ -29 +29 @@
 from docutils.writers.html4css1 import HTMLTranslator
 from docutils.nodes import SkipNode
-
-def wxview(html, url="", size=(850, 540)):
-    import wx
-    from wx.html2 import WebView
-    frame = wx.Frame(None, -1, size=size)
-    view = WebView.New(frame)
-    view.SetPage(html, url)
-    frame.Show()
-    return frame
-
-def view_rst(filename):
-    from os.path import expanduser
-    with open(expanduser(filename)) as fid:
-        rst = fid.read()
-    html = rst2html(rst)
-    wxview(html)
 
 def rst2html(rst, part="whole", math_output="mathjax"):
@@ -155 +139 @@
     assert replace_dollar(u"a (again $in parens$) a") == u"a (again :math:`in parens`) a"
 
-def view_rst_app(filename):
+def load_rst_as_html(filename):
+    from os.path import expanduser
+    with open(expanduser(filename)) as fid:
+        rst = fid.read()
+    html = rst2html(rst)
+    return html
+
+def wxview(html, url="", size=(850, 540)):
+    import wx
+    from wx.html2 import WebView
+    frame = wx.Frame(None, -1, size=size)
+    view = WebView.New(frame)
+    view.SetPage(html, url)
+    frame.Show()
+    return frame
+
+def qtview(html, url=""):
+    try:
+        from PyQt5.QtWebKitWidgets import QWebView
+        from PyQt5.QtCore import QUrl
+    except ImportError:
+        from PyQt4.QtWebkit import QWebView
+        from PyQt4.QtCore import QUrl
+    helpView = QWebView()
+    helpView.setHtml(html, QUrl(url))
+    helpView.show()
+    return helpView
+
+def view_html_wxapp(html, url=""):
     import wx  # type: ignore
     app = wx.App()
-    view_rst(filename)
+    frame = wxview(html, url)
     app.MainLoop()
 
+def view_html_qtapp(html, url=""):
+    import sys
+    try:
+        from PyQt5.QtWidgets import QApplication
+    except ImportError:
+        from PyQt4.QtGui import QApplication
+    app = QApplication([])
+    frame = qtview(html, url)
+    sys.exit(app.exec_())
+
+def view_rst_app(filename, qt=False):
+    import os
+    html = load_rst_as_html(filename)
+    url="file://"+os.path.abspath(filename)+"/"
+    if qt:
+        view_html_qtapp(html, url)
+    else:
+        view_html_wxapp(html, url)
 
 if __name__ == "__main__":
     import sys
-    view_rst_app(sys.argv[1])
+    view_rst_app(sys.argv[1], qt=True)