Changeset 0d0aa40 in sasview for src/sas/sasgui

Timestamp:

Sep 15, 2016 6:33:57 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:

d4115a55

Parents:

bc9efde

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/12/16 08:26:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 06:33:57)

Message:

Allow deletion of linear fits (closes #466)

Also fixes bug where the linear fit would disappear if the home button
was clicked whilst using a non-linear scale

Location:

src/sas/sasgui

Files:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• plottools/PlotPanel.py (modified) (5 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -604 +604 @@
 
             if self.parent.ClassName.count('wxDialog') == 0:
-                wx_id = ids.next()
-                plot_menu.Append(wx_id, '&Linear Fit', name)
-                wx.EVT_MENU(self, wx_id, self.onFitting)
-                plot_menu.AppendSeparator()
+                if plot.id != 'fit':
+                    wx_id = ids.next()
+                    plot_menu.Append(wx_id, '&Linear Fit', name)
+                    wx.EVT_MENU(self, wx_id, self.onFitting)
+                    plot_menu.AppendSeparator()
 
                 wx_id = ids.next()

src/sas/sasgui/plottools/PlotPanel.py

@@ -15 +15 @@
 import os
 import transform
-from plottables import Data1D
 #TODO: make the plottables interactive
 from binder import BindArtist
@@ -190 +189 @@
 
         # new data for the fit
+        from sas.sasgui.guiframe.dataFitting import Data1D
         self.fit_result = Data1D(x=[], y=[], dy=None)
         self.fit_result.symbol = 13
@@ -1725 +1725 @@
         if remove_fit:
             self.graph.delete(self.fit_result)
+            if hasattr(self, 'plots'):
+                if 'fit' in self.plots.keys():
+                    del self.plots['fit']
         self.ly = None
         self.q_ctrl = None
@@ -1738 +1741 @@
         _yscale = 'linear'
         for item in list:
+            if item.id == 'fit':
+                continue
             item.setLabel(self.xLabel, self.yLabel)
             # control axis labels from the panel itself
@@ -1892 +1897 @@
         self.graph.render(self)
         self._offset_graph()
+        if hasattr(self, 'plots'):
+            # Used by Plotter1D
+            fit_id = 'fit'
+            self.fit_result.id = fit_id
+            self.fit_result.title = 'Fit'
+            self.fit_result.name = 'Fit'
+            self.plots[fit_id] = self.fit_result
         self.subplot.figure.canvas.draw_idle()