Changeset 6c08ba5 in sasview for fittingview/src/sans/perspectives

Timestamp:

Sep 15, 2011 12:13:26 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:

4133316

Parents:

b2aef1c

Message:

disabled checkbox if there is no data in the fitpage

File:

• fittingview/src/sans/perspectives/fitting/simfitpage.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -164 +164 @@
         if self.cb1.GetValue()== True:
             for item in self.model_list:
-                item[0].SetValue(True)
-                self.model_toFit.append(item)
+                if item[0].IsEnabled():
+                    item[0].SetValue(True)
+                    self.model_toFit.append(item)
                 
             ## constraint info
@@ -588 +589 @@
                 iy += 1 
                 for fitproblem in value.get_fit_problem():
+                    data = fitproblem.get_fit_data()
                     model = fitproblem.get_model()
                     name = '_'
@@ -594 +596 @@
                     cb = wx.CheckBox(self, -1, name)
                     cb.SetValue(False)
-                    cb.Enable(model is not None)
+                    cb.Enable(model is not None and data.is_data)
                     sizer.Add(cb, (iy, ix), (1, 1), 
                                wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -603 +605 @@
                     sizer.Add(model_type, (iy, ix), (1, 1), 
                               wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                    data = fitproblem.get_fit_data()
                     name = '-'
-                    if data is not None:
+                    if data is not None and data.is_data:
                         name = str(data.name)
                     data_used = wx.StaticText(self, -1, name)