Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
laser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
plugins
laser
Commits
4c3ea9c5
Commit
4c3ea9c5
authored
5 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Parsers for SensorLaser2D
parent
38e6f931
No related branches found
No related tags found
3 merge requests
!30
Release after RAL
,
!29
After 2nd RAL submission
,
!3
Resolve "new processor: pc matching for demo"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/laser/sensor/sensor_laser_2D.h
+27
-0
27 additions, 0 deletions
include/laser/sensor/sensor_laser_2D.h
src/yaml/sensor_laser_2D_yaml.cpp
+24
-1
24 additions, 1 deletion
src/yaml/sensor_laser_2D_yaml.cpp
test/yaml/sensor_laser_2D.yaml
+14
-0
14 additions, 0 deletions
test/yaml/sensor_laser_2D.yaml
with
65 additions
and
1 deletion
include/laser/sensor/sensor_laser_2D.h
+
27
−
0
View file @
4c3ea9c5
...
@@ -20,6 +20,33 @@ struct IntrinsicsLaser2D : public IntrinsicsBase
...
@@ -20,6 +20,33 @@ struct IntrinsicsLaser2D : public IntrinsicsBase
virtual
~
IntrinsicsLaser2D
()
=
default
;
virtual
~
IntrinsicsLaser2D
()
=
default
;
laserscanutils
::
LaserScanParams
scan_params
;
laserscanutils
::
LaserScanParams
scan_params
;
IntrinsicsLaser2D
()
=
default
;
IntrinsicsLaser2D
(
std
::
string
_unique_name
,
const
wolf
::
ParamsServer
&
_server
)
:
IntrinsicsBase
(
_unique_name
,
_server
)
{
scan_params
.
angle_min_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/angle_min"
);
scan_params
.
angle_max_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/angle_max"
);
scan_params
.
angle_step_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/angle_step"
);
scan_params
.
scan_time_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/scan_time"
);
scan_params
.
range_min_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/range_min"
);
scan_params
.
range_max_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/range_max"
);
scan_params
.
range_std_dev_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/range_std_dev"
);
scan_params
.
angle_std_dev_
=
_server
.
getParam
<
double
>
(
_unique_name
+
"/angle_std_dev"
);
}
std
::
string
print
()
{
return
"
\n
"
+
IntrinsicsBase
::
print
()
+
"
\n
"
+
"angle_min: "
+
std
::
to_string
(
scan_params
.
angle_min_
)
+
"
\n
"
+
"angle_max: "
+
std
::
to_string
(
scan_params
.
angle_max_
)
+
"
\n
"
+
"angle_step: "
+
std
::
to_string
(
scan_params
.
angle_step_
)
+
"
\n
"
+
"scan_time: "
+
std
::
to_string
(
scan_params
.
scan_time_
)
+
"
\n
"
+
"range_min: "
+
std
::
to_string
(
scan_params
.
range_min_
)
+
"
\n
"
+
"range_max: "
+
std
::
to_string
(
scan_params
.
range_max_
)
+
"
\n
"
+
"range_std_dev: "
+
std
::
to_string
(
scan_params
.
range_std_dev_
)
+
"
\n
"
+
"angle_std_dev: "
+
std
::
to_string
(
scan_params
.
angle_std_dev_
)
+
"
\n
"
;
}
};
};
WOLF_PTR_TYPEDEFS
(
SensorLaser2D
);
WOLF_PTR_TYPEDEFS
(
SensorLaser2D
);
...
...
This diff is collapsed.
Click to expand it.
src/yaml/sensor_laser_2D_yaml.cpp
+
24
−
1
View file @
4c3ea9c5
...
@@ -24,8 +24,31 @@ IntrinsicsBasePtr createIntrinsicsLaser2D(const std::string& _filename_dot_yaml)
...
@@ -24,8 +24,31 @@ IntrinsicsBasePtr createIntrinsicsLaser2D(const std::string& _filename_dot_yaml)
{
{
// If required: Parse YAML
// If required: Parse YAML
IntrinsicsLaser2DPtr
params
;
// dummy
WOLF_INFO
(
"IntrinsicsLaser2D: Parsing file: "
,
_filename_dot_yaml
);
YAML
::
Node
config
=
YAML
::
LoadFile
(
_filename_dot_yaml
);
if
(
config
[
"type"
].
as
<
std
::
string
>
()
==
"LASER 2D"
)
{
IntrinsicsLaser2DPtr
params
=
std
::
make_shared
<
IntrinsicsLaser2D
>
();
params
->
scan_params
.
angle_min_
=
config
[
"/angle_min"
]
.
as
<
double
>
();
params
->
scan_params
.
angle_max_
=
config
[
"/angle_max"
]
.
as
<
double
>
();
params
->
scan_params
.
angle_step_
=
config
[
"/angle_step"
]
.
as
<
double
>
();
params
->
scan_params
.
scan_time_
=
config
[
"/scan_time"
]
.
as
<
double
>
();
params
->
scan_params
.
range_min_
=
config
[
"/range_min"
]
.
as
<
double
>
();
params
->
scan_params
.
range_max_
=
config
[
"/range_max"
]
.
as
<
double
>
();
params
->
scan_params
.
range_std_dev_
=
config
[
"/range_std_dev"
]
.
as
<
double
>
();
params
->
scan_params
.
angle_std_dev_
=
config
[
"/angle_std_dev"
]
.
as
<
double
>
();
return
params
;
return
params
;
}
std
::
cout
<<
"Bad configuration file. No processor type found."
<<
std
::
endl
;
return
nullptr
;
}
}
// register into factory
// register into factory
...
...
This diff is collapsed.
Click to expand it.
test/yaml/sensor_laser_2D.yaml
0 → 100644
+
14
−
0
View file @
4c3ea9c5
type
:
"
LASER
2D"
# from sensor base
# no params so far
# from sensor laser 2D
angle_min
:
1
angle_max
:
2
angle_step
:
3
scan_time
:
4
range_min
:
5
range_max
:
6
range_std_dev
:
7
angle_std_dev
:
8
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