Changeset 158a0c7 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jul 13, 2018 2:24:30 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Children:

41d6187

Parents:

5dba493 (diff), ecbfddd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge useful commits from ESS_GUI

• commit 'ecbfddd': add VS files, stackdumps to gitignore check whether .py files are outdated before generating them from .ui or .qrc files (huge startup speed-up) Update version number to 5.0 - SASVIEW-949 CR: Deleting a single dataitem child will close the corresponding plot (SASVIEW-958) corrections to GUITests doc add documentation to GUITests

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• MainWindow.py (modified) (1 diff)

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/MainWindow/MainWindow.py

@@ -10 +10 @@
 from sas.qtgui.UI import main_resources_rc
 from .UI.MainWindowUI import Ui_MainWindow
-
-# Initialize logging
-import sas.qtgui.Utilities.SasviewLogger
 
 class MainSasViewWindow(QMainWindow, Ui_MainWindow):