Changeset cce33b3 in sasview

Timestamp:

Feb 24, 2009 11:47:22 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:

9fca3ea

Parents:

18eba35

Message:

status bar messaged added

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (2 diffs)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -571 +571 @@
         #print "in smearer",self.enable_smearer.GetValue()
         smear =None
+        msg=""
         if self.enable_smearer.GetValue():
             from DataLoader.qsmearing import smear_selection
             smear =smear_selection( self.data )
+            if hasattr(self.data,"dxl"):
+                msg= ": Resolution smearing parameters"
+            if hasattr(self.data,"dxw"):
+                msg= ": Slit smearing parameters"
             if smear ==None:
                 wx.PostEvent(self.manager.parent, StatusEvent(status=\
@@ -579 +584 @@
             else:
                 wx.PostEvent(self.manager.parent, StatusEvent(status=\
-                            "Data contains smearing information"))
+                            "Data contains smearing information %s"%msg))
         self.manager.set_smearer(smear)   
             

sansview/perspectives/fitting/fitting.py

@@ -199 +199 @@
         """
         self.parent.set_perspective(self.perspective)
-        
-        
+
+    def copy_data(self, item, dy):
+        detector=None
+        source=None
+        dxl=None
+        dxw=None
+        if hasattr(item, "dxl"):
+            dxl = item.dxl
+        if hasattr(item, "dxw"):
+            dxw = item.dxw
+        if hasattr(item, "detector"):
+            detector =item.detector
+        if hasattr(item, "source"):
+            source =item.source
+        from sans.guiframe import dataFitting 
+        data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
+        data.name=item.name
+        data.detector=detector
+        data.source= source
+        return data
+
     def _onSelect(self,event):
         """ 
@@ -212 +231 @@
                     if item.name in  self.err_dy.iterkeys():
                         dy= self.err_dy[item.name]
-                        data= Data1D(x=item.x, y=item.y, dy=dy)
-                        data.name=item.name
+                        data= self.copy_data(item, dy)
+                    else:
+                        data= self.copy_data(item, dy)
                 else:
                     if item.dy==None:
                         dy= numpy.zeros(len(item.y))
                         dy[dy==0]=1
-                        print "dy", dy
-                        data= Data1D(x=item.x, y=item.y, dy=dy)
-                        data.name=item.name
+                        data= self.copy_data(item, dy)
                     else:
-                        data= Data1D(x=item.x, y=item.y, dy=item.dy)
-                        data.name=item.name
+                        data= self.copy_data(item, dy)
+                        
+                        
             if item.name == self.panel.graph.selected_plottable or\
                  item.__class__.__name__ is "Data2D":