Changeset 2dbb681 in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Oct 21, 2008 12:30:12 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:

5893cdb

Parents:

b3328d8

Message:

change window title

File:

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

sansview/perspectives/fitting/modelpage.py

@@ -39 +39 @@
     
     
-    def __init__(self, parent,model,description, *args, **kwargs):
+    def __init__(self, parent,model, *args, **kwargs):
         wx.Panel.__init__(self, parent, *args, **kwargs)
         """ 
@@ -80 +80 @@
         # model on which the fit would be performed
         self.model=model
-        self.description=description
-        self.set_panel(model,description)
+        try:
+            print"init modelpage",model.name
+            self.set_panel(model)
+        except:
+            raise
         # preview selected model name
         self.prevmodel_name=model.__class__.__name__
@@ -95 +98 @@
         self.SetSizer(self.vbox)
         self.Centre()
-        
+       
         
     def onClose(self,event):
@@ -123 +126 @@
         id=0
         self.model_list_box=dict
-        for item in self.model_list_box.itervalues():
-            if hasattr(item, "name"):
-                name = item.name
-            else:
-                name = item.__name__
-            
+        list_name=[]
+        for item in  self.model_list_box.itervalues():
+            name = item.__name__
+            model=item()
+            if hasattr(model, "name"):
+                name = model.name
+            list_name.append(name)
+        list_name.sort()   
+        for name in list_name:
             self.modelbox.Insert(name,int(id))
             id+=1
-            
-            wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
+        wx.EVT_COMBOBOX(self.modelbox,-1, self._on_select_model) 
         return 0
    
-    def set_page(self, model,description):
+    def set_page(self, model,description=None):
         #print " modelpage: set_page was called",model
         self.model=model
-        self.description=description
+        name = self.model.__class__.__name__
         if hasattr(self.model, "name"):
             name = self.model.name
-        else:
-            name = self.model.__class__.__name__
+        
+           
         self.modelbox.SetValue(name)
-        self.set_panel(self.model,description)
+        self.set_panel(self.model)
         self.manager.draw_model(self.model)
+        
     def _on_select_model(self,event):
         """
@@ -153 +159 @@
         #print "modelpage: self.model_list_box ",self.model_list_box
         for item in self.model_list_box.itervalues():
-            model=item()
-            #print "modelpage:model",model
-            if hasattr(model, "name"):
-                name = model.name
-            else:
-                name = model.__class__.__name__
-            try:
-                if name ==event.GetString():
-                    self.model=model
-                    self.set_panel(self.model)
-                    self.manager.draw_model(self.model)
-            except:
-                raise #ValueError,"model.name is not equal to model class name"
+            name = item.__name__
+            items=item()
+            if hasattr(items, "name"):
+                name = items.name
+            print "fitpage: _on_select_model model name",name ,event.GetString()
+            if name ==event.GetString():
+                model=items
+                print "fitpage: _on_select_model model name",name ,event.GetString()
+                self.manager.draw_model(model)
+                self.set_panel(model)
     def set_model_name(self,name):
         """ 
@@ -197 +200 @@
         
         
-    def set_panel(self,model,description=None):
+    def set_panel(self,model):
         """
             Build the panel from the model content
             @param model: the model selected in combo box for fitting purpose
         """
-    
+        
         self.sizer2.Clear(True)
         self.sizer1.Clear(True)
@@ -210 +213 @@
         keys = self.model.getParamList()
         keys.sort()
+        print "went here",self.model.name,model.description
         iy = 1
         ix = 0
@@ -216 +220 @@
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
-        self.cb01 = wx.StaticText(self, -1,str(description))
+        self.cb01 = wx.StaticText(self, -1,str(model.description))
         self.sizer1.Add(self.cb01,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -245 +249 @@
             ctl1.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
             self.sizer2.Add(ctl1, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-           
             ix +=1
             # Units
@@ -262 +265 @@
             else:
                 self.text2_4.Hide()
-       
         self.vbox.Layout()
         self.GrandParent.GetSizer().Layout()
-        
+        print "out"
         
     def _onparamEnter(self,event):
@@ -280 +282 @@
                      value= float(item[1].GetValue())
                      self.model.setParam(name,value)
-                     self.manager.draw_model(self.model)
                 except:
-                    
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
-   
-  
+            self.manager.draw_model(self.model)
+