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-gui
Commits
665bc71d
Commit
665bc71d
authored
Feb 07, 2018
by
Joseph Mirabel
Committed by
Joseph Mirabel
Feb 07, 2018
Browse files
Use CORBA::Long instead of Short for path ids.
parent
a76e1636
Changes
1
Hide whitespace changes
Inline
Side-by-side
plugins/hppwidgetsplugin/pathplayer.cc
View file @
665bc71d
...
...
@@ -85,7 +85,7 @@ namespace hpp {
gepetto
::
gui
::
WindowsManagerPtr_t
wsm
=
main
->
osg
();
HppWidgetsPlugin
::
HppClient
*
hpp
=
plugin_
->
client
();
hpp
::
floatSeq_var
times
;
hpp
::
floatSeqSeq_var
waypoints
=
hpp
->
problem
()
->
getWaypoints
((
CORBA
::
U
Short
)
pid
,
times
.
out
());
hpp
::
floatSeqSeq_var
waypoints
=
hpp
->
problem
()
->
getWaypoints
((
CORBA
::
U
Long
)
pid
,
times
.
out
());
if
(
!
wsm
->
getGroup
(
pn
,
false
))
{
wsm
->
createGroup
(
pn
);
wsm
->
addToGroup
(
pn
,
"hpp-gui"
);
...
...
@@ -138,7 +138,7 @@ namespace hpp {
emit
displayPath_status
(
100
);
return
;
}
CORBA
::
U
Short
pid
=
(
CORBA
::
U
Short
)
pathIndex
()
->
value
();
CORBA
::
U
Long
pid
=
(
CORBA
::
U
Long
)
pathIndex
()
->
value
();
std
::
stringstream
ss
;
ss
<<
"curvedpath_"
<<
pid
<<
"_"
<<
jointName
;
std
::
string
pn
=
ss
.
str
();
graphics
::
WindowsManager
::
Color_t
colorE
(
1.
f
,
0.
f
,
0.
f
,
1.
f
);
...
...
@@ -170,7 +170,7 @@ namespace hpp {
void
PathPlayer
::
update
()
{
CORBA
::
Short
nbPath
=
plugin_
->
client
()
->
problem
()
->
numberPaths
();
CORBA
::
Long
nbPath
=
plugin_
->
client
()
->
problem
()
->
numberPaths
();
if
(
nbPath
>
0
)
{
pathIndex
()
->
setEnabled
(
true
);
...
...
@@ -316,11 +316,11 @@ namespace hpp {
void
PathPlayer
::
updateConfiguration
()
{
hpp
::
floatSeq_var
config
=
plugin_
->
client
()
->
problem
()
->
configAtParam
((
short
unsigned
int
)
pathIndex
()
->
value
(),
currentParam_
);
plugin_
->
client
()
->
problem
()
->
configAtParam
((
CORBA
::
ULong
)
pathIndex
()
->
value
(),
currentParam_
);
plugin_
->
client
()
->
robot
()
->
setCurrentConfig
(
config
.
in
());
if
(
velocity_
)
{
config
=
plugin_
->
client
()
->
problem
()
->
velocityAtParam
((
short
unsigned
int
)
pathIndex
()
->
value
(),
currentParam_
);
plugin_
->
client
()
->
problem
()
->
velocityAtParam
((
CORBA
::
ULong
)
pathIndex
()
->
value
(),
currentParam_
);
plugin_
->
client
()
->
robot
()
->
setCurrentVelocity
(
config
.
in
());
}
gepetto
::
gui
::
MainWindow
::
instance
()
->
requestApplyCurrentConfiguration
();
...
...
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