Changeset 80013a6 in sasmodels

Timestamp:

Sep 12, 2016 12:40:05 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

41e7f2e

Parents:

2e49f9e

Message:

allow 'edit' option when comparing precision, giving sliders for the parameter values

File:

• sasmodels/compare.py (modified) (2 diffs)

sasmodels/compare.py

@@ -958 +958 @@
     from bumps.gui.app_frame import AppFrame  # type: ignore
 
+    is_mac = "cocoa" in wx.version()
+    # Create an app if not running embedded
+    app = wx.App() if wx.GetApp() is None else None
     problem = FitProblem(Explore(opts))
-    is_mac = "cocoa" in wx.version()
-    app = wx.App()
-    frame = AppFrame(parent=None, title="explore")
+    frame = AppFrame(parent=None, title="explore", size=(1000,700))
     if not is_mac: frame.Show()
     frame.panel.set_model(model=problem)
@@ -967 +968 @@
     frame.panel.aui.Split(0, wx.TOP)
     if is_mac: frame.Show()
-    app.MainLoop()
+    # If running withing an app, start the main loop
+    if app: app.MainLoop()
 
 class Explore(object):