Skip to content

Commit 02fa1dc

Browse files
committed
Improve tool tip. Altitude and selection first.
1 parent d9eeb14 commit 02fa1dc

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

polygon_coverage_ros/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@
2828
<depend>polygon_coverage_planners</depend>
2929
<depend>cgal_catkin</depend>
3030

31+
<exec_depend>rviz_polygon_tool</exec_depend>
32+
3133
</package>

rviz_polygon_tool/src/polygon_tool.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ const QString kR = "<b>r:</b> Reset polygon";
4444
const QString kC = "<b>c:</b> Clear all";
4545
const QString kEnter = "<b>Enter:</b> Publish polygon";
4646
const QString kMouse = "<b>Mouse wheel (+shift/ctrl):</b> Change altitude";
47+
const QString kInfo = kLeftClick + ", " + kRightClick + ", " + kH + ", " + kP +
48+
", " + kV + ", " + kR + ", " + kC + ", " + kEnter + ", " +
49+
kMouse;
4750
const QString kAltitude = "Altitude: ";
4851
const QString kSelection = "Current Selection: ";
49-
const QString kStatus = kLeftClick + ", " + kRightClick + ", " + kH + ", " +
50-
kP + ", " + kV + ", " + kR + ", " + kC + ", " + kEnter +
51-
", " + kMouse + ", " + kAltitude;
5252

5353
// Point scales.
5454
const float kPtScale = 0.5;
@@ -332,14 +332,15 @@ void PolygonTool::publishPolygon() {
332332
}
333333

334334
void PolygonTool::updateStatus() {
335-
const QString kPrefix =
336-
kStatus + QString::number(altitude_) + "m, " + kSelection;
335+
QString status = kAltitude + QString::number(altitude_) + "m, " + kSelection;
337336
if (polygon_selection_ == polygons_.begin()) {
338-
setStatus(kPrefix + " Hull");
337+
status += " Hull";
339338
} else {
340339
int idx = std::distance(polygons_.begin(), polygon_selection_) - 1;
341-
setStatus(kPrefix + " Hole " + QString::number(idx));
340+
status += " Hole " + QString::number(idx);
342341
}
342+
status += ", " + kInfo;
343+
setStatus(status);
343344
}
344345

345346
void PolygonTool::removeEmptyHoles() {

0 commit comments

Comments
 (0)