Changeset dc5ef15 in sasview for src/sas/qtgui/Calculators

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/Calculators

Files:

• GenericScatteringCalculator.py (modified) (1 diff)
• UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -8 +8 @@
 from PyQt4 import QtCore
 from twisted.internet import threads
+from mpl_toolkits.mplot3d import Axes3D
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-from sas.sasgui.perspectives.calculator.load_thread import GenReader
+from sas.qtgui.Utilities.GenericReader import GenReader
+
 from sas.sascalc.dataloader.data_info import Detector
 from sas.sascalc.dataloader.data_info import Source
 from sas.sascalc.calculator import sas_gen
 
-from mpl_toolkits.mplot3d import Axes3D
+from sas.qtgui.Plotting.Arrow3D import Arrow3D
 from sas.qtgui.Plotting.PlotterBase import PlotterBase
-from sas.sasgui.guiframe.dataFitting import Data2D
 from sas.qtgui.Plotting.Plotter2D import Plotter2D
-from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.qtgui.Plotting.Plotter import Plotter
-from sas.sasgui.plottools.arrow3d import Arrow3D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 # Local UI

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -19 +19 @@
 from sas.qtgui.Calculators.GenericScatteringCalculator import Plotter3D
 
-from sas.sasgui.guiframe.data_manager import DataManager
+from sas.qtgui.MainWindow.DataManager import DataManager
 from sas.qtgui.MainWindow.GuiManager import GuiManager
 from sas.qtgui.Utilities.GuiUtils import *