Skip to content

Commit ee5144f

Browse files
authored
background colour and private nodehandle (ros#70)
* only set background colour parameters when unset * move background colour parameters to be in private namespace
1 parent 7db6f1b commit ee5144f

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

turtlesim/include/turtlesim/turtle_frame.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ private slots:
7676
bool killCallback(turtlesim::Kill::Request&, turtlesim::Kill::Response&);
7777

7878
ros::NodeHandle nh_;
79+
ros::NodeHandle private_nh_;
7980
QTimer* update_timer_;
8081
QImage path_image_;
8182
QPainter path_painter_;

turtlesim/src/turtle_frame.cpp

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ TurtleFrame::TurtleFrame(QWidget* parent, Qt::WindowFlags f)
4848
, path_painter_(&path_image_)
4949
, frame_count_(0)
5050
, id_counter_(0)
51+
, private_nh_("~")
5152
{
5253
setFixedSize(500, 500);
5354
setWindowTitle("TurtleSim");
@@ -60,9 +61,18 @@ TurtleFrame::TurtleFrame(QWidget* parent, Qt::WindowFlags f)
6061

6162
connect(update_timer_, SIGNAL(timeout()), this, SLOT(onUpdate()));
6263

63-
nh_.setParam("background_r", DEFAULT_BG_R);
64-
nh_.setParam("background_g", DEFAULT_BG_G);
65-
nh_.setParam("background_b", DEFAULT_BG_B);
64+
if (!private_nh_.hasParam("background_r"))
65+
{
66+
private_nh_.setParam("background_r", DEFAULT_BG_R);
67+
}
68+
if (!private_nh_.hasParam("background_g"))
69+
{
70+
private_nh_.setParam("background_g", DEFAULT_BG_G);
71+
}
72+
if (!private_nh_.hasParam("background_b"))
73+
{
74+
private_nh_.setParam("background_b", DEFAULT_BG_B);
75+
}
6676

6777
QVector<QString> turtles;
6878
turtles.append("box-turtle.png");
@@ -194,9 +204,9 @@ void TurtleFrame::clear()
194204
int g = DEFAULT_BG_G;
195205
int b = DEFAULT_BG_B;
196206

197-
nh_.param("background_r", r, r);
198-
nh_.param("background_g", g, g);
199-
nh_.param("background_b", b, b);
207+
private_nh_.param("background_r", r, r);
208+
private_nh_.param("background_g", g, g);
209+
private_nh_.param("background_b", b, b);
200210

201211
path_image_.fill(qRgb(r, g, b));
202212
update();

0 commit comments

Comments
 (0)