Changeset 08895c5 in sasview

Timestamp:

Feb 24, 2009 1:24:27 PM (16 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:

• fitpage1D.py (modified) (1 diff)
• fitpanel.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage1D.py

@@ -407 +407 @@
         self.qmax_x =float( self.qmax.GetValue())
         if len(self.param_toFit) >0 and flag==True:
+            if self.data.name == self.model.__class__.__name__:
+                print "when here have the same name "
+                wx.PostEvent(self.parent.parent, StatusEvent(status=\
+                            "Attempt to fit model %s with itself. fit will\
+                            not be performed"%self.data.name))
+                return 
             self.manager.schedule_for_fit( value=1,fitproblem =None) 
             if hasattr(self.data, "data"):

sansview/perspectives/fitting/fitpanel.py

@@ -105 +105 @@
             name = 'Fit'
        
-        if self.fit_page_name != name:
+        if self.fit_page_name != name and self.draw_model_name !=name:
             #self.about_page.Disable()
             from fitpage1D import FitPage1D