Changeset 060b857 in sasview

Timestamp:

Sep 8, 2008 12:14:08 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:

bee885e

Parents:

c8c5b9a

Message:

model view added

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (4 diffs)
• fitting.py (modified) (3 diffs)
• modelpage.py (modified) (5 diffs)
• models.py (modified) (1 diff)

sansview/perspectives/fitting/fitpanel.py

@@ -50 +50 @@
         # save the title of the last page tab added
         self.fit_page_name=None
-        self.draw_model_name=[]
+        self.draw_model_name=None
+        self.page_name="Model View"
         self.nb.Update()
         self.SetSizer(self.sizer)
@@ -90 +91 @@
             return panel
     def add_model_page(self,model,page_title):
-        if not  page_title in self.draw_model_name: 
+        print "fitpanel: self.draw_model_name",self.draw_model_name
+        if  page_title !=self.draw_model_name or self.draw_model_name ==None: 
+            print "went here"
             from modelpage import ModelPage
             panel = ModelPage(self.nb,model, -1)
@@ -97 +100 @@
             self.nb.AddPage(page=panel,text=page_title,select=True)
             panel.populate_box( self.model_list_box)
-            self.draw_model_name.append(page_title)
+            self.draw_model_name=page_title
+        else:
+            print "fitpanel: a page was added already "
+            for i in range(self.nb.GetPageCount()):
+                if self.nb.GetPageText(i)==self.page_name:
+                    page=self.nb.GetPage(i)
+                    page.set_page(model)
+                    break
+                
            
   
@@ -147 +158 @@
                     del page_finder[page]
                     break
-            #delete the page from notebook
+            #Delete the page from notebook
+            page_number = self.nb.GetSelection()
+            if self.nb.GetPageText(page_number)== self.page_name:
+                self.draw_model_name=None
+                
             selected_page.Destroy()
-            self.nb.RemovePage(self.nb.GetSelection())
+            self.nb.RemovePage(page_number)
             self.name=None
             

sansview/perspectives/fitting/fitting.py

@@ -234 +234 @@
             self.plot_helper(currpage=current_pg,qmin=qmin,qmax=qmax)
         except:
-             wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
+            raise
+            wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
             
        
@@ -352 +353 @@
                 #print "fitting: pars",pars
                 pars.sort()
-                
-                self.fitter.set_model(model,model.name, self.id, pars) 
+                print "fitting: model ",model.__class__.__name__
+                self.fitter.set_model(Model(model),model.name, self.id, pars) 
                 self.fitter.set_data(data,self.id,qmin,qmax)
                 #Do the fit SCIPY
@@ -543 +544 @@
             Plot a theory from a model selected from the menu
         """
+        print "_on_model_menu done"
         #name = evt.model.__class__.__name__
         name="Model View"

sansview/perspectives/fitting/modelpage.py

@@ -49 +49 @@
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
-       
         self.sizer3 = wx.GridBagSizer(5,5)
         self.sizer2 = wx.GridBagSizer(5,5)
-       
         self.modelbox = wx.ComboBox(self, -1)
         id = wx.NewId()
-       
         self.vbox.Add(self.sizer3)
         self.vbox.Add(self.sizer2)
-      
         ix = 0
         iy = 1
-        
         self.sizer3.Add(wx.StaticText(self,-1,'Model'),(iy,ix),(1,1)\
                   , wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
         self.sizer3.Add(self.modelbox,(iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-       
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -79 +73 @@
         # flag to check if the user has selected a new model in the combox box
         self.model_hasChanged=False
-       
         #dictionary of model name and model class
         self.model_list_box={}
         # Data1D to make a deep comparison between 2 Data1D for checking data
         #change
-       
         self.vbox.Layout()
         self.vbox.Fit(self) 
@@ -124 +116 @@
             wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
         return 0
-    
-    
+   
+    def set_page(self, model):
+        print " modelpage: set_page was called",model
+        self.model=model
+        if hasattr(self.model, "name"):
+            name = self.model.name
+        else:
+            name = self.model.__class__.__name__
+        self.modelbox.SetValue(name)
+        self.set_panel(self.model)
+        self.manager.draw_model(self.model)
     def _on_select_model(self,event):
         """
@@ -191 +192 @@
         iy = 1
         ix = 0
+        
         self.cb1 = wx.StaticText(self, -1,'Parameters')
         self.sizer2.Add(self.cb1,(iy, ix),(1,1),\
@@ -246 +248 @@
             for item in self.parameters:
                 try:
-                     name=str(item[0])
+                     name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
-                     
+                     print "modelpage: name. value",name , value
                      self.model.setParam(name,value)
                      self.manager.draw_model(self.model)

sansview/perspectives/fitting/models.py

@@ -4 +4 @@
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
+