Changeset b9a5f0e in sasview for src/sas/perspectives/invariant

Timestamp:

Feb 13, 2015 4:52:52 AM (10 years ago)

Author:

krzywon

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:

fd5ac0d

Parents:

35ec279

Message:

90% complete with the conversion.

Location:

src/sas/perspectives/invariant

Files:

• help_panel.py (modified) (1 diff)
• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (3 diffs)
• invariant_state.py (modified) (2 diffs)

src/sas/perspectives/invariant/help_panel.py

@@ -82 +82 @@
         self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, 
                                      size=(500, -1))
-import sas.perspectives.invariant as invariant
+        import sas.perspectives.invariant as invariant
         path = invariant.get_data_path(media='media')
         self.path = os.path.join(path,"invariant_help.html")

src/sas/perspectives/invariant/invariant.py

@@ -22 +22 @@
 from sas.guiframe.events import StatusEvent
 from sas.guiframe.gui_style import GUIFRAME_ID
-from sas import Reader as reader
+from sas.perspectives.invariant.invariant_state import Reader as reader
 from sas.dataloader.loader import Loader
-from sas import InvariantPanel
+from sas.perspectives.invariant.invariant_panel import InvariantPanel
 from sas.guiframe.plugin_base import PluginBase
 

src/sas/perspectives/invariant/invariant_panel.py

@@ -14 +14 @@
 from sas.guiframe.events import StatusEvent
 from sas.guiframe.events import AppendBookmarkEvent
-from sas import InvariantDetailsPanel
-from sas import InvariantContainer
-from sas import OutputTextCtrl
-from sas import InvTextCtrl
-from sas import InvariantState as IState
+from sas.perspectives.invariant.invariant_details import InvariantDetailsPanel
+from sas.perspectives.invariant.invariant_details import InvariantContainer
+from sas.perspectives.invariant.invariant_widgets import OutputTextCtrl
+from sas.perspectives.invariant.invariant_widgets import InvTextCtrl
+from sas.perspectives.invariant.invariant_state import InvariantState as IState
 from sas.guiframe.panel_base import PanelBase
 # The minimum q-value to be used when extrapolating
@@ -766 +766 @@
         : param event: report button event
         """
-        from sas import ReportDialog
+        from sas.perspectives.invariant.report_dialog import ReportDialog
 
         self.state.set_report_string()
@@ -1914 +1914 @@
         self.loader = Loader()
         import invariant
-        path = "C:/ECLPS/workspace/trunk/sansdataloader/test/ascii_test_3.txt"
+        path = "C:/ECLPS/workspace/trunk/sasdataloader/test/ascii_test_3.txt"
         data = self.loader.load(path)
         self.panel = InvariantPanel(self)

src/sas/perspectives/invariant/invariant_state.py

@@ -106 +106 @@
         self.wximbmp = None
         # report_html strings
-import sas.perspectives.invariant as invariant
+        import sas.perspectives.invariant as invariant
         path = invariant.get_data_path(media='media')
         path_report_html = os.path.join(path,"report_template.html")
@@ -643 +643 @@
     ## Wildcards
     type = ["Invariant file (*.inv)|*.inv",
-            "SANSView file (*.svs)|*.svs"]
+            "SASView file (*.svs)|*.svs"]
     ## List of allowed extensions
     ext = ['.inv', '.INV', '.svs', 'SVS']