Changeset dc5ef15 in sasview for src/sas/qtgui/Plotting/LinearFit.py

Timestamp:

May 18, 2017 3:36:57 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:

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

File:

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

src/sas/qtgui/Plotting/LinearFit.py

@@ -7 +7 @@
 from PyQt4 import QtCore
 
-#from sas.sasgui.transform import 
 from sas.qtgui.Utilities.GuiUtils import formatNumber
-from sas.sasgui.plottools import fittings
-from sas.sasgui.plottools import transform
-
-from sas.sasgui.plottools.LineModel import LineModel
+
+from sas.qtgui.Plotting import Fittings
+from sas.qtgui.Plotting import DataTransform
+from sas.qtgui.Plotting.LineModel import LineModel
 
 # Local UI
@@ -67 +66 @@
         self.default_A = self.model.getParam('A')
         self.default_B = self.model.getParam('B')
-        self.cstA = fittings.Parameter(self.model, 'A', self.default_A)
-        self.cstB = fittings.Parameter(self.model, 'B', self.default_B)
-        self.transform = transform
+        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A)
+        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B)
+        self.transform = DataTransform
 
         self.setFixedSize(self.minimumSizeHint())
@@ -123 +122 @@
 
         # Find the fitting parameters
-        self.cstA = fittings.Parameter(self.model, 'A', self.default_A)
-        self.cstB = fittings.Parameter(self.model, 'B', self.default_B)
+        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A)
+        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B)
         tempdy = numpy.asarray(tempdy)
         tempdy[tempdy == 0] = 1
@@ -132 +131 @@
             xmax = numpy.log10(xmax)
 
-        chisqr, out, cov = fittings.sasfit(self.model,
+        chisqr, out, cov = Fittings.sasfit(self.model,
                                            [self.cstA, self.cstB],
                                            tempx, tempy, tempdy,
@@ -193 +192 @@
                 tempy  = [numpy.log10(y[i])
                          for i in range(len(x)) if x[i] >= xmin_check]
-                tempdy = [transform.errToLogX(y[i], 0, dy[i], 0)
+                tempdy = [DataTransform.errToLogX(y[i], 0, dy[i], 0)
                          for i in range(len(x)) if x[i] >= xmin_check]
             else:
                 tempy = map(numpy.log10, y)
-                tempdy = map(lambda t1,t2:transform.errToLogX(t1,0,t2,0),y,dy)
+                tempdy = map(lambda t1,t2:DataTransform.errToLogX(t1,0,t2,0),y,dy)
         else:
             tempy = y