Author: bugman
Date: Fri May 24 16:17:27 2013
New Revision: 19732
URL: http://svn.gna.org/viewcvs/relax?rev=19732&view=rev
Log:
All of the binary file arguments for the user functions now are file
selection GUI elements.
The GUI user function wizard pages now have file selection buttons for
selecting the executable to
run. These all have the preview button disabled. The results.read and
state.load GUI elements also
have the preview button disabled.
Modified:
trunk/user_functions/dasha.py
trunk/user_functions/dx.py
trunk/user_functions/grace.py
trunk/user_functions/palmer.py
trunk/user_functions/results.py
trunk/user_functions/state.py
Modified: trunk/user_functions/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/dasha.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/dasha.py (original)
+++ trunk/user_functions/dasha.py Fri May 24 16:17:27 2013
@@ -21,6 +21,13 @@
# Module docstring.
"""The dasha user function definitions for controlling the Dasha model-free
software."""
+
+# Python module imports.
+import dep_check
+if dep_check.wx_module:
+ from wx import FD_OPEN
+else:
+ FD_OPEN = -1
# relax module imports.
from pipe_control import dasha
@@ -105,8 +112,11 @@
name = "binary",
default = "dasha",
py_type = "str",
+ arg_type = "file sel",
desc_short = "Dasha executable file",
- desc = "The name of the executable Dasha program file."
+ desc = "The name of the executable Dasha program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
# Description.
uf.desc.append(Desc_container())
Modified: trunk/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/dx.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/dx.py (original)
+++ trunk/user_functions/dx.py Fri May 24 16:17:27 2013
@@ -21,6 +21,13 @@
# Module docstring.
"""The dx user function definitions for controlling the OpenDX visualisation
software."""
+
+# Python module imports.
+import dep_check
+if dep_check.wx_module:
+ from wx import FD_OPEN
+else:
+ FD_OPEN = -1
# relax module imports.
from pipe_control import diffusion_tensor
@@ -65,8 +72,11 @@
name = "dx_exe",
default = "dx",
py_type = "str",
+ arg_type = "file sel",
desc_short = "OpenDX executable file name",
- desc = "The OpenDX executable file."
+ desc = "The OpenDX executable file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
uf.add_keyarg(
name = "vp_exec",
Modified: trunk/user_functions/grace.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/grace.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/grace.py (original)
+++ trunk/user_functions/grace.py Fri May 24 16:17:27 2013
@@ -76,8 +76,11 @@
name = "grace_exe",
default = "xmgrace",
py_type = "str",
+ arg_type = "file sel",
desc_short = "Grace executable file",
- desc = "The Grace executable file."
+ desc = "The Grace executable file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
# Description.
uf.desc.append(Desc_container())
Modified: trunk/user_functions/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/palmer.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/palmer.py (original)
+++ trunk/user_functions/palmer.py Fri May 24 16:17:27 2013
@@ -21,6 +21,13 @@
# Module docstring.
"""The palmer user function definitions for controlling the Modelfree4
software."""
+
+# Python module imports.
+import dep_check
+if dep_check.wx_module:
+ from wx import FD_OPEN
+else:
+ FD_OPEN = -1
# relax module imports.
from pipe_control import palmer
@@ -59,8 +66,11 @@
name = "binary",
default = "modelfree4",
py_type = "str",
+ arg_type = "file sel",
desc_short = "Modelfree executable file",
- desc = "The name of the executable Modelfree program file."
+ desc = "The name of the executable Modelfree program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
uf.add_keyarg(
name = "diff_search",
@@ -178,8 +188,11 @@
name = "binary",
default = "modelfree4",
py_type = "str",
+ arg_type = "file sel",
desc_short = "Modelfree4 executable file",
- desc = "The name of the executable Modelfree program file."
+ desc = "The name of the executable Modelfree program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
# Description.
uf.desc.append(Desc_container())
Modified: trunk/user_functions/results.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/results.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/results.py (original)
+++ trunk/user_functions/results.py Fri May 24 16:17:27 2013
@@ -71,7 +71,8 @@
desc_short = "file name",
desc = "The name of the file to read results from.",
wiz_filesel_wildcard = "relax results files (*.bz2)|*.bz2|relax results
files (*.gz)|*.gz|relax results files (*.*)|*.*",
- wiz_filesel_style = FD_OPEN
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
uf.add_keyarg(
name = "dir",
Modified: trunk/user_functions/state.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/state.py?rev=19732&r1=19731&r2=19732&view=diff
==============================================================================
--- trunk/user_functions/state.py (original)
+++ trunk/user_functions/state.py Fri May 24 16:17:27 2013
@@ -56,7 +56,8 @@
desc_short = "file name",
desc = "The file name, which can be a string or a file descriptor
object, of a saved program state.",
wiz_filesel_wildcard = "relax state files (*.bz2)|*.bz2|relax state
files (*.gz)|*.gz|relax state files (*.*)|*.*",
- wiz_filesel_style = FD_OPEN
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
uf.add_keyarg(
name = "dir",
r19732 - in /trunk/user_functions: dasha.py dx.py grace.py palmer.py results.py state.py