Changeset 925a30e in sasview

Timestamp:

Mar 6, 2009 12:27:00 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:

7b73518

Parents:

f93dfcb

Message:

comments added to class

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (1 diff)
• fitpanel.py (modified) (13 diffs)
• fitproblem.py (modified) (7 diffs)
• helpPanel.py (modified) (3 diffs)
• old_ modelpage.py (deleted)
• old_fitpanel.py (deleted)
• simfitpage.py (modified) (17 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -175 +175 @@
             raise
         except:
-            wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
-            return 
+            raise
+            #wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+            #return 
     

sansview/perspectives/fitting/fitpanel.py

@@ -9 +9 @@
 (FitPageEvent, EVT_FIT_PAGE)   = wx.lib.newevent.NewEvent()
 class FitPanel(wx.aui.AuiNotebook):    
-#class FitPanel(wx.aui.AuiNotebook,wx.panel):
+
     """
         FitPanel class contains fields allowing to fit  models and  data
@@ -22 +22 @@
     CENTER_PANE = True
     def __init__(self, parent, *args, **kwargs):
-        
-        #wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_SCROLL_BUTTONS )
         wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_DEFAULT_STYLE  )
         
@@ -38 +36 @@
         self.about_page = PanelAbout(self, -1)
         self.AddPage(self.about_page,"welcome!")
-        #self.about_page.Disable()
-        #Creating a page for simultaneous fitting
+      
        
-        
-        self._mgr = self.GetAuiManager()
-
-        
         #dictionary of miodel {model class name, model class}
         self.model_list_box={}
@@ -64 +57 @@
     def onClosePage(self, event):
         """
+             close page and remove all references to the closed page
         """
         selected_page = self.GetPage(self.GetSelection())
@@ -78 +72 @@
                     break
             #Delete the page from notebook
-           
-            #print "on close",selected_page.name,self.GetPageText(page_number),self.draw_model_name
-            
             if selected_page.name in self.fit_page_name:
                 self.fit_page_name.remove(selected_page.name)
                 
             if selected_page.name== self.draw_model_name:
-                #print "went here"
                 self.draw_model_name=None
                 self.model_page=None
@@ -91 +81 @@
                 self.model_page=None
                 self.draw_model_name=None
-            #selected_page.Destroy()
-            #self.RemovePage(page_number)
-            #i=self.DeletePage(page_number)
+            
         elif selected_page==self.about_page:
-            #selected_page.Destroy()
-            #self.DeletePage(page_number)
             self.about_page=None
         else:
-            
             self.manager.sim_page=None  
-            #self.DeletePage(page_number)
-   
-
-
+        
         
     def set_manager(self, manager):
@@ -112 +94 @@
         """
         self.manager = manager
-        #self.sim_page.set_manager(manager)
+
         
     def set_owner(self,owner):
@@ -119 +101 @@
             @param owner: the class responsible of plotting
         """
-        self.event_owner=owner
+        self.event_owner = owner
         
     def add_sim_page(self):
+        """
+            Add the simultaneous fit page
+        """
         from simfitpage import SimultaneousFitPage
         self.sim_page = SimultaneousFitPage(self, id=-1)
@@ -131 +116 @@
         """ 
             Add a fitting page on the notebook contained by fitpanel
-            @param panel: contains in the page to add
-            @param name: title of the page tab
+            @param data: data to fit
             @return panel : page just added for futher used. is used by fitting module
         """     
         try:
-            name = data.name # item in Data1D
+            name = data.name 
         except:
             name = 'Fit'
         
-        #if self.fit_page_name != name and self.draw_model_name !=name:
         if not name in self.fit_page_name :
-            #self.about_page.Disable()
             from fitpage1D import FitPage1D
             panel = FitPage1D(self,data, -1)
             panel.name=name
-            #m_name= "M"+str(self.count)  
+            
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
@@ -154 +136 @@
             self.fit_page_name.append(name)
     
-            return panel #,m_name
+            return panel 
         else:
-            return None #, None
+            return None 
         
     def _help_add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50):
@@ -167 +149 @@
         """
         from modelpage import ModelPage
-        #print "fitpanel model", model
+        
         panel = ModelPage(self,model,page_title, -1)
         panel.set_manager(self.manager)
@@ -201 +183 @@
             @param npts: number of Q points
         """
-        #print "self.draw_model_name none",self.draw_model_name
         if topmenu==True:
             if  self.draw_model_name ==None:
-                #print "self.draw_model_name none"
                 self._help_add_model_page(model,description,page_title, qmin=qmin, qmax=qmax, npts=npts)
             else:
-                #self.model_page.name=page_title
-                #self.draw_model_name=page_title
-                #print "wnent here self.draw_model_name ",self.draw_model_name,self.model_page.name,self.model_page
-                
                 self.model_page.select_model(model, page_title)
           
@@ -217 +193 @@
             @return the current page selected
         """
-        #return self.nb.GetCurrentPage()
         return self.GetPage(self.GetSelection() )
   
-    
-    def onClose(self, page=None,page_number=None):
-        """
-             close the current page except the simpage. remove each check box link to the model
-             selected on that page. remove its reference into page_finder (fitting module)
-        """
-        #print "model page", page_number, page, self.draw_model_name
-        if page!=None and page_number!=None:
-            i=self.DeletePage(page_number)
-            #self.nb.RemovePage(page_number)
-            #page.Destroy()
-            self.model_page_number=None
-            self.model_page=None
-            self.draw_model_name=None
-            #print"self.draw_model_name",self.draw_model_name
-            return 
-        try:
-            sim_page = self.GetPage(1)
-            selected_page = self.GetPage(self.GetSelection())
-            #print "sim_page ",sim_page ,selected_page
-            if sim_page != selected_page:
-                #print "sim_page ",sim_page ,selected_page
-                # remove the check box link to the model name of this page (selected_page)
-                sim_page.remove_model(selected_page)
-                #remove that page from page_finder of fitting module
-                page_finder=self.manager.get_page_finder() 
-                for page, value in page_finder.iteritems():
-                    if page==selected_page:
-                        del page_finder[page]
-                        break
-                #Delete the page from notebook
-                page_number = self.GetSelection()
-                #print "on close",selected_page.name,self.GetPageText(page_number),self.draw_model_name
-                
-                if selected_page.name in self.fit_page_name:
-                    self.fit_page_name.remove(selected_page.name)
-                    
-                if selected_page.name== self.draw_model_name:
-                    #print "went here"
-                    self.draw_model_name=None
-                    self.model_page=None
-                if  page_number == 1:
-                    self.model_page=None
-                    self.draw_model_name=None
-                #selected_page.Destroy()
-                #self.RemovePage(page_number)
-                i=self.DeletePage(page_number)
-                #self.count =self.count -1 
-                
-        except:
-            raise
-        #print "fitpanel", self.draw_model_name 
-        
+   
     def set_model_list(self,dict):
          """ 

sansview/perspectives/fitting/fitproblem.py

@@ -16 +16 @@
             and its name assign example [lineModel, M0]
         """
+        ## data used for fitting
         self.fit_data=None
-        self.theory_name=None
+        ## list containing couple of model and its name
         self.model_list=[]
+        ## if 1 this fit problem will be selected to fit , if 0 
+        ## it will not be selected for fit
         self.schedule=0
+        ##list containing parameter name and value
         self.list_param=[]
-        self.name_per_page=None
+        ## smear object to smear or not data1D
         self.smearer= None
+        ## same as fit_data but with more info for plotting
+        ## axis unit info and so on see plottables definition
         self.plotted_data=None
         
+        
     def set_smearer(self, smearer):
+        """
+          save reference of  smear object on fitdata
+          @param smear : smear object from DataLoader
+        """
         self.smearer= smearer
-        #print "smeaerer in fitproblem",self.smearer
+       
     def get_smearer(self):
+        """
+            return smear object
+        """
         return self.smearer
     
-    def save_model_name(self, name):  
-        self.name_per_page= name
-        
-        
-    def get_name(self):
-        return self.name_per_page
     
     def set_model(self,model,name):
@@ -53 +61 @@
         """
         self.plotted_data = data
+        
+        
     def add_fit_data(self,data):
         """ 
@@ -62 +72 @@
     def get_model(self):
         """ @return: saved model """
-        #print "fitproblem",self.model_list
         return self.model_list
      
@@ -89 +98 @@
     def set_model_param(self,name,value):
         """ 
-            set the value of a given parameter of this model
+            Store the name and value of a parameter of this fitproblem's model
             @param name: name of the given parameter
             @param value: value of that parameter
         """
-        #print "fitproblem",name,value
-        #self.model_list[0].setParam(name,value)
         self.list_param.append([name,value])
+        
+        
     def get_model_param(self):
         """ 
-            set the value of a given parameter of this model
-            @param name: name of the given parameter
-            @param value: value of that parameter
+            @return list of couple of parameter name and value
         """
-        #print self.param_name, self.param_value
-        #self.model_list[0].setParam(name,value)
         return self.list_param
+        
         
     def reset_model(self,model):
@@ -111 +117 @@
             @param value: new model
         """
-        #print "fitproblem : reset model"
         self.model_list[0]=model
+        
         
     def schedule_tofit(self, schedule=0):
@@ -123 +129 @@
         """ return true or false if a problem as being schedule for fitting"""
         return self.schedule
+    
+    
     def clear_model_param(self):
         """
@@ -128 +136 @@
         """
         self.list_param=[]
+        
+        

sansview/perspectives/fitting/helpPanel.py

@@ -46 +46 @@
         
         button_OK = wx.Button(self, wx.ID_OK, "OK")
-        #button_Cancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
-        
+
         sizer_button = wx.BoxSizer(wx.HORIZONTAL)
         sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        sizer_button.Add(button_OK, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
-        #sizer_button.Add(button_Cancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)        
+        sizer_button.Add(button_OK, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)       
         vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
 
@@ -63 +61 @@
     def __init__(self, parent, id, title):
         wx.Frame.__init__(self, parent, id, title, size=(600, 450))
-        
+        """
+             contains help info
+        """
         vbox1  = wx.BoxSizer(wx.HORIZONTAL)
         
@@ -127 +127 @@
         
         self.SetSizer(vbox1)
-        
         self.Centre()
         self.Show(True)
+        
+        
     def OnLinkClicked(self, event):
         """

sansview/perspectives/fitting/simfitpage.py

@@ -9 +9 @@
         two data members window_name and window_caption
     """
-      ## Internal name for the AUI manager
+    ## Internal name for the AUI manager
     window_name = "simultaneous Fit page"
     ## Title to appear on top of the window
@@ -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)
-        #self.sizer2 = wx.GridBagSizer(5,5)
         self.sizer2  = wx.BoxSizer(wx.HORIZONTAL)
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
@@ -54 +52 @@
         self.model_toFit=[]
         
-        #self.add_model(self.page_finder)
         self.vbox.Layout()
         self.vbox.Fit(self) 
@@ -84 +81 @@
         self.add_model( self.manager.page_finder)
         
+        
     def select_all_model_name(self,event):
         """
@@ -92 +90 @@
             for item in self.model_list:
                 item[0].SetValue(True)
-                #item[1].schedule_tofit(1)
                 self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
                 self.model_toFit.append(item)
         else:
-            #print"simfit: deselected all"
-            
             for item in self.model_list:
                 item[0].SetValue(False) 
@@ -112 +107 @@
         if len(self.model_list)>0:
             for item in self.model_list:
-                #print "went here to clear"
                 item[0].SetValue(False) 
                 self.manager.schedule_for_fit( value=0,fitproblem =item[1])
@@ -123 +117 @@
         iy = 1 
         list=[]
-       # if len(self.page_finder)>0:
         for page, value in page_finder.iteritems():
             try:
@@ -137 +130 @@
                 self.model_list.append([cb,value,page,modelname])
             except:
-                #wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Simultaneous fit: %s doesn't have a model selected yet %s" % \
-                #(value.get_data().group_id,sys.exc_value)))
                 pass
         iy +=1
@@ -145 +136 @@
         self.vbox.Layout()
         
+        
     def remove_model(self,delpage):
         """
@@ -150 +142 @@
              @param delpage: the page removed
         """
-        #print "self.model_list",self.model_list
-       
         self.model_list=[]
         self.model_toFit=[]
@@ -174 +164 @@
                     self.model_list.append([cb,value,page,modelname])
             except:
-                #wx.PostEvent(self.parent.GrandParent, StatusEvent(status="Simultaneous fit: %s doesn't have a model selected yet %s" % \
-                #(value.get_data().group_id,sys.exc_value)))
                 pass
         iy +=1
@@ -182 +170 @@
         self.vbox.Layout()
         
+        
     def select_model_name(self,event):
         """
@@ -189 +178 @@
         for item in self.model_list:
             if item[0].GetValue()==True:
-                #item[1].schedule_tofit('True')
-                #item[1].schedule_tofit(1)
                 self.model_toFit.append(item)
                 self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
             else:
-                #print"simfit: deselected one"
                 self.manager.schedule_for_fit( value=0,fitproblem =item[1]) 
                 if item in self.model_toFit:
@@ -209 +195 @@
     def set_model(self):
         """
-            set_model take values in self.params which are the values enters by the user
-            and try to assign them into the model concerned in self.manager. page.finder
+            set_model take values in self.params which are the values
+            entered by the user and try to assign them into the model 
+            concerned in self.manager. page.finder
         """
         if len(self.params) >0:
             for item in self.model_toFit:
-                #print"simfitpage: self.model_toFit",item[1]
                 list=item[1].get_model()
-                #print "simfitpage: list fitpanel2",list,list[0]
                 model=list[0]
                 param_list=model.getParamList()
-                #print "simfitpage: on set_model self.params ",self.params
                 if self.params !=[]:
                     for element in self.params:
@@ -225 +209 @@
                             for item in param_list:
                                 if item==str(element[1]):
-                                    #print "simfitpage: on set_model page 1",param_list
-                                    #print "simfitpage: model name",element[0], model.name
-                                    #print "simfitpage: param name ,param value",element[1],element[2]
-                                    self.manager.set_page_finder(model.name,element[1],\
+                                    self.manager.set_page_finder(model.name,element[1],
                                                                  str(element[2]))
-                            #print "simfitpage:on set_model page 2",model.params['A'],self.params[2]
+                           
     
     def _onTextEnter(self):
@@ -236 +217 @@
             get values from the constrainst textcrtl ,parses them into model name
             parameter name and parameters values.
-            store them in a list self.params .when when params is not empty set_model uses it
-            to reset the appropriate model and its appropriates parameters
+            store them in a list self.params .when when params is not empty set_model 
+            uses it to reset the appropriate model and its appropriates parameters
         """
         value= self.ctl2.GetValue()
         if value:
             self.params=[]
-            #print "simfitpage: value",value
             try:
                 expression='[\s,;]'
                 if re.search(expression,value) !=None:
                     word=re.split(expression,value)
-                    #print "simfitpage: when herre",word
                     for item in word:
                         self.params.append(self.parser_helper(item))
@@ -253 +232 @@
                     self.params.append(self.parser_helper(value))  
             except:
-                #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):
+      
+        
+    def 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):
-        """
-             @return  param:a list containing the name of a model ,its parameters 
-             value and name extracted from the constrainst controlbox
-        """
-        #print "simfitpage: value",value
         if string.find(value, "=") !=-1:
             model_param= re.split("=",value)
             param_name=model_param[0]
             param_value=model_param[1]
-            #print"simfitpage: ", param_name
-            #print "simfitpage: ",param_value
+            
             if string.find(param_name,".")!=-1:
                 param_names= re.split("\.",param_name)
                 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
         else:
-            #raise ValueError,"Missing '=' in expression"
             wx.PostEvent(self.parent.Parent, StatusEvent(status="Missing '=' in expression"))