Changes in / [5dba493:158a0c7] in sasview

Files:

• .gitignore (modified) (2 diffs)
• src/sas/qtgui/GUITests.py (modified) (1 diff)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (1 diff)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (3 diffs)
• src/sas/qtgui/convertUI.py (modified) (4 diffs)
• src/sas/sasview/__init__.py (modified) (1 diff)

.gitignore

@@ -10 +10 @@
 # Feel free to add more stuff to this as and when it becomes an issue.
 
+# stack dumps due to Git Bash internal crashes
+*.stackdump
+
 # Editor files
+*.pyproj
 .DS_Store
 /.settings
@@ -17 +21 @@
 /.pydevproject
 /.idea
+/.vs
 
 # Build and run files

src/sas/qtgui/GUITests.py

@@ -3 +3 @@
 from PyQt5 import QtGui
 from PyQt5 import QtWidgets
+
+"""
+Unit tests for the QT GUI
+=========================
+
+In order to run the tests, first install SasView and sasmodels to site-packages
+by running ``python setup.py install`` in both repositories.
+
+The tests can be run with ``python GUITests.py``, or to get more verbose
+console output (recommended), use ``python GUITests.py -v``.
+"""
 
 # Prepare the general QApplication instance

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -496 +496 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-        item = GuiUtils.itemFromFilename(filename, model)
 
         new_plots = []
-        for plot in plots:
+        for item, plot in plots.items():
             plot_id = plot.id
             if plot_id in list(self.active_plots.keys()):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -415 +415 @@
     assert isinstance(filename, str)
 
-    plot_data = []
+    plot_data = {}
     # Iterate over model looking for named items
     for index in range(model_item.rowCount()):
@@ -421 +421 @@
         if str(item.text()) == filename:
             # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append(item.child(0).data())
+            plot_data[item] = item.child(0).data()
             # Going 1 level deeper only
             for index_2 in range(item.rowCount()):
@@ -427 +427 @@
                 if item_2 and item_2.isCheckable():
                     # TODO: assure item type is correct (either data1/2D or Plotter)
-                    plot_data.append(item_2.child(0).data())
+                    plot_data[item_2] = item_2.child(0).data()
 
     return plot_data

src/sas/qtgui/convertUI.py

@@ -13 +13 @@
     os.system(execute)
 
+def file_in_newer(file_in, file_out):
+    """
+    Check whether file_in is newer than file_out, if file_out exists.
+
+    Returns True if file_in is newer, or if file_out doesn't exist; False
+    otherwise.
+    """
+    try:
+        out_stat = os.stat(file_out)
+    except OSError:
+        # file_out does not exist
+        return True
+
+    in_stat = os.stat(file_in)
+
+    # simple comparison of modification time
+    return in_stat.st_mtime >= out_stat.st_mtime
+
 # look for .ui files
 for root, dirs, files in os.walk("."):
@@ -19 +37 @@
             file_in = os.path.join(root, file)
             file_out = os.path.splitext(file_in)[0]+'.py'
-            pyuic(file_in, file_out)
+            if file_in_newer(file_in, file_out):
+                print("Generating " + file_out + " ...")
+                pyuic(file_in, file_out)
 
 # RC file in UI directory
@@ -27 +47 @@
 out_file = 'main_resources_rc.py'
 
-pyrrc(os.path.join(ui_root, rc_file), os.path.join(ui_root, out_file))
+in_file = os.path.join(ui_root, rc_file)
+out_file = os.path.join(ui_root, out_file)
+
+if file_in_newer(in_file, out_file):
+    print("Generating " + out_file + " ...")
+    pyrrc(in_file, out_file)
 
 # Images
@@ -34 +59 @@
 rc_file = 'images.qrc'
 out_file = 'images_rc.py'
-pyrrc(os.path.join(images_root, rc_file), os.path.join(out_root, out_file))
+
+in_file = os.path.join(images_root, rc_file)
+out_file = os.path.join(ui_root, out_file)
+
+if file_in_newer(in_file, out_file):
+    print("Generating " + out_file + " ...")
+    pyrrc(in_file, out_file)
+

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.1"
+__version__ = "5.0"
 __build__ = "GIT_COMMIT"