Changeset 88f286d in sasview

Timestamp:

May 24, 2011 4:29:55 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

bc03f06

Parents:

57b551e

Message:

Added model number in the title of the model box

File:

• sansview/perspectives/fitting/fitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -39 +39 @@
         """
         BasicPage.__init__(self, parent, color=color)
-        self.model_name_txt = None
+        
         ## draw sizer
         self._fill_datainfo_sizer()
@@ -422 +422 @@
         sizer_data.Add(wx.StaticText(self, -1, 'Name : '))
         sizer_data.Add(self.dataSource )
-        self.model_name_txt = wx.StaticText(self, -1, " [No model]",
-                                 style=wx.ALIGN_LEFT)
-        self.model_name_txt.SetForegroundColour('blue')
-        sizer_data.Add(self.model_name_txt)
+        sizer_data.Add( (0,5) )
         """
         #---------sizer 2 draw--------------------------------
@@ -457 +454 @@
         self.formfactorbox = None
         self.multifactorbox = None
-        box_description= wx.StaticBox(self, -1,str(title))
-        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-         
+        self.mbox_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(self.mbox_description, wx.VERTICAL)
+        
         id = wx.NewId()
         self.model_help =wx.Button(self,id,'Details', size=(80,23))
@@ -1084 +1081 @@
    
             self._manager._on_model_panel(evt=evt)
+            self.mbox_description.SetLabel("Model [%s]" % str(self.model.name))
             self.state.model = self.model.clone()
             self.state.model.name = self.model.name
-            if self.model_name_txt is not None:
-                self.model_name_txt.SetLabel(" [%s]" % str(self.model.name))
-                self.model_name_txt.SetForegroundColour('blue')
+
             self._draw_model()
         if event != None: