Author: bugman
Date: Fri Jul 29 16:36:26 2011
New Revision: 13997
URL: http://svn.gna.org/viewcvs/relax?rev=13997&view=rev
Log:
Layout improvements in a number of user function and other wizard pages.
The description heights are now used (the variable had been renamed), and the
free file format
GUI element containing user function pages now use the space better and have
been shortened.
Modified:
branches/gui_testing/gui/analyses/base.py
branches/gui_testing/gui/user_functions/deselect.py
branches/gui_testing/gui/user_functions/relax_data.py
branches/gui_testing/gui/user_functions/select.py
branches/gui_testing/gui/user_functions/sequence.py
branches/gui_testing/gui/user_functions/spectrum.py
branches/gui_testing/gui/user_functions/value.py
Modified: branches/gui_testing/gui/analyses/base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/base.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/base.py (original)
+++ branches/gui_testing/gui/analyses/base.py Fri Jul 29 16:36:26 2011
@@ -591,7 +591,7 @@
# Class variables.
image_path = paths.WIZARD_IMAGE_PATH + 'spectrum' + sep +
'spectrum_200.png'
uf_path = ['spectrum', 'error_analysis']
- desc_height = 500
+ height_desc = 500
def add_contents(self, sizer):
"""Add the specific GUI elements.
Modified: branches/gui_testing/gui/user_functions/deselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/deselect.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/deselect.py (original)
+++ branches/gui_testing/gui/user_functions/deselect.py Fri Jul 29 16:36:26
2011
@@ -61,7 +61,7 @@
"""
# Execute the wizard.
- wizard = Wiz_window(size_x=900, size_y=800,
title=self.get_title('deselect', 'read'))
+ wizard = Wiz_window(size_x=900, size_y=700,
title=self.get_title('deselect', 'read'))
page = Read_page(wizard, self.gui)
wizard.add_page(page)
wizard.run()
@@ -124,7 +124,7 @@
# Some class variables.
uf_path = ['deselect', 'read']
- desc_height = 200
+ height_desc = 200
def add_contents(self, sizer):
"""Add the sequence specific GUI elements.
@@ -135,9 +135,6 @@
# Add a file selection.
self.file = self.file_selection(sizer, "The deselection file:",
message="Deselection file selection", style=wx.FD_OPEN,
tooltip=self.uf._doc_args_dict['file'])
-
- # The parameter file settings.
- self.free_file_format(sizer)
# The spin ID restriction.
self.spin_id = self.spin_id_element(sizer, desc="Restrict data
loading to certain spins:")
@@ -148,6 +145,9 @@
# The change_all flag.
self.change_all = self.boolean_selector(sizer, "Change all:",
tooltip=self.uf._doc_args_dict['change_all'], default=False)
+
+ # The parameter file settings.
+ self.free_file_format(sizer, data_cols=False, padding=3, spacer=0)
def on_execute(self):
Modified: branches/gui_testing/gui/user_functions/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/relax_data.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/relax_data.py (original)
+++ branches/gui_testing/gui/user_functions/relax_data.py Fri Jul 29 16:36:26
2011
@@ -63,7 +63,7 @@
"""
# Execute the wizard.
- wizard = Wiz_window(size_x=1000, size_y=800,
title=self.get_title('relax_data', 'read'))
+ wizard = Wiz_window(size_x=1000, size_y=700,
title=self.get_title('relax_data', 'read'))
page = Read_page(wizard, self.gui)
wizard.add_page(page)
wizard.run()
@@ -118,7 +118,7 @@
"""The relax_data.read() user function page."""
# Some class variables.
- desc_height = 180
+ height_desc = 140
image_path = WIZARD_IMAGE_PATH + 'fid.png'
uf_path = ['relax_data', 'read']
@@ -143,7 +143,7 @@
self.spin_id = self.spin_id_element(sizer, desc="Restrict data
loading to certain spins:")
# The parameter file settings.
- self.free_file_format(sizer, data_cols=True, padding=5, spacer=0)
+ self.free_file_format(sizer, data_cols=True, padding=3, spacer=0)
def on_execute(self):
Modified: branches/gui_testing/gui/user_functions/select.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/select.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/select.py (original)
+++ branches/gui_testing/gui/user_functions/select.py Fri Jul 29 16:36:26 2011
@@ -61,7 +61,7 @@
"""
# Execute the wizard.
- wizard = Wiz_window(size_x=900, size_y=800,
title=self.get_title('select', 'read'))
+ wizard = Wiz_window(size_x=900, size_y=700,
title=self.get_title('select', 'read'))
page = Read_page(wizard, self.gui)
wizard.add_page(page)
wizard.run()
@@ -124,7 +124,7 @@
# Some class variables.
uf_path = ['select', 'read']
- desc_height = 200
+ height_desc = 200
def add_contents(self, sizer):
"""Add the sequence specific GUI elements.
@@ -135,9 +135,6 @@
# Add a file selection.
self.file = self.file_selection(sizer, "The selection file:",
message="Selection file selection", style=wx.FD_OPEN,
tooltip=self.uf._doc_args_dict['file'])
-
- # The parameter file settings.
- self.free_file_format(sizer)
# The spin ID restriction.
self.spin_id = self.spin_id_element(sizer, desc="Restrict data
loading to certain spins:")
@@ -148,6 +145,9 @@
# The change_all flag.
self.change_all = self.boolean_selector(sizer, "Change all:",
tooltip=self.uf._doc_args_dict['change_all'], default=False)
+
+ # The parameter file settings.
+ self.free_file_format(sizer, data_cols=False, padding=3, spacer=0)
def on_execute(self):
Modified: branches/gui_testing/gui/user_functions/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/sequence.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/sequence.py (original)
+++ branches/gui_testing/gui/user_functions/sequence.py Fri Jul 29 16:36:26
2011
@@ -154,7 +154,7 @@
self.spin_id = self.spin_id_element(sizer, "Restrict data loading to
certain spins:")
# The parameter file settings.
- self.free_file_format(sizer)
+ self.free_file_format(sizer, data_cols=False, padding=3, spacer=0)
def on_execute(self):
Modified: branches/gui_testing/gui/user_functions/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/spectrum.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/spectrum.py (original)
+++ branches/gui_testing/gui/user_functions/spectrum.py Fri Jul 29 16:36:26
2011
@@ -88,7 +88,7 @@
"""
# Execute the wizard.
- wizard = Wiz_window(size_x=1000, size_y=900,
title=self.get_title('spectrum', 'read_intensities'))
+ wizard = Wiz_window(size_x=1000, size_y=750,
title=self.get_title('spectrum', 'read_intensities'))
page = Read_intensities_page(wizard, self.gui)
wizard.add_page(page)
wizard.run()
@@ -165,7 +165,7 @@
# Some class variables.
image_path = WIZARD_IMAGE_PATH + 'spectrum' + sep + 'spectrum_200.png'
uf_path = ['spectrum', 'error_analysis']
- desc_height = 550
+ height_desc = 550
def add_contents(self, sizer):
"""Add the specific GUI elements.
@@ -236,7 +236,7 @@
"""The spectrum.read_intensities() user function page."""
# Some class variables.
- desc_height = 180
+ height_desc = 140
image_path = WIZARD_IMAGE_PATH + 'spectrum' + sep + 'spectrum_200.png'
uf_path = ['spectrum', 'read_intensities']
@@ -273,7 +273,7 @@
self.ncproc = self.input_field(sizer, "The Bruker ncproc value:",
tooltip=self.uf._doc_args_dict['ncproc'])
# The parameter file settings.
- self.free_file_format(sizer, data_cols=False, padding=5, spacer=0)
+ self.free_file_format(sizer, data_cols=False, padding=3, spacer=0)
def on_execute(self):
@@ -299,7 +299,7 @@
spin_name_col = gui_to_int(self.spin_name_col.GetValue())
# The column separator.
- sep = str(self.sep.GetValue())
+ sep = gui_to_str(self.sep.GetValue())
if sep == 'white space':
sep = None
Modified: branches/gui_testing/gui/user_functions/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/value.py?rev=13997&r1=13996&r2=13997&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/value.py (original)
+++ branches/gui_testing/gui/user_functions/value.py Fri Jul 29 16:36:26 2011
@@ -71,7 +71,7 @@
# Some class variables.
image_path = WIZARD_IMAGE_PATH + 'value' + sep + 'value.png'
uf_path = ['value', 'set']
- desc_height = 400
+ height_desc = 400
def add_contents(self, sizer):
"""Add the sequence specific GUI elements.
r13997 - in /branches/gui_testing/gui: analyses/ user_functions/