Changeset ebfe223 in sasview

Timestamp:

Aug 8, 2018 9:31:28 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_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cde0611

Parents:

03e04a4

Message:

Modified use of plot id to check existing plots.
Fixed padding for main param table
Shuffled initialization calls to minimize model updates.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

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

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -135 +135 @@
         self.initializeCategoryCombo()
 
+        # Initial control state
+        self.initializeControls()
+
+        QtWidgets.QApplication.processEvents()
+
         # Connect signals to controls
         self.initializeSignals()
-
-        # Initial control state
-        self.initializeControls()
 
         if data is not None:
@@ -325 +327 @@
             QTreeView::item {
                 border: 1px;
-                padding: 2px 15px;
+                padding: 2px 1px;
             }