rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

OP-538 Included fixes into ground codebase, thanks.

Browse Source
This commit is contained in:
elafargue 2011-06-26 12:16:21 +02:00
parent dc651b6604
commit c55602a466
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c vendored
View File

@ -30,8 +30,6 @@
/*!
* \defgroup light Lights
*/
/*!
/*!
* \ingroup light

1
ground/openpilotgcs/src/plugins/config/ahrs.ui
View File

@ -110,7 +110,6 @@
</layout>
</item>
</layout>
<zorder></zorder>
</widget>
</item>
<item>

23
ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp
View File

@ -46,23 +46,23 @@ HITLWidget::HITLWidget(QWidget *parent)
: QWidget(parent),
simulator(0)
{
widget = new Ui_HITLWidget();
widget->setupUi(this);
widget = new Ui_HITLWidget();
widget->setupUi(this);
widget->startButton->setEnabled(true);
widget->stopButton->setEnabled(false);
greenColor = "rgb(35, 221, 35)";
strAutopilotDisconnected = " Autopilot disconnected ";
strSimulatorDisconnected = " Simulator disconnected ";
strAutopilotConnected = " Autopilot connected ";
strSimulatorConnected = " Simulator connected ";
strAutopilotDisconnected = " Autopilot OFF ";
strSimulatorDisconnected = " Simulator OFF ";
strAutopilotConnected = " Autopilot ON ";
strSimulatorConnected = " Simulator ON ";
widget->apLabel->setText(strAutopilotDisconnected);
widget->simLabel->setText(strSimulatorDisconnected);
connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked()));
connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked()));
connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked()));
connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked()));
connect(widget->buttonClearLog, SIGNAL(clicked()), this, SLOT(buttonClearLogClicked()));
}
@ -188,10 +188,9 @@ void HITLWidget::buttonClearLogClicked()
void HITLWidget::onAutopilotConnect()
{
widget->simLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor));
widget->apLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor));
widget->apLabel->setText(strAutopilotConnected);
qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation");
qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation");
}
void HITLWidget::onAutopilotDisconnect()
@ -214,5 +213,3 @@ void HITLWidget::onSimulatorDisconnect()
widget->simLabel->setText(" " + simulator->Name() +" disconnected ");
qxtLog->info(QString("HITL: %1 disconnected").arg(simulator->Name()));
}

2
ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
View File

@ -31,7 +31,7 @@
<property name="title">
<string>Sound Collection</string>
</property>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="layoutWidget_2">
<property name="geometry">
<rect>
<x>10</x>