Changeset 00353b4 in sasview

Timestamp:

Oct 15, 2008 4:16:05 PM (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:

7764b41

Parents:

8809e48

Message:

modified context menu

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -343 +343 @@
         self.text4_2.Show()
         self.text4_3.Show()
-        if not dataset.data.__class__.__name__=='Data2D':
+        if not hasattr(dataset.data,'image'):
             self.xmin.SetValue(format_number(min(dataset.data.x)))
             self.xmin.Show()
@@ -505 +505 @@
                      name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
-                     self.model.setParam(name,value)
-                     self.manager.redraw_model(float(self.xmin.GetValue())\
-                                               ,float(self.xmax.GetValue()))
+                     self.model.setParam(name,value) 
                 except:
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Drawing  Error:wrong value entered : %s"% sys.exc_value))
-                     
+            self.manager.redraw_model(float(self.xmin.GetValue())\
+                                               ,float(self.xmax.GetValue()))      
                      
     def select_all_param(self,event): 
@@ -521 +520 @@
             if  self.cb1.GetValue()==True:
                 for item in self.parameters:
-                   
                     item[0].SetValue(True)
                     list= [item[0],item[1],item[2],item[3]]

sansview/perspectives/fitting/fitting.py

@@ -4 +4 @@
 
 from copy import deepcopy 
-#from sans.guitools.plottables import Data1D, Theory1D
-#from sans.guitools.PlotPanel import PlotPanel
 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  
@@ -84 +84 @@
         self.graph=graph
         for item in graph.plottables:
-            if item.__class__.__name__ is "Data2D":
+            if item.__class__.__name__ is "MetaData2D":
                 return [["Fit Data2D", "Dialog with fitting parameters ", self._onSelect]] 
             else:
-                if item.name==graph.selected_plottable and item.__class__.__name__ is not "Theory1D":
-                    return [["Select Data", "Dialog with fitting parameters ", self._onSelect]] 
+                if item.name==graph.selected_plottable and (item.__class__.__name__ is  "MetaData1D"or \
+                                        item.__class__.__name__ is  "Data1D" ):
+                    return [["Fit Data1D", "Dialog with fitting parameters ", self._onSelect]] 
         return []   
 
@@ -143 +144 @@
         self.panel = event.GetEventObject()
         for item in self.panel.graph.plottables:
-            if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "Data2D":
+            if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "MetaData2D":
                 #find a name for the page created for notebook
                 try:
@@ -152 +153 @@
                     page = self.fit_panel.add_fit_page(name)
                     # add data associated to the page created
-                    if item.__class__.__name__=='Data1D':
+                    if item.__class__.__name__=='MetaData1D' or item.__class__.__name__=='Data1D' :
                         new_item=FitData1D(item)
                     else:
@@ -484 +485 @@
             data=fitdata.data
             
-            if data!=None and data.__class__.__name__ != 'Data2D':
+            if data!=None and data.__class__.__name__ != 'MetaData2D':
                 theory = Theory1D(x=[], y=[])
                 theory.name = "Model"