Skip to content
Snippets Groups Projects
Commit 2ecfc2ac authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge remote-tracking branch 'origin/devel' into 1-adapt-to-core-cmake-refactor

parents e3ccec7a 4900458a
No related branches found
No related tags found
2 merge requests!3After cmake and const refactor,!2Resolve "Adapt to core cmake refactor"
/.cproject
/.project
/.settings/language.settings.xml
...@@ -42,13 +42,13 @@ class PublisherGnssAccuracy: public Publisher ...@@ -42,13 +42,13 @@ class PublisherGnssAccuracy: public Publisher
{ {
visualization_msgs::Marker PL_marker_msg_; visualization_msgs::Marker PL_marker_msg_;
std_msgs::ColorRGBA marker_color_; std_msgs::ColorRGBA marker_color_;
SensorBasePtr sensor_; SensorBaseConstPtr sensor_;
double k_H_, k_V_; double k_H_, k_V_;
public: public:
PublisherGnssAccuracy(const std::string& _unique_name, PublisherGnssAccuracy(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem); ProblemConstPtr _problem);
WOLF_PUBLISHER_CREATE(PublisherGnssAccuracy); WOLF_PUBLISHER_CREATE(PublisherGnssAccuracy);
virtual ~PublisherGnssAccuracy(){}; virtual ~PublisherGnssAccuracy(){};
......
...@@ -45,15 +45,15 @@ class PublishGnssFix: public Publisher ...@@ -45,15 +45,15 @@ class PublishGnssFix: public Publisher
geometry_msgs::PoseArray pose_array_msg_; geometry_msgs::PoseArray pose_array_msg_;
geometry_msgs::PoseStamped pose_msg_; geometry_msgs::PoseStamped pose_msg_;
visualization_msgs::Marker marker_msg_; visualization_msgs::Marker marker_msg_;
SensorBasePtr sensor_; SensorBaseConstPtr sensor_;
std::string frame_id_, map_frame_id_; std::string frame_id_, map_frame_id_;
ros::Publisher pub_pose_array_, pub_marker_, pub_pose_; ros::Publisher pub_pose_array_, pub_marker_, pub_pose_;
public: public:
PublishGnssFix(const std::string& _unique_name, PublishGnssFix(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem); ProblemConstPtr _problem);
WOLF_PUBLISHER_CREATE(PublishGnssFix); WOLF_PUBLISHER_CREATE(PublishGnssFix);
virtual ~PublishGnssFix(){}; virtual ~PublishGnssFix(){};
......
...@@ -40,12 +40,12 @@ class PublisherGnssTf: public Publisher ...@@ -40,12 +40,12 @@ class PublisherGnssTf: public Publisher
std::string map_frame_id_, enu_frame_id_, ecef_frame_id_; std::string map_frame_id_, enu_frame_id_, ecef_frame_id_;
tf::StampedTransform T_enu_map_, T_ecef_enu_; tf::StampedTransform T_enu_map_, T_ecef_enu_;
tf::TransformBroadcaster tfb_; tf::TransformBroadcaster tfb_;
SensorGnssPtr sensor_gnss_; SensorGnssConstPtr sensor_gnss_;
public: public:
PublisherGnssTf(const std::string& _unique_name, PublisherGnssTf(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem); ProblemConstPtr _problem);
WOLF_PUBLISHER_CREATE(PublisherGnssTf); WOLF_PUBLISHER_CREATE(PublisherGnssTf);
virtual ~PublisherGnssTf(){}; virtual ~PublisherGnssTf(){};
......
...@@ -42,13 +42,13 @@ class PublisherTrackerGnssInfo: public Publisher ...@@ -42,13 +42,13 @@ class PublisherTrackerGnssInfo: public Publisher
{ {
protected: protected:
ProcessorTrackerGnssPtr processor_tracker_gnss_; ProcessorTrackerGnssConstPtr processor_tracker_gnss_;
ros::Publisher publisher_untracked_; ros::Publisher publisher_untracked_;
public: public:
PublisherTrackerGnssInfo(const std::string& _unique_name, PublisherTrackerGnssInfo(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem); ProblemConstPtr _problem);
WOLF_PUBLISHER_CREATE(PublisherTrackerGnssInfo); WOLF_PUBLISHER_CREATE(PublisherTrackerGnssInfo);
virtual ~PublisherTrackerGnssInfo(){}; virtual ~PublisherTrackerGnssInfo(){};
......
...@@ -31,9 +31,9 @@ namespace wolf ...@@ -31,9 +31,9 @@ namespace wolf
{ {
PublisherGnssAccuracy::PublisherGnssAccuracy(const std::string& _unique_name, PublisherGnssAccuracy::PublisherGnssAccuracy(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem) : ProblemConstPtr _problem) :
Publisher(_unique_name, _server, _problem) Publisher(_unique_name, _server, _problem)
{ {
Eigen::Vector4d col = _server.getParam<Eigen::Vector4d>(prefix_ + "/marker_color"); Eigen::Vector4d col = _server.getParam<Eigen::Vector4d>(prefix_ + "/marker_color");
marker_color_.r = col(0); marker_color_.r = col(0);
......
...@@ -28,8 +28,8 @@ namespace wolf ...@@ -28,8 +28,8 @@ namespace wolf
{ {
PublishGnssFix::PublishGnssFix(const std::string& _unique_name, PublishGnssFix::PublishGnssFix(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem) : ProblemConstPtr _problem) :
Publisher(_unique_name, _server, _problem) Publisher(_unique_name, _server, _problem)
{ {
sensor_ = _problem->findSensor(_server.getParam<std::string>(prefix_ + "/sensor")); sensor_ = _problem->findSensor(_server.getParam<std::string>(prefix_ + "/sensor"));
......
...@@ -33,10 +33,10 @@ namespace wolf ...@@ -33,10 +33,10 @@ namespace wolf
PublisherGnssTf::PublisherGnssTf(const std::string& _unique_name, PublisherGnssTf::PublisherGnssTf(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem) : ProblemConstPtr _problem) :
Publisher(_unique_name, _server, _problem) Publisher(_unique_name, _server, _problem)
{ {
sensor_gnss_ = std::static_pointer_cast<SensorGnss>(_problem->findSensor(_server.getParam<std::string>(prefix_ + "/sensor_gnss_name"))); sensor_gnss_ = std::static_pointer_cast<const SensorGnss>(_problem->findSensor(_server.getParam<std::string>(prefix_ + "/sensor_gnss_name")));
T_enu_map_.setIdentity(); T_enu_map_.setIdentity();
T_enu_map_.frame_id_ = "ENU"; T_enu_map_.frame_id_ = "ENU";
......
...@@ -29,24 +29,13 @@ namespace wolf ...@@ -29,24 +29,13 @@ namespace wolf
PublisherTrackerGnssInfo::PublisherTrackerGnssInfo(const std::string& _unique_name, PublisherTrackerGnssInfo::PublisherTrackerGnssInfo(const std::string& _unique_name,
const ParamsServer& _server, const ParamsServer& _server,
const ProblemPtr _problem) : ProblemConstPtr _problem) :
Publisher(_unique_name, _server, _problem), Publisher(_unique_name, _server, _problem),
processor_tracker_gnss_(nullptr) processor_tracker_gnss_(nullptr)
{ {
auto proc_name = _server.getParam<std::string>(prefix_ + "/processor_gnss"); auto proc_name = _server.getParam<std::string>(prefix_ + "/processor_gnss");
for (auto sen : _problem->getHardware()->getSensorList()) processor_tracker_gnss_ = std::dynamic_pointer_cast<const ProcessorTrackerGnss>(problem_->findProcessor(proc_name));
{
for (auto proc : sen->getProcessorList())
if (proc_name == proc->getName())
{
processor_tracker_gnss_ = std::dynamic_pointer_cast<ProcessorTrackerGnss>(proc);
if (not processor_tracker_gnss_)
throw std::runtime_error("PublisherTrackerGnssInfo: the processor with name " + proc_name + " is not of type ProcessorTrackerGnss.");
break;
}
if (processor_tracker_gnss_)
break;
}
if (not processor_tracker_gnss_) if (not processor_tracker_gnss_)
throw std::runtime_error("PublisherTrackerGnssInfo: the processor with name " + proc_name + " was not found."); throw std::runtime_error("PublisherTrackerGnssInfo: the processor with name " + proc_name + " was not found.");
} }
......
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