Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
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
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
wolf
Commits
019a6171
Commit
019a6171
authored
3 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Rename SensorModel --> SensorMotionModel
parent
d22274bb
No related branches found
No related tags found
2 merge requests
!440
New tag
,
!437
Resolve "Strange things in WOLF core?"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
include/core/sensor/sensor_motion_model.h
+9
-9
9 additions, 9 deletions
include/core/sensor/sensor_motion_model.h
src/sensor/sensor_motion_model.cpp
+5
-5
5 additions, 5 deletions
src/sensor/sensor_motion_model.cpp
with
16 additions
and
16 deletions
CMakeLists.txt
+
2
−
2
View file @
019a6171
...
@@ -213,7 +213,7 @@ SET(HDRS_SENSOR
...
@@ -213,7 +213,7 @@ SET(HDRS_SENSOR
include/core/sensor/sensor_base.h
include/core/sensor/sensor_base.h
include/core/sensor/sensor_diff_drive.h
include/core/sensor/sensor_diff_drive.h
include/core/sensor/factory_sensor.h
include/core/sensor/factory_sensor.h
include/core/sensor/sensor_model.h
include/core/sensor/sensor_
motion_
model.h
include/core/sensor/sensor_odom_2d.h
include/core/sensor/sensor_odom_2d.h
include/core/sensor/sensor_odom_3d.h
include/core/sensor/sensor_odom_3d.h
include/core/sensor/sensor_pose.h
include/core/sensor/sensor_pose.h
...
@@ -319,7 +319,7 @@ SET(SRCS_PROCESSOR
...
@@ -319,7 +319,7 @@ SET(SRCS_PROCESSOR
SET
(
SRCS_SENSOR
SET
(
SRCS_SENSOR
src/sensor/sensor_base.cpp
src/sensor/sensor_base.cpp
src/sensor/sensor_diff_drive.cpp
src/sensor/sensor_diff_drive.cpp
src/sensor/sensor_model.cpp
src/sensor/sensor_
motion_
model.cpp
src/sensor/sensor_odom_2d.cpp
src/sensor/sensor_odom_2d.cpp
src/sensor/sensor_odom_3d.cpp
src/sensor/sensor_odom_3d.cpp
src/sensor/sensor_pose.cpp
src/sensor/sensor_pose.cpp
...
...
This diff is collapsed.
Click to expand it.
include/core/sensor/sensor_motion_model.h
+
9
−
9
View file @
019a6171
...
@@ -19,26 +19,26 @@
...
@@ -19,26 +19,26 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
//
//--------LICENSE_END--------
//--------LICENSE_END--------
#ifndef SRC_SENSOR_MODEL_H_
#ifndef SRC_SENSOR_
MOTION_
MODEL_H_
#define SRC_SENSOR_MODEL_H_
#define SRC_SENSOR_
MOTION_
MODEL_H_
//wolf includes
//wolf includes
#include
"core/sensor/sensor_base.h"
#include
"core/sensor/sensor_base.h"
namespace
wolf
{
namespace
wolf
{
WOLF_PTR_TYPEDEFS
(
SensorModel
);
WOLF_PTR_TYPEDEFS
(
SensorMo
tionMo
del
);
class
SensorModel
:
public
SensorBase
class
SensorMo
tionMo
del
:
public
SensorBase
{
{
public:
public:
SensorModel
();
SensorMo
tionMo
del
();
~
SensorModel
()
override
;
~
SensorMo
tionMo
del
()
override
;
static
SensorBasePtr
create
(
const
std
::
string
&
_unique_name
,
static
SensorBasePtr
create
(
const
std
::
string
&
_unique_name
,
const
ParamsServer
&
_server
)
const
ParamsServer
&
_server
)
{
{
auto
sensor
=
std
::
make_shared
<
SensorModel
>
();
auto
sensor
=
std
::
make_shared
<
SensorMo
tionMo
del
>
();
sensor
->
setName
(
_unique_name
);
sensor
->
setName
(
_unique_name
);
return
sensor
;
return
sensor
;
}
}
...
@@ -47,7 +47,7 @@ class SensorModel : public SensorBase
...
@@ -47,7 +47,7 @@ class SensorModel : public SensorBase
const
Eigen
::
VectorXd
&
_extrinsics
,
const
Eigen
::
VectorXd
&
_extrinsics
,
const
ParamsSensorBasePtr
_intrinsics
)
const
ParamsSensorBasePtr
_intrinsics
)
{
{
auto
sensor
=
std
::
make_shared
<
SensorModel
>
();
auto
sensor
=
std
::
make_shared
<
SensorMo
tionMo
del
>
();
sensor
->
setName
(
_unique_name
);
sensor
->
setName
(
_unique_name
);
return
sensor
;
return
sensor
;
}
}
...
@@ -56,4 +56,4 @@ class SensorModel : public SensorBase
...
@@ -56,4 +56,4 @@ class SensorModel : public SensorBase
}
/* namespace wolf */
}
/* namespace wolf */
#endif
/* SRC_SENSOR_
POSE
_H_ */
#endif
/* SRC_SENSOR_
MOTION_MODEL
_H_ */
This diff is collapsed.
Click to expand it.
src/sensor/sensor_motion_model.cpp
+
5
−
5
View file @
019a6171
...
@@ -19,18 +19,18 @@
...
@@ -19,18 +19,18 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
//
//--------LICENSE_END--------
//--------LICENSE_END--------
#include
"core/sensor/sensor_model.h"
#include
"
../../include/
core/sensor/sensor_
motion_
model.h"
namespace
wolf
{
namespace
wolf
{
SensorModel
::
SensorModel
()
:
SensorMo
tionMo
del
::
SensorMo
tionMo
del
()
:
SensorBase
(
"SensorModel"
,
nullptr
,
nullptr
,
nullptr
,
6
)
SensorBase
(
"SensorModel"
,
nullptr
,
nullptr
,
nullptr
,
6
)
{
{
//
//
}
}
SensorModel
::~
SensorModel
()
SensorMo
tionMo
del
::~
SensorMo
tionMo
del
()
{
{
//
//
}
}
...
@@ -40,6 +40,6 @@ SensorModel::~SensorModel()
...
@@ -40,6 +40,6 @@ SensorModel::~SensorModel()
// Register in the FactorySensor
// Register in the FactorySensor
#include
"core/sensor/factory_sensor.h"
#include
"core/sensor/factory_sensor.h"
namespace
wolf
{
namespace
wolf
{
WOLF_REGISTER_SENSOR
(
SensorModel
);
WOLF_REGISTER_SENSOR
(
SensorMo
tionMo
del
);
WOLF_REGISTER_SENSOR_AUTO
(
SensorModel
);
WOLF_REGISTER_SENSOR_AUTO
(
SensorMo
tionMo
del
);
}
}
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