Changeset 41a8cb3 in sasview

Timestamp:

Apr 20, 2012 12:58:17 PM (13 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:

3553ad2

Parents:

c151afc

Message:

added msg in the panel

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (15 diffs)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -19 +19 @@
     FONT_VARIANT = 0
     PNL_WIDTH = 460
-    PNL_HITE = 300
+    PNL_HITE = 320
 else:
     FONT_VARIANT = 1
     PNL_WIDTH = 500
-    PNL_HITE = 370
+    PNL_HITE = 400
 M_NAME = 'SumModel'
 EDITOR_WIDTH = 800
-EDITOR_HEIGTH = 700
+EDITOR_HEIGTH = 720
 PANEL_WIDTH = 500
 _BOX_WIDTH = 51
@@ -74 +74 @@
         self.model1_string = "SphereModel"
         self.model2_string = "CylinderModel"
+        self._notes = ''
+        self._msg_box = None
+        self.msg_sizer = None
         self._build_sizer()
         self.model1_name = str(self.model1.GetValue())
@@ -152 +155 @@
         #explanation  += "  Note: This will overwrite the previous sum model.\n"
         model_string = " Model%s (p%s):"
+        # msg
+        self._msg_box = wx.StaticText(self, -1, self._notes)
+        self.msg_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.msg_sizer.Add(self._msg_box, 0, wx.LEFT, 0)
         vbox.Add(self.name_hsizer)
         vbox.Add(self.desc_sizer)
@@ -174 +181 @@
         vbox.Add((10,10))
         vbox.Add(self.static_line_1, 0, wx.EXPAND, 10)
+        vbox.Add(self.msg_sizer, 0, 
+                 wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE|wx.BOTTOM, 10)
         sizer_button = wx.BoxSizer(wx.HORIZONTAL)
         sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -214 +223 @@
                 wx.MessageBox(msg, info)  
                 self._notes = msg
+                color = 'red'
+                self._msg_box.SetLabel(msg)
+                self._msg_box.SetForegroundColour(color)
                 return self.good_name
         self.fname = os.path.join(self.plugin_dir, t_fname)
-        self._notes = "SumModel function (%s) has been set. \n" % str(title)
+        s_title = title
+        if len(title) > 20:
+            s_title = title[0:19] + '...'
+        self._notes = "SumModel function (%s) has been set! \n" % str(s_title)
         self.good_name = True
         self.on_apply(self.fname)
@@ -235 +250 @@
             msg = self._notes
             info = 'Infor'
+            color = 'blue'
         except:
             msg= "Easy Custom Sum: Error occurred..."
             info = 'Error'
+            color = 'red'
+        self._msg_box.SetLabel(msg)
+        self._msg_box.SetForegroundColour(color)
         if self.parent.parent != None:
             from sans.guiframe.events import StatusEvent 
@@ -350 +369 @@
         self.function_strings = ''
         self._notes = ""
+        self._msg_box = None
+        self.msg_sizer = None
         self.warning = ""
         self._description = "New Custom Model"
@@ -369 +390 @@
         self.function_sizer = wx.BoxSizer(wx.VERTICAL)
         self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.msg_sizer = wx.BoxSizer(wx.HORIZONTAL)
         
     def _layout_name(self):
@@ -444 +466 @@
         self.function_sizer.Add(function_txt, 0, wx.LEFT, 10)
         self.function_sizer.Add( self.function_tcl, 1, wx.EXPAND|wx.ALL, 10)
-
+        
+    def _layout_msg(self):
+        """
+        Layout msg
+        """
+        self._msg_box = wx.StaticText(self, -1, self._notes)
+        self.msg_sizer.Add(self._msg_box, 0, wx.LEFT, 10)  
                     
     def _layout_button(self):  
@@ -462 +490 @@
                                    (self.bt_close, 0, 
                                     wx.LEFT|wx.BOTTOM, 15)])
-        
+          
     def _do_layout(self):
         """
@@ -472 +500 @@
         self._layout_param()
         self._layout_function()
+        self._layout_msg()
         self._layout_button()
         self.main_sizer.AddMany([(self.name_sizer, 0,  
@@ -489 +518 @@
                                  (wx.StaticLine(self), 0, 
                                        wx.ALL|wx.EXPAND, 5),
+                                 (self.msg_sizer, 0, 
+                                        wx.EXPAND|wx.ALL, 5),
                                 (self.button_sizer, 0,
                                          wx.EXPAND|wx.ALL, 5)])
@@ -513 +544 @@
         Check name if exist already
         """
+        self._notes = ''
         self.on_change_name(None)
         plugin_dir = self.path
@@ -525 +557 @@
                 return False
         self.fname = os.path.join(plugin_dir, t_fname)
+        s_title = title
+        if len(title) > 20:
+            s_title = title[0:19] + '...'
         self._notes += "Model function name set "
-        self._notes += "to %s. \n" % str(title)
+        self._notes += "to %s. \n" % str(s_title)
         return True
     
@@ -575 +610 @@
                 self.base.update_custom_combo()
             msg = "Successful!!!"
+            msg += "  " + self._notes
+            msg += " Please look for it in the 'Customized Models' box."
             info = 'Info'
+            color = 'blue'
         else:
             info = 'Error'
+            color = 'red'
             wx.MessageBox(msg, info)  
+        
+        self._msg_box.SetLabel(msg)
+        self._msg_box.SetForegroundColour(color)
         # Send msg to the top window  
         if self.base != None: