Changeset 06e7c26 in sasview for fittingview

Timestamp:

Dec 2, 2011 12:03:01 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:

7a7dbf4

Parents:

fa4885f9

Message:

fixed combined/batch

File:

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

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

@@ -156 +156 @@
             wx.PostEvent(self._manager.parent, StatusEvent(status=\
                             "Fitting: %s"%msg, info="info"))
-        if self.show_constraint.GetValue():
+        if not self.batch_on and self.show_constraint.GetValue():
             if not self._set_constraint():
                 return
@@ -232 +232 @@
         if len(self.model_toFit)>=1:
             self._store_model()
-            if self.show_constraint.GetValue() and\
+            if not self.batch_on and self.show_constraint.GetValue() and\
                              len(self.constraints_list)==0:
                 self._show_all_constraint() 
@@ -734 +734 @@
         self.hide_constraint.SetValue(True)
         self.show_constraint.SetValue(False)
+        print "self.show_constraint", self.show_constraint
         
         sizer_title.Add(wx.StaticText(self,-1," Model"))