r23578 - in /trunk/user_functions: chemical_shift.py spectrum.py wildcards.py -- May 28, 2014 - 22:39

Author: bugman
Date: Wed May 28 22:39:51 2014
New Revision: 23578

URL: http://svn.gna.org/viewcvs/relax?rev=23578&view=rev
Log:
Created a file selection wildcard for use in the GUI for selecting peak lists.

This is used in the four user functions which read peak lists.


Modified:
    trunk/user_functions/chemical_shift.py
    trunk/user_functions/spectrum.py
    trunk/user_functions/wildcards.py

Modified: trunk/user_functions/chemical_shift.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/chemical_shift.py?rev=23578&r1=23577&r2=23578&view=diff
==============================================================================
--- trunk/user_functions/chemical_shift.py      (original)
+++ trunk/user_functions/chemical_shift.py      Wed May 28 22:39:51 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2013 Edward d'Auvergne                                       
 #
+# Copyright (C) 2013-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -35,6 +35,7 @@
 from pipe_control import chemical_shift
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.objects import Desc_container
+from user_functions.wildcards import WILDCARD_SPECTRUM_PEAKLIST
 
 
 # The user function class.
@@ -54,6 +55,7 @@
     arg_type = "file sel",
     desc_short = "file name",
     desc = "The name of the peak list of generic formatted file containing 
the chemical shifts.",
+    wiz_filesel_wildcard = WILDCARD_SPECTRUM_PEAKLIST,
     wiz_filesel_style = FD_OPEN
 )
 uf.add_keyarg(

Modified: trunk/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/spectrum.py?rev=23578&r1=23577&r2=23578&view=diff
==============================================================================
--- trunk/user_functions/spectrum.py    (original)
+++ trunk/user_functions/spectrum.py    Wed May 28 22:39:51 2014
@@ -37,6 +37,7 @@
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()
 from user_functions.objects import Desc_container
+from user_functions.wildcards import WILDCARD_SPECTRUM_PEAKLIST
 
 
 # The user function class.
@@ -222,6 +223,7 @@
     arg_type = "file sel multi",
     desc_short = "file name(s)",
     desc = "The name of the file or the list of files containing the 
intensity data.",
+    wiz_filesel_wildcard = WILDCARD_SPECTRUM_PEAKLIST,
     wiz_filesel_style = FD_OPEN
 )
 uf.add_keyarg(
@@ -376,6 +378,7 @@
     arg_type = "file sel",
     desc_short = "file name",
     desc = "The name of the file containing the intensity data.",
+    wiz_filesel_wildcard = WILDCARD_SPECTRUM_PEAKLIST,
     wiz_filesel_style = FD_OPEN
 )
 uf.add_keyarg(

Modified: trunk/user_functions/wildcards.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/wildcards.py?rev=23578&r1=23577&r2=23578&view=diff
==============================================================================
--- trunk/user_functions/wildcards.py   (original)
+++ trunk/user_functions/wildcards.py   Wed May 28 22:39:51 2014
@@ -46,6 +46,14 @@
     "Uncompressed relax state files (*.*)|*.*"
 WILDCARD_RELAX_SCRIPT = "relax scripts (*.py)|*.py;*.PY"
 
+# Spectral data.
+WILDCARD_SPECTRUM_PEAKLIST = \
+    "Sparky peak lists (*.list)|*.list;*.LIST|"+\
+    "XEasy peak lists (*.text)|*.text;*.TEXT|"+\
+    "NMRView peak lists (*.xpk)|*.xpk;*.XPK|"+\
+    "NMRPipe seriesTab peak lists (*.ser)|*.ser;*.SER|"+\
+    "All files (*)|*"
+
 # 3D structure related wildcards.
 WILDCARD_STRUCT_GAUSSIAN_ALL = \
     "Gaussian log files (*.log)|*.log;*.LOG|"+\