Author: bugman
Date: Fri Jul 8 09:01:45 2011
New Revision: 13513
URL: http://svn.gna.org/viewcvs/relax?rev=13513&view=rev
Log:
Merged revisions 13510-13512 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r13510 | bugman | 2011-07-08 08:58:14 +0200 (Fri, 08 Jul 2011) | 3 lines
Bug fix for the sequence.read() user function - the force flag is now being
passed on.
........
r13511 | bugman | 2011-07-08 09:00:06 +0200 (Fri, 08 Jul 2011) | 5 lines
Another fix for the sequence.write() user function - the force flag is
passed to open_write_file().
This is from the relax_io.write_spin_data() function.
........
r13512 | bugman | 2011-07-08 09:01:05 +0200 (Fri, 08 Jul 2011) | 5 lines
Bug fix for the sequence.write() user function when the column separator is
not whitespace.
The column widths are no longer fixed is the separator is not whitespace.
........
Modified:
branches/gui_testing/ (props changed)
branches/gui_testing/generic_fns/sequence.py
branches/gui_testing/relax_io.py
Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 8 09:01:45 2011
@@ -1,1 +1,1 @@
-/1.3:1-13417
+/1.3:1-13512
Modified: branches/gui_testing/generic_fns/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/sequence.py?rev=13513&r1=13512&r2=13513&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/sequence.py (original)
+++ branches/gui_testing/generic_fns/sequence.py Fri Jul 8 09:01:45 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2009 Edward d'Auvergne
#
+# Copyright (C) 2003-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -438,4 +438,4 @@
spin_names = None
# Write the data.
- write_spin_data(file=file, dir=dir, sep=sep, mol_names=mol_names,
res_nums=res_nums, res_names=res_names, spin_nums=spin_nums,
spin_names=spin_names)
+ write_spin_data(file=file, dir=dir, sep=sep, mol_names=mol_names,
res_nums=res_nums, res_names=res_names, spin_nums=spin_nums,
spin_names=spin_names, force=force)
Modified: branches/gui_testing/relax_io.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax_io.py?rev=13513&r1=13512&r2=13513&view=diff
==============================================================================
--- branches/gui_testing/relax_io.py (original)
+++ branches/gui_testing/relax_io.py Fri Jul 8 09:01:45 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2008 Edward d'Auvergne
#
+# Copyright (C) 2003-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -791,11 +791,16 @@
sep = ''
# Open the file.
- file = open_write_file(file_name=file, dir=dir)
+ file = open_write_file(file_name=file, dir=dir, force=force)
# The spin ID column lengths.
len_args = [10] * 6
for i in range(len(args)):
+ # Different separator.
+ if sep:
+ len_args[i] = 0
+ continue
+
# Minimum width of the header name lengths.
if args[i] and len(arg_names[i]) > len_args[i]:
len_args[i] = len(arg_names[i]) + 2
@@ -806,6 +811,8 @@
len_args[i] = len(repr(args[i][spin_index])) + 1
# Data and error formatting strings.
+ if sep:
+ data_length = ''
data_head_format = "%%-%ss" % data_length
if not data_format:
data_format = "%%%ss" % data_length
r13513 - in /branches/gui_testing: ./ generic_fns/sequence.py relax_io.py