Changeset 060b857 in sasview for sansview/perspectives/fitting/modelpage.py

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

File:

• sansview/perspectives/fitting/modelpage.py (modified) (5 diffs)

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)