Commit c6bce751 authored by Lorenz Meier's avatar Lorenz Meier

Added level button to controls

parent 542dbc4b
...@@ -39,6 +39,7 @@ SensorsComponentController::SensorsComponentController(void) : ...@@ -39,6 +39,7 @@ SensorsComponentController::SensorsComponentController(void) :
_gyroButton(NULL), _gyroButton(NULL),
_accelButton(NULL), _accelButton(NULL),
_airspeedButton(NULL), _airspeedButton(NULL),
_levelButton(NULL),
_cancelButton(NULL), _cancelButton(NULL),
_showOrientationCalArea(false), _showOrientationCalArea(false),
_gyroCalInProgress(false), _gyroCalInProgress(false),
...@@ -106,6 +107,7 @@ void SensorsComponentController::_startVisualCalibration(void) ...@@ -106,6 +107,7 @@ void SensorsComponentController::_startVisualCalibration(void)
_gyroButton->setEnabled(false); _gyroButton->setEnabled(false);
_accelButton->setEnabled(false); _accelButton->setEnabled(false);
_airspeedButton->setEnabled(false); _airspeedButton->setEnabled(false);
_levelButton->setEnabled(false);
_cancelButton->setEnabled(true); _cancelButton->setEnabled(true);
_progressBar->setProperty("value", 0); _progressBar->setProperty("value", 0);
...@@ -119,6 +121,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St ...@@ -119,6 +121,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
_gyroButton->setEnabled(true); _gyroButton->setEnabled(true);
_accelButton->setEnabled(true); _accelButton->setEnabled(true);
_airspeedButton->setEnabled(true); _airspeedButton->setEnabled(true);
_levelButton->setEnabled(true);
_cancelButton->setEnabled(false); _cancelButton->setEnabled(false);
if (code == StopCalibrationSuccess) { if (code == StopCalibrationSuccess) {
...@@ -439,4 +442,4 @@ void SensorsComponentController::cancelCalibration(void) ...@@ -439,4 +442,4 @@ void SensorsComponentController::cancelCalibration(void)
emit waitingForCancelChanged(); emit waitingForCancelChanged();
_cancelButton->setEnabled(false); _cancelButton->setEnabled(false);
_uas->stopCalibration(); _uas->stopCalibration();
} }
\ No newline at end of file
...@@ -50,6 +50,7 @@ public: ...@@ -50,6 +50,7 @@ public:
Q_PROPERTY(QQuickItem* gyroButton MEMBER _gyroButton) Q_PROPERTY(QQuickItem* gyroButton MEMBER _gyroButton)
Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton) Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton)
Q_PROPERTY(QQuickItem* airspeedButton MEMBER _airspeedButton) Q_PROPERTY(QQuickItem* airspeedButton MEMBER _airspeedButton)
Q_PROPERTY(QQuickItem* levelButton MEMBER _levelButton)
Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton) Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton)
Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText) Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText)
...@@ -127,6 +128,7 @@ private: ...@@ -127,6 +128,7 @@ private:
QQuickItem* _gyroButton; QQuickItem* _gyroButton;
QQuickItem* _accelButton; QQuickItem* _accelButton;
QQuickItem* _airspeedButton; QQuickItem* _airspeedButton;
QQuickItem* _levelButton;
QQuickItem* _cancelButton; QQuickItem* _cancelButton;
QQuickItem* _orientationCalAreaHelpText; QQuickItem* _orientationCalAreaHelpText;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment