Changeset 6e4c9fe in sasview

Timestamp:

Aug 26, 2011 3:20:47 PM (13 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:

f3242cf

Parents:

5d2e4c1

Message:

make sure the default data get create on toggle mode only and remove redondonant current_smear object

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (6 diffs)
• fitpage.py (modified) (8 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -90 +90 @@
         self.engine_type = 'scipy'
         ## smear default
-        self.smearer = None
         self.current_smearer = None
         ## 2D smear accuracy default
@@ -111 +110 @@
         ## selected parameters to apply dispersion
         self.disp_cb_dict ={}
-
         ## smearer object
-        self.smearer = None
         self.enable2D = False
         self.is_mac = ON_MAC
@@ -155 +152 @@
         ## dictionary of saved state
         self.saved_states = {} 
-        #create a default data for an empty panel
-        self.create_default_data()
         ## Create context menu for page
         self.popUpMenu = wx.Menu()
@@ -198 +193 @@
         Only when the page is on theory mode.
         """
-        if self.enable2D and not check_data_validity(self.data):
-            self._create_default_2d_data()
-        else:
-            self._create_default_1d_data()
-        
-            
+        if not hasattr(self, "model_view"):
+            return
+        toggle_mode_on = self.model_view.IsEnabled()
+        if toggle_mode_on:
+            if self.enable2D and not check_data_validity(self.data):
+                self._create_default_2d_data()
+            else:
+                self._create_default_1d_data()
+        
     def _create_default_1d_data(self):
         """
@@ -875 +873 @@
             self.state.disable_disp = self.disable_disp.GetValue()
             
-        self.state.smearer = copy.deepcopy(self.smearer)
+        self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self,"enable_smearer"):
             self.state.enable_smearer = \
@@ -941 +939 @@
             self.state.disable_disp = self.disable_disp.GetValue()
             
-        self.state.smearer = copy.deepcopy(self.smearer)
+        self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self,"enable_smearer"):
             self.state.enable_smearer = \

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -64 +64 @@
         self.enable_fit_button()
         self.fill_data_combobox(data_list=self.data_list)
+        #create a default data for an empty panel
+        self.create_default_data()
     
     def enable_fit_button(self):
@@ -1118 +1120 @@
                 if not self.disable_smearer.GetValue():
                     # Set the smearer environments
-                    temp_smear = self.smearer
+                    temp_smear = self.current_smearer
             except:
                 raise
@@ -1417 +1419 @@
             if data.dqx_data == None or  data.dqy_data ==None: 
                 return
-            elif self.smearer != None and (data.dqx_data.any()!=0) and \
+            elif self.current_smearer != None and (data.dqx_data.any()!=0) and \
                             (data.dqx_data.any()!=0): 
                 self.smear_type = "Pinhole2d"
@@ -1635 +1637 @@
         if data is None:
             return
-        self.smearer = smear_selection(data, self.model)
+        self.current_smearer = smear_selection(data, self.model)
         self.disable_smearer.SetValue(True)
-        if self.smearer == None:
+        if self.current_smearer == None:
             self.enable_smearer.Disable()
         else:
@@ -1736 +1738 @@
             self.structurebox.Enable()
             data_name = self.data.name
-            #data_min, data_max, npts = self.compute_data_range(self.data)
             data_min, data_max = self.qmin_data_set, self.qmax_data_set
             npts =  self.npts_data_set
             #set maximum range for x in linear scale
-            if not hasattr(self.data,"data"): #Display only for 1D data fit
+            if not hasattr(self.data, "data"): #Display only for 1D data fit
                 self.btEditMask.Disable()  
                 self.EditMask_title.Disable()
             else:
-                
                 self.btEditMask.Enable()  
                 self.EditMask_title.Enable() 
@@ -1755 +1755 @@
         
         self.Npts_total.Bind(wx.EVT_MOUSE_EVENTS, self._npts_click)
-        #self.Npts_total.Disable()
         self.dataSource.SetValue(data_name)
         self.qmin_x = data_min
@@ -1790 +1789 @@
             wx.PostEvent(self._manager.parent, NewPlotEvent(plot=self.data, 
                                                 title=str(self.data.title)))
-            self._manager.store_data(uid=self.uid, data_list=self.data_list,
-                                      caption=self.window_name)
+            #self._manager.store_data(uid=self.uid, data_list=self.data_list,
+            #                          caption=self.window_name)
             self._draw_model()
     
@@ -2411 +2410 @@
             if hasattr(self.data,"dxw"):
                 msg= ": Slit smearing parameters"
-            if self.smearer ==None:
+            if self.current_smearer ==None:
                 wx.PostEvent(self._manager.parent, StatusEvent(status=\
                             "Data contains no smearing information"))