Changeset d85c194 in sasview for src/sas/sasgui/perspectives/pr

Timestamp:

Feb 22, 2016 9:04:24 AM (9 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

Location:

src/sas/sasgui/perspectives/pr

Files:

• __init__.py (moved) (moved from src/sas/perspectives/pr/__init__.py)
• explore_dialog.py (moved) (moved from src/sas/perspectives/pr/explore_dialog.py) (1 diff)
• inversion_panel.py (moved) (moved from src/sas/perspectives/pr/inversion_panel.py) (1 diff)
• inversion_state.py (moved) (moved from src/sas/perspectives/pr/inversion_state.py) (1 diff)
• media/pr_help.rst (moved) (moved from src/sas/perspectives/pr/media/pr_help.rst)
• pr.py (moved) (moved from src/sas/perspectives/pr/pr.py) (2 diffs)
• pr_thread.py (moved) (moved from src/sas/perspectives/pr/pr_thread.py)
• pr_widgets.py (moved) (moved from src/sas/perspectives/pr/pr_widgets.py)

src/sas/sasgui/perspectives/pr/explore_dialog.py

@@ -30 +30 @@
 from sas.sasgui.plottools.PlotPanel import PlotPanel
 from sas.sasgui.plottools import Data1D as Model1D
-from sas.guiframe.gui_style import GUIFRAME_ID
+from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
 from sas.sasgui.plottools.plottables import Graph
 

src/sas/sasgui/perspectives/pr/inversion_panel.py

@@ -10 +10 @@
 import logging
 from wx.lib.scrolledpanel import ScrolledPanel
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.panel_base import PanelBase
 from inversion_state import InversionState
 from pr_widgets import PrTextCtrl
 from pr_widgets import DataFileTextCtrl
 from pr_widgets import OutputTextCtrl
-from sas.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
 if sys.platform.count("win32") > 0:

src/sas/sasgui/perspectives/pr/inversion_state.py

@@ -18 +18 @@
 import logging
 from lxml import etree
-from sas.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
 from sas.sascalc.dataloader.readers.cansas_reader import get_content

src/sas/sasgui/perspectives/pr/pr.py

@@ -23 +23 @@
 import numpy
 import pylab
-from sas.guiframe.gui_manager import MDIFrame
-from sas.guiframe.dataFitting import Data1D
-from sas.guiframe.events import NewPlotEvent
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.gui_style import GUIFRAME_ID
+from sas.sasgui.guiframe.gui_manager import MDIFrame
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.events import NewPlotEvent
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
 from sas.sascalc.pr.invertor import Invertor
 from sas.sascalc.dataloader.loader import Loader
@@ -33 +33 @@
 
 from pr_widgets import load_error
-from sas.guiframe.plugin_base import PluginBase
+from sas.sasgui.guiframe.plugin_base import PluginBase