Changeset 9f25bce in sasview

Timestamp:

Mar 31, 2017 9:32:19 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:

116260a

Parents:

4ff5e35

Message:

Towards more 1D plots responding to data change.
Minor bug fixes.

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (9 diffs)
• Plotter.py (modified) (1 diff)
• Plotter2D.py (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -967 +967 @@
         # Check if there are any other items for this tab
         # If so, delete them
+        # TODO: fix this to resemble GuiUtils.updateModelItemWithPlot
+        # 
         current_tab_name = model_item.text()[:2]
         for current_index in xrange(self.theory_model.rowCount()):

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

@@ -237 +237 @@
         self.cmdPlot.clicked.connect(self.onPlot)
         # Line edits
-        self.txtNpts.textChanged.connect(self.onNpts)
-        self.txtMinRange.textChanged.connect(self.onMinRange)
-        self.txtMaxRange.textChanged.connect(self.onMaxRange)
+        self.txtNpts.editingFinished.connect(self.onNpts)
+        self.txtMinRange.editingFinished.connect(self.onMinRange)
+        self.txtMaxRange.editingFinished.connect(self.onMaxRange)
 
         # Respond to change in parameters from the UI
@@ -366 +366 @@
         Plot the current set of data
         """
-        if self.data is None :#or not self.data.is_data:
+        if self.data is None :
             self.createDefaultDataset()
         self.calculateQGridForModel()
 
-    def onNpts(self, text):
+    #def onNpts(self, text):
+    def onNpts(self):
         """
         Callback for number of points line edit update
@@ -376 +377 @@
         # assumes type/value correctness achieved with QValidator
         try:
-            self.npts = int(text)
+            self.npts = int(self.txtNpts.text())
         except ValueError:
             # TODO
@@ -382 +383 @@
             # notifying the user about format available.
             pass
-
-    def onMinRange(self, text):
+        # Force redisplay
+        if self.model_is_loaded:
+            self.onPlot()
+
+    #def onMinRange(self, text):
+    def onMinRange(self):
         """
         Callback for minimum range of points line edit update
@@ -389 +394 @@
         # assumes type/value correctness achieved with QValidator
         try:
-            self.q_range_min = float(text)
+            self.q_range_min = float(self.txtMinRange.text())
         except ValueError:
             # TODO
@@ -397 +402 @@
         # set Q range labels on the main tab
         self.lblMinRangeDef.setText(str(self.q_range_min))
-
-    def onMaxRange(self, text):
+        if self.model_is_loaded:
+            self.onPlot()
+
+    #def onMaxRange(self, text):
+    def onMaxRange(self):
         """
         Callback for maximum range of points line edit update
@@ -404 +412 @@
         # assumes type/value correctness achieved with QValidator
         try:
-            self.q_range_max = float(text)
+            self.q_range_max = float(self.txtMaxRange.text())
         except:
             pass
         # set Q range labels on the main tab
         self.lblMaxRangeDef.setText(str(self.q_range_max))
+        if self.model_is_loaded:
+            self.onPlot()
 
     def setDefaultStructureCombo(self):
@@ -633 +643 @@
         # Notify the GUI manager so it can update the main model in DataExplorer
         GuiUtils.updateModelItemWithPlot(self._index, QtCore.QVariant(fitted_data), name)
-        # Force redisplay
 
     def createTheoryIndex(self, fitted_data):
@@ -712 +721 @@
             residuals_plot.id = "Residual " + residuals_plot.id
             self.createNewIndex(residuals_plot)
+            self.communicate.plotUpdateSignal.emit([residuals_plot])
 
         self.communicate.plotUpdateSignal.emit([fitted_data])

src/sas/qtgui/Plotter.py

@@ -572 +572 @@
 
         #if self.leftdown and self.selectedText is not None:
-        if self.leftdown or self.selectedText is None:
+        if not self.leftdown or self.selectedText is None:
             return
         # User has clicked on text and is dragging
-        if event.inaxes is  None:
+        if event.inaxes is None:
             # User has dragged outside of axes
             self.selectedText = None

src/sas/qtgui/Plotter2D.py

@@ -277 +277 @@
         variant_plot = QtCore.QVariant(new_plot)
         GuiUtils.updateModelItemWithPlot(self._item, variant_plot, new_plot.id)
-        # TODO: force immediate display (?)
 
     def setSlicer(self, slicer):