Changeset dc5ef15 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

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

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FitThread.py (added)
• FittingLogic.py (modified) (1 diff)
• FittingPerspective.py (modified) (1 diff)
• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (2 diffs)
• ModelThread.py (added)
• OptionsWidget.py (modified) (1 diff)
• SmearingWidget.py (modified) (1 diff)
• UnitTesting/FittingLogicTest.py (modified) (1 diff)
• UnitTesting/FittingPerspectiveTest.py (modified) (1 diff)
• UnitTesting/FittingUtilitiesTest.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (1 diff)

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

@@ -1 +1 @@
 import numpy as np
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
+
 from sas.sascalc.dataloader.data_info import Detector
 from sas.sascalc.dataloader.data_info import Source

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

@@ -7 +7 @@
 
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
-#from FitPage import FitPage
 
 class FittingWindow(QtGui.QTabWidget):

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

@@ -6 +6 @@
 import numpy
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 def replaceShellName(param_name, value):
@@ -363 +363 @@
     return [i >> d & 1 for d in xrange(digits)]
 
+def getWeight(data, is2d, flag=None):
+    """
+    Received flag and compute error on data.
+    :param flag: flag to transform error of data.
+    """
+    weight = None
+    if is2d:
+        dy_data = data.err_data
+        data = data.data
+    else:
+        dy_data = data.dy
+        data = data.y
+
+    if flag == 0:
+        weight = numpy.ones_like(data)
+    elif flag == 1:
+        weight = dy_data
+    elif flag == 2:
+        weight = numpy.sqrt(numpy.abs(data))
+    elif flag == 3:
+        weight = numpy.abs(data)
+    return weight

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

@@ -17 +17 @@
 from sasmodels.sasview_model import load_standard_models
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
-from sas.sasgui.perspectives.fitting.fit_thread import FitThread
-
-from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.sasgui.perspectives.fitting.model_thread import Calc1D
-from sas.sasgui.perspectives.fitting.model_thread import Calc2D
-from sas.sasgui.perspectives.fitting.utils import get_weight
+from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 from sas.qtgui.Perspectives.Fitting.UI.FittingWidgetUI import Ui_FittingWidgetUI
+from sas.qtgui.Perspectives.Fitting.FitThread import FitThread
+from sas.qtgui.Perspectives.Fitting.ModelThread import Calc1D
+from sas.qtgui.Perspectives.Fitting.ModelThread import Calc2D
 from sas.qtgui.Perspectives.Fitting.FittingLogic import FittingLogic
 from sas.qtgui.Perspectives.Fitting import FittingUtilities
@@ -815 +814 @@
         """
         # Send original data for weighting
-        weight = get_weight(data=data, is2d=self.is2D, flag=self.weighting)
+        weight = FittingUtilities.getWeight(data=data, is2d=self.is2D, flag=self.weighting)
         update_module = data.err_data if self.is2D else data.dy
         update_module = weight

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

@@ -6 +6 @@
 from PyQt4 import QtCore
 
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 # Local UI

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

@@ -5 +5 @@
 from PyQt4 import QtCore
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 # Local UI

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -11 +11 @@
 from sas.qtgui.Utilities.GuiUtils import *
 from sas.qtgui.Perspectives.Fitting.FittingWidget import *
-from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.qtgui.Plotting.PlotterData import Data1D
 
 app = QtGui.QApplication(sys.argv)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

@@ -13 +13 @@
 # Local
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.sasgui.guiframe.dataFitting import Data1D
-
+from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py

@@ -3 +3 @@
 from PyQt4 import QtGui
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 from UnitTesting.TestUtils import WarningTestNotImplemented

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -17 +17 @@
 from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy
 
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 app = QtGui.QApplication(sys.argv)