Author: bugman
Date: Thu Jun 9 20:10:45 2011
New Revision: 12947
URL: http://svn.gna.org/viewcvs/relax?rev=12947&view=rev
Log:
Big simplification by shifting the widths of the text selection GUI element
to hard coded variables.
These hard coded class variables are located in the base class.
Modified:
1.3/gui/analyses/auto_model_free.py
1.3/gui/analyses/auto_noe.py
1.3/gui/analyses/auto_rx_base.py
1.3/gui/analyses/base.py
1.3/gui/components/spectrum.py
Modified: 1.3/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_model_free.py?rev=12947&r1=12946&r2=12947&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_model_free.py (original)
+++ 1.3/gui/analyses/auto_model_free.py Thu Jun 9 20:10:45 2011
@@ -776,13 +776,13 @@
self.add_max_iterations(box)
# Add the PDB file selection GUI element.
- self.field_structure = self.add_text_sel_element(box, self.parent,
text="Structure file (.pdb)", default=str(self.gui.structure_file_pdb_msg),
control=StructureTextCtrl, width_text=230, width_control=350,
width_button=103, fn='open_file', editable=False, button=True)
+ self.field_structure = self.add_text_sel_element(box, self.parent,
text="Structure file (.pdb)", default=str(self.gui.structure_file_pdb_msg),
control=StructureTextCtrl, fn='open_file', editable=False, button=True)
# Add the unresolved spins GUI element.
- self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues", width_text=230, width_control=350,
width_button=103)
+ self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues")
# Add the results directory GUI element.
- self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.results_dir_model,
width_text=230, width_control=350, width_button=103,
fn=self.resdir_modelfree, button=True)
+ self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.results_dir_model,
fn=self.resdir_modelfree, button=True)
# Add the execution GUI element.
self.add_execute_relax(box)
Modified: 1.3/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_noe.py?rev=12947&r1=12946&r2=12947&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Thu Jun 9 20:10:45 2011
@@ -229,34 +229,34 @@
self.add_title(box, "Setup for steady-state NOE analysis")
# Add the frequency selection GUI element.
- self.field_nmr_frq = self.add_text_sel_element(box, self.parent,
text="NMR Frequency [MHz]", default=str(self.data.frq), width_text=230,
width_control=350, width_button=103)
+ self.field_nmr_frq = self.add_text_sel_element(box, self.parent,
text="NMR Frequency [MHz]", default=str(self.data.frq))
# Add the results directory GUI element.
- self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.save_dir, width_text=230,
width_control=350, width_button=103, fn=self.results_directory, button=True)
+ self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.save_dir,
fn=self.results_directory, button=True)
# Add the sequence file selection GUI element.
- self.field_sequence = self.add_text_sel_element(box, self.parent,
text="Sequence file", default=str(self.gui.sequence_file_msg),
width_text=230, width_control=350, width_button=103, fn=self.load_sequence,
editable=False, button=True)
+ self.field_sequence = self.add_text_sel_element(box, self.parent,
text="Sequence file", default=str(self.gui.sequence_file_msg),
fn=self.load_sequence, editable=False, button=True)
# Add the structure file selection GUI element.
- self.field_structure = self.add_text_sel_element(box, self.parent,
text="Sequence from PDB structure file",
default=self.gui.structure_file_pdb_msg, control=StructureTextCtrl,
width_text=230, width_control=350, width_button=103, fn='open_file',
editable=False, button=True)
+ self.field_structure = self.add_text_sel_element(box, self.parent,
text="Sequence from PDB structure file",
default=self.gui.structure_file_pdb_msg, control=StructureTextCtrl,
fn='open_file', editable=False, button=True)
# Add the unresolved spins GUI element.
- self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues", width_text=230, width_control=350,
width_button=103)
+ self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues")
# Add peak list selection header.
self.add_subtitle(box, "NOE peak lists")
# Add the saturated NOE peak list selection GUI element.
- self.field_sat_noe = self.add_text_sel_element(box, self.parent,
text="Saturated NOE peak list", default=self.data.sat_file, width_text=230,
width_control=350, width_button=103, fn=self.sat_file, button=True)
+ self.field_sat_noe = self.add_text_sel_element(box, self.parent,
text="Saturated NOE peak list", default=self.data.sat_file, fn=self.sat_file,
button=True)
# Add the saturated RMSD background GUI element:
- self.field_sat_rmsd = self.add_text_sel_element(box, self.parent,
text="Baseplane RMSD", default=str(self.data.sat_rmsd), width_text=230,
width_control=350, width_button=103)
+ self.field_sat_rmsd = self.add_text_sel_element(box, self.parent,
text="Baseplane RMSD", default=str(self.data.sat_rmsd))
# Add the reference NOE peak list selection GUI element.
- self.field_ref_noe = self.add_text_sel_element(box, self.parent,
text="Reference NOE peak list", default=self.data.ref_file, width_text=230,
width_control=350, width_button=103, fn=self.ref_file, button=True)
+ self.field_ref_noe = self.add_text_sel_element(box, self.parent,
text="Reference NOE peak list", default=self.data.ref_file, fn=self.ref_file,
button=True)
# Add the reference RMSD background GUI element:
- self.field_ref_rmsd = self.add_text_sel_element(box, self.parent,
text="Baseplane RMSD", default=str(self.data.ref_rmsd), width_text=230,
width_control=350, width_button=103)
+ self.field_ref_rmsd = self.add_text_sel_element(box, self.parent,
text="Baseplane RMSD", default=str(self.data.ref_rmsd))
# Add the execution GUI element.
self.add_execute_relax(box)
Modified: 1.3/gui/analyses/auto_rx_base.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_rx_base.py?rev=12947&r1=12946&r2=12947&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Thu Jun 9 20:10:45 2011
@@ -231,19 +231,19 @@
self.add_title(box, "Setup for %s relaxation analysis" % self.label)
# Add the frequency selection GUI element.
- self.field_nmr_frq = self.add_text_sel_element(box, self.parent,
text="NMR Frequency [MHz]", default=str(self.data.frq), width_text=230,
width_control=350, width_button=103)
+ self.field_nmr_frq = self.add_text_sel_element(box, self.parent,
text="NMR Frequency [MHz]", default=str(self.data.frq))
# Add the results directory GUI element.
- self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.save_dir, width_text=230,
width_control=350, width_button=103, fn=self.results_directory, button=True)
+ self.field_results_dir = self.add_text_sel_element(box, self.parent,
text="Results directory", default=self.data.save_dir,
fn=self.results_directory, button=True)
# Add the sequence file selection GUI element.
- self.field_sequence = self.add_text_sel_element(box, self.parent,
text="Sequence file", default=str(self.gui.sequence_file_msg),
width_text=230, width_control=350, width_button=103, fn=self.load_sequence,
editable=False, button=True)
+ self.field_sequence = self.add_text_sel_element(box, self.parent,
text="Sequence file", default=str(self.gui.sequence_file_msg),
fn=self.load_sequence, editable=False, button=True)
# Add the structure file selection GUI element.
- self.field_structure = self.add_text_sel_element(box, self.parent,
text="Sequence from PDB structure file",
default=self.gui.structure_file_pdb_msg, control=StructureTextCtrl,
width_text=230, width_control=350, width_button=103, fn='open_file',
editable=False, button=True)
+ self.field_structure = self.add_text_sel_element(box, self.parent,
text="Sequence from PDB structure file",
default=self.gui.structure_file_pdb_msg, control=StructureTextCtrl,
fn='open_file', editable=False, button=True)
# Add the unresolved spins GUI element.
- self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues", width_text=230, width_control=350,
width_button=103)
+ self.field_unresolved = self.add_text_sel_element(box, self.parent,
text="Unresolved residues")
# Add the peak list selection GUI element.
self.peak_intensity = Peak_intensity(gui=self.gui,
parent=self.parent, subparent=self, data=self.data, label=self.label, box=box)
Modified: 1.3/gui/analyses/base.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/base.py?rev=12947&r1=12946&r2=12947&view=diff
==============================================================================
--- 1.3/gui/analyses/base.py (original)
+++ 1.3/gui/analyses/base.py Thu Jun 9 20:10:45 2011
@@ -33,6 +33,8 @@
# Hard coded variables.
size_graphic_panel = 200
+ width_text = 240
+ width_button = 100
def add_button_open(self, box, parent, fn=None, width=-1, height=-1):
"""Add a button for opening and changing files and directories.
@@ -166,7 +168,7 @@
return field
- def add_text_sel_element(self, box, parent, text="", default="",
control=wx.TextCtrl, width_text=-1, width_control=-1, width_button=-1,
height=-1, fn=None, editable=True, button=False):
+ def add_text_sel_element(self, box, parent, text="", default="",
control=wx.TextCtrl, fn=None, editable=True, button=False):
"""Create a text selection element for the frame.
This consists of a horizontal layout with a static text element, a
text control, and an optional button.
@@ -181,14 +183,6 @@
@type default: str
@keyword control: The control class to use.
@type control: wx.TextCtrl derived class
- @keyword width_text: The minimum width of the static text.
- @type width_text: int
- @keyword width_control: The minimum width of the text control.
- @type width_control: int
- @keyword width_button: The minimum width of the button.
- @type width_button: int
- @keyword height: The minimum height of the entire element.
- @type height: int
@keyword fn: The function or method to execute when
clicking on the button. If this is a string, then an equivalent function
will be searched for in the control object.
@type fn: func or str
@keyword editable: A flag specifying if the control is editable
or not.
@@ -201,10 +195,10 @@
sizer = wx.BoxSizer(wx.HORIZONTAL)
# The label.
- self.add_static_text(sizer, parent, text=text, width=width_text)
+ self.add_static_text(sizer, parent, text=text, width=self.width_text)
# The text input field.
- field = self.add_text_control(sizer, parent, text=default,
control=control, width=width_control, editable=editable)
+ field = self.add_text_control(sizer, parent, text=default,
control=control, editable=editable)
size = field.GetSize()
# The button.
@@ -215,11 +209,11 @@
fn = getattr(field, fn)
# Add the button.
- self.add_button_open(sizer, parent, fn=fn, width=width_button,
height=size[1])
+ self.add_button_open(sizer, parent, fn=fn,
width=self.width_button, height=size[1])
# No button, so add a spacer.
else:
- sizer.AddSpacer((width_button, -1))
+ sizer.AddSpacer((self.width_button, -1))
# Add the element to the box.
box.Add(sizer, 1, wx.EXPAND, 0)
Modified: 1.3/gui/components/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/components/spectrum.py?rev=12947&r1=12946&r2=12947&view=diff
==============================================================================
--- 1.3/gui/components/spectrum.py (original)
+++ 1.3/gui/components/spectrum.py Thu Jun 9 20:10:45 2011
@@ -245,7 +245,7 @@
self.subparent.add_subtitle(box, "Data points")
# Add the cycle delay time element.
- self.delay_time = self.subparent.add_text_sel_element(box,
self.parent, text="Single delay cycle time [s]", width_text=230,
width_control=350)
+ self.delay_time = self.subparent.add_text_sel_element(box,
self.parent, text="Single delay cycle time [s]")
# A sizer for the buttons and grid.
sizer = wx.BoxSizer(wx.HORIZONTAL)
r12947 - in /1.3/gui: analyses/ components/