Changeset bb7d8a4 in sasview

Timestamp:

Mar 26, 2009 3:54:37 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:

a911b48

Parents:

dfae8b3

Message:

simpage working on

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (1 diff)
• simfitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -450 +450 @@
                             param_name = item[0]
                             ## check if constraint
-                            if param_value !=None:
+                            if param_value !=None and param_name != None:
                                 new_model.parameterset[ param_name].set( param_value )
                 

sansview/perspectives/fitting/simfitpage.py

@@ -99 +99 @@
             if event.GetId()==item[length-2].GetId():
                 sizer= item[length-1]
+                sizer.Clear(True)
                 self.sizer_constraints.Remove(sizer)
-                self.sizer_constraints.Layout()
+                #self.sizer_constraints.Layout()
                 self.sizer2.Layout()
                 self.SetScrollbars(20,20,200,100)
@@ -537 +538 @@
             param = item[1].GetString(item[1].GetCurrentSelection())
             constraint = item[3].GetValue().lstrip().rstrip()
+            if param.lstrip().rstrip()=="":
+                param= None
+                msg= " Constraint will be ignored!. missing parameters in combobox"
+                msg+= " to set constraint! "
+                wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
+                
             if model  in self.constraint_dict.keys():
                 page = self.constraint_dict[model]
                 if constraint == "":
+                    msg= " Constraint will be ignored!. missing value in textcrtl"
+                    msg+= " to set constraint! "
+                    wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
                     constraint = None