From ee1f5145037fdf10edd291512d655057c5b4871e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Fri, 27 Apr 2018 09:37:45 +0200 Subject: [PATCH] [Doc] use os.path.join --- doc/c-tutorials/direct-geometry.md | 5 +++-- doc/c-tutorials/inverse-kinematics.md | 5 +++-- doc/d-labs/1-directgeom.md | 3 ++- doc/d-labs/2-invgeom.md | 3 ++- doc/d-labs/3-invkine.md | 3 ++- doc/d-labs/src/ur5x4.py | 4 +++- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/doc/c-tutorials/direct-geometry.md b/doc/c-tutorials/direct-geometry.md index d10501abc..e425b58a3 100644 --- a/doc/c-tutorials/direct-geometry.md +++ b/doc/c-tutorials/direct-geometry.md @@ -4,9 +4,10 @@ ```py from pinocchio.robot_wrapper import RobotWrapper +from os.path import join -PKG = '/opt/openrobots/share/' -URDF = PKG + 'ur5_description/urdf/ur5_gripper.urdf' +PKG = '/opt/openrobots/share' +URDF = join(PKG, 'ur5_description/urdf/ur5_gripper.urdf'@ robot = RobotWrapper(URDF, [PKG]) ``` diff --git a/doc/c-tutorials/inverse-kinematics.md b/doc/c-tutorials/inverse-kinematics.md index f4e99d840..0bdbeb788 100644 --- a/doc/c-tutorials/inverse-kinematics.md +++ b/doc/c-tutorials/inverse-kinematics.md @@ -4,9 +4,10 @@ ```py import pinocchio +from os.path import join -PKG = '/opt/openrobots/share/' -URDF = PKG + 'ur5_description/urdf/ur5_gripper.urdf' +PKG = '/opt/openrobots/share' +URDF = join(PKG, 'ur5_description/urdf/ur5_gripper.urdf') robot = pinocchio.robot_wrapper.RobotWrapper(URDF, [PKG]) robot.initDisplay(loadModel=True) diff --git a/doc/d-labs/1-directgeom.md b/doc/d-labs/1-directgeom.md index 85cdef635..84ded87ed 100644 --- a/doc/d-labs/1-directgeom.md +++ b/doc/d-labs/1-directgeom.md @@ -127,9 +127,10 @@ of pinocchio (available in the homedir of the VBox). ```py from pinocchio.robot_wrapper import RobotWrapper +from os.path import join PKG = '/opt/openrobots/share' -URDF = PKG + '/ur5_description/urdf/ur5_gripper.urdf' +URDF = join(PKG, 'ur5_description/urdf/ur5_gripper.urdf') robot = RobotWrapper(URDF, [PKG]) ``` diff --git a/doc/d-labs/2-invgeom.md b/doc/d-labs/2-invgeom.md index 4c1f89d4c..3f606dc80 100644 --- a/doc/d-labs/2-invgeom.md +++ b/doc/d-labs/2-invgeom.md @@ -138,11 +138,12 @@ sudo apt install robotpkg-romeo-description Romeo can be loaded with: ```py +from os.path import join import pinocchio as se3 from pinocchio.romeo_wrapper import RomeoWrapper PKG = '/opt/openrobots/share' -URDF = PKG + 'romeo_description/urdf/romeo.urdf' +URDF = join(PKG, 'romeo_description/urdf/romeo.urdf') robot = RomeoWrapper(URDF, [PKG]) # Load urdf model robot.initDisplay(loadModel=True) diff --git a/doc/d-labs/3-invkine.md b/doc/d-labs/3-invkine.md index 2d71f8d1c..f8c7fe4b8 100644 --- a/doc/d-labs/3-invkine.md +++ b/doc/d-labs/3-invkine.md @@ -21,12 +21,13 @@ the tool. They are displayed when the robot moves. Example of how to use the robot is has below. ```py +from os.path import join import pinocchio as se3 from mobilerobot import MobileRobotWrapper from pinocchio.utils import * PKG = '/opt/openrobots/share' -URDF = PKG + '/ur5_description/urdf/ur5_gripper.urdf' +URDF = join(PKG, 'ur5_description/urdf/ur5_gripper.urdf') robot = MobileRobotWrapper(URDF, [PKG]) robot.initDisplay(loadModel=True) diff --git a/doc/d-labs/src/ur5x4.py b/doc/d-labs/src/ur5x4.py index ae77d9d05..1cc5fa4b5 100644 --- a/doc/d-labs/src/ur5x4.py +++ b/doc/d-labs/src/ur5x4.py @@ -3,6 +3,8 @@ Load 4 times the UR5 model, plus a plate object on top of them, to feature a sim No optimization, this file is just an example of how to load the models. ''' +from os.path import join + from pinocchio import SE3 from pinocchio.robot_wrapper import RobotWrapper from pinocchio.utils import rotate, zero, eye, se3ToXYZQUAT, urdf @@ -10,7 +12,7 @@ from pinocchio.utils import rotate, zero, eye, se3ToXYZQUAT, urdf import numpy as np PKG = '/opt/openrobots/share' -URDF = PKG + '/ur5_description/urdf/ur5_gripper.urdf' +URDF = join(PKG, 'ur5_description/urdf/ur5_gripper.urdf') def loadRobot(M0, name): -- GitLab