Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-rbprm-corba
Commits
7915d9c4
Commit
7915d9c4
authored
Mar 20, 2020
by
Jason Chemin
Browse files
Set client default parameter to None + fix syntax for None
parent
cd1ce615
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/hpp/corbaserver/rbprm/rbprmbuilder.py
View file @
7915d9c4
...
...
@@ -28,7 +28,7 @@ class Builder(Robot):
# # Constructor
def
__init__
(
self
,
load
=
True
,
clientRbprm
=
None
):
self
.
tf_root
=
"base_link"
if
clientRbprm
==
None
:
if
clientRbprm
is
None
:
self
.
clientRbprm
=
RbprmClient
()
else
:
self
.
clientRbprm
=
clientRbprm
...
...
@@ -44,7 +44,7 @@ class Builder(Robot):
# \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
,
client
):
def
loadModel
(
self
,
urdfName
,
urdfNameroms
,
rootJointType
,
meshPackageName
,
packageName
,
urdfSuffix
,
srdfSuffix
,
client
=
None
):
Robot
.
__init__
(
self
,
urdfName
,
rootJointType
,
False
,
client
=
client
)
if
(
isinstance
(
urdfNameroms
,
list
)):
for
urdfNamerom
in
urdfNameroms
:
...
...
src/hpp/corbaserver/rbprm/rbprmfullbody.py
View file @
7915d9c4
...
...
@@ -46,7 +46,7 @@ class FullBody(Robot):
# \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
loadFullBodyModel
(
self
,
urdfName
,
rootJointType
,
meshPackageName
,
packageName
,
urdfSuffix
,
srdfSuffix
,
client
):
def
loadFullBodyModel
(
self
,
urdfName
,
rootJointType
,
meshPackageName
,
packageName
,
urdfSuffix
,
srdfSuffix
,
client
=
None
):
Robot
.
__init__
(
self
,
urdfName
,
rootJointType
,
False
,
client
)
self
.
clientRbprm
.
rbprm
.
loadFullBodyRobot
(
urdfName
,
rootJointType
,
packageName
,
urdfName
,
urdfSuffix
,
srdfSuffix
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment