Ignore:
Timestamp:
Oct 23, 2011 1:39:52 AM (13 years ago)
Author:
Jae Cho <jhjcho@…>
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:
96683dc
Parents:
db8590a
Message:

fixed model reset problem w/smearer

Location:
fittingview/src/sans/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/basepage.py

    rdb8590a r2d34d55  
    634634        self.Show(False) 
    635635        name = menu.GetLabel(event.GetId()) 
    636         self._on_select_model_helper() 
     636        self._on_select_model_helper(reset=True) 
    637637        if name in self.saved_states.keys(): 
    638638            previous_state = self.saved_states[name] 
  • fittingview/src/sans/perspectives/fitting/fitpage.py

    rdb8590a r2d34d55  
    12131213        """   
    12141214        self.Show(False)  
    1215         copy_flag = ''  
     1215        copy_flag = False  
    12161216        is_poly_enabled = None  
    12171217        if event != None: 
     
    12551255            #self._set_save_flag(True) 
    12561256            # Reset smearer, model and data 
    1257             #self._set_smear(self.data) 
     1257            if not copy_flag: 
     1258                self.disable_smearer.SetValue(True) 
     1259                self.enable_smearer.SetValue(False) 
    12581260     
    12591261            # more disables for 2D 
     
    13181320            if copy_flag: 
    13191321                self.get_paste_params(copy_flag) 
     1322                wx.CallAfter(self._onDraw, None) 
    13201323                 
    1321                 wx.CallAfter(self._onDraw, None) 
    13221324        else: 
    13231325            wx.CallAfter(self._draw_model) 
Note: See TracChangeset for help on using the changeset viewer.