Author: bugman
Date: Fri Nov 28 09:35:55 2014
New Revision: 26799
URL: http://svn.gna.org/viewcvs/relax?rev=26799&view=rev
Log:
Merged revisions 26794-26795,26798 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r26794 | bugman | 2014-11-27 21:48:08 +0100 (Thu, 27 Nov 2014) | 3 lines
Updated the target_functions package __all__ list to include the relax_fit*
modules.
........
r26795 | bugman | 2014-11-27 21:50:50 +0100 (Thu, 27 Nov 2014) | 3 lines
Modified the package __all__ list checking unit test to accept *.so C
modules.
........
r26798 | bugman | 2014-11-28 09:34:02 +0100 (Fri, 28 Nov 2014) | 9 lines
Bug fix for the pymol.view user function for when no PDB file exists.
The pymol.view user function would fail with an AttributeError when the
currently loaded data does
not exist as a PDB file. This is now caught and the non-existent PDB is no
longer displayed. A
better solution might be to dump all the current structural data into a
temporary file and load
that, all within a try-finally statement to be sure to delete the temporary
file. This solution may
not be what the user is interested in anyway.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/pipe_control/pymol_control.py
branches/frame_order_cleanup/target_functions/__init__.py
branches/frame_order_cleanup/test_suite/unit_tests/package_checking.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 28 09:35:55 2014
@@ -1 +1 @@
-/trunk:1-26791
+/trunk:1-26798
Modified: branches/frame_order_cleanup/pipe_control/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/pymol_control.py?rev=26799&r1=26798&r2=26799&view=diff
==============================================================================
--- branches/frame_order_cleanup/pipe_control/pymol_control.py (original)
+++ branches/frame_order_cleanup/pipe_control/pymol_control.py Fri Nov 28
09:35:55 2014
@@ -34,9 +34,11 @@
from subprocess import PIPE, Popen
from tempfile import mktemp
from time import sleep
+from warnings import warn
# relax module imports.
from lib.errors import RelaxError, RelaxNoPdbError, RelaxNoSequenceError
+from lib.warnings import RelaxWarning
from lib.io import delete, file_root, get_file_path, open_read_file,
open_write_file, test_binary
from lib.structure.files import find_pdb_files
from pipe_control.mol_res_spin import exists_mol_res_spin_data
@@ -145,6 +147,11 @@
open_files = []
for model in cdp.structure.structural_data:
for mol in model.mol:
+ # No file path.
+ if not hasattr(mol, 'file_name'):
+ warn(RelaxWarning("Cannot display the current molecular
data in PyMOL as it has not be exported as a PDB file."))
+ continue
+
# The file path as the current directory.
file_path = None
if access(mol.file_name, F_OK):
Modified: branches/frame_order_cleanup/target_functions/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/__init__.py?rev=26799&r1=26798&r2=26799&view=diff
==============================================================================
--- branches/frame_order_cleanup/target_functions/__init__.py (original)
+++ branches/frame_order_cleanup/target_functions/__init__.py Fri Nov 28
09:35:55 2014
@@ -33,5 +33,7 @@
'mf',
'n_state_model',
'potential',
- 'relax_disp'
+ 'relax_disp',
+ 'relax_fit',
+ 'relax_fit_wrapper'
]
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/package_checking.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/package_checking.py?rev=26799&r1=26798&r2=26799&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/unit_tests/package_checking.py
(original)
+++ branches/frame_order_cleanup/test_suite/unit_tests/package_checking.py
Fri Nov 28 09:35:55 2014
@@ -89,6 +89,10 @@
if access(self.package_path+sep+module+'.py', F_OK):
continue
+ # Check for the C module.
+ if access(self.package_path+sep+module+'.so', F_OK):
+ continue
+
# Check for the package.
if access(self.package_path+sep+module, F_OK):
continue
r26799 - in /branches/frame_order_cleanup: ./ pipe_control/ target_functions/ test_suite/unit_tests/