Author: bugman
Date: Sun May 13 12:58:38 2012
New Revision: 16277
URL: http://svn.gna.org/viewcvs/relax?rev=16277&view=rev
Log:
Converted all of the GUI code to use the auto-generated user function design
and storage object.
Modified:
branches/uf_redesign/gui/analyses/auto_model_free.py
branches/uf_redesign/gui/analyses/auto_noe.py
branches/uf_redesign/gui/analyses/auto_rx_base.py
branches/uf_redesign/gui/components/relax_data.py
branches/uf_redesign/gui/components/spectrum.py
Modified: branches/uf_redesign/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/auto_model_free.py?rev=16277&r1=16276&r2=16277&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/auto_model_free.py (original)
+++ branches/uf_redesign/gui/analyses/auto_model_free.py Sun May 13 12:58:38
2012
@@ -51,8 +51,7 @@
from gui.message import error_message, Question, Missing_data
from gui.misc import add_border, gui_to_int, gui_to_str, list_to_gui,
protected_exec, str_to_gui
from gui import paths
-from gui.uf_pages.structure import Read_pdb_page, Vectors_page
-from gui.uf_pages import User_functions; user_functions = User_functions()
+from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizard import Wiz_window
@@ -585,11 +584,11 @@
self.vect_wizard = Wiz_window(parent=self.gui, size_x=800,
size_y=600, title="Load unit vectors from file")
# Create the PDB reading page.
- page = Read_pdb_page(self.vect_wizard)
+ page = uf_store['structure.read_pdb'].create_page(self.vect_wizard)
self.vect_wizard.add_page(page, skip_button=True)
# Create the vector loading page.
- page = Vectors_page(self.vect_wizard)
+ page = uf_store['structure.vectors'].create_page(self.vect_wizard)
self.vect_wizard.add_page(page)
# Reset the cursor.
@@ -718,7 +717,7 @@
"""
# Call the user function.
- user_functions.value.set(param='csa')
+ uf_store['value.set'](param='csa')
def value_set_heteronuc_type(self, event):
@@ -729,7 +728,7 @@
"""
# Call the user function.
- user_functions.value.set(param='heteronuc_type')
+ uf_store['value.set'](param='heteronuc_type')
def value_set_proton_type(self, event):
@@ -740,7 +739,7 @@
"""
# Call the user function.
- user_functions.value.set(param='proton_type')
+ uf_store['value.set'](param='proton_type')
def value_set_r(self, event):
@@ -751,7 +750,7 @@
"""
# Call the user function.
- user_functions.value.set(param='r')
+ uf_store['value.set'](param='r')
Modified: branches/uf_redesign/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/auto_noe.py?rev=16277&r1=16276&r2=16277&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/auto_noe.py (original)
+++ branches/uf_redesign/gui/analyses/auto_noe.py Sun May 13 12:58:38 2012
@@ -47,9 +47,7 @@
from gui.message import error_message, Missing_data, Question
from gui.misc import gui_to_str, protected_exec, str_to_gui
from gui import paths
-from gui.uf_pages.noe import Spectrum_type_page
-from gui.uf_pages.spectrum import Baseplane_rmsd_page,
Integration_points_page, Read_intensities_page, Replicated_page
-from gui.uf_pages.spin import Name_page
+from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizard import Wiz_window
@@ -310,12 +308,12 @@
# Ask about naming spins, and add the spin.name user function
page.
if status.show_gui and Question(msg, title="Incomplete setup",
size=(450, 250), default=True).ShowModal() == wx.ID_YES:
- page = Name_page(self.wizard, sync=True)
+ page = uf_store['spin.name'].create_page(self.wizard,
sync=True)
self.page_indices['read'] = self.wizard.add_page(page,
proceed_on_error=False)
# The spectrum.read_intensities page.
- self.page_intensity = Read_intensities_page(self.wizard, sync=True)
+ self.page_intensity =
uf_store['spectrum.read_intensities'].create_page(self.wizard, sync=True)
self.page_indices['read'] =
self.wizard.add_page(self.page_intensity, skip_button=True,
proceed_on_error=False)
# Error type selection page.
@@ -324,24 +322,24 @@
self.wizard.set_seq_next_fn(self.page_indices['err_type'],
self.wizard_page_after_error_type)
# The spectrum.replicated page.
- page = Replicated_page(self.wizard, sync=True)
+ page = uf_store['spectrum.replicated'].create_page(self.wizard,
sync=True)
self.page_indices['repl'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
self.wizard.set_seq_next_fn(self.page_indices['repl'],
self.wizard_page_after_repl)
page.on_display_post = self.wizard_update_repl
# The spectrum.baseplane_rmsd page.
- page = Baseplane_rmsd_page(self.wizard, sync=True)
+ page = uf_store['spectrum.baseplane_rmsd'].create_page(self.wizard,
sync=True)
self.page_indices['rmsd'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
self.wizard.set_seq_next_fn(self.page_indices['rmsd'],
self.wizard_page_after_rmsd)
page.on_display_post = self.wizard_update_rmsd
# The spectrum.integration_points page.
- page = Integration_points_page(self.wizard, sync=True)
+ page =
uf_store['spectrum.integration_points'].create_page(self.wizard, sync=True)
self.page_indices['pts'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
page.on_display_post = self.wizard_update_pts
# The noe.spectrum_type page.
- page = Spectrum_type_page(self.wizard, sync=True)
+ page = uf_store['noe.spectrum_type'].create_page(self.wizard,
sync=True)
self.page_indices['spectrum_type'] = self.wizard.add_page(page,
skip_button=False, proceed_on_error=False)
page.on_display_post = self.wizard_update_spectrum_type
Modified: branches/uf_redesign/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/auto_rx_base.py?rev=16277&r1=16276&r2=16277&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/auto_rx_base.py (original)
+++ branches/uf_redesign/gui/analyses/auto_rx_base.py Sun May 13 12:58:38 2012
@@ -47,9 +47,7 @@
from gui.message import error_message, Missing_data, Question
from gui.misc import gui_to_int, gui_to_str, int_to_gui, protected_exec,
str_to_gui
from gui import paths
-from gui.uf_pages.relax_fit import Relax_time_page
-from gui.uf_pages.spectrum import Baseplane_rmsd_page,
Integration_points_page, Read_intensities_page, Replicated_page
-from gui.uf_pages.spin import Name_page
+from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizard import Wiz_window
@@ -326,12 +324,12 @@
# Ask about naming spins, and add the spin.name user function
page.
if status.show_gui and Question(msg, title="Incomplete setup",
size=(450, 250), default=True).ShowModal() == wx.ID_YES:
- page = Name_page(self.wizard, sync=True)
+ page = uf_store['spin.name'].create_page(self.wizard,
sync=True)
self.page_indices['read'] = self.wizard.add_page(page,
proceed_on_error=False)
# The spectrum.read_intensities page.
- self.page_intensity = Read_intensities_page(self.wizard, sync=True)
+ self.page_intensity =
uf_store['spectrum.read_intensities'].create_page(self.wizard, sync=True)
self.page_indices['read'] =
self.wizard.add_page(self.page_intensity, skip_button=True,
proceed_on_error=False)
# Error type selection page.
@@ -340,24 +338,24 @@
self.wizard.set_seq_next_fn(self.page_indices['err_type'],
self.wizard_page_after_error_type)
# The spectrum.replicated page.
- page = Replicated_page(self.wizard, sync=True)
+ page = uf_store['spectrum.replicated'].create_page(self.wizard,
sync=True)
self.page_indices['repl'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
self.wizard.set_seq_next_fn(self.page_indices['repl'],
self.wizard_page_after_repl)
page.on_init = self.wizard_update_repl
# The spectrum.baseplane_rmsd page.
- page = Baseplane_rmsd_page(self.wizard, sync=True)
+ page = uf_store['spectrum.baseplane_rmsd'].create_page(self.wizard,
sync=True)
self.page_indices['rmsd'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
self.wizard.set_seq_next_fn(self.page_indices['rmsd'],
self.wizard_page_after_rmsd)
page.on_init = self.wizard_update_rmsd
# The spectrum.integration_points page.
- page = Integration_points_page(self.wizard, sync=True)
+ page =
uf_store['spectrum.integration_points'].create_page(self.wizard, sync=True)
self.page_indices['pts'] = self.wizard.add_page(page,
skip_button=True, proceed_on_error=False)
page.on_init = self.wizard_update_pts
# The relax_fit.relax_time page.
- page = Relax_time_page(self.wizard, sync=True)
+ page = uf_store['relax_fit.relax_time'].create_page(self.wizard,
sync=True)
self.page_indices['relax_time'] = self.wizard.add_page(page,
skip_button=False, proceed_on_error=False)
page.on_init = self.wizard_update_relax_time
Modified: branches/uf_redesign/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/relax_data.py?rev=16277&r1=16276&r2=16277&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/relax_data.py (original)
+++ branches/uf_redesign/gui/components/relax_data.py Sun May 13 12:58:38 2012
@@ -36,7 +36,7 @@
from gui.fonts import font
from gui.misc import add_border, float_to_gui, gui_to_str, str_to_gui
from gui import paths
-from gui.uf_pages import User_functions; user_functions = User_functions()
+from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
class Relax_data_list:
@@ -164,7 +164,7 @@
"""
# Launch the dialog.
- user_functions.bruker.read()
+ uf_store['bruker.read']()
def build_element(self):
@@ -327,7 +327,7 @@
id = gui_to_str(self.element.GetItemText(item))
# Launch the dialog.
- user_functions.relax_data.delete(ri_id=id)
+ uf_store['relax_data.delete'](ri_id=id)
def relax_data_read(self, event):
@@ -338,7 +338,7 @@
"""
# Launch the dialog.
- user_functions.relax_data.read()
+ uf_store['relax_data.read']()
def resize(self, event):
Modified: branches/uf_redesign/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/spectrum.py?rev=16277&r1=16276&r2=16277&view=diff
==============================================================================
--- branches/uf_redesign/gui/components/spectrum.py (original)
+++ branches/uf_redesign/gui/components/spectrum.py Sun May 13 12:58:38 2012
@@ -37,7 +37,7 @@
from gui.fonts import font
from gui.misc import add_border, float_to_gui, gui_to_str, str_to_gui
from gui import paths
-from gui.uf_pages import User_functions; user_functions = User_functions()
+from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
class Spectra_list:
@@ -236,7 +236,7 @@
id = gui_to_str(self.element.GetItemText(item))
# Launch the dialog.
- user_functions.spectrum.delete(spectrum_id=id)
+ uf_store['spectrum.delete'](spectrum_id=id)
def delete(self):
r16277 - in /branches/uf_redesign/gui: analyses/ components/