Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
cda6e922
Commit
cda6e922
authored
10 years ago
by
Raphael Grimm
Browse files
Options
Downloads
Patches
Plain Diff
added ctor for Vector3 and FramedVector3 accepting 3 floats + 1 string (in case of a FramedVector3)
parent
865c3d19
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/robotstate/remote/ArmarPose.cpp
+13
-0
13 additions, 0 deletions
source/RobotAPI/libraries/robotstate/remote/ArmarPose.cpp
source/RobotAPI/libraries/robotstate/remote/ArmarPose.h
+2
-0
2 additions, 0 deletions
source/RobotAPI/libraries/robotstate/remote/ArmarPose.h
with
15 additions
and
0 deletions
source/RobotAPI/libraries/robotstate/remote/ArmarPose.cpp
+
13
−
0
View file @
cda6e922
...
...
@@ -39,6 +39,13 @@ namespace armarx
z
=
m
(
2
,
3
);
}
Vector3
::
Vector3
(
::
Ice
::
Float
x
,
::
Ice
::
Float
y
,
::
Ice
::
Float
z
)
{
this
->
x
=
x
;
this
->
y
=
y
;
this
->
z
=
z
;
}
Vector3f
Vector3
::
toEigen
()
const
{
Vector3f
v
;
...
...
@@ -322,6 +329,12 @@ namespace armarx
this
->
frame
=
frame
;
}
FramedVector3
::
FramedVector3
(
Ice
::
Float
x
,
::
Ice
::
Float
y
,
::
Ice
::
Float
z
,
const
std
::
string
&
frame
)
:
Vector3
(
x
,
y
,
z
)
{
this
->
frame
=
frame
;
}
string
FramedVector3
::
getFrame
()
const
{
return
frame
;
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/robotstate/remote/ArmarPose.h
+
2
−
0
View file @
cda6e922
...
...
@@ -68,6 +68,7 @@ namespace armarx
Vector3
();
Vector3
(
const
Eigen
::
Vector3f
&
);
Vector3
(
const
Eigen
::
Matrix4f
&
);
Vector3
(
::
Ice
::
Float
x
,
::
Ice
::
Float
y
,
::
Ice
::
Float
z
);
virtual
Eigen
::
Vector3f
toEigen
()
const
;
...
...
@@ -370,6 +371,7 @@ namespace armarx
FramedVector3
();
FramedVector3
(
const
FramedVector3
&
source
);
FramedVector3
(
const
Eigen
::
Vector3f
&
vec
,
const
std
::
string
&
frame
);
FramedVector3
(
Ice
::
Float
x
,
::
Ice
::
Float
y
,
::
Ice
::
Float
z
,
const
std
::
string
&
frame
);
std
::
string
getFrame
()
const
;
static
FramedVector3Ptr
ChangeFrame
(
const
VirtualRobot
::
RobotPtr
robot
,
const
FramedVector3
&
framedVec
,
const
std
::
string
&
newFrame
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment