Changeset 1a8e2e8e in sasview

Timestamp:

Aug 17, 2016 4:45:15 AM (8 years ago)

Author:

lewis

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

6bb4edd

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/17/16 04:42:40)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/17/16 04:45:15)

Message:

Don't reset graph axis on linear fit (fixes #603)

Also sets the default fit limits of the fit dialog to the zoomed in region
if values haven't previously been entered

File:

• src/sas/sasgui/plottools/PlotPanel.py (modified) (3 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -666 +666 @@
                 dlg.setFitRange(self.xminView, self.xmaxView,
                                 self.xmin, self.xmax)
+            else:
+                xlim = self.subplot.get_xlim()
+                ylim = self.subplot.get_ylim()
+                dlg.setFitRange(xlim[0], xlim[1], ylim[0], ylim[1])
             # It would be nice for this to NOT be modal (i.e. Show).
             # Not sure about other ramifications - for example
@@ -1894 +1898 @@
 
         """
+        xlim = self.subplot.get_xlim()
+        ylim = self.subplot.get_ylim()
+
         # Saving value to redisplay in Fit Dialog when it is opened again
         self.Avalue, self.Bvalue, self.ErrAvalue, \
@@ -1924 +1931 @@
             self.fit_result.name = 'Fit'
             self.plots[fit_id] = self.fit_result
+        self.subplot.set_xlim(xlim)
+        self.subplot.set_ylim(ylim)
         self.subplot.figure.canvas.draw_idle()