Changeset 286bb6c in sasview

Timestamp:

Apr 8, 2010 6:30:04 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

c81140c

Parents:

2fff4db

Message:

remove import of dataloader

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -335 +335 @@
                 #delete the previous theory page and add a new one
                 name, panel = self.opened_pages[type]
-                self.manager.reset_plot_panel(panel.get_data())
+                #self.manager.reset_plot_panel(panel.get_data())
                 #delete the existing page and replace it
                 index = self.GetPageIndex(panel)

sansview/perspectives/fitting/fitting.py

@@ -15 +15 @@
 from copy import deepcopy
 
-from DataLoader.data_info import Data1D as LoaderData1D
 from danse.common.plottools.PlotPanel import PlotPanel
 
@@ -568 +567 @@
             raise ValueError, "create_fittable_data1D expects Data1D"
         #For prview the theory is not a subclass of DataLoader.Data1D
-        if not issubclass(data.__class__, LoaderData1D):
+        #if not issubclass(data.__class__, LoaderData1D): must be used 
+        #for checking
+        if not hasattr(data, "is_data"):
             if class_name == 'Theory1D':
                 temp_data = Theory1D(x=data.x, y=data.y, dy=data.y)
                 temp_data.copy_from_datainfo(data1d=data)
                 temp_data.name = data.name
+                data = temp_data
             if class_name == 'Data1D':
                 temp_data = Data1D(x=data.x, y=data.y, dx=data.dx, dy=data.y)
-                temp_data.copy_from_datainfo(data=data)
+                temp_data.copy_from_datainfo(data1d=data)
                 temp_data.name = data.name
-            data = temp_data
+                data = temp_data
         
         #get the appropriate dy