Author: bugman
Date: Thu Jul 21 11:45:58 2011
New Revision: 13802
URL: http://svn.gna.org/viewcvs/relax?rev=13802&view=rev
Log:
Renamed the uf_gui observer object to gui_uf.
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/components/relax_data.py
branches/gui_testing/gui/components/spectrum.py
branches/gui_testing/gui/spin_viewer/frame.py
branches/gui_testing/gui/spin_viewer/tree.py
branches/gui_testing/gui/user_functions/base.py
branches/gui_testing/status.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=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Thu Jul 21 11:45:58
2011
@@ -211,7 +211,7 @@
self.build_main_box(box_centre)
# Register the method for updating the spin count for the completion
of user functions.
- status.observers.uf_gui.register(self.data.pipe_name,
self.update_spin_count)
+ status.observers.gui_uf.register(self.data.pipe_name,
self.update_spin_count)
def _about(self, event):
@@ -478,7 +478,7 @@
self.peak_intensity.delete()
# Remove.
- status.observers.uf_gui.unregister(self.data.pipe_name)
+ status.observers.gui_uf.unregister(self.data.pipe_name)
def execute(self, event):
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=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Jul 21 11:45:58 2011
@@ -119,7 +119,7 @@
self.build_main_box(box_centre)
# Register the method for updating the spin count for the completion
of user functions.
- status.observers.uf_gui.register(self.data.pipe_name,
self.update_spin_count)
+ status.observers.gui_uf.register(self.data.pipe_name,
self.update_spin_count)
def assemble_data(self):
@@ -195,7 +195,7 @@
self.peak_intensity.delete()
# Remove.
- status.observers.uf_gui.unregister(self.data.pipe_name)
+ status.observers.gui_uf.unregister(self.data.pipe_name)
def execute(self, event):
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=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Thu Jul 21 11:45:58 2011
@@ -120,7 +120,7 @@
self.build_main_box(box_centre)
# Register the method for updating the spin count for the completion
of user functions.
- status.observers.uf_gui.register(self.data.pipe_name,
self.update_spin_count)
+ status.observers.gui_uf.register(self.data.pipe_name,
self.update_spin_count)
def assemble_data(self):
@@ -211,7 +211,7 @@
self.peak_intensity.delete()
# Remove.
- status.observers.uf_gui.unregister(self.data.pipe_name)
+ status.observers.gui_uf.unregister(self.data.pipe_name)
def execute(self, event):
Modified: branches/gui_testing/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/components/relax_data.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/components/relax_data.py (original)
+++ branches/gui_testing/gui/components/relax_data.py Thu Jul 21 11:45:58 2011
@@ -94,7 +94,7 @@
self.name = 'relaxation data list: %s' % id
# Register the grid for updating when a user function completes.
- status.observers.uf_gui.register(self.name, self.build_grid)
+ status.observers.gui_uf.register(self.name, self.build_grid)
def add_buttons(self, sizer):
@@ -183,7 +183,7 @@
"""Unregister the class."""
# Unregister the class.
- status.observers.uf_gui.unregister(self.name)
+ status.observers.gui_uf.unregister(self.name)
def init_grid(self, sizer):
Modified: branches/gui_testing/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/components/spectrum.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/components/spectrum.py (original)
+++ branches/gui_testing/gui/components/spectrum.py Thu Jul 21 11:45:58 2011
@@ -98,7 +98,7 @@
self.name = 'spectra list: %s' % id
# Register the grid for updating when a user function completes.
- status.observers.uf_gui.register(self.name, self.build_grid)
+ status.observers.gui_uf.register(self.name, self.build_grid)
def add_buttons(self, sizer):
@@ -189,7 +189,7 @@
"""Unregister the class."""
# Unregister the class.
- status.observers.uf_gui.unregister(self.name)
+ status.observers.gui_uf.unregister(self.name)
def init_grid(self, sizer):
Modified: branches/gui_testing/gui/spin_viewer/frame.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/spin_viewer/frame.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/spin_viewer/frame.py (original)
+++ branches/gui_testing/gui/spin_viewer/frame.py Thu Jul 21 11:45:58 2011
@@ -145,7 +145,7 @@
self.name = 'spin view refresh'
# Register a few methods in the observer objects.
- status.observers.uf_gui.register(self.name, self.refresh)
+ status.observers.gui_uf.register(self.name, self.refresh)
status.observers.pipe_alteration.register(self.name, self.refresh)
# First update.
@@ -187,7 +187,7 @@
"""
# Unregister the methods from the observers to avoid unnecessary
updating.
- status.observers.uf_gui.unregister(self.name)
+ status.observers.gui_uf.unregister(self.name)
status.observers.pipe_alteration.unregister(self.name)
# Close the window.
Modified: branches/gui_testing/gui/spin_viewer/tree.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/spin_viewer/tree.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/spin_viewer/tree.py (original)
+++ branches/gui_testing/gui/spin_viewer/tree.py Thu Jul 21 11:45:58 2011
@@ -207,7 +207,7 @@
self.gui.interpreter.molecule.delete(gui_to_str(self.info['id']))
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def delete_residue(self, event):
@@ -226,7 +226,7 @@
self.gui.interpreter.residue.delete(gui_to_str(self.info['id']))
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def delete_spin(self, event):
@@ -245,7 +245,7 @@
self.gui.interpreter.spin.delete(gui_to_str(self.info['id']))
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def deselect_molecule(self, event):
@@ -264,7 +264,7 @@
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def deselect_residue(self, event):
@@ -283,7 +283,7 @@
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def deselect_spin(self, event):
@@ -297,7 +297,7 @@
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def get_info(self):
@@ -512,7 +512,7 @@
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def select_residue(self, event):
@@ -531,7 +531,7 @@
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def select_spin(self, event):
@@ -545,7 +545,7 @@
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']),
change_all=False)
# Notify all observers that a user function has completed.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def set_bitmap_mol(self, mol_branch_id, select=True):
Modified: branches/gui_testing/gui/user_functions/base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/base.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/base.py (original)
+++ branches/gui_testing/gui/user_functions/base.py Thu Jul 21 11:45:58 2011
@@ -253,7 +253,7 @@
"""Notify that the user function has completed."""
# Notify.
- status.observers.uf_gui.notify()
+ status.observers.gui_uf.notify()
def process_doc(self, doc):
Modified: branches/gui_testing/status.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/status.py?rev=13802&r1=13801&r2=13802&view=diff
==============================================================================
--- branches/gui_testing/status.py (original)
+++ branches/gui_testing/status.py Thu Jul 21 11:45:58 2011
@@ -99,7 +99,7 @@
self.observers.pipe_alteration = Observer()
# The observer object for GUI user function completion.
- self.observers.uf_gui = Observer()
+ self.observers.gui_uf = Observer()
# The observer object for changes to the GUI analysis tabs.
self.observers.gui_analysis = Observer()
r13802 - in /branches/gui_testing: ./ gui/analyses/ gui/components/ gui/spin_viewer/ gui/user_functions/