Changeset fcd8887d in sasview

Timestamp:

Jan 26, 2010 3:37:49 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:

25e3fc9

Parents:

ffa69b6

Message:

allow proper update of data2D

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1343 +1343 @@
            
         self.structurebox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
+        
+        self.initialize_combox()
+             
         wx.EVT_COMBOBOX(self.formfactorbox,-1, self._on_select_model)
         wx.EVT_COMBOBOX(self.structurebox,-1, self._on_select_model)
         
        
-        self.initialize_combox()
-             
         ## check model type to show sizer
         if self.model !=None:

sansview/perspectives/fitting/fitpage.py

@@ -654 +654 @@
                 ## error occured on chisqr computation
                 pass
-            if self.data is not None:
+            if self.data is not None and self.data.__class__.__name__ !="Data2D":
                 ## set smearing value whether or not the data contain the smearing info
                 self.manager.set_smearer(smearer=temp_smear, qmin= float(self.qmin_x),
                                      qmax= float(self.qmax_x)) 
+           
             evt = ModelEventbox(model=self.model)
             wx.PostEvent(self.event_owner, evt)