diff --git a/images/earth.html b/images/earth.html
index 052dd95..c82e7c0 100644
--- a/images/earth.html
+++ b/images/earth.html
@@ -14,7 +14,7 @@ google.load("earth", "1", { 'language': 'en'});
var ge = null;
var initialized = false;
-var currAircraft = 220;
+var currAircraft = 0;
var followEnabled = false;
var lastLat = 0;
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 6a8266c..bc59b3d 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -898,7 +898,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
imagePackets = p.packets;
imagePayload = p.payload;
imageQuality = p.jpg_quality;
- imageStart = MG::TIME::getGroundTimeNow();
+ imageStart = QGC::groundTimeMilliseconds();
}
break;
diff --git a/src/ui/UASView.ui b/src/ui/UASView.ui
index b514421..b4d8569 100644
--- a/src/ui/UASView.ui
+++ b/src/ui/UASView.ui
@@ -7,7 +7,7 @@
0
0
360
- 119
+ 121
@@ -111,11 +111,12 @@ QToolButton#typeButton {
font-size: 12px;
border: 0px solid #999999;
border-radius: 5px;
- min-width:44px;
- max-width: 80px;
- min-height: 44px;
- max-height: 44px;
+ min-width:42px;
+ max-width: 42px;
+ min-height: 42px;
+ max-height: 42px;
padding: 0px;
+ margin: 0px;
background-color: none;
}
@@ -123,12 +124,13 @@ QPushButton {
font-weight: bold;
font-size: 12px;
border: 1px solid #999999;
- border-radius: 10px;
+ border-radius: 8px;
min-width: 20px;
- max-width: 80px;
+ max-width: 32px;
min-height: 16px;
max-height: 16px;
padding: 2px;
+ spacing: 10px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777777, stop: 1 #555555);
}
@@ -162,7 +164,7 @@ QProgressBar:horizontal {
border-radius: 4px;
text-align: center;
padding: 2px;
- color: #DDDDDF;
+ color: #111111;
background-color: #111118;
}
@@ -173,6 +175,7 @@ QProgressBar:vertical {
font-size: 7px;
padding: 2px;
color: #DDDDDF;
+ min-width: 16px;
background-color: #111118;
}
@@ -182,6 +185,7 @@ QProgressBar:horizontal {
QProgressBar:horizontal QLabel {
font-size: 9px;
+ color: #111111;
}
QProgressBar:vertical QLabel {
@@ -236,9 +240,18 @@ QMenu::separator {
2
-
+
+ 2
+
+
+ 2
+
+
2
+
+ 0
+
-
@@ -253,12 +266,18 @@ QMenu::separator {
0
+
+
+ 16777215
+ 130
+
+
-
+
- 4
+ 5
2
@@ -270,14 +289,14 @@ QMenu::separator {
- 44
- 44
+ 42
+ 42
- 80
- 44
+ 42
+ 42
@@ -334,7 +353,7 @@ QMenu::separator {
- -
+
-
@@ -353,6 +372,9 @@ QMenu::separator {
MODE
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
-
@@ -374,6 +396,9 @@ QMenu::separator {
00:00:00
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
-
@@ -395,9 +420,12 @@ QMenu::separator {
00:00:00
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
- -
+
-
@@ -413,6 +441,9 @@ QMenu::separator {
0
+
+ throttle %p%
+
-
@@ -434,6 +465,9 @@ QMenu::separator {
00.00 m
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
-
@@ -455,6 +489,9 @@ QMenu::separator {
00.0 m/s
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
-
@@ -545,7 +582,7 @@ QMenu::separator {
- -
+
-
@@ -578,8 +615,8 @@ QMenu::separator {
- -
-
+
-
+
4
@@ -594,6 +631,12 @@ QMenu::separator {
22
+
+
+ 38
+ 22
+
+
Liftoff / Launch
@@ -617,6 +660,12 @@ QMenu::separator {
22
+
+
+ 38
+ 22
+
+
Loiter / Wait at current position
@@ -640,6 +689,12 @@ QMenu::separator {
22
+
+
+ 38
+ 22
+
+
Continue flightplan
@@ -663,6 +718,12 @@ QMenu::separator {
22
+
+
+ 38
+ 22
+
+
Fly straight to landing location
@@ -680,6 +741,12 @@ QMenu::separator {
-
+
+
+ 38
+ 22
+
+
Only in standby mode: Power off system
@@ -697,12 +764,24 @@ QMenu::separator {
-
+
+
+ 0
+ 0
+
+
26
22
+
+
+ 38
+ 22
+
+
Emergency land system at closest possible site
@@ -726,6 +805,12 @@ QMenu::separator {
22
+
+
+ 38
+ 22
+
+
Kill immediately all onboard power
@@ -743,29 +828,14 @@ QMenu::separator {
- -
-
-
-
- -1
- 50
- false
- false
-
-
-
- NAV
-
-
-
- -
+
-
Waiting for first status update..
- -
+
-
@@ -786,6 +856,34 @@ QMenu::separator {
+ -
+
+
+
+ -1
+ 50
+ false
+ false
+
+
+
+ NAV
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 8
+ 20
+
+
+
+
diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc
index 3d672f6..bb30a91 100644
--- a/src/ui/uas/UASView.cc
+++ b/src/ui/uas/UASView.cc
@@ -132,6 +132,7 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
// Heartbeat fade
refreshTimer = new QTimer(this);
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+ refreshTimer->start(updateInterval);
// Hide kill and shutdown buttons per default
m_ui->killButton->hide();
@@ -270,7 +271,7 @@ void UASView::receiveHeartbeat(UASInterface* uas)
{
Q_UNUSED(uas);
heartbeatColor = QColor(20, 200, 20);
- QString colorstyle("QGroupBox { border-radius: 5px; padding: 2px; margin: 2px; border: 0px; background-color: %1; }");
+ QString colorstyle("QGroupBox { border-radius: 5px; padding: 2px; margin: 0px; border: 0px; background-color: %1; }");
m_ui->heartbeatIcon->setStyleSheet(colorstyle.arg(heartbeatColor.name()));
if (timeout) setBackgroundColor();
timeout = false;
@@ -604,7 +605,7 @@ void UASView::refresh()
}
generalUpdateCount++;
- QString colorstyle("QGroupBox { border-radius: 5px; padding: 2px; margin: 2px; border: 0px; background-color: %1; }");
+ QString colorstyle("QGroupBox { border-radius: 5px; padding: 2px; margin: 0px; border: 0px; background-color: %1; }");
if (timeout)
{