Skip to content

Q
qgroundcontrol
Commit ae9d9af4 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

parents 8dc537df 17fc6302
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 38 deletions
files/styles/style-dark.css
View file @ ae9d9af4
...@@ -208,6 +208,27 @@ QGCToolBar .QWidget { ...@@ -208,6 +208,27 @@ QGCToolBar .QWidget {
background-color: transparent; background-color: transparent;
} }
QGCPX4SensorCalibration QLabel#magLabel {
font-size: 15pt;
font-weight: bold;
border-radius: 4px;
min-height: 25px;
}
QGCPX4SensorCalibration QLabel#gyroLabel {
font-size: 15pt;
font-weight: bold;
border-radius: 4px;
min-height: 25px;
}
QGCPX4SensorCalibration QLabel#accelLabel {
font-size: 15pt;
font-weight: bold;
border-radius: 4px;
min-height: 25px;
}
QGCToolWidgetItem { QGCToolWidgetItem {
border: 1px solid #666; border: 1px solid #666;
border-radius: 3px; border-radius: 3px;
...@@ -409,12 +430,9 @@ QPushButton#viewModeGeneric, QPushButton#viewModePX4, QPushButton#viewModeAPM, Q ...@@ -409,12 +430,9 @@ QPushButton#viewModeGeneric, QPushButton#viewModePX4, QPushButton#viewModeAPM, Q
} }
QPushButton#magButton, QPushButton#gyroButton, QPushButton#accelButton { QPushButton#magButton, QPushButton#gyroButton, QPushButton#accelButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #757575, stop: 1 #333);
border-radius: 8px; border-radius: 5px;
min-height: 30px; border: 1px solid #000000;
max-height: 50px;
min-width: 60px;
border: 3px solid #465158;
} }
QWidget#containerWidget { QWidget#containerWidget {
......
src/ui/px4_configuration/QGCPX4SensorCalibration.h
View file @ ae9d9af4
...@@ -42,12 +42,28 @@ public slots: ...@@ -42,12 +42,28 @@ public slots:
*/ */
virtual void contextMenuEvent(QContextMenuEvent* event); virtual void contextMenuEvent(QContextMenuEvent* event);
void setAutopilotOrientation(int index);
void setGpsOrientation(int index);
void parameterChanged(int uas, int component, QString parameterName, QVariant value);
protected slots:
void setInstructionImage(const QString &path); void setInstructionImage(const QString &path);
void setAutopilotImage(const QString &path);
void setGpsImage(const int index);
void setAutopilotImage(const int index);
void setGpsImage(const QString &path);
protected: protected:
UASInterface* activeUAS; UASInterface* activeUAS;
QAction* clearAction; QAction* clearAction;
QPixmap instructionIcon; QPixmap instructionIcon;
QPixmap autopilotIcon;
QPixmap gpsIcon;
bool accelStarted; bool accelStarted;
bool accelDone[6]; bool accelDone[6];
bool gyroStarted; bool gyroStarted;
...@@ -55,6 +71,10 @@ protected: ...@@ -55,6 +71,10 @@ protected:
QStringList accelAxes; QStringList accelAxes;
virtual void resizeEvent(QResizeEvent* event); virtual void resizeEvent(QResizeEvent* event);
void setMagCalibrated(bool calibrated);
void setGyroCalibrated(bool calibrated);
void setAccelCalibrated(bool calibrated);
private: private:
Ui::QGCPX4SensorCalibration *ui; Ui::QGCPX4SensorCalibration *ui;
......
src/ui/px4_configuration/QGCPX4SensorCalibration.ui
View file @ ae9d9af4
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>531</width> <width>657</width>
<height>448</height> <height>598</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -36,8 +36,29 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -36,8 +36,29 @@ QPushButton#gyroButton, QPushButton#accelButton {
border: 2px solid #465158; border: 2px solid #465158;
}</string> }</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowstretch="1,0,0,0,0,0,0" columnstretch="30,0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="1,0,0,0,0,0,0,0,0,0" columnstretch="30,8,8,15">
<item row="4" column="0" colspan="3"> <item row="3" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Autopilot and GPS / Compass Orientation</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<widget class="QLabel" name="instructionLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="8" column="0" colspan="4">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
...@@ -45,12 +66,12 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -45,12 +66,12 @@ QPushButton#gyroButton, QPushButton#accelButton {
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>498</width> <width>498</width>
<height>21</height> <height>5</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="2"> <item row="9" column="2">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -63,19 +84,51 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -63,19 +84,51 @@ QPushButton#gyroButton, QPushButton#accelButton {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="5" column="0">
<widget class="QLabel" name="instructionLabel"> <widget class="QComboBox" name="autopilotComboBox"/>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="magComboBox"/>
</item>
<item row="0" column="2" rowspan="7" colspan="2">
<widget class="QPlainTextEdit" name="textView"/>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="9" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item> <item row="0" column="2">
<widget class="QPushButton" name="magButton"> <widget class="QLabel" name="accelLabel">
<property name="text"> <property name="text">
<string>Magnetometer</string> <string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="gyroLabel">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="gyroButton">
<property name="text">
<string>Gyroscope</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../../qgroundcontrol.qrc"> <iconset resource="../../../qgroundcontrol.qrc">
...@@ -83,10 +136,10 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -83,10 +136,10 @@ QPushButton#gyroButton, QPushButton#accelButton {
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QPushButton" name="gyroButton"> <widget class="QPushButton" name="magButton">
<property name="text"> <property name="text">
<string>Gyroscope</string> <string>Magnetometer</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../../qgroundcontrol.qrc"> <iconset resource="../../../qgroundcontrol.qrc">
...@@ -94,7 +147,7 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -94,7 +147,7 @@ QPushButton#gyroButton, QPushButton#accelButton {
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="2">
<widget class="QPushButton" name="accelButton"> <widget class="QPushButton" name="accelButton">
<property name="text"> <property name="text">
<string>Accelerometer</string> <string>Accelerometer</string>
...@@ -105,28 +158,32 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -105,28 +158,32 @@ QPushButton#gyroButton, QPushButton#accelButton {
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="magLabel">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="0" rowspan="2"> <item row="4" column="0">
<widget class="QLabel" name="iconLabel"> <widget class="QLabel" name="autopilotLabel">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="4" column="1">
<widget class="QProgressBar" name="progressBar"> <widget class="QLabel" name="gpsLabel">
<property name="value"> <property name="text">
<number>24</number> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="3" colspan="2">
<widget class="QPlainTextEdit" name="textView"/>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
......
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