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
Unified 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 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <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> <number>0</number>
</property> </property>
<item row="1" column="1"> <item row="1" column="1">
@ -996,7 +1005,16 @@
<string>Configuration</string> <string>Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1009,12 +1027,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>21</width>
<height>28</height> <height>16</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1033,7 +1060,16 @@
<string>Configuration</string> <string>Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1046,12 +1082,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>21</width>
<height>28</height> <height>16</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1084,7 +1129,16 @@
<string>Onboard Configuration</string> <string>Onboard Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1097,12 +1151,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>16</width>
<height>28</height> <height>16</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1208,7 +1271,16 @@
<item row="0" column="0" rowspan="3"> <item row="0" column="0" rowspan="3">
<widget class="QWidget" name="navBarWidget" native="true"> <widget class="QWidget" name="navBarWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout"> <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> <number>0</number>
</property> </property>
<item> <item>
@ -1247,26 +1319,14 @@ Upgrade</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="rcMenuButton"> <widget class="QPushButton" name="airframeMenuButton">
<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"> <property name="text">
<string>Radio <string>Airframe
Calibration</string> Config</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qgroundcontrol.qrc"> <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>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -1301,14 +1361,26 @@ Calibration</string>
</widget> </widget>
</item> </item>
<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"> <property name="text">
<string>Airframe <string>Radio
Config</string> Calibration</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qgroundcontrol.qrc"> <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>
<property name="iconSize"> <property name="iconSize">
<size> <size>

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

@ -202,7 +202,7 @@ void QGCMapToolBar::setUpdateInterval()
if (ok) if (ok)
{ {
map->setUpdateRateLimit(time); 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) if (ok)
{ {
map->SetMapType((MapType::Types)mapType); 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() void QGCMapToolBar::tileLoadStart()
{ {
ui->posLabel->setText(tr("Starting to load tiles..")); ui->posLabel->setText(tr("Loading.."));
} }
void QGCMapToolBar::tileLoadEnd() void QGCMapToolBar::tileLoadEnd()
@ -238,11 +238,11 @@ void QGCMapToolBar::tileLoadProgress(int progress)
{ {
if (progress == 1) if (progress == 1)
{ {
ui->posLabel->setText(tr("1 tile to load..")); ui->posLabel->setText(tr("1 tile"));
} }
else if (progress > 0) else if (progress > 0)
{ {
ui->posLabel->setText(tr("%1 tiles to load..").arg(progress)); ui->posLabel->setText(tr("%1 tile").arg(progress));
} }
else else
{ {

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

@ -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(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))); connect(uas, SIGNAL(parameterChanged(int,int,QString,QVariant)), this, SLOT(parameterChanged(int,int,QString,QVariant)));
activeUAS = uas; 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) void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int severity, QString text)

Write Preview
Loading…
Cancel
Save