Changeset 504dd9f5 in sasview


Ignore:
Timestamp:
Mar 15, 2011 7:01:57 AM (14 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:
df22224
Parents:
52d3fd1
Message:

working on fit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/fitpage.py

    rdce84c0 r504dd9f5  
    931931        Allow to fit 
    932932        """ 
    933         #make sure all parameter values are updated. 
    934         #if self.check_invalid_panel(): 
    935         #    return 
    936         if self.model ==None: 
    937             msg="Please select a Model first..." 
     933        if self.data is None: 
     934            msg = "Please select a Data first..." 
    938935            wx.MessageBox(msg, 'Info') 
    939936            wx.PostEvent(self._manager.parent, StatusEvent(status=\ 
    940                             "Fit: %s"%msg)) 
     937                            "Fit: %s" % msg)) 
     938            return 
     939        if self.model is None: 
     940            msg = "Please select a Model first..." 
     941            wx.MessageBox(msg, 'Info') 
     942            wx.PostEvent(self._manager.parent, StatusEvent(status=\ 
     943                            "Fit: %s" % msg)) 
    941944            return 
    942945 
     
    963966        self.qmax_x = float( self.qmax.GetValue()) 
    964967        self._manager._reset_schedule_problem(id=self.id, value=0) 
    965         self._manager.schedule_for_fit(id=id,value=1,page=self,fitproblem =None)  
     968        self._manager.schedule_for_fit(id=id,value=1, fitproblem =None)  
    966969        self._manager.set_fit_range(id=self.id,qmin= self.qmin_x,  
    967970                                   qmax= self.qmax_x) 
Note: See TracChangeset for help on using the changeset viewer.