zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into thread_test

QGC4.4
Lorenz Meier 11 years ago
parent
d7aa40c7b2 2792adc5ee
commit
9cfcdb79a0
3 changed files with 120 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 140
      src/ui/QGCPX4VehicleConfig.ui
  2. 10
      src/ui/map/QGCMapToolBar.cc
  3. 9
      src/ui/px4_configuration/QGCPX4SensorCalibration.cc

140
src/ui/QGCPX4VehicleConfig.ui
Unescape View File

@ -20,7 +20,16 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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> @@ -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> @@ -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>

10
src/ui/map/QGCMapToolBar.cc
Unescape View File

@ -202,7 +202,7 @@ void QGCMapToolBar::setUpdateInterval() @@ -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() @@ -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) @@ -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
{

9
src/ui/px4_configuration/QGCPX4SensorCalibration.cc
Unescape View File

@ -337,6 +337,15 @@ void QGCPX4SensorCalibration::setActiveUAS(UASInterface* uas) @@ -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)

Write Preview
Loading…
Cancel
Save