Changeset d85c194 in sasview for src/sas/sasgui/perspectives/fitting/fitting.py

Timestamp:

Feb 22, 2016 7:04:24 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

06aaa75d

Parents:

d7bb526

Message:

Remaining modules refactored

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (moved) (moved from src/sas/perspectives/fitting/fitting.py) (3 diffs)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -22 +22 @@
 
 from sas.sascalc.dataloader.loader import Loader
-from sas.guiframe.dataFitting import Data2D
-from sas.guiframe.dataFitting import Data1D
-from sas.guiframe.dataFitting import check_data_validity
-from sas.guiframe.events import NewPlotEvent
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.events import EVT_SLICER_PANEL
-from sas.guiframe.events import EVT_SLICER_PARS_UPDATE
-from sas.guiframe.gui_style import GUIFRAME_ID
-from sas.guiframe.plugin_base import PluginBase
-from sas.guiframe.data_processor import BatchCell
+from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import check_data_validity
+from sas.sasgui.guiframe.events import NewPlotEvent
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.events import EVT_SLICER_PANEL
+from sas.sasgui.guiframe.events import EVT_SLICER_PARS_UPDATE
+from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
+from sas.sasgui.guiframe.plugin_base import PluginBase
+from sas.sasgui.guiframe.data_processor import BatchCell
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
-from sas.perspectives.fitting.console import ConsoleUpdate
-from sas.perspectives.fitting.fitproblem import FitProblemDictionary
-from sas.perspectives.fitting.fitpanel import FitPanel
-from sas.perspectives.fitting.resultpanel import ResultPanel, PlotResultEvent
-
-from sas.perspectives.fitting.fit_thread import FitThread
-from sas.perspectives.fitting.pagestate import Reader
-from sas.perspectives.fitting.fitpage import Chi2UpdateEvent
-from sas.perspectives.calculator.model_editor import TextDialog
-from sas.perspectives.calculator.model_editor import EditorWindow
-from sas.guiframe.gui_manager import MDIFrame
-from sas.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.console import ConsoleUpdate
+from sas.sasgui.perspectives.fitting.fitproblem import FitProblemDictionary
+from sas.sasgui.perspectives.fitting.fitpanel import FitPanel
+from sas.sasgui.perspectives.fitting.resultpanel import ResultPanel, PlotResultEvent
+
+from sas.sasgui.perspectives.fitting.fit_thread import FitThread
+from sas.sasgui.perspectives.fitting.pagestate import Reader
+from sas.sasgui.perspectives.fitting.fitpage import Chi2UpdateEvent
+from sas.sasgui.perspectives.calculator.model_editor import TextDialog
+from sas.sasgui.perspectives.calculator.model_editor import EditorWindow
+from sas.sasgui.guiframe.gui_manager import MDIFrame
+from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
 MAX_NBR_DATA = 4
@@ -224 +224 @@
         event_id = event.GetId()
         label = self.edit_menu.GetLabel(event_id)
-        from sas.perspectives.calculator.pyconsole import PyConsole
+        from sas.sasgui.perspectives.calculator.pyconsole import PyConsole
         filename = os.path.join(models.find_plugins_dir(), label)
         frame = PyConsole(parent=self.parent, manager=self,
@@ -1419 +1419 @@
         if "Data" not in batch_outputs.keys():
             batch_outputs["Data"] = []
-        from sas.guiframe.data_processor import BatchCell
+        from sas.sasgui.guiframe.data_processor import BatchCell
         cell = BatchCell()
         cell.label = data.name