Author: bugman Date: Mon May 7 12:16:19 2012 New Revision: 16039 URL: http://svn.gna.org/viewcvs/relax?rev=16039&view=rev Log: Added support for the free format file settings GUI element to the auto-generated user functions. The normal argument elements are suppressed if the arg_type arg is set to 'free format', and the free format element will then be added to the end. The 'data_col' argument is searched for to see if the data elements should be activated. Modified: branches/uf_redesign/gui/uf_objects.py Modified: branches/uf_redesign/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16039&r1=16038&r2=16039&view=diff ============================================================================== --- branches/uf_redesign/gui/uf_objects.py (original) +++ branches/uf_redesign/gui/uf_objects.py Mon May 7 12:16:19 2012 @@ -181,6 +181,10 @@ @type sizer: wx.Sizer instance """ + # Initialise the free format file settings flag. + free_format = False + free_format_data = False + # Loop over the arguments. for i in range(len(self.uf_data.kargs)): # Alias. @@ -200,6 +204,13 @@ # Special arg type: directory selection dialog. elif arg['arg_type'] == 'dir sel': self.element_dir_sel(key=arg['name'], sizer=sizer, desc=desc, tooltip=arg['desc'], read_only=arg['wiz_read_only']) + + # Special arg type: free format file settings. + elif arg['arg_type'] == 'free format': + # Switch the flags. + free_format = True + if arg['name'] == 'data_col': + free_format_data = True # Value types. elif arg['py_type'] in ['float', 'int', 'num', 'str']: @@ -248,6 +259,10 @@ # Unknown type. else: raise RelaxError("The Python object type '%s' cannot be handled." % arg['py_type']) + + # Add the free format element. + if free_format: + self.free_file_format(sizer, data_cols=free_format_data, padding=3, spacer=0) def add_desc(self, sizer, max_y=220):