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
Merge requests
!436
added uint support and 2 more tof sensor values
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
added uint support and 2 more tof sensor values
feature/armarde-tof
into
master
Overview
1
Commits
2
Pipelines
2
Changes
24
Merged
Torben Hildebrand
requested to merge
feature/armarde-tof
into
master
1 year ago
Overview
1
Commits
2
Pipelines
2
Changes
24
Expand
0
0
Merge request reports
Compare
master
version 1
2c977094
1 year ago
master (base)
and
latest version
latest version
2250292c
2 commits,
1 year ago
version 1
2c977094
1 commit,
1 year ago
24 files
+
402
−
30
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
24
Search (e.g. *.vue) (Ctrl+P)
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
+
18
−
0
Options
@@ -257,9 +257,15 @@ namespace armarx
int
dataSize
=
0
;
switch
(
i
->
getElementType
())
{
case
armarx
::
aron
::
type
::
matrix
::
INT8
:
case
armarx
::
aron
::
type
::
matrix
::
UINT8
:
dataSize
=
1
;
break
;
case
armarx
::
aron
::
type
::
matrix
::
INT16
:
case
armarx
::
aron
::
type
::
matrix
::
UINT16
:
dataSize
=
2
;
break
;
case
armarx
::
aron
::
type
::
matrix
::
UINT32
:
case
armarx
::
aron
::
type
::
matrix
::
INT32
:
case
armarx
::
aron
::
type
::
matrix
::
FLOAT32
:
dataSize
=
4
;
@@ -273,6 +279,18 @@ namespace armarx
// UGLY HACK: FIX ME!!!
switch
(
i
->
getElementType
())
{
case
armarx
::
aron
::
type
::
matrix
::
UINT8
:
createdMatrix
->
setType
(
"unsigned char"
);
break
;
case
armarx
::
aron
::
type
::
matrix
::
UINT16
:
createdMatrix
->
setType
(
"unsigned short"
);
break
;
case
armarx
::
aron
::
type
::
matrix
::
UINT32
:
createdMatrix
->
setType
(
"unsigned int"
);
break
;
case
armarx
::
aron
::
type
::
matrix
::
INT8
:
createdMatrix
->
setType
(
"char"
);
break
;
case
armarx
::
aron
::
type
::
matrix
::
INT16
:
createdMatrix
->
setType
(
"short"
);
break
;
Loading