r17209 - in /branches/cst: ./ gui/analyses/auto_model_free.py -- July 04, 2012 - 16:32

Author: bugman
Date: Wed Jul  4 16:32:33 2012
New Revision: 17209

URL: http://svn.gna.org/viewcvs/relax?rev=17209&view=rev
Log:
Merged revisions 17206 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r17206 | bugman | 2012-07-04 14:22:00 +0200 (Wed, 04 Jul 2012) | 5 lines
  
  Fixes for the tooltips and activation/deactivation of the GUI model-free 
analysis buttons.
  
  This is for the buttons for setting up the relaxation mechanisms and the 
nuclear isotopes.
........

Modified:
    branches/cst/   (props changed)
    branches/cst/gui/analyses/auto_model_free.py

Propchange: branches/cst/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  4 16:32:33 2012
@@ -1,1 +1,1 @@
-/trunk:1-17202
+/trunk:1-17208

Modified: branches/cst/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/cst/gui/analyses/auto_model_free.py?rev=17209&r1=17208&r2=17209&view=diff
==============================================================================
--- branches/cst/gui/analyses/auto_model_free.py (original)
+++ branches/cst/gui/analyses/auto_model_free.py Wed Jul  4 16:32:33 2012
@@ -260,7 +260,8 @@
         wx.CallAfter(self.relax_data.Enable, enable)
         wx.CallAfter(self.button_dipole_pair.Enable, enable)
         wx.CallAfter(self.button_csa.Enable, enable)
-        wx.CallAfter(self.button_isotope.Enable, enable)
+        wx.CallAfter(self.button_isotope_heteronuc.Enable, enable)
+        wx.CallAfter(self.button_isotope_proton.Enable, enable)
         wx.CallAfter(self.local_tm_model_field.Enable, enable)
         wx.CallAfter(self.mf_model_field.Enable, enable)
         wx.CallAfter(self.grid_inc.Enable, enable)
@@ -285,7 +286,7 @@
         
self.button_dipole_pair.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.dipole_pair",
 "22x22"), wx.BITMAP_TYPE_ANY))
         self.button_dipole_pair.SetFont(font.normal)
         self.button_dipole_pair.SetSize((-1, 25))
-        self.button_dipole_pair.SetToolTipString("Set the Chemical Shift 
Anisotropy (CSA) values via the value.set user function.")
+        self.button_dipole_pair.SetToolTipString("Define the magnetic 
dipole-dipole relaxation mechanism.")
         self.gui.Bind(wx.EVT_BUTTON, self.setup_dipole_pair, 
self.button_dipole_pair)
         sizer.Add(self.button_dipole_pair, 1, wx.ALL|wx.EXPAND, 0)
 
@@ -294,27 +295,27 @@
         
self.button_csa.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.align_tensor", 
"22x22"), wx.BITMAP_TYPE_ANY))
         self.button_csa.SetFont(font.normal)
         self.button_csa.SetSize((-1, 25))
-        self.button_csa.SetToolTipString("Set the Chemical Shift Anisotropy 
(CSA) values via the value.set user function.")
+        self.button_csa.SetToolTipString("Define the Chemical Shift 
Anisotropy (CSA) relaxation mechanism via the value.set user function.")
         self.gui.Bind(wx.EVT_BUTTON, self.value_set_csa, self.button_csa)
         sizer.Add(self.button_csa, 1, wx.ALL|wx.EXPAND, 0)
 
         # Isotope type button (heteronucleus).
-        self.button_isotope = wx.lib.buttons.ThemedGenBitmapTextButton(self, 
-1, None, " X isotope")
-        
self.button_isotope.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.nuclear_symbol",
 "22x22"), wx.BITMAP_TYPE_ANY))
-        self.button_isotope.SetFont(font.normal)
-        self.button_isotope.SetSize((-1, 25))
-        self.button_isotope.SetToolTipString("Set the nuclear isotope types 
of the heteronuclear spins via the spin.isotope user function.")
-        self.gui.Bind(wx.EVT_BUTTON, self.spin_isotope_heteronuc, 
self.button_isotope)
-        sizer.Add(self.button_isotope, 1, wx.ALL|wx.EXPAND, 0)
+        self.button_isotope_heteronuc = 
wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " X isotope")
+        
self.button_isotope_heteronuc.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.nuclear_symbol",
 "22x22"), wx.BITMAP_TYPE_ANY))
+        self.button_isotope_heteronuc.SetFont(font.normal)
+        self.button_isotope_heteronuc.SetSize((-1, 25))
+        self.button_isotope_heteronuc.SetToolTipString("Set the nuclear 
isotope types of the heteronuclear spins via the spin.isotope user function.")
+        self.gui.Bind(wx.EVT_BUTTON, self.spin_isotope_heteronuc, 
self.button_isotope_heteronuc)
+        sizer.Add(self.button_isotope_heteronuc, 1, wx.ALL|wx.EXPAND, 0)
 
         # Isotope type button (proton).
-        self.button_isotope = wx.lib.buttons.ThemedGenBitmapTextButton(self, 
-1, None, " H isotope")
-        
self.button_isotope.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.nuclear_symbol",
 "22x22"), wx.BITMAP_TYPE_ANY))
-        self.button_isotope.SetFont(font.normal)
-        self.button_isotope.SetSize((-1, 25))
-        self.button_isotope.SetToolTipString("Set the nuclear isotope types 
of the proton spins via the spin.isotope user function.")
-        self.gui.Bind(wx.EVT_BUTTON, self.spin_isotope_proton, 
self.button_isotope)
-        sizer.Add(self.button_isotope, 1, wx.ALL|wx.EXPAND, 0)
+        self.button_isotope_proton = 
wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, " H isotope")
+        
self.button_isotope_proton.SetBitmapLabel(wx.Bitmap(fetch_icon("relax.nuclear_symbol",
 "22x22"), wx.BITMAP_TYPE_ANY))
+        self.button_isotope_proton.SetFont(font.normal)
+        self.button_isotope_proton.SetSize((-1, 25))
+        self.button_isotope_proton.SetToolTipString("Set the nuclear isotope 
types of the proton spins via the spin.isotope user function.")
+        self.gui.Bind(wx.EVT_BUTTON, self.spin_isotope_proton, 
self.button_isotope_proton)
+        sizer.Add(self.button_isotope_proton, 1, wx.ALL|wx.EXPAND, 0)
 
         # Add the element to the box.
         box.Add(sizer, 0, wx.ALL|wx.EXPAND, 0)