Browse Source

Implementation of Optical Flow config

QGC4.4
Michael Carpenter 12 years ago
parent
commit
d440a4d62b
  1. BIN
      files/images/devices/BR-0016-01-3T.jpg
  2. 1
      qgroundcontrol.qrc
  3. 29
      src/ui/configuration/OpticalFlowConfig.cc
  4. 7
      src/ui/configuration/OpticalFlowConfig.h
  5. 36
      src/ui/configuration/OpticalFlowConfig.ui

BIN
files/images/devices/BR-0016-01-3T.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

1
qgroundcontrol.qrc

@ -113,6 +113,7 @@
<file>files/images/devices/BR-APMPWRDEAN-2.jpg</file> <file>files/images/devices/BR-APMPWRDEAN-2.jpg</file>
<file>files/images/devices/AC-0004-11-2.jpg</file> <file>files/images/devices/AC-0004-11-2.jpg</file>
<file>files/images/devices/BR-0004-03-2.jpg</file> <file>files/images/devices/BR-0004-03-2.jpg</file>
<file>files/images/devices/BR-0016-01-3T.jpg</file>
</qresource> </qresource>
<qresource prefix="/general"> <qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file> <file alias="vera.ttf">files/styles/Vera.ttf</file>

29
src/ui/configuration/OpticalFlowConfig.cc

@ -1,11 +1,36 @@
#include "OpticalFlowConfig.h" #include "OpticalFlowConfig.h"
#include <QMessageBox>
OpticalFlowConfig::OpticalFlowConfig(QWidget *parent) : AP2ConfigWidget(parent)
OpticalFlowConfig::OpticalFlowConfig(QWidget *parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
connect(ui.enableCheckBox,SIGNAL(clicked(bool)),this,SLOT(enableCheckBoxClicked(bool)));
} }
OpticalFlowConfig::~OpticalFlowConfig() OpticalFlowConfig::~OpticalFlowConfig()
{ {
} }
void OpticalFlowConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value)
{
if (parameterName == "FLOW_ENABLE")
{
if (value.toInt() == 0)
{
ui.enableCheckBox->setChecked(false);
}
else
{
ui.enableCheckBox->setChecked(true);
}
}
}
void OpticalFlowConfig::enableCheckBoxClicked(bool checked)
{
if (!m_uas)
{
QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration"));
return;
}
m_uas->setParameter(0,"FLOW_ENABLE",checked ? 1 : 0);
}

7
src/ui/configuration/OpticalFlowConfig.h

@ -2,16 +2,19 @@
#define OPTICALFLOWCONFIG_H #define OPTICALFLOWCONFIG_H
#include <QWidget> #include <QWidget>
#include "AP2ConfigWidget.h"
#include "ui_OpticalFlowConfig.h" #include "ui_OpticalFlowConfig.h"
class OpticalFlowConfig : public QWidget class OpticalFlowConfig : public AP2ConfigWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit OpticalFlowConfig(QWidget *parent = 0); explicit OpticalFlowConfig(QWidget *parent = 0);
~OpticalFlowConfig(); ~OpticalFlowConfig();
private slots:
void parameterChanged(int uas, int component, QString parameterName, QVariant value);
void enableCheckBoxClicked(bool checked);
private: private:
Ui::OpticalFlowConfig ui; Ui::OpticalFlowConfig ui;
}; };

36
src/ui/configuration/OpticalFlowConfig.ui

@ -29,7 +29,41 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="enableCheckBox">
<property name="geometry">
<rect>
<x>100</x>
<y>60</y>
<width>70</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Enable</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>81</width>
<height>71</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../qgroundcontrol.qrc">:/files/images/devices/BR-0016-01-3T.jpg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</widget> </widget>
<resources/> <resources>
<include location="../../../qgroundcontrol.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

Loading…
Cancel
Save