Changeset 00daba9 in sasview for fittingview

Timestamp:

Sep 21, 2011 10:15:17 AM (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:

6721b75

Parents:

6774d79

Message:

added tip

File:

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

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

@@ -50 +50 @@
         Simultaneous page display
         """
+        self.SetupScrolling()
         ##Font size
         self.SetWindowVariant(variant = FONT_VARIANT)
@@ -138 +139 @@
         ## validity of the constraint expression is own by fit engine
         if self.show_constraint.GetValue():
-            self._set_constraint()
+            if not self._set_constraint():
+                return
         ## model was actually selected from this page to be fit
         if len(self.model_toFit) >= 1 :
@@ -405 +407 @@
                 self.ctl2.SetValue(str(model_right + "." + str(param)))
                 has_param = True
-                if num_cbox == len(param_list):
+                if num_cbox == (len(param_list) + 1):
                     break
                 self._show_constraint()
@@ -429 +431 @@
             nb_fit_param = 0
             for id, model in self.constraint_dict.iteritems():
-                nb_fit_param += len(self.page_finder[id].get_param2fit())#len(get_fittableParam(model))
+                nb_fit_param += len(self.page_finder[id].get_param2fit())
             ##Don't add anymore
             if len(self.constraints_list) == nb_fit_param:
@@ -437 +439 @@
                 self.sizer_constraints.Layout()
                 self.sizer2.Layout()
-                self.SetScrollbars(20,20,25,65)
+                #self.SetScrollbars(20,20,25,65)
                 return
         if len(self.model_toFit) < 2 :
@@ -444 +446 @@
             self.sizer_constraints.Layout()
             self.sizer2.Layout()
-            self.SetScrollbars(20,20,25,65)
+            #self.SetScrollbars(20,20,25,65)
             return
             
@@ -488 +490 @@
         self.sizer_constraints.Layout()
         self.sizer2.Layout()
-        self.SetScrollbars(20,20,25,65)
+        #self.SetScrollbars(20,20,25,65)
         
     def _hide_constraint(self): 
@@ -692 +694 @@
                                      StatusEvent(status= msg ))
                         constraint = None
+                    if str(param) in self.page_finder[id].get_param2fit():
+                        msg = " Checking constraint for parameter: %s ", param
+                        wx.PostEvent(self.parent.parent, 
+                                    StatusEvent(info="info", status= msg ))
+                    else:
+                        model_name = item[0].GetLabel()
+                        fitpage = self.page_finder[id].get_fit_tab_caption()
+                        msg = "All constrainted parameters must be set "
+                        msg += " adjustable: '%s.%s' "% (model_name, param)
+                        msg += "is NOT checked in '%s'. "% fitpage
+                        msg += " Please check it to fit or"
+                        msg += " remove the line of the constraint."
+                        wx.PostEvent(self.parent.parent, 
+                                StatusEvent(info="error", status= msg ))
+                        return False
+                        
                     for fid in self.page_finder[id].iterkeys():
                         self.page_finder[id].set_model_param(param,
                                                         constraint, fid=fid)
                     break
+        return True
     
     def _fill_sizer_model_list(self,sizer):