Changeset 2e27cdb6 in sasview

Timestamp:

May 16, 2018 7:03:21 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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

Children:

976978b

Parents:

b12404e

git-author:

Piotr Rozyczko <rozyczko@…> (05/16/18 05:50:24)

git-committer:

Piotr Rozyczko <rozyczko@…> (05/16/18 07:03:21)

Message:

Fixed runtime UI conversion

Files:

• run.py (modified) (1 diff)
• src/sas/qtgui/convertUI.py (modified) (2 diffs, 1 prop)

run.py

@@ -141 +141 @@
     sys.path.append(build_path)
 
-    # Run the UI conversion tool
-    import sas.qtgui.convertUI
+    # Run the UI conversion tool if executed from script
+    if os.path.splitext(sys.argv[0])[1].lower() == ".py":
+        import sas.qtgui.convertUI
 
 

src/sas/qtgui/convertUI.py

@@ -1 +1 @@
 # Convert all .ui files in all subdirectories of the current script
 import os
+import sys
 
 def pyrrc(in_file, out_file):
@@ -21 +22 @@
 
 # RC file in UI directory
-ui_root = 'UI'
+execute_root = os.path.split(sys.modules[__name__].__file__)[0]
+ui_root = os.path.join(execute_root, 'UI')
 rc_file = 'main_resources.qrc'
 out_file = 'main_resources_rc.py'
+
 pyrrc(os.path.join(ui_root, rc_file), os.path.join(ui_root, out_file))
 
 # Images
-images_root = 'images'
+images_root = os.path.join(execute_root, 'images')
 rc_file = 'images.qrc'
 out_file = 'images_rc.py'
-pyrrc(os.path.join(images_root, rc_file), os.path.join(ui_root, out_file))
+pyrrc(os.path.join(images_root, rc_file), os.path.join(images_root, out_file))