Changeset 269df2b in sasview for fittingview


Ignore:
Timestamp:
Oct 20, 2011 6:15:21 PM (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:
1dbff4c
Parents:
afac721
Message:

on set data /select model reset smearer to None from custom smearer

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

Legend:

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

    r94078a8 r269df2b  
    12621262            try: 
    12631263                # update smearer sizer 
     1264                if not self.enable_smearer.GetValue(): 
     1265                    self.disable_smearer.SetValue(True) 
    12641266                self.onSmear(None) 
    12651267                temp_smear = None 
     
    19681970        if flag: 
    19691971            #set model view button 
    1970             self.current_smearer = smear_selection(self.data, self.model) 
     1972            if not self.enable_smearer.GetValue(): 
     1973                    self.disable_smearer.SetValue(True) 
     1974            self.onSmear(None) 
     1975            #self._set_smear(self.data) 
     1976 
    19711977            if self.data.__class__.__name__ == "Data2D": 
    19721978                self.enable2D = True 
     
    22062212                      
    22072213        """ 
    2208  
    2209         #if self.check_invalid_panel(): 
    2210         #    return 
    2211         if self.model ==None: 
     2214        if self.model == None: 
    22122215            self.disable_smearer.SetValue(True) 
     2216            if event == None: 
     2217                return 
    22132218            msg="Please select a Model first..." 
    22142219            wx.MessageBox(msg, 'Info') 
     
    23882393        are compute when fitting 
    23892394        """ 
    2390   
    2391         #if self.check_invalid_panel(): 
    2392         #    return 
    2393  
    2394         if self.model ==None: 
     2395        if self.model == None: 
    23952396            self.disable_smearer.SetValue(True) 
    2396              
     2397            if event == None: 
     2398                return 
    23972399            msg="Please select a Model first..." 
    23982400            wx.MessageBox(msg, 'Info') 
     
    25672569        if self.data is None: 
    25682570            return 
    2569          
     2571 
    25702572        if self.model == None: 
    25712573            self.disable_smearer.SetValue(True) 
     2574            if event == None: 
     2575                return 
    25722576            msg="Please select a Model first..." 
    25732577            wx.MessageBox(msg, 'Info') 
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r2bb37c3 r269df2b  
    644644                msg = "set_mearer requires at least data.\n" 
    645645                msg += "Got data = %s .\n" % str(data) 
    646                 raise ValueError, msg 
     646                return 
     647                #raise ValueError, msg 
    647648            model = self.page_finder[uid].get_model(fid=fid) 
    648649            if model is None: 
Note: See TracChangeset for help on using the changeset viewer.