Author: bugman
Date: Sat Mar 23 21:26:44 2013
New Revision: 19086
URL: http://svn.gna.org/viewcvs/relax?rev=19086&view=rev
Log:
Shifted the opendx package to pipe_control.opendx.
Have of the package should be shifted into lib.opendx in the future.
Added:
trunk/pipe_control/opendx/
- copied from r19084, trunk/opendx/
trunk/test_suite/unit_tests/_pipe_control/_opendx/
- copied from r19084, trunk/test_suite/unit_tests/_opendx/
Removed:
trunk/opendx/
trunk/test_suite/unit_tests/_opendx/
Modified:
trunk/pipe_control/__init__.py
trunk/pipe_control/opendx/isosurface_3D.py
trunk/pipe_control/opendx/main.py
trunk/test_suite/unit_tests/_pipe_control/__init__.py
trunk/test_suite/unit_tests/_pipe_control/_opendx/test___init__.py
trunk/user_functions/dx.py
Modified: trunk/pipe_control/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/__init__.py?rev=19086&r1=19085&r2=19086&view=diff
==============================================================================
--- trunk/pipe_control/__init__.py (original)
+++ trunk/pipe_control/__init__.py Sat Mar 23 21:26:44 2013
@@ -44,6 +44,7 @@
'molmol',
'monte_carlo',
'noesy',
+ 'opendx',
'palmer',
'paramag',
'pcs',
Modified: trunk/pipe_control/opendx/isosurface_3D.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/opendx/isosurface_3D.py?rev=19086&r1=19084&r2=19086&view=diff
==============================================================================
--- trunk/pipe_control/opendx/isosurface_3D.py (original)
+++ trunk/pipe_control/opendx/isosurface_3D.py Sat Mar 23 21:26:44 2013
@@ -29,7 +29,7 @@
# relax module imports.
from pipe_control import pipes
from pipe_control import value
-from opendx.base_map import Base_Map
+from pipe_control.opendx.base_map import Base_Map
class Iso3D(Base_Map):
Modified: trunk/pipe_control/opendx/main.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/opendx/main.py?rev=19086&r1=19084&r2=19086&view=diff
==============================================================================
--- trunk/pipe_control/opendx/main.py (original)
+++ trunk/pipe_control/opendx/main.py Sat Mar 23 21:26:44 2013
@@ -27,7 +27,7 @@
from os import system
# relax module imports.
-from opendx import isosurface_3D
+from pipe_control.opendx import isosurface_3D
from lib.errors import RelaxError
from lib.io import test_binary
Modified: trunk/test_suite/unit_tests/_pipe_control/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_pipe_control/__init__.py?rev=19086&r1=19085&r2=19086&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_pipe_control/__init__.py (original)
+++ trunk/test_suite/unit_tests/_pipe_control/__init__.py Sat Mar 23 21:26:44
2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2007-2008 Edward d'Auvergne
#
+# Copyright (C) 2007-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -20,7 +20,8 @@
###############################################################################
-__all__ = ['_structure',
+__all__ = ['_opendx',
+ '_structure',
'test_molecule',
'test_pipes',
'test_relax_data',
Modified: trunk/test_suite/unit_tests/_pipe_control/_opendx/test___init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_pipe_control/_opendx/test___init__.py?rev=19086&r1=19084&r2=19086&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_pipe_control/_opendx/test___init__.py
(original)
+++ trunk/test_suite/unit_tests/_pipe_control/_opendx/test___init__.py Sat
Mar 23 21:26:44 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -25,15 +25,15 @@
# relax module imports.
from test_suite.unit_tests.package_checking import PackageTestCase
-import opendx
+import pipe_control.opendx
class Test___init__(PackageTestCase):
- """Unit tests for the opendx package."""
+ """Unit tests for the pipe_control.opendx package."""
def setUp(self):
"""Set up for the package checking."""
- self.package = opendx
- self.package_name = 'opendx'
- self.package_path = sys.path[0] + sep + 'opendx'
+ self.package = pipe_control.opendx
+ self.package_name = 'pipe_control.opendx'
+ self.package_path = sys.path[0] + sep + 'pipe_control.opendx'
Modified: trunk/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/dx.py?rev=19086&r1=19085&r2=19086&view=diff
==============================================================================
--- trunk/user_functions/dx.py (original)
+++ trunk/user_functions/dx.py Sat Mar 23 21:26:44 2013
@@ -25,7 +25,7 @@
# relax module imports.
from pipe_control import diffusion_tensor
from graphics import WIZARD_IMAGE_PATH
-import opendx.main
+import pipe_control.opendx.main
from prompt.doc_string import regexp_doc
from specific_analyses.model_free import Model_free
from user_functions.data import Uf_info; uf_info = Uf_info()
r19086 - in /trunk: opendx/ pipe_control/ pipe_control/opendx/ test_suite/unit_tests/_opendx/ test_suite/unit_tests/_pipe_co...