Skip to content

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

Merge branch 'master' into thread_test

parents d7aa40c7 2792adc5
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 39 deletions
src/ui/QGCPX4VehicleConfig.ui
View file @ 9cfcdb79
......@@ -20,7 +20,16 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="1">
......@@ -996,7 +1005,16 @@
<string>Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1009,12 +1027,21 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>21</width>
<height>16</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1033,7 +1060,16 @@
<string>Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1046,12 +1082,21 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>21</width>
<height>16</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1084,7 +1129,16 @@
<string>Onboard Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1097,12 +1151,21 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>16</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1208,7 +1271,16 @@
<item row="0" column="0" rowspan="3">
<widget class="QWidget" name="navBarWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -1247,26 +1319,14 @@ Upgrade</string>
</widget>
</item>
<item>
<widget class="QPushButton" name="rcMenuButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<widget class="QPushButton" name="airframeMenuButton">
<property name="text">
<string>Radio
Calibration</string>
<string>Airframe
Config</string>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/px4/menu/remote.png</normaloff>:/files/images/px4/menu/remote.png</iconset>
<normaloff>:/files/images/px4/menu/plane.png</normaloff>:/files/images/px4/menu/plane.png</iconset>
</property>
<property name="iconSize">
<size>
......@@ -1301,14 +1361,26 @@ Calibration</string>
</widget>
</item>
<item>
<widget class="QPushButton" name="airframeMenuButton">
<widget class="QPushButton" name="rcMenuButton">
<property name="minimumSize">
<size>
<width>100</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Airframe
Config</string>
<string>Radio
Calibration</string>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/px4/menu/plane.png</normaloff>:/files/images/px4/menu/plane.png</iconset>
<normaloff>:/files/images/px4/menu/remote.png</normaloff>:/files/images/px4/menu/remote.png</iconset>
</property>
<property name="iconSize">
<size>
......
src/ui/map/QGCMapToolBar.cc
View file @ 9cfcdb79
......@@ -202,7 +202,7 @@ void QGCMapToolBar::setUpdateInterval()
if (ok)
{
map->setUpdateRateLimit(time);
ui->posLabel->setText(tr("Map update rate limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : ""));
ui->posLabel->setText(tr("Limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : ""));
}
}
}
......@@ -219,14 +219,14 @@ void QGCMapToolBar::setMapType()
if (ok)
{
map->SetMapType((MapType::Types)mapType);
ui->posLabel->setText(tr("Map type: %1").arg(mapType));
ui->posLabel->setText(tr("Map: %1").arg(mapType));
}
}
}
void QGCMapToolBar::tileLoadStart()
{
ui->posLabel->setText(tr("Starting to load tiles.."));
ui->posLabel->setText(tr("Loading.."));
}
void QGCMapToolBar::tileLoadEnd()
......@@ -238,11 +238,11 @@ void QGCMapToolBar::tileLoadProgress(int progress)
{
if (progress == 1)
{
ui->posLabel->setText(tr("1 tile to load.."));
ui->posLabel->setText(tr("1 tile"));
}
else if (progress > 0)
{
ui->posLabel->setText(tr("%1 tiles to load..").arg(progress));
ui->posLabel->setText(tr("%1 tile").arg(progress));
}
else
{
......
src/ui/px4_configuration/QGCPX4SensorCalibration.cc
View file @ 9cfcdb79
......@@ -337,6 +337,15 @@ void QGCPX4SensorCalibration::setActiveUAS(UASInterface* uas)
connect(uas, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(handleTextMessage(int,int,int,QString)));
connect(uas, SIGNAL(parameterChanged(int,int,QString,QVariant)), this, SLOT(parameterChanged(int,int,QString,QVariant)));
activeUAS = uas;
if (activeUAS->isRotaryWing()) {
// Users are confused by the config button
ui->diffPressureButton->hide();
ui->diffPressureLabel->hide();
} else {
ui->diffPressureButton->show();
ui->diffPressureLabel->show();
}
}
void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int severity, QString text)
......
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