Author: bugman
Date: Sat Nov 16 17:12:26 2013
New Revision: 21457
URL: http://svn.gna.org/viewcvs/relax?rev=21457&view=rev
Log:
The dispersion GUI analysis now uses graphics.fetch_icon() for all icons.
The gui.paths module no longer exists.
Modified:
branches/relax_disp/gui/analyses/auto_relax_disp.py
Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=21457&r1=21456&r2=21457&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Sat Nov 16 17:12:26
2013
@@ -41,7 +41,6 @@
from gui.filedialog import RelaxDirDialog
from gui.fonts import font
from gui.message import error_message, Missing_data
-from gui import paths
from gui.string_conv import float_to_gui, gui_to_bool, gui_to_float,
gui_to_int, gui_to_str, str_to_gui
from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizards.peak_intensity import Peak_intensity_wizard
@@ -329,11 +328,11 @@
Text_ctrl(box, self, text="The data pipe bundle:",
default=self.data.pipe_bundle, tooltip="This is the data pipe bundle
associated with this analysis.", editable=False, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
# Add the results directory GUI element.
- self.field_results_dir = Text_ctrl(box, self, text="Results
directory:", icon=paths.icon_16x16.open_folder, default=self.data.save_dir,
tooltip="The directory in which all automatically created files will be
saved.", tooltip_button="Select the results directory.",
fn=self.results_directory, button=True, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
+ self.field_results_dir = Text_ctrl(box, self, text="Results
directory:", icon=fetch_icon('oxygen.actions.document-open-folder', "16x16"),
default=self.data.save_dir, tooltip="The directory in which all automatically
created files will be saved.", tooltip_button="Select the results
directory.", fn=self.results_directory, button=True,
width_text=self.width_text, width_button=self.width_button,
spacer=self.spacer_horizontal)
# Add the results directory GUI element.
tooltip = "The optional directory containing the dispersion
auto-analysis results from a previous run. The optimised parameters from
these previous results will be used as the starting point for optimisation
rather than performing a grid search. This is essential for when large spin
clusters are specified, as a grid search becomes prohibitively expensive with
clusters of three or more spins. At some point a RelaxError will occur
because the grid search is impossibly large. For the cluster specific
parameters, i.e. the populations of the states and the exchange parameters,
an average value will be used as the starting point. For all other
parameters, the R20 values for each spin and magnetic field, as well as the
parameters related to the chemical shift difference dw, the optimised values
of the previous run will be directly copied."
- self.field_pre_run_dir = Text_ctrl(box, self, text="Previous run
directory:", icon=paths.icon_16x16.open_folder, tooltip=tooltip,
tooltip_button="Select the results directory of the previous run.",
fn=self.pre_run_directory, button=True, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
+ self.field_pre_run_dir = Text_ctrl(box, self, text="Previous run
directory:", icon=fetch_icon('oxygen.actions.document-open-folder', "16x16"),
tooltip=tooltip, tooltip_button="Select the results directory of the previous
run.", fn=self.pre_run_directory, button=True, width_text=self.width_text,
width_button=self.width_button, spacer=self.spacer_horizontal)
# Add the spin GUI element.
self.add_spin_systems(box, self)
r21457 - /branches/relax_disp/gui/analyses/auto_relax_disp.py