Skip to content
This repository was archived by the owner on Nov 13, 2017. It is now read-only.

Commit 4591ae5

Browse files
committed
style changes
1 parent fd6a020 commit 4591ae5

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

perception/occupancy_map_monitor/include/moveit/occupancy_map_monitor/occupancy_map_monitor.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,16 @@ class OccupancyMapMonitor
123123
}
124124

125125
/** \brief Enable sending diffs of the occupancy map */
126-
void enableOctomapDiff(bool enable) { octomap_diff_enable = enable; }
126+
void setOctomapDiff(bool enable)
127+
{
128+
octomap_diff_enable_ = enable;
129+
}
127130

128131
/** \brief Returns if sending diffs of the occupancy map is enabled */
129-
bool isOctomapDiffEnabled() const { return octomap_diff_enable; }
132+
bool isOctomapDiffEnabled() const
133+
{
134+
return octomap_diff_enable_;
135+
}
130136

131137
private:
132138

@@ -147,7 +153,7 @@ class OccupancyMapMonitor
147153

148154
OccMapTreePtr tree_;
149155
OccMapTreeConstPtr tree_const_;
150-
bool octomap_diff_enable;
156+
bool octomap_diff_enable_;
151157

152158
boost::scoped_ptr<pluginlib::ClassLoader<OccupancyMapUpdater> > updater_plugin_loader_;
153159
std::vector<OccupancyMapUpdaterPtr> map_updaters_;

perception/occupancy_map_monitor/src/occupancy_map_monitor.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@ void OccupancyMapMonitor::initialize()
8787
tree_.reset(new OccMapTree(map_resolution_));
8888
tree_const_ = tree_;
8989

90-
octomap_diff_enable = false;
91-
if (nh_.getParam("octomap_diff", octomap_diff_enable))
90+
octomap_diff_enable_ = false;
91+
if (nh_.getParam("octomap_diff", octomap_diff_enable_))
9292
{
93-
if (octomap_diff_enable) ROS_INFO("Octomap diff enabled");
94-
tree_->enableChangeDetection(octomap_diff_enable);
93+
if (octomap_diff_enable_)
94+
ROS_INFO("Octomap diff enabled");
95+
tree_->enableChangeDetection(octomap_diff_enable_);
9596
}
9697

9798
XmlRpc::XmlRpcValue sensor_list;

0 commit comments

Comments
 (0)