Changeset 51d47b5 in sasview for sansview/perspectives/fitting/simfitpage.py

Timestamp:

Feb 26, 2009 3:38:02 PM (15 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:

3199b59

Parents:

8346667

Message:

small bugs fixed

File:

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

sansview/perspectives/fitting/simfitpage.py

@@ -21 +21 @@
         """
         self.parent = parent
+        #self.page_finder = page_finder
+        self.page_finder={}
         self.sizer3 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
@@ -51 +53 @@
         self.model_list=[]
         self.model_toFit=[]
-        self.page_finder={}
-       
+        
+        #self.add_model(self.page_finder)
         self.vbox.Layout()
         self.vbox.Fit(self) 
@@ -64 +66 @@
         for page in self.page_finder.iterkeys():
             page.set_model_parameter()
-            
-        #if len(self.model_toFit) ==1 :
-        #    self.manager._on_single_fit()
-           # print "simfitpage: when here"
         if len(self.model_toFit) >= 1 :
             self._onTextEnter()
@@ -84 +82 @@
         """
         self.manager = manager
-        
+        self.add_model( self.manager.page_finder)
         
     def select_all_model_name(self,event):
@@ -125 +123 @@
         iy = 1 
         list=[]
+       # if len(self.page_finder)>0:
         for page, value in page_finder.iteritems():
             try:
@@ -254 +253 @@
                     self.params.append(self.parser_helper(value))  
             except:
-                raise
+                #raise
                 wx.PostEvent(self.parent.Parent, StatusEvent(status="Constraint Error: %s" % sys.exc_value))
         #print "simfitpage: self.params",self.params
-        
-        
+    def new_parser_helper(self,value):
+        """
+             @return  param:a list containing the name of a model ,its parameters 
+             value and name extracted from the constrainst controlbox
+        """
+        from sans.guiframe import utils
+        mylist=["=","<",">","<=", ">="]
+        for item in mylist:
+            if utils.look_for_tag( value,str(item))[0]:
+                print "went here"
+                model_param = utils.split_text(str(item), value,1)
+                param_name = model_param[0]
+                param_value = model_param[1]
+                print "simpage",utils.look_for_tag(param_name,"\.")[0]
+                if utils.look_for_tag(param_name,"\.")[0]:
+                    param_names = utils.split_text("\.",param_name,1)
+                    model_name = param_names[0]
+                    param_name = param_names[1]
+                    ##### just added
+                    print "simfitpage: param name",model_name,param_name
+                
+                    param=[str(model_name),param_name,str(param_value),"="]
+                    #print "simfitpage: param",param
+                    return param
+                else:
+                    #raise ValueError,"cannot evaluate this expression"
+                    wx.PostEvent(self.parent.Parent,
+                                  StatusEvent(status="cannot evaluate this expression"))
+                    return
+            elif utils.look_for_tag( value,"<")[0]:
+                model_param = utils.split_text("<", value,2)
+                if len(model_param)== 2:
+                    try:
+                        param_name = str(model_param[0])
+                        param_value = float(model_param[1])
+                        param=[str(model_name),param_name,param_value,"<"]
+                        #print "simfitpage: param",param
+                        return param
+                    except:
+                        wx.PostEvent(self.parent.Parent, StatusEvent(status="\
+                        could read this expression%s" % sys.exc_value))
+                        return
+            else:
+                #raise ValueError,"Missing '=' in expression"
+                wx.PostEvent(self.parent.Parent, StatusEvent(status="Missing '=' in expression"))
+                
+            
         
     def parser_helper(self,value):
@@ -283 +327 @@
                 return param
             else:
-                raise ValueError,"cannot evaluate this expression"
+                #raise ValueError,"cannot evaluate this expression"
+                wx.PostEvent(self.parent.Parent,
+                              StatusEvent(status="cannot evaluate this expression"))
                 return
         else:
-            raise ValueError,"Missing '=' in expression"
+            #raise ValueError,"Missing '=' in expression"
+            wx.PostEvent(self.parent.Parent, StatusEvent(status="Missing '=' in expression"))