12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes templating on data type. (#122)

master
Damon Kohler 2016-10-17 16:39:29 +02:00 committed by GitHub
parent d1707853af
commit caa77c8588
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cartographer_ros/cartographer_ros/node_main.cc
View File

@ -146,8 +146,7 @@ class Node {
std::deque<carto::mapping::TrajectoryNode::ConstantData> constant_data_ std::deque<carto::mapping::TrajectoryNode::ConstantData> constant_data_
GUARDED_BY(mutex_); GUARDED_BY(mutex_);
carto::mapping::MapBuilder map_builder_ GUARDED_BY(mutex_); carto::mapping::MapBuilder map_builder_ GUARDED_BY(mutex_);
carto::sensor::Collator<carto::sensor::Data> sensor_collator_ carto::sensor::Collator sensor_collator_ GUARDED_BY(mutex_);
GUARDED_BY(mutex_);
SensorBridge sensor_bridge_ GUARDED_BY(mutex_); SensorBridge sensor_bridge_ GUARDED_BY(mutex_);
::ros::NodeHandle node_handle_; ::ros::NodeHandle node_handle_;

8
cartographer_ros/cartographer_ros/sensor_bridge.cc
View File

@ -56,10 +56,10 @@ SensorBridgeOptions CreateSensorBridgeOptions(
return options; return options;
} }
SensorBridge::SensorBridge( SensorBridge::SensorBridge(const SensorBridgeOptions& options,
const SensorBridgeOptions& options, const TfBridge* const tf_bridge, const TfBridge* const tf_bridge,
const int trajectory_id, const int trajectory_id,
carto::sensor::Collator<carto::sensor::Data>* const sensor_collator) carto::sensor::Collator* const sensor_collator)
: options_(options), : options_(options),
tf_bridge_(tf_bridge), tf_bridge_(tf_bridge),
trajectory_id_(trajectory_id), trajectory_id_(trajectory_id),

11
cartographer_ros/cartographer_ros/sensor_bridge.h
View File

@ -47,11 +47,9 @@ SensorBridgeOptions CreateSensorBridgeOptions(
// Converts ROS messages into SensorData in tracking frame for the MapBuilder. // Converts ROS messages into SensorData in tracking frame for the MapBuilder.
class SensorBridge { class SensorBridge {
public: public:
explicit SensorBridge( explicit SensorBridge(const SensorBridgeOptions& options,
const SensorBridgeOptions& options, const TfBridge* tf_bridge, const TfBridge* tf_bridge, int trajectory_id,
int trajectory_id, ::cartographer::sensor::Collator* sensor_collator);
::cartographer::sensor::Collator<::cartographer::sensor::Data>*
sensor_collator);
SensorBridge(const SensorBridge&) = delete; SensorBridge(const SensorBridge&) = delete;
SensorBridge& operator=(const SensorBridge&) = delete; SensorBridge& operator=(const SensorBridge&) = delete;
@ -77,8 +75,7 @@ class SensorBridge {
const SensorBridgeOptions options_; const SensorBridgeOptions options_;
const TfBridge* const tf_bridge_; const TfBridge* const tf_bridge_;
const int trajectory_id_; const int trajectory_id_;
::cartographer::sensor::Collator<::cartographer::sensor::Data>* const ::cartographer::sensor::Collator* const sensor_collator_;
sensor_collator_;
}; };
} // namespace cartographer_ros } // namespace cartographer_ros