r14233 - in /branches/gui_testing/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py base.py -- August 07, 2011 - 10:52

Author: bugman
Date: Sun Aug  7 10:52:29 2011
New Revision: 14233

URL: http://svn.gna.org/viewcvs/relax?rev=14233&view=rev
Log:
Reverted r14221 as this was not an optimal change.

The command used was:
svn merge -r14221:14220 .

.....
  r14221 | bugman | 2011-08-06 21:59:57 +0200 (Sat, 06 Aug 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/gui/analyses/auto_model_free.py
     M /branches/gui_testing/gui/analyses/auto_noe.py
     M /branches/gui_testing/gui/analyses/auto_rx_base.py
     M /branches/gui_testing/gui/analyses/base.py
  
  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=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Sun Aug  7 10:52:29 
2011
@@ -480,7 +480,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.field_spin_system = self.add_spin_systems(box, self)
+        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=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Sun Aug  7 10:52:29 2011
@@ -199,7 +199,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.field_spin_system = self.add_spin_systems(box, self)
+        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=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Sun Aug  7 10:52:29 2011
@@ -210,7 +210,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.field_spin_system = self.add_spin_systems(box, self)
+        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=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/base.py (original)
+++ branches/gui_testing/gui/analyses/base.py Sun Aug  7 10:52:29 2011
@@ -211,15 +211,10 @@
         @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.
-        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
+        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)
 
 
     def add_static_text(self, box, parent, text='', width=-1, height=-1):