Changeset c10d9d6c in sasview

Timestamp:

Mar 17, 2016 12:54:22 PM (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:

fc18690, b080ba8

Parents:

aac161f1

Message:

updated references to old paths.

Location:

src

Files:

• examples/test_chisq_panel.py (modified) (1 diff)
• sas/sasgui/perspectives/fitting/pagestate.py (modified) (2 diffs)
• sas/sasgui/perspectives/invariant/invariant.py (modified) (1 diff)
• sas/sasgui/perspectives/invariant/invariant_state.py (modified) (1 diff)
• sas/sasgui/perspectives/pr/pr.py (modified) (1 diff)

src/examples/test_chisq_panel.py

@@ -86 +86 @@
         dy = numpy.sqrt(100*numpy.abs(y))/100
 
-    from sas.plottools.plottables import Data1D, Theory1D, Chisq , Graph
+    from sas.sasgui.plottools.plottables import Data1D, Theory1D, Chisq , Graph
     data = Data1D(x,y,dy=dy)
     data.xaxis('distance', 'm')

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

@@ -1613 +1613 @@
 
         if state.data is None:
-            data = sas.dataloader.data_info.Data1D(x=[], y=[])
+            data = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[])
             return None
         elif not state.data.is_data:
@@ -1626 +1626 @@
 
             if issubclass(state.data.__class__,
-                          sas.dataloader.data_info.Data1D):
+                          sas.sascalc.dataloader.data_info.Data1D):
                 data = state.data
                 doc, sasentry = self._to_xml_doc(data)

src/sas/sasgui/perspectives/invariant/invariant.py

@@ -237 +237 @@
         else:
             msg = "invariant.save_file: the data being saved is"
-            msg += " not a sas.dataloader.data_info.Data1D object"
+            msg += " not a sas.sascalc.dataloader.data_info.Data1D object"
             raise RuntimeError, msg
 

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -773 +773 @@
         """
         if datainfo is None:
-            datainfo = sas.dataloader.data_info.Data1D(x=[], y=[])
-        elif not issubclass(datainfo.__class__, sas.dataloader.data_info.Data1D):
+            datainfo = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[])
+        elif not issubclass(datainfo.__class__, sas.sascalc.dataloader.data_info.Data1D):
             msg = "The cansas writer expects a Data1D"
             msg += " instance: %s" % str(datainfo.__class__.__name__)

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

@@ -896 +896 @@
         # First, check that the data is of the right type
         if issubclass(self.current_plottable.__class__,
-                      sas.dataloader.data_info.Data1D):
+                      sas.sascalc.dataloader.data_info.Data1D):
             self.state_reader.write(filepath, self.current_plottable, prstate)
         else: