Skip to content
Snippets Groups Projects
Commit 019a6171 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Rename SensorModel --> SensorMotionModel

parent d22274bb
No related branches found
No related tags found
2 merge requests!440New tag,!437Resolve "Strange things in WOLF core?"
...@@ -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
......
...@@ -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(SensorMotionModel);
class SensorModel : public SensorBase class SensorMotionModel : public SensorBase
{ {
public: public:
SensorModel(); SensorMotionModel();
~SensorModel() override; ~SensorMotionModel() 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<SensorMotionModel>();
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<SensorMotionModel>();
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_ */
...@@ -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() : SensorMotionModel::SensorMotionModel() :
SensorBase("SensorModel", nullptr, nullptr, nullptr, 6) SensorBase("SensorModel", nullptr, nullptr, nullptr, 6)
{ {
// //
} }
SensorModel::~SensorModel() SensorMotionModel::~SensorMotionModel()
{ {
// //
} }
...@@ -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(SensorMotionModel);
WOLF_REGISTER_SENSOR_AUTO(SensorModel); WOLF_REGISTER_SENSOR_AUTO(SensorMotionModel);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment