Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
936b56b9
Commit
936b56b9
authored
Sep 06, 2012
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added last param / wp update time
parent
6b560420
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
UASWaypointManager.cc
src/uas/UASWaypointManager.cc
+3
-1
QGCParamWidget.cc
src/ui/QGCParamWidget.cc
+13
-1
QGCToolBar.cc
src/ui/QGCToolBar.cc
+1
-1
No files found.
src/uas/UASWaypointManager.cc
View file @
936b56b9
...
...
@@ -201,7 +201,9 @@ void UASWaypointManager::handleWaypoint(quint8 systemId, quint8 compId, mavlink_
protocol_timer
.
stop
();
emit
readGlobalWPFromUAS
(
false
);
emit
updateStatusString
(
"done."
);
QTime
time
=
QTime
::
currentTime
();
QString
timeString
=
time
.
toString
();
emit
updateStatusString
(
tr
(
"done. (updated at %1)"
).
arg
(
timeString
));
}
}
else
{
...
...
src/ui/QGCParamWidget.cc
View file @
936b56b9
...
...
@@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
#include <QFileDialog>
#include <QFile>
#include <QList>
#include <QTime>
#include <QSettings>
#include <QMessageBox>
#include <QApplication>
...
...
@@ -444,7 +445,18 @@ void QGCParamWidget::addParameter(int uas, int component, int paramCount, int pa
}
QString
val
=
QString
(
"%1"
).
arg
(
value
.
toFloat
(),
5
,
'f'
,
1
,
QChar
(
' '
));
//statusLabel->setText(tr("OK: %1 %2 #%3/%4, %5 miss").arg(parameterName).arg(val).arg(paramId+1).arg(paramCount).arg(missCount));
statusLabel
->
setText
(
tr
(
"OK: %1 %2 (%3/%4)"
).
arg
(
parameterName
).
arg
(
val
).
arg
(
paramCount
-
missCount
).
arg
(
paramCount
));
if
(
missCount
==
0
)
{
// Transmission done
QTime
time
=
QTime
::
currentTime
();
QString
timeString
=
time
.
toString
();
statusLabel
->
setText
(
tr
(
"All received. (updated at %1)"
).
arg
(
timeString
));
}
else
{
// Transmission in progress
statusLabel
->
setText
(
tr
(
"OK: %1 %2 (%3/%4)"
).
arg
(
parameterName
).
arg
(
val
).
arg
(
paramCount
-
missCount
).
arg
(
paramCount
));
}
}
// Check if last parameter was received
...
...
src/ui/QGCToolBar.cc
View file @
936b56b9
...
...
@@ -134,7 +134,7 @@ void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms)
{
toolBarTimeoutLabel
->
setStyleSheet
(
QString
(
"QLabel { margin: 0px 2px; font: 14px; color: %1; background-color: %2; }"
).
arg
(
QGC
::
colorDarkWhite
.
name
()).
arg
(
QGC
::
colorMagenta
.
dark
(
250
).
name
()));
}
toolBarTimeoutLabel
->
setText
(
tr
(
"CONNECTION LOST: %1 s"
).
arg
((
ms
/
1000.0
f
),
2
,
'f'
,
1
));
toolBarTimeoutLabel
->
setText
(
tr
(
"CONNECTION LOST: %1 s"
).
arg
((
ms
/
1000.0
f
),
2
,
'f'
,
1
,
' '
));
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment