Changeset 2ecb0a5 in sasview

Timestamp:

Sep 20, 2017 7:23:28 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6e50a8d

Parents:

e75de07

Message:

run without gui if run.py includes a script file; include tinycc path on windows

File:

• run.py (modified) (2 diffs)

run.py

@@ -103 +103 @@
         addpath(joinpath(root, '..', 'bumps'))
 
+    try:
+        import tinycc
+    except:
+        addpath(joinpath(root, '../tinycc/build/lib'))
+
     # select wx version
     #addpath(os.path.join(root, '..','wxPython-src-3.0.0.0','wxPython'))
@@ -174 +179 @@
     get_logger().debug("Starting SASVIEW in debug mode.")
     prepare()
-    from sas.sasview.sasview import run_gui
-    run_gui()
+    from sas.sasview.sasview import run_cli, run_gui
+    if len(sys.argv) == 1:
+        run_gui()
+    else:
+        run_cli()
     get_logger().debug("Ending SASVIEW in debug mode.")