Browse Source

Fixed initialization of custom widgets, not shown per default

QGC4.4
Lorenz Meier 12 years ago
parent
commit
bd806b22d0
  1. 7
      src/ui/MAVLinkDecoder.cc
  2. 3
      src/ui/MainWindow.cc

7
src/ui/MAVLinkDecoder.cc

@ -257,8 +257,13 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 @@ -257,8 +257,13 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64
name = name.arg(messageInfo[msgid].name, fieldName);
}
if (multiComponentSourceDetected) name.prepend(QString("C%1:").arg(msg->compid));
if (multiComponentSourceDetected)
{
name.prepend(QString("C%1:").arg(msg->compid));
}
name.prepend(QString("M%1:").arg(msg->sysid));
switch (messageInfo[msgid].fields[fieldid].type)
{
case MAVLINK_TYPE_CHAR:

3
src/ui/MainWindow.cc

@ -360,6 +360,7 @@ void MainWindow::buildCustomWidget() @@ -360,6 +360,7 @@ void MainWindow::buildCustomWidget()
Qt::DockWidgetArea location = static_cast <Qt::DockWidgetArea>(tool->getDockWidgetArea(currentView));
addDockWidget(location, dock);
dock->hide();
}
}
}
@ -749,7 +750,7 @@ void MainWindow::loadCustomWidget(const QString& fileName, bool singleinstance) @@ -749,7 +750,7 @@ void MainWindow::loadCustomWidget(const QString& fileName, bool singleinstance)
tool->setMainMenuAction(showAction);
ui.menuTools->addAction(showAction);
this->addDockWidget(Qt::BottomDockWidgetArea, dock);
dock->setVisible(true);
dock->hide();
}
else
{

Loading…
Cancel
Save