Changeset 00561739 in sasview for sansview/perspectives/fitting/simfitpage.py

Timestamp:

Sep 29, 2008 9:37:15 AM (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:

fa9674b

Parents:

4ab1c91

Message:

constraint fitting is not working yet

File:

• sansview/perspectives/fitting/simfitpage.py (modified) (7 diffs)

sansview/perspectives/fitting/simfitpage.py

@@ -44 +44 @@
 
         self.ctl2 = wx.TextCtrl(self, -1, style=wx.TE_MULTILINE)
-        self.ctl2.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
-        self.ctl2.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        #self.ctl2.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
+        #self.ctl2.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
         self.sizer2.Add(self.ctl2, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
        
@@ -65 +65 @@
     def onFit(self,event):
         """ signal for fitting"""
+        self._onTextEnter()
         if len(self.model_toFit) >0 :
             if len(self.params)>0:
@@ -75 +76 @@
             wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Select at least on model to fit "))
+            
+            
     def set_manager(self, manager):
         """
@@ -105 +108 @@
             @param page_finder: the dictionary containing models information
         """
-        import copy 
+       
         self.model_list=[]
         self.model_toFit=[]
@@ -206 +209 @@
     
                 
-    def _onTextEnter(self,event):
+    #def _onTextEnter(self,event):
+    def _onTextEnter(self):
         """
             get values from the constrainst textcrtl ,parses them into model name
@@ -225 +229 @@
                         self.params.append(self.parser_helper(item))
                     except:
-                        wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Loading Error: %s" % sys.exc_value))
+                        wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Constraint Error: %s" % sys.exc_value))
             else:
                 try:
                     self.params.append(self.parser_helper(value))
                 except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Loading Error: %s" % sys.exc_value))
+                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Constraint Error: %s" % sys.exc_value))
         except:
             raise
@@ -253 +257 @@
                 model_name=param_names[0]
                 param_name=param_names[1]
-                param=[str(model_name),str(param_name),str(param_value)]
+                ##### just added
+                if string.find(param_name,".")!=-1:
+                ########
+                    param_new_name= re.split("\.",param_name)
+                else:  
+                    param_new_name=  param_name
+                print "simfitpage: param name",param_new_name
+                param=[str(model_name),str(param_new_name[1]),str(param_value)]
                 #print "simfitpage: param",param
                 return param