From ed267f7b02123b9dbc1b8637234f99b0e920561c Mon Sep 17 00:00:00 2001
From: pFernbach <pierre.fernbach@gmail.com>
Date: Thu, 22 Nov 2018 11:18:54 +0100
Subject: [PATCH] fix indentation in rbprmBuilder.py : always 2 spaces
---
src/hpp/corbaserver/rbprm/rbprmbuilder.py | 562 +++++++++++-----------
1 file changed, 281 insertions(+), 281 deletions(-)
diff --git a/src/hpp/corbaserver/rbprm/rbprmbuilder.py b/src/hpp/corbaserver/rbprm/rbprmbuilder.py
index 5748644..2d053e2 100755
--- a/src/hpp/corbaserver/rbprm/rbprmbuilder.py
+++ b/src/hpp/corbaserver/rbprm/rbprmbuilder.py
@@ -25,285 +25,285 @@ import hpp.gepetto.blender.exportmotion as em
# A RbprmDevice robot is a dual representation of a robots. One robot describes the
# trunk of the robot, and a set of robots describe the range of motion of each limb of the robot.
class Builder (object):
- ## Constructor
- def __init__ (self, load = True):
- self.tf_root = "base_link"
- self.rootJointType = dict()
- self.client = BasicClient () # client of hpp.corbaserver.robot
- self.clientRbprm = RbprmClient () # client of hpp.corbaserver.rbprm.rbprmBuilder
- self.load = load
-
- ## Virtual function to load the robot model.
- #
- # \param urdfName urdf description of the robot trunk,
- # \param urdfNameroms either a string, or an array of strings, indicating the urdf of the different roms to add.
- # \param rootJointType type of root joint among ("freeflyer", "planar",
- # "anchor"),
- # \param meshPackageName name of the meshpackage from where the robot mesh will be loaded
- # \param packageName name of the package from where the robot will be loaded
- # \param urdfSuffix optional suffix for the urdf of the robot package
- # \param srdfSuffix optional suffix for the srdf of the robot package
- def loadModel (self, urdfName, urdfNameroms, rootJointType, meshPackageName, packageName, urdfSuffix, srdfSuffix):
- if(isinstance(urdfNameroms, list)):
- for urdfNamerom in urdfNameroms:
- self.clientRbprm.rbprm.loadRobotRomModel(urdfNamerom, rootJointType, packageName, urdfNamerom, urdfSuffix, srdfSuffix)
- else:
- self.clientRbprm.rbprm.loadRobotRomModel(urdfNameroms, rootJointType, packageName, urdfNameroms, urdfSuffix, srdfSuffix)
- self.clientRbprm.rbprm.initNewProblemSolver()
- self.clientRbprm.rbprm.loadRobotCompleteModel(urdfName, rootJointType, packageName, urdfName, urdfSuffix, srdfSuffix)
- self.name = urdfName
- self.displayName = urdfName
- self.tf_root = "base_link"
- self.rootJointType = rootJointType
- self.jointNames = self.client.robot.getJointNames ()
- self.allJointNames = self.client.robot.getAllJointNames ()
- self.client.robot.meshPackageName = meshPackageName
- self.meshPackageName = meshPackageName
- self.rankInConfiguration = dict ()
- self.rankInVelocity = dict ()
- self.packageName = packageName
- self.urdfName = urdfName
- self.urdfSuffix = urdfSuffix
- self.srdfSuffix = srdfSuffix
- rankInConfiguration = rankInVelocity = 0
- for j in self.jointNames:
- self.rankInConfiguration [j] = rankInConfiguration
- rankInConfiguration += self.client.robot.getJointConfigSize (j)
- self.rankInVelocity [j] = rankInVelocity
- rankInVelocity += self.client.robot.getJointNumberDof (j)
-
-
-
- ## Init RbprmShooter
+ ## Constructor
+ def __init__ (self, load = True):
+ self.tf_root = "base_link"
+ self.rootJointType = dict()
+ self.client = BasicClient ()
+ self.clientRbprm = RbprmClient ()
+ self.load = load
+
+ ## Virtual function to load the robot model.
+ #
+ # \param urdfName urdf description of the robot trunk,
+ # \param urdfNameroms either a string, or an array of strings, indicating the urdf of the different roms to add.
+ # \param rootJointType type of root joint among ("freeflyer", "planar",
+ # "anchor"),
+ # \param meshPackageName name of the meshpackage from where the robot mesh will be loaded
+ # \param packageName name of the package from where the robot will be loaded
+ # \param urdfSuffix optional suffix for the urdf of the robot package
+ # \param srdfSuffix optional suffix for the srdf of the robot package
+ def loadModel (self, urdfName, urdfNameroms, rootJointType, meshPackageName, packageName, urdfSuffix, srdfSuffix):
+ if(isinstance(urdfNameroms, list)):
+ for urdfNamerom in urdfNameroms:
+ self.clientRbprm.rbprm.loadRobotRomModel(urdfNamerom, rootJointType, packageName, urdfNamerom, urdfSuffix, srdfSuffix)
+ else:
+ self.clientRbprm.rbprm.loadRobotRomModel(urdfNameroms, rootJointType, packageName, urdfNameroms, urdfSuffix, srdfSuffix)
+ self.clientRbprm.rbprm.initNewProblemSolver()
+ self.clientRbprm.rbprm.loadRobotCompleteModel(urdfName, rootJointType, packageName, urdfName, urdfSuffix, srdfSuffix)
+ self.name = urdfName
+ self.displayName = urdfName
+ self.tf_root = "base_link"
+ self.rootJointType = rootJointType
+ self.jointNames = self.client.robot.getJointNames ()
+ self.allJointNames = self.client.robot.getAllJointNames ()
+ self.client.robot.meshPackageName = meshPackageName
+ self.meshPackageName = meshPackageName
+ self.rankInConfiguration = dict ()
+ self.rankInVelocity = dict ()
+ self.packageName = packageName
+ self.urdfName = urdfName
+ self.urdfSuffix = urdfSuffix
+ self.srdfSuffix = srdfSuffix
+ rankInConfiguration = rankInVelocity = 0
+ for j in self.jointNames:
+ self.rankInConfiguration [j] = rankInConfiguration
+ rankInConfiguration += self.client.robot.getJointConfigSize (j)
+ self.rankInVelocity [j] = rankInVelocity
+ rankInVelocity += self.client.robot.getJointNumberDof (j)
+
+
+
+ ## Init RbprmShooter
+ #
+ def initshooter (self):
+ return self.clientRbprm.rbprm.initshooter ()
+
+ ## Sets limits on robot orientation, described according to Euler's ZYX rotation order
+ #
+ # \param bounds 6D vector with the lower and upperBound for each rotation axis in sequence
+ def boundSO3 (self, bounds):
+ return self.clientRbprm.rbprm.boundSO3 (bounds)
+
+ ## Specifies a preferred affordance for a given rom.
+ # This constrains the planner to accept a rom configuration only if
+ # it collides with a surface the normal of which has these properties.
+ #
+ # \param rom name of the rome,
+ # \param affordances list of affordance names
+ def setAffordanceFilter (self, rom, affordances):
+ return self.clientRbprm.rbprm.setAffordanceFilter (rom, affordances)
+
+ ## Specifies a rom constraint for the planner.
+ # A configuration will be valid if and only if the considered rom collides
+ # with the environment.
+ #
+ # \param romFilter array of roms indicated by name, which determine the constraint.
+ def setFilter (self, romFilter):
+ return self.clientRbprm.rbprm.setFilter (romFilter)
+
+ ## Export a computed path for blender
#
- def initshooter (self):
- return self.clientRbprm.rbprm.initshooter ()
-
- ## Sets limits on robot orientation, described according to Euler's ZYX rotation order
- #
- # \param bounds 6D vector with the lower and upperBound for each rotation axis in sequence
- def boundSO3 (self, bounds):
- return self.clientRbprm.rbprm.boundSO3 (bounds)
-
- ## Specifies a preferred affordance for a given rom.
- # This constrains the planner to accept a rom configuration only if
- # it collides with a surface the normal of which has these properties.
- #
- # \param rom name of the rome,
- # \param affordances list of affordance names
- def setAffordanceFilter (self, rom, affordances):
- return self.clientRbprm.rbprm.setAffordanceFilter (rom, affordances)
-
- ## Specifies a rom constraint for the planner.
- # A configuration will be valid if and only if the considered rom collides
- # with the environment.
- #
- # \param romFilter array of roms indicated by name, which determine the constraint.
- def setFilter (self, romFilter):
- return self.clientRbprm.rbprm.setFilter (romFilter)
-
- ## Export a computed path for blender
- #
- # \param problem the problem associated with the path computed for the robot
- # \param stepsize increment along the path
- # \param pathId if of the considered path
- # \param filename name of the output file where to save the output
- def exportPath (self, viewer, problem, pathId, stepsize, filename):
- em.exportPath(viewer, self.client.robot, problem, pathId, stepsize, filename)
-
- ## \name Degrees of freedom
- # \{
-
- ## Get size of configuration
- # \return size of configuration
- def getConfigSize (self):
- return self.client.robot.getConfigSize ()
-
- # Get size of velocity
- # \return size of velocity
- def getNumberDof (self):
- return self.client.robot.getNumberDof ()
- ## \}
-
- ## \name Joints
- #\{
-
- ## Get joint names in the same order as in the configuration.
- def getJointNames (self):
- return self.client.robot.getJointNames ()
-
- ## Get joint names in the same order as in the configuration.
- def getAllJointNames (self):
- return self.client.robot.getAllJointNames ()
-
- ## Get joint position.
- def getJointPosition (self, jointName):
- return self.client.robot.getJointPosition (jointName)
-
- ## Set static position of joint in its parent frame
- def setJointPosition (self, jointName, position):
- return self.client.robot.setJointPosition (jointName, position)
-
- ## Get joint number degrees of freedom.
- def getJointNumberDof (self, jointName):
- return self.client.robot.getJointNumberDof (jointName)
-
- ## Get joint number config size.
- def getJointConfigSize (self, jointName):
- return self.client.robot.getJointConfigSize (jointName)
-
- ## set bounds for the joint
- def setJointBounds (self, jointName, inJointBound):
- return self.client.robot.setJointBounds (jointName, inJointBound)
-
- ## Set bounds on the translation part of the freeflyer joint.
- #
- # Valid only if the robot has a freeflyer joint.
- def setTranslationBounds (self, xmin, xmax, ymin, ymax, zmin, zmax):
- self.client.robot.setJointBounds \
- (self.displayName + "base_joint_x", [xmin, xmax])
- self.client.robot.setJointBounds \
- (self.displayName + "base_joint_y", [ymin, ymax])
- self.client.robot.setJointBounds \
- (self.displayName + "base_joint_z", [zmin, zmax])
-
- ## Get link position in joint frame
- #
- # Joints are oriented in a different way as in urdf standard since
- # rotation and uni-dimensional translation joints act around or along
- # their x-axis. This method returns the position of the urdf link in
- # world frame.
- #
- # \param jointName name of the joint
- # \return position of the link in world frame.
- def getLinkPosition (self, jointName):
- return self.client.robot.getLinkPosition (jointName)
-
- ## Get link name
- #
- # \param jointName name of the joint,
- # \return name of the link.
- def getLinkName (self, jointName):
- return self.client.robot.getLinkName (jointName)
-
- def getLinkNames (self, jointName):
- return self.client.robot.getLinkNames (jointName)
- ## \}
-
- ## \name Access to current configuration
- #\{
-
- ## Set current configuration of composite robot
- #
- # \param q configuration of the composite robot
- def setCurrentConfig (self, q):
- self.client.robot.setCurrentConfig (q)
-
- ## Get current configuration of composite robot
- #
- # \return configuration of the composite robot
- def getCurrentConfig (self):
- return self.client.robot.getCurrentConfig ()
-
- ## Shoot random configuration
- # \return dofArray Array of degrees of freedom.
- def shootRandomConfig(self):
- return self.client.robot.shootRandomConfig ()
-
- ## \}
-
- ## \name Bodies
- # \{
-
- ## Get the list of objects attached to a joint.
- # \param inJointName name of the joint.
- # \return list of names of CollisionObject attached to the body.
- def getJointInnerObjects (self, jointName):
- return self.client.robot.getJointInnerObjects (jointName)
-
-
- ## Get list of collision objects tested with the body attached to a joint
- # \param inJointName name of the joint.
- # \return list of names of CollisionObject
- def getJointOuterObjects (self, jointName):
- return self.client.robot.getJointOuterObjects (jointName)
-
- ## Get position of robot object
- # \param objectName name of the object.
- # \return transformation as a hpp.Transform object
- def getObjectPosition (self, objectName):
- return Transform (self.client.robot.getObjectPosition
- (objectName))
-
- ## \brief Remove an obstacle from outer objects of a joint body
- #
- # \param objectName name of the object to remove,
- # \param jointName name of the joint owning the body,
- # \param collision whether collision with object should be computed,
- # \param distance whether distance to object should be computed.
- def removeObstacleFromJoint (self, objectName, jointName, collision,
- distance):
- return self.client.obstacle.removeObstacleFromJoint \
- (objectName, jointName, collision, distance)
-
-
- ## \}
-
- ## \name Collision checking and distance computation
- # \{
-
- ## Test collision with obstacles and auto-collision.
- #
- # Check whether current configuration of robot is valid by calling
- # CkwsDevice::collisionTest ().
- # \return whether configuration is valid
- # \note Deprecated. Use isConfigValid instead.
- def collisionTest (self):
- print "Deprecated. Use isConfigValid instead"
- return self.client.robot.collisionTest ()
-
- ## Check the validity of a configuration.
- #
- # Check whether a configuration of robot is valid.
- # \param cfg a configuration
- # \return whether configuration is valid
- def isConfigValid (self, cfg):
- return self.client.robot.isConfigValid (cfg)
-
- ## Compute distances between bodies and obstacles
- #
- # \return list of distances,
- # \return names of the objects belonging to a body
- # \return names of the objects tested with inner objects,
- # \return closest points on the body,
- # \return closest points on the obstacles
- # \note outer objects for a body can also be inner objects of another
- # body.
- def distancesToCollision (self):
- return self.client.robot.distancesToCollision ()
- ## \}
-
- ## \}
- ## \name Mass and inertia
- # \{
-
- ## Get mass of robot
- def getMass (self):
- return self.client.robot.getMass ()
-
- ## Get position of center of mass
- def getCenterOfMass (self):
- return self.client.robot.getCenterOfMass ()
- ## Get Jacobian of the center of mass
- def getJacobianCenterOfMass (self):
- return self.client.robot.getJacobianCenterOfMass ()
- ##\}
-
- ## Get the dimension of the extra configuration space
- def getDimensionExtraConfigSpace(self):
- return self.client.robot.getDimensionExtraConfigSpace()
-
- ## Convert a direction vector to a quaternion (use Eigen::Quaterniond::FromTwoVectors with Z vector)
- # \param u the vector director
- def quaternionFromVector(self,vector):
- return self.client.robot.quaternionFromVector(vector)
+ # \param problem the problem associated with the path computed for the robot
+ # \param stepsize increment along the path
+ # \param pathId if of the considered path
+ # \param filename name of the output file where to save the output
+ def exportPath (self, viewer, problem, pathId, stepsize, filename):
+ em.exportPath(viewer, self.client.robot, problem, pathId, stepsize, filename)
+
+ ## \name Degrees of freedom
+ # \{
+
+ ## Get size of configuration
+ # \return size of configuration
+ def getConfigSize (self):
+ return self.client.robot.getConfigSize ()
+
+ # Get size of velocity
+ # \return size of velocity
+ def getNumberDof (self):
+ return self.client.robot.getNumberDof ()
+ ## \}
+
+ ## \name Joints
+ #\{
+
+ ## Get joint names in the same order as in the configuration.
+ def getJointNames (self):
+ return self.client.robot.getJointNames ()
+
+ ## Get joint names in the same order as in the configuration.
+ def getAllJointNames (self):
+ return self.client.robot.getAllJointNames ()
+
+ ## Get joint position.
+ def getJointPosition (self, jointName):
+ return self.client.robot.getJointPosition (jointName)
+
+ ## Set static position of joint in its parent frame
+ def setJointPosition (self, jointName, position):
+ return self.client.robot.setJointPosition (jointName, position)
+
+ ## Get joint number degrees of freedom.
+ def getJointNumberDof (self, jointName):
+ return self.client.robot.getJointNumberDof (jointName)
+
+ ## Get joint number config size.
+ def getJointConfigSize (self, jointName):
+ return self.client.robot.getJointConfigSize (jointName)
+
+ ## set bounds for the joint
+ def setJointBounds (self, jointName, inJointBound):
+ return self.client.robot.setJointBounds (jointName, inJointBound)
+
+ ## Set bounds on the translation part of the freeflyer joint.
+ #
+ # Valid only if the robot has a freeflyer joint.
+ def setTranslationBounds (self, xmin, xmax, ymin, ymax, zmin, zmax):
+ self.client.robot.setJointBounds \
+ (self.displayName + "base_joint_x", [xmin, xmax])
+ self.client.robot.setJointBounds \
+ (self.displayName + "base_joint_y", [ymin, ymax])
+ self.client.robot.setJointBounds \
+ (self.displayName + "base_joint_z", [zmin, zmax])
+
+ ## Get link position in joint frame
+ #
+ # Joints are oriented in a different way as in urdf standard since
+ # rotation and uni-dimensional translation joints act around or along
+ # their x-axis. This method returns the position of the urdf link in
+ # world frame.
+ #
+ # \param jointName name of the joint
+ # \return position of the link in world frame.
+ def getLinkPosition (self, jointName):
+ return self.client.robot.getLinkPosition (jointName)
+
+ ## Get link name
+ #
+ # \param jointName name of the joint,
+ # \return name of the link.
+ def getLinkName (self, jointName):
+ return self.client.robot.getLinkName (jointName)
+
+ def getLinkNames (self, jointName):
+ return self.client.robot.getLinkNames (jointName)
+ ## \}
+
+ ## \name Access to current configuration
+ #\{
+
+ ## Set current configuration of composite robot
+ #
+ # \param q configuration of the composite robot
+ def setCurrentConfig (self, q):
+ self.client.robot.setCurrentConfig (q)
+
+ ## Get current configuration of composite robot
+ #
+ # \return configuration of the composite robot
+ def getCurrentConfig (self):
+ return self.client.robot.getCurrentConfig ()
+
+ ## Shoot random configuration
+ # \return dofArray Array of degrees of freedom.
+ def shootRandomConfig(self):
+ return self.client.robot.shootRandomConfig ()
+
+ ## \}
+
+ ## \name Bodies
+ # \{
+
+ ## Get the list of objects attached to a joint.
+ # \param inJointName name of the joint.
+ # \return list of names of CollisionObject attached to the body.
+ def getJointInnerObjects (self, jointName):
+ return self.client.robot.getJointInnerObjects (jointName)
+
+
+ ## Get list of collision objects tested with the body attached to a joint
+ # \param inJointName name of the joint.
+ # \return list of names of CollisionObject
+ def getJointOuterObjects (self, jointName):
+ return self.client.robot.getJointOuterObjects (jointName)
+
+ ## Get position of robot object
+ # \param objectName name of the object.
+ # \return transformation as a hpp.Transform object
+ def getObjectPosition (self, objectName):
+ return Transform (self.client.robot.getObjectPosition
+ (objectName))
+
+ ## \brief Remove an obstacle from outer objects of a joint body
+ #
+ # \param objectName name of the object to remove,
+ # \param jointName name of the joint owning the body,
+ # \param collision whether collision with object should be computed,
+ # \param distance whether distance to object should be computed.
+ def removeObstacleFromJoint (self, objectName, jointName, collision,
+ distance):
+ return self.client.obstacle.removeObstacleFromJoint \
+ (objectName, jointName, collision, distance)
+
+
+ ## \}
+
+ ## \name Collision checking and distance computation
+ # \{
+
+ ## Test collision with obstacles and auto-collision.
+ #
+ # Check whether current configuration of robot is valid by calling
+ # CkwsDevice::collisionTest ().
+ # \return whether configuration is valid
+ # \note Deprecated. Use isConfigValid instead.
+ def collisionTest (self):
+ print "Deprecated. Use isConfigValid instead"
+ return self.client.robot.collisionTest ()
+
+ ## Check the validity of a configuration.
+ #
+ # Check whether a configuration of robot is valid.
+ # \param cfg a configuration
+ # \return whether configuration is valid
+ def isConfigValid (self, cfg):
+ return self.client.robot.isConfigValid (cfg)
+
+ ## Compute distances between bodies and obstacles
+ #
+ # \return list of distances,
+ # \return names of the objects belonging to a body
+ # \return names of the objects tested with inner objects,
+ # \return closest points on the body,
+ # \return closest points on the obstacles
+ # \note outer objects for a body can also be inner objects of another
+ # body.
+ def distancesToCollision (self):
+ return self.client.robot.distancesToCollision ()
+ ## \}
+
+ ## \}
+ ## \name Mass and inertia
+ # \{
+
+ ## Get mass of robot
+ def getMass (self):
+ return self.client.robot.getMass ()
+
+ ## Get position of center of mass
+ def getCenterOfMass (self):
+ return self.client.robot.getCenterOfMass ()
+ ## Get Jacobian of the center of mass
+ def getJacobianCenterOfMass (self):
+ return self.client.robot.getJacobianCenterOfMass ()
+ ##\}
+
+ ## Get the dimension of the extra configuration space
+ def getDimensionExtraConfigSpace(self):
+ return self.client.robot.getDimensionExtraConfigSpace()
+
+ ## Convert a direction vector to a quaternion (use Eigen::Quaterniond::FromTwoVectors with Z vector)
+ # \param u the vector director
+ def quaternionFromVector(self,vector):
+ return self.client.robot.quaternionFromVector(vector)
--
GitLab