Skip to content

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

Improve layout of sensor calibration

parent a9a049ca
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 79 deletions
src/ui/px4_configuration/QGCPX4SensorCalibration.cc
View file @ 6cb8eb14
......@@ -19,6 +19,10 @@ QGCPX4SensorCalibration::QGCPX4SensorCalibration(QWidget *parent) :
connect(ui->accelButton, SIGNAL(clicked()), this, SLOT(accelButtonClicked()));
connect(ui->diffPressureButton, SIGNAL(clicked()), this, SLOT(diffPressureButtonClicked()));
connect(ui->logCheckBox, SIGNAL(clicked(bool)), ui->textView, SLOT(setVisible(bool)));
ui->logCheckBox->setChecked(false);
ui->textView->setVisible(false);
ui->gyroButton->setEnabled(false);
ui->magButton->setEnabled(false);
ui->accelButton->setEnabled(false);
......
src/ui/px4_configuration/QGCPX4SensorCalibration.ui
View file @ 6cb8eb14
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>659</width>
<height>603</height>
<height>636</height>
</rect>
</property>
<property name="windowTitle">
......@@ -36,24 +36,75 @@ QPushButton#gyroButton, QPushButton#accelButton, QPushButton#diffPressureButton
border: 2px solid #465158;
}</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="20,0,0,0,0,0,0" columnstretch="30,0,0,0">
<item row="3" column="0" colspan="2">
<widget class="QPlainTextEdit" name="textView"/>
</item>
<item row="6" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
<layout class="QGridLayout" name="gridLayout" rowstretch="40,5,1,1,1,1,1,1" columnstretch="1,2,30,1,1,10">
<item row="0" column="4" rowspan="6" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,10,10">
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Autopilot Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="autopilotLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Magnetometer Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="gpsLabel">
<property name="minimumSize">
<size>
<width>150</width>
<height>120</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="magComboBox"/>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" colspan="4">
<item row="6" column="2" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -66,8 +117,29 @@ QPushButton#gyroButton, QPushButton#accelButton, QPushButton#diffPressureButton
</property>
</spacer>
</item>
<item row="6" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" rowspan="2" colspan="4">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="2" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QPlainTextEdit" name="textView">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="1,1,1,1">
<item row="0" column="2">
<widget class="QLabel" name="accelLabel">
<property name="text">
......@@ -154,76 +226,45 @@ QPushButton#gyroButton, QPushButton#accelButton, QPushButton#diffPressureButton
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
<item row="5" column="0" colspan="4">
<widget class="QLabel" name="instructionLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Autopilot Orientation</string>
<item row="7" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="autopilotLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="instructionLabel">
<item row="2" column="0">
<widget class="QCheckBox" name="logCheckBox">
<property name="text">
<string/>
<string>Log</string>
</property>
</widget>
</item>
<item row="1" column="2" rowspan="4" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Magnetometer Orientation</string>
<item row="2" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="gpsLabel">
<property name="minimumSize">
<size>
<width>150</width>
<height>120</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="magComboBox"/>
</item>
</layout>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
......
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