Changeset 50c769e in sasview for sansview/perspectives/fitting

Timestamp:

Feb 19, 2009 3:13:27 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:

77bf7c0

Parents:

4f8a00c

Message:

add model description back on modelpage

File:

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

sansview/perspectives/fitting/modelpage.py

@@ -48 +48 @@
         #panel interface
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
+        self.sizer11 = wx.BoxSizer(wx.HORIZONTAL)
         self.sizer10 = wx.GridBagSizer(5,5)
         self.sizer9 = wx.GridBagSizer(5,5)
@@ -59 +60 @@
         self.vbox.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
         self.vbox.Add(self.sizer4)
+        #model description
+        self.vbox.Add(self.sizer11)
         #model paramaters layer
         self.vbox.Add(self.sizer5)
@@ -77 +80 @@
       
         #------------------ sizer 4  draw------------------------  
-        # model on which the fit would be performed
-        self.model=model 
+       
        
         # define combox box
@@ -100 +102 @@
         self.model_view.Bind(wx.EVT_BUTTON, self.onModel2D,id=id)
         self.model_view.SetToolTipString("View model in 2D")
+        
         self.sizer4.Add(self.model_view,(iy,ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        
         self.model_view.Enable()
         self.model_view.SetFocus()
         
+        ix = 0
+        iy += 1
+        self.sizer4.Add((20,20),(iy,ix),(1,1),wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+
         #----------sizer6-------------------------------------------------
         self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
@@ -203 +211 @@
         self.model_list_box={}
         #Draw initial panel
+         #-----sizer 11--------------------model description------
         if self.model!=None:
             self.set_panel(self.model)
@@ -216 +225 @@
         self.Layout()
         self.parent.GetSizer().Layout()
+    def set_model_description(self, model):
+        
+        if model !=None and str(model.description)!=""and self.data==None:
+            self.sizer11.Clear(True)
+            self.box_description= wx.StaticBox(self, -1, 'Model Description')
+            boxsizer1 = wx.StaticBoxSizer(self.box_description, wx.VERTICAL)
+            boxsizer1.SetMinSize((320,20))
+            self.description = wx.StaticText(self,-1,str(model.description))
+            boxsizer1.Add(self.description, 0, wx.EXPAND)  
+            self.sizer11.Add(boxsizer1,1, wx.EXPAND | wx.ALL, 2)
+      
         
     def set_owner(self,owner):
@@ -471 +491 @@
         self.fixed_param=[]
         self.model = model
+        
+        self.set_model_description( self.model) 
+        
         keys = self.model.getParamList()
         #list of dispersion paramaters