From 222607d11c9ec5d2666dacc187c03396c898f34b Mon Sep 17 00:00:00 2001 From: lm Date: Wed, 2 Jun 2010 09:49:06 +0200 Subject: [PATCH] Added support to set ground time as linechart time --- src/uas/UAS.cc | 4 ++-- src/ui/linechart/LinechartWidget.cc | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 32ee33641..ff956dbf2 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -224,7 +224,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) // COMMUNICATIONS DROP RATE emit dropRateChanged(this->getUASID(), state.packet_drop); - qDebug() << __FILE__ << __LINE__ << "RCV LOSS: " << state.packet_drop; + //qDebug() << __FILE__ << __LINE__ << "RCV LOSS: " << state.packet_drop; // AUDIO if (modechanged && statechanged) @@ -237,7 +237,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) // Output the one message audiostring += modeAudio + stateAudio; } - if (state.status == (int)MAV_STATE_CRITICAL || state.status == (int)MAV_STATE_EMERGENCY) + if ((int)state.status == (int)MAV_STATE_CRITICAL || state.status == (int)MAV_STATE_EMERGENCY) { GAudioOutput::instance()->startEmergency(); } diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index 77cb768e3..b23175eba 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -119,7 +119,7 @@ void LinechartWidget::createLayout() // activePlot = getPlot(0); // plotContainer->setPlot(activePlot); - layout->addWidget(activePlot, 0, 0, 1, 5); + layout->addWidget(activePlot, 0, 0, 1, 6); layout->setRowStretch(0, 10); layout->setRowStretch(1, 0); @@ -156,6 +156,7 @@ void LinechartWidget::createLayout() QToolButton* timeButton = new QToolButton(this); timeButton->setText(tr("Ground Time")); timeButton->setCheckable(true); + timeButton->setChecked(false); layout->addWidget(timeButton, 1, 4); layout->setColumnStretch(4, 0); connect(timeButton, SIGNAL(clicked(bool)), activePlot, SLOT(enforceGroundTime(bool))); @@ -172,8 +173,8 @@ void LinechartWidget::createLayout() // Add scroll bar to layout and make sure it gets all available space - layout->addWidget(scrollbar, 1, 4); - layout->setColumnStretch(4, 10); + layout->addWidget(scrollbar, 1, 5); + layout->setColumnStretch(5, 10); ui.diagramGroupBox->setLayout(layout); -- 2.22.0