Changeset 57b7ee2 in sasview for src/sas/qtgui/Plotter2D.py

Timestamp:

Feb 9, 2017 8:07:05 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

9a05a8d5

Parents:

bda1faa7

Message:

Code review changes for Slicer Parameter Editor

File:

• src/sas/qtgui/Plotter2D.py (modified) (5 diffs)

src/sas/qtgui/Plotter2D.py

@@ -45 +45 @@
         # Reference to the current slicer
         self.slicer = None
+        self.slicer_widget = None
         # Create Artist and bind it
         self.connect = BindArtist(self.figure)
@@ -160 +161 @@
             self.actionClearSlicer = self.contextMenu.addAction("&Clear Slicer")
             self.actionClearSlicer.triggered.connect(self.onClearSlicer)
-            self.actionEditSlicer = self.contextMenu.addAction("&Edit Slicer Parameters")
-            self.actionEditSlicer.triggered.connect(self.onEditSlicer)
+            if self.slicer.__class__.__name__ != "BoxSumCalculator":
+                self.actionEditSlicer = self.contextMenu.addAction("&Edit Slicer Parameters")
+                self.actionEditSlicer.triggered.connect(self.onEditSlicer)
         self.contextMenu.addSeparator()
         self.actionColorMap = self.contextMenu.addAction("&2D Color Map")
@@ -213 +215 @@
         """
         assert self.slicer
+        # Only show the dialog if not currently shown
+        if self.slicer_widget:
+            return
+        def slicer_closed():
+            # Need to disconnect the signal!!
+            self.slicer_widget.close_signal.disconnect()
+            # reset slicer_widget on "Edit Slicer Parameters" window close
+            self.slicer_widget = None
 
         self.param_model = self.slicer.model()
-         # Pass the model to the Slicer Parameters widget
+        # Pass the model to the Slicer Parameters widget
         self.slicer_widget = SlicerParameters(self, model=self.param_model)
-        self.manager.parent.workspace().addWindow(self.slicer_widget)
+        self.slicer_widget.close_signal.connect(slicer_closed)
 
         self.slicer_widget.show()
@@ -283 +293 @@
         self.slicer.update()
 
+        # Reset the model on the Edit slicer parameters widget
+        self.param_model = self.slicer.model()
+        if self.slicer_widget:
+            self.slicer_widget.setModel(self.param_model)
+
+
     def onSectorView(self):
         """
@@ -288 +304 @@
         """
         self.setSlicer(slicer=SectorInteractor)
+
 
     def onAnnulusView(self):