Changeset 12db2db6 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Sep 7, 2018 10:25:19 AM (6 years ago)

Author:

Laura Forster <Awork@…>

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:

2f14b5d, 0101c9f

Parents:

339e22b (diff), f0365a2e (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 branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (3 diffs)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -560 +560 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-        ids_keys = list(self.active_plots.keys())
-        ids_vals = [val.data.id for val in self.active_plots.values()]
 
         new_plots = []
         for item, plot in plots.items():
-            plot_id = plot.id
-            if plot_id in ids_keys:
-                self.active_plots[plot_id].replacePlot(plot_id, plot)
-            elif plot_id in ids_vals:
-                list(self.active_plots.values())[ids_vals.index(plot_id)].replacePlot(plot_id, plot)
-            else:
+            if not self.updatePlot(plot):
                 # Don't plot intermediate results, e.g. P(Q), S(Q)
-                match = GuiUtils.theory_plot_ID_pattern.match(plot_id)
+                match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
                 # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
                 if match and match.groups()[1] != None:
@@ -706 +699 @@
                 self.active_plots[plot_set.id] = old_plot
 
-    def updatePlot(self, new_data):
-        """
-        Modify existing plot for immediate response
-        """
-        data = new_data[0]
+    def updatePlot(self, data):
+        """
+        Modify existing plot for immediate response and returns True.
+        Returns false, if the plot does not exist already.
+        """
+        try: # there might be a list or a single value being passed
+            data = data[0]
+        except TypeError:
+            pass
         assert type(data).__name__ in ['Data1D', 'Data2D']
 
@@ -719 +716 @@
         if data_id in ids_keys:
             self.active_plots[data_id].replacePlot(data_id, data)
+            return True
         elif data_id in ids_vals:
             list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
+            return True
+        return False
 
     def chooseFiles(self):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -422 +422 @@
         self._workspace.actionExcel.triggered.connect(self.actionExcel)
         self._workspace.actionLatex.triggered.connect(self.actionLatex)
-
         # View
         self._workspace.actionShow_Grid_Window.triggered.connect(self.actionShow_Grid_Window)
@@ -452 +451 @@
         self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models)
         self._workspace.actionAddMult_Models.triggered.connect(self.actionAddMult_Models)
+        self._workspace.actionEditMask.triggered.connect(self.actionEditMask)
+
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
@@ -781 +782 @@
         self.add_mult_editor.show()
 
+    def actionEditMask(self):
+
+        self.communicate.extMaskEditorSignal.emit()
+
     #============ ANALYSIS =================
     def actionFitting(self):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -113 +113 @@
     <addaction name="actionManage_Custom_Models"/>
     <addaction name="actionAddMult_Models"/>
+    <addaction name="separator"/>
+    <addaction name="EditMask"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -413 +415 @@
    </property>
   </action>
+    <action name="EditMask">
+   <property name="text">
+    <string>Edit Mask</string>
+   </property>
+  </action>
   <action name="actionCascade">
    <property name="text">