a little change and fix a bug when i use matplotlib 1.5.3

LMCallMe · LMCallMe · commit 25da11c7dfb9 · 2016-12-08T10:42:57.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,89 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
diff --git a/robot/__init__.py b/robot/__init__.py
@@ -1,52 +1,4 @@
 __doc__ = """
-The Robotics Toolbox for Python
-Based on the Matlab version
-Peter Corke 2007
-"""
-
-######################
-#   Import Section   #
-######################
-
-from numpy import *
-
-# Import Link Constructor section
-from Link import *
-
-# Import Robot Constructor section
-from Robot import *
-
-# utility
-from utility import *
-
-# Import transformations section
-from transform import *
-
-from trplot import *
-
-from jacobian import *
-
-# import kinematics section
-from kinematics import *
-
-from manipulability import *
-
-# import trajectories section
-from trajectory import *
-
-# import Quaternion constructor section
-from Quaternion import *
-
-# import dynamics section
-from dynamics import *
-
-# import robot models sections
-#from puma560 import *
-#from puma560akb import *
-#from stanford import *
-#from twolink import *
-
-print """
 Robotics Toolbox for Python
 Based on Matlab Toolbox Version 7  April-2002
 
@@ -118,3 +70,47 @@
   stanford    - Stanford arm data 
   twolink     - simple 2-link example 
 """
+
+######################
+#   Import Section   #
+######################
+
+from numpy import *
+
+# Import Link Constructor section
+from Link import *
+
+# Import Robot Constructor section
+from Robot import *
+
+# utility
+from utility import *
+
+# Import transformations section
+from transform import *
+
+from trplot import *
+
+from jacobian import *
+
+# import kinematics section
+from kinematics import *
+
+from manipulability import *
+
+# import trajectories section
+from trajectory import *
+
+# import Quaternion constructor section
+from Quaternion import *
+
+# import dynamics section
+from dynamics import *
+
+# import robot models sections
+#from puma560 import *
+#from puma560akb import *
+#from stanford import *
+#from twolink import *
+
+
diff --git a/robot/trplot.py b/robot/trplot.py
@@ -1,4 +1,4 @@
-import matplotlib.axes3d as p3
+import mpl_toolkits.mplot3d.axes3d as p3
 from numpy import * # for outer and arange
 import pylab as p   # for figure
 from robot.Quaternion import *

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import matplotlib.axes3d as p3`
	`1`	`+import mpl_toolkits.mplot3d.axes3d as p3`
`2`	`2`	`from numpy import * # for outer and arange`
`3`	`3`	`import pylab as p # for figure`
`4`	`4`	`from robot.Quaternion import *`