Merge pull request #73 from BCLab-UNM/hotfix-forward-info-from-popout-mapframe

gmfricke · web-flow · commit f1a1845c1dfd · 2017-10-10T10:46:54.000-06:00
Bug fix: infolog messages from popout map not displayed
diff --git a/src/rqt_rover_gui/src/MapFrame.cpp b/src/rqt_rover_gui/src/MapFrame.cpp
@@ -73,6 +73,9 @@ void MapFrame::createPopoutWindow( MapData * map_data )
   popout_window->setCentralWidget(central_widget);
 
   connect(this, SIGNAL(delayedUpdate()), popout_mapframe, SLOT(update()), Qt::QueuedConnection);
+
+  // Forward info messages from the popout framt to the rover gui via the signal in this parent map frame
+  connect(popout_mapframe, SIGNAL(sendInfoLogMessage(QString)), this, SIGNAL(sendInfoLogMessage(QString)));
 }
 
 void MapFrame::paintEvent(QPaintEvent* event) {
@@ -880,7 +883,6 @@ void MapFrame::receiveCurrentRoverName( QString rover_name )
   this->rover_currently_selected = rover_name.toStdString();
 }
 
-
 MapFrame::~MapFrame()
 {
   // Safely erase map data - locks to make sure a frame isnt being drawn

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ void MapFrame::createPopoutWindow( MapData * map_data )`
`73`	`73`	`popout_window->setCentralWidget(central_widget);`
`74`	`74`
`75`	`75`	`connect(this, SIGNAL(delayedUpdate()), popout_mapframe, SLOT(update()), Qt::QueuedConnection);`
	`76`	`+`
	`77`	`+ // Forward info messages from the popout framt to the rover gui via the signal in this parent map frame`
	`78`	`+ connect(popout_mapframe, SIGNAL(sendInfoLogMessage(QString)), this, SIGNAL(sendInfoLogMessage(QString)));`
`76`	`79`	`}`
`77`	`80`
`78`	`81`	`void MapFrame::paintEvent(QPaintEvent* event) {`
`@@ -880,7 +883,6 @@ void MapFrame::receiveCurrentRoverName( QString rover_name )`
`880`	`883`	`this->rover_currently_selected = rover_name.toStdString();`
`881`	`884`	`}`
`882`	`885`
`883`		`-`
`884`	`886`	`MapFrame::~MapFrame()`
`885`	`887`	`{`
`886`	`888`	`// Safely erase map data - locks to make sure a frame isnt being drawn`