Changeset dc5ef15 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

May 18, 2017 5: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/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

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