Changeset 08895c5 in sasview for sansview


Ignore:
Timestamp:
Feb 24, 2009 3:24:27 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:
3e1a859
Parents:
8f83c90d
Message:

small bug fixed on attempt to fit model with model 1D

Location:
sansview/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sansview/perspectives/fitting/fitpage1D.py

    rcce33b3 r08895c5  
    407407        self.qmax_x =float( self.qmax.GetValue()) 
    408408        if len(self.param_toFit) >0 and flag==True: 
     409            if self.data.name == self.model.__class__.__name__: 
     410                print "when here have the same name " 
     411                wx.PostEvent(self.parent.parent, StatusEvent(status=\ 
     412                            "Attempt to fit model %s with itself. fit will\ 
     413                            not be performed"%self.data.name)) 
     414                return  
    409415            self.manager.schedule_for_fit( value=1,fitproblem =None)  
    410416            if hasattr(self.data, "data"): 

  • sansview/perspectives/fitting/fitpanel.py

    r2a8fac1 r08895c5  
    105105            name = 'Fit' 
    106106        
    107         if self.fit_page_name != name: 
     107        if self.fit_page_name != name and self.draw_model_name !=name: 
    108108            #self.about_page.Disable() 
    109109            from fitpage1D import FitPage1D 
Note: See TracChangeset for help on using the changeset viewer.