r14221 - in /branches/gui_testing/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py base.py -- August 06, 2011 - 21:59

Author: bugman
Date: Sat Aug  6 21:59:57 2011
New Revision: 14221

URL: http://svn.gna.org/viewcvs/relax?rev=14221&view=rev
Log:
The add_spin_systems() base class method now returns the Text_ctrl instance 
it creates.


Modified:
    branches/gui_testing/gui/analyses/auto_model_free.py
    branches/gui_testing/gui/analyses/auto_noe.py
    branches/gui_testing/gui/analyses/auto_rx_base.py
    branches/gui_testing/gui/analyses/base.py

Modified: branches/gui_testing/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_model_free.py?rev=14221&r1=14220&r2=14221&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Sat Aug  6 21:59:57 
2011
@@ -501,7 +501,7 @@
         self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
-        self.add_spin_systems(box, self)
+        self.field_spin_system = self.add_spin_systems(box, self)
 
         # Add the relaxation data list GUI element, with spacing.
         box.AddSpacer(10)

Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=14221&r1=14220&r2=14221&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Sat Aug  6 21:59:57 2011
@@ -182,7 +182,7 @@
         self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
-        self.add_spin_systems(box, self)
+        self.field_spin_system = self.add_spin_systems(box, self)
 
         # Add the peak list selection GUI element, with spacing.
         box.AddSpacer(40)

Modified: branches/gui_testing/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_rx_base.py?rev=14221&r1=14220&r2=14221&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Sat Aug  6 21:59:57 2011
@@ -191,7 +191,7 @@
         self.field_results_dir = Text_ctrl(box, self, text="Results 
directory", icon=paths.icon_16x16.open_folder, default=self.data.save_dir, 
fn=self.results_directory, button=True, width_text=self.width_text, 
width_button=self.width_button, spacer=self.spacer_horizontal)
 
         # Add the spin GUI element.
-        self.add_spin_systems(box, self)
+        self.field_spin_system = self.add_spin_systems(box, self)
 
         # Add the peak list selection GUI element, with spacing.
         box.AddSpacer(20)

Modified: branches/gui_testing/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/base.py?rev=14221&r1=14220&r2=14221&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/base.py (original)
+++ branches/gui_testing/gui/analyses/base.py Sat Aug  6 21:59:57 2011
@@ -211,10 +211,15 @@
         @type box:          wx.BoxSizer instance
         @param parent:      The parent GUI element.
         @type parent:       wx object
+        @return:            The spin system GUI element.
+        @rtype:             Text_ctrl instance
         """
 
         # Add the element.
-        self.spin_systems = Text_ctrl(box, self, text="Spin systems", 
button_text=" Spin editor", default=self.spin_count(), 
icon=paths.icon_16x16.spin, fn=self.launch_spin_editor, editable=False, 
button=True, width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+        spin_view = Text_ctrl(box, self, text="Spin systems", button_text=" 
Spin editor", default=self.spin_count(), icon=paths.icon_16x16.spin, 
fn=self.launch_spin_editor, editable=False, button=True, 
width_text=self.width_text, width_button=self.width_button, 
spacer=self.spacer_horizontal)
+
+        # Return the control.
+        return spin_view
 
 
     def add_static_text(self, box, parent, text='', width=-1, height=-1):