Changeset 570a58f9 in sasview

Timestamp:

Jan 6, 2017 3:40:05 AM (8 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:

fed94a2

Parents:

aadf0af1

git-author:

Piotr Rozyczko <rozyczko@…> (01/06/17 03:31:10)

git-committer:

Piotr Rozyczko <rozyczko@…> (01/06/17 03:40:05)

Message:

Linear fits for 1D charts

Location:

src/sas/qtgui

Files:

• GuiUtils.py (modified) (1 diff)
• LinearFit.py (added)
• Plotter.py (modified) (10 diffs)
• PlotterBase.py (modified) (3 diffs)
• UI/LinearFitUI.ui (added)

src/sas/qtgui/GuiUtils.py

@@ -693 +693 @@
     """
     return item.child(0).data().toPyObject()
+
+def formatNumber(value, high=False):
+    """
+    Return a float in a standardized, human-readable formatted string.
+    This is used to output readable (e.g. x.xxxe-y) values to the panel.
+    """
+    try:
+        value = float(value)
+    except:
+        output = "NaN"
+        return output.lstrip().rstrip()
+
+    if high:
+        output = "%-6.4g" % value
+
+    else:
+        output = "%-5.3g" % value
+    return output.lstrip().rstrip()

src/sas/qtgui/Plotter.py

@@ -12 +12 @@
 from sas.qtgui.AddText import AddText
 from sas.qtgui.SetGraphRange import SetGraphRange
+from sas.qtgui.LinearFit import LinearFit
 
 class PlotterWidget(PlotterBase):
@@ -19 +20 @@
     def __init__(self, parent=None, manager=None, quickplot=False):
         super(PlotterWidget, self).__init__(parent, manager=manager, quickplot=quickplot)
+
         self.parent = parent
         self.addText = AddText(self)
@@ -27 +29 @@
         # Simple window for data display
         self.txt_widget = QtGui.QTextEdit(None)
+
+        self.xLogLabel = "log10(x)"
+        self.yLogLabel = "log10(y)"
+
+        # Data container for the linear fit
+        self.fit_result = Data1D(x=[], y=[], dy=None)
+        self.fit_result.symbol = 13
+        self.fit_result.name = "Fit"
+
+        # Add a slot for receiving update signal from LinearFit
+        # NEW style signals - don't work!
+        #self.updatePlot = QtCore.pyqtSignal(tuple)
+        #self.updatePlot.connect(self.updateWithData)
+        # OLD style signals - work perfectly
+        QtCore.QObject.connect(self, QtCore.SIGNAL('updatePlot'), self.onFitDisplay)
 
     @property
@@ -48 +65 @@
             self.data = data
         assert(self._data)
+
+        is_fit = (self._data.id=="fit")
 
         # Shortcut for an axis
@@ -87 +106 @@
 
         # Current labels for axes
-        ax.set_ylabel(self.y_label)
-        ax.set_xlabel(self.x_label)
+        if self.y_label and not is_fit:
+            ax.set_ylabel(self.y_label)
+        if self.x_label and not is_fit:
+            ax.set_xlabel(self.x_label)
 
         # Title only for regular charts
-        if not self.quickplot:
+        if not self.quickplot and not is_fit:
             ax.set_title(label=self._title)
 
@@ -161 +182 @@
             if plot.id != 'fit':
                 self.actionLinearFit = plot_menu.addAction('&Linear Fit')
-                self.actionLinearFit.triggered.connect(self.onLinearFit)
+                self.actionLinearFit.triggered.connect(
+                                functools.partial(self.onLinearFit, id))
                 plot_menu.addSeparator()
 
@@ -209 +231 @@
         """
         if self.properties.exec_() == QtGui.QDialog.Accepted:
-            xLabel, yLabel = self.properties.getValues()
-            self.xyTransform(xLabel, yLabel)
+            self.xLogLabel, self.yLogLabel = self.properties.getValues()
+            self.xyTransform(self.xLogLabel, self.yLogLabel)
 
     def onModifyGraph(self):
@@ -319 +341 @@
         GuiUtils.saveData1D(plot_data)
 
-    def onLinearFit(self):
+    def onLinearFit(self, id):
         """
         Creates and displays a simple linear fit for the selected plot
         """
-        pass
+        selected_plot = self.plot_dict[id]
+
+        maxrange = (min(selected_plot.x), max(selected_plot.x))
+        fitrange = self.ax.get_xlim()
+
+        fit_dialog = LinearFit(parent=self,
+                    data=selected_plot,
+                    max_range=maxrange,
+                    fit_range=fitrange,
+                    xlabel=self.xLogLabel,
+                    ylabel=self.yLogLabel)
+        if fit_dialog.exec_() == QtGui.QDialog.Accepted:
+            return
 
     def onRemovePlot(self, id):
         """
+        Responds to the plot delete action
+        """
+        self.removePlot(id)
+
+        if len(self.plot_dict) == 0:
+            # last plot: graph is empty must be the panel must be destroyed
+                self.parent.close()
+
+    def removePlot(self, id):
+        """
         Deletes the selected plot from the chart
         """
+        if id not in self.plot_dict:
+            return
+
         selected_plot = self.plot_dict[id]
 
@@ -341 +388 @@
             if ids != id:
                 self.plot(data=plot_dict[ids], hide_error=plot_dict[ids].hide_error)                
-
-        if len(self.plot_dict) == 0:
-            # last plot: graph is empty must be the panel must be destroyed
-                self.parent.close()
 
     def onFreeze(self, id):
@@ -387 +430 @@
         Transforms x and y in View and set the scale
         """
-        # Clear the plot first
-        plt.cla()
-        self.ax.cla()
-
-        new_xlabel, new_ylabel, xscale, yscale = GuiUtils.xyTransform(self.data, xLabel, yLabel)
-        self.xscale = xscale
-        self.yscale = yscale
-        self.xLabel = new_xlabel
-        self.yLabel = new_ylabel
-
-        # Plot the updated chart
-        self.plot(marker='o', linestyle='')
+        # Transform all the plots on the chart
+        for id in self.plot_dict.keys():
+            current_plot = self.plot_dict[id]
+            if current_plot.id == "fit":
+                self.removePlot(id)
+                continue
+            new_xlabel, new_ylabel, xscale, yscale =\
+                GuiUtils.xyTransform(current_plot, xLabel, yLabel)
+            self.xscale = xscale
+            self.yscale = yscale
+            self.xLabel = new_xlabel
+            self.yLabel = new_ylabel
+            # Plot the updated chart
+            self.removePlot(id)
+            self.plot(data=current_plot, marker='o', linestyle='')
+
+        pass # debug hook
+
+    def onFitDisplay(self, fit_data):
+        """
+        Add a linear fitting line to the chart
+        """
+        # Create new data structure with fitting result
+        tempx = fit_data[0]
+        tempy = fit_data[1]
+        self.fit_result.x = []
+        self.fit_result.y = []
+        self.fit_result.x = tempx
+        self.fit_result.y = tempy
+        self.fit_result.dx = None
+        self.fit_result.dy = None
+
+        #Remove another Fit, if exists
+        self.removePlot("fit")
+
+        self.fit_result.reset_view()
+        #self.offset_graph()
+
+        # Set plot properties
+        self.fit_result.id = 'fit'
+        self.fit_result.title = 'Fit'
+        self.fit_result.name = 'Fit'
+
+        # Plot the line
+        self.plot(data=self.fit_result, marker='', linestyle='solid', hide_error=True)
 
 

src/sas/qtgui/PlotterBase.py

@@ -58 +58 @@
 
         # Mouse click related
+        self._scale_xlo = None
+        self._scale_xhi = None
+        self._scale_ylo = None
+        self._scale_yhi = None
         self.x_click = None
         self.y_click = None
@@ -70 +74 @@
         # Pre-define the Scale properties dialog
         self.properties = ScaleProperties(self,
-                                          init_scale_x=self.x_label,
-                                          init_scale_y=self.y_label)
+                                init_scale_x=self.x_label,
+                                init_scale_y=self.y_label)
 
         # default color map
@@ -460 +464 @@
         # Notify the listeners about a new graph title
         self.manager.communicator.activeGraphName.emit((current_title, title))
+
+    def offset_graph(self):
+        """
+        Zoom and offset the graph to the last known settings
+        """
+        for ax in self.axes:
+            if self._scale_xhi is not None and self._scale_xlo is not None:
+                ax.set_xlim(self._scale_xlo, self._scale_xhi)
+            if self._scale_yhi is not None and self._scale_ylo is not None:
+                ax.set_ylim(self._scale_ylo, self._scale_yhi)