Changeset 693ab78 in sasview

Timestamp:

Oct 20, 2008 10:37:51 AM (16 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:

48c7477

Parents:

24120ab

Message:

fix add error

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -183 +183 @@
             @return residuals
         """
+        print self.data.x
+        print self.data.y
+        print self.data.dy
+        
         flag=self.checkFitRange()
         if flag== True:

sansview/perspectives/fitting/fitpanel.py

@@ -78 +78 @@
             name = 'Fit'
         if self.fit_page_name != name:
-            if data.__class__.__name__=='MetaData2D':
+            if data.__class__.__name__=='Data2D':
                  from fitpage2D import FitPage2D
                  panel = FitPage2D(self.nb,data, -1)

sansview/perspectives/fitting/fitting.py

@@ -5 +5 @@
 from copy import deepcopy 
 from danse.common.plottools.plottables import Data1D, Theory1D, Data2D
-
-from sans.guiframe.data_loader import MetaData1D, MetaTheory1D, MetaData2D
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
@@ -85 +83 @@
         self.graph=graph
         for item in graph.plottables:
-            if item.__class__.__name__ is "MetaData2D":
+            if item.__class__.__name__ is "Data2D":
                 return [["Fit Data2D", "Dialog with fitting parameters ", self._onSelect]] 
             else:
-                if item.name==graph.selected_plottable and (item.__class__.__name__ is  "MetaData1D"or \
-                                        item.__class__.__name__ is  "Data1D" ):
+                if item.name==graph.selected_plottable and\
+                 item.__class__.__name__ is  "Data1D":
                     return [["Fit Data1D", "Dialog with fitting parameters ", self._onSelect]] 
         return []   
@@ -145 +143 @@
         self.panel = event.GetEventObject()
         for item in self.panel.graph.plottables:
-            if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "MetaData2D":
+            if item.name == self.panel.graph.selected_plottable or\
+                 item.__class__.__name__ is "Data2D":
                 #find a name for the page created for notebook
                 try:
@@ -474 +473 @@
                     break 
             
-            if data!=None and data.__class__.__name__ != 'MetaData2D':
+            if data!=None and data.__class__.__name__ != 'Data2D':
                 theory = Theory1D(x=[], y=[])
                 theory.name = "Model"