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
29f66547
Commit
29f66547
authored
Apr 11, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set minimum to Qt 5.11
Windows fixes
parent
54483e91
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
41 additions
and
40 deletions
+41
-40
GeoTagController.cc
src/AnalyzeView/GeoTagController.cc
+4
-3
GeoTagPage.qml
src/AnalyzeView/GeoTagPage.qml
+7
-7
LogDownloadPage.qml
src/AnalyzeView/LogDownloadPage.qml
+1
-1
MultiVehicleList.qml
src/FlightDisplay/MultiVehicleList.qml
+5
-5
QGCViewDialogContainer.qml
src/QmlControls/QGCViewDialogContainer.qml
+1
-1
MainQmlWindow.qml
src/ui/MainQmlWindow.qml
+9
-9
BatteryIndicator.qml
src/ui/toolbar/BatteryIndicator.qml
+2
-2
GPSIndicator.qml
src/ui/toolbar/GPSIndicator.qml
+2
-2
GPSRTKIndicator.qml
src/ui/toolbar/GPSRTKIndicator.qml
+2
-2
JoystickIndicator.qml
src/ui/toolbar/JoystickIndicator.qml
+2
-2
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+2
-2
RCRSSIIndicator.qml
src/ui/toolbar/RCRSSIIndicator.qml
+2
-2
TelemetryRSSIIndicator.qml
src/ui/toolbar/TelemetryRSSIIndicator.qml
+2
-2
No files found.
src/AnalyzeView/GeoTagController.cc
View file @
29f66547
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
#include <QDebug>
#include <QDebug>
#include <cfloat>
#include <cfloat>
#include <QDir>
#include <QDir>
#include <QUrl>
#include "ExifParser.h"
#include "ExifParser.h"
#include "ULogParser.h"
#include "ULogParser.h"
...
@@ -38,7 +39,7 @@ GeoTagController::~GeoTagController()
...
@@ -38,7 +39,7 @@ GeoTagController::~GeoTagController()
void
GeoTagController
::
setLogFile
(
QString
filename
)
void
GeoTagController
::
setLogFile
(
QString
filename
)
{
{
filename
.
replace
(
"file://"
,
""
);
filename
=
QUrl
(
filename
).
toLocalFile
(
);
if
(
!
filename
.
isEmpty
())
{
if
(
!
filename
.
isEmpty
())
{
_worker
.
setLogFile
(
filename
);
_worker
.
setLogFile
(
filename
);
emit
logFileChanged
(
filename
);
emit
logFileChanged
(
filename
);
...
@@ -47,7 +48,7 @@ void GeoTagController::setLogFile(QString filename)
...
@@ -47,7 +48,7 @@ void GeoTagController::setLogFile(QString filename)
void
GeoTagController
::
setImageDirectory
(
QString
dir
)
void
GeoTagController
::
setImageDirectory
(
QString
dir
)
{
{
dir
.
replace
(
"file://"
,
""
);
dir
=
QUrl
(
dir
).
toLocalFile
(
);
if
(
!
dir
.
isEmpty
())
{
if
(
!
dir
.
isEmpty
())
{
_worker
.
setImageDirectory
(
dir
);
_worker
.
setImageDirectory
(
dir
);
emit
imageDirectoryChanged
(
dir
);
emit
imageDirectoryChanged
(
dir
);
...
@@ -56,7 +57,7 @@ void GeoTagController::setImageDirectory(QString dir)
...
@@ -56,7 +57,7 @@ void GeoTagController::setImageDirectory(QString dir)
void
GeoTagController
::
setSaveDirectory
(
QString
dir
)
void
GeoTagController
::
setSaveDirectory
(
QString
dir
)
{
{
dir
.
replace
(
"file://"
,
""
);
dir
=
QUrl
(
dir
).
toLocalFile
(
);
if
(
!
dir
.
isEmpty
())
{
if
(
!
dir
.
isEmpty
())
{
_worker
.
setSaveDirectory
(
dir
);
_worker
.
setSaveDirectory
(
dir
);
emit
saveDirectoryChanged
(
dir
);
emit
saveDirectoryChanged
(
dir
);
...
...
src/AnalyzeView/GeoTagPage.qml
View file @
29f66547
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.3
import
QtQuick
2.11
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Layouts
1.12
import
QtQuick
.
Layouts
1.11
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
Palette
1.0
...
@@ -40,7 +40,7 @@ AnalyzePage {
...
@@ -40,7 +40,7 @@ AnalyzePage {
//-----------------------------------------------------------------
//-----------------------------------------------------------------
ProgressBar
{
ProgressBar
{
id
:
progressBar
id
:
progressBar
maximumValue
:
100
to
:
100
value
:
geoController
.
progress
value
:
geoController
.
progress
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.alignment
:
Qt
.
AlignVCenter
Layout.alignment
:
Qt
.
AlignVCenter
...
@@ -113,7 +113,7 @@ AnalyzePage {
...
@@ -113,7 +113,7 @@ AnalyzePage {
selectFolder
:
true
selectFolder
:
true
selectExisting
:
true
selectExisting
:
true
onAccepted
:
{
onAccepted
:
{
geoController
.
imageDirectory
=
openLogFile
.
folder
geoController
.
selectImageDir
=
openLogFile
.
folder
close
()
close
()
}
}
}
}
...
@@ -141,7 +141,7 @@ AnalyzePage {
...
@@ -141,7 +141,7 @@ AnalyzePage {
selectFolder
:
true
selectFolder
:
true
selectExisting
:
true
selectExisting
:
true
onAccepted
:
{
onAccepted
:
{
geoController
.
saveDirectory
=
openLogFile
.
folder
geoController
.
saveDirectory
=
selectDestDir
.
folder
close
()
close
()
}
}
}
}
...
...
src/AnalyzeView/LogDownloadPage.qml
View file @
29f66547
...
@@ -73,7 +73,7 @@ AnalyzePage {
...
@@ -73,7 +73,7 @@ AnalyzePage {
title
:
qsTr
(
"
Date
"
)
title
:
qsTr
(
"
Date
"
)
width
:
ScreenTools
.
defaultFontPixelWidth
*
34
width
:
ScreenTools
.
defaultFontPixelWidth
*
34
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
delegate
:
Text
{
delegate
:
Text
{
text
:
{
text
:
{
var
o
=
logController
.
model
.
get
(
styleData
.
row
)
var
o
=
logController
.
model
.
get
(
styleData
.
row
)
if
(
o
)
{
if
(
o
)
{
...
...
src/FlightDisplay/MultiVehicleList.qml
View file @
29f66547
...
@@ -149,31 +149,31 @@ Item {
...
@@ -149,31 +149,31 @@ Item {
QGCButton
{
QGCButton
{
text
:
"
Arm
"
text
:
"
Arm
"
visible
:
!
_vehicle
.
armed
visible
:
_vehicle
&&
!
_vehicle
.
armed
onClicked
:
_vehicle
.
armed
=
true
onClicked
:
_vehicle
.
armed
=
true
}
}
QGCButton
{
QGCButton
{
text
:
"
Start Mission
"
text
:
"
Start Mission
"
visible
:
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
missionFlightMode
visible
:
_vehicle
&&
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
missionFlightMode
onClicked
:
_vehicle
.
startMission
()
onClicked
:
_vehicle
.
startMission
()
}
}
QGCButton
{
QGCButton
{
text
:
"
Pause
"
text
:
"
Pause
"
visible
:
_vehicle
.
armed
&&
_vehicle
.
pauseVehicleSupported
visible
:
_vehicle
&&
_vehicle
.
armed
&&
_vehicle
.
pauseVehicleSupported
onClicked
:
_vehicle
.
pauseVehicle
()
onClicked
:
_vehicle
.
pauseVehicle
()
}
}
QGCButton
{
QGCButton
{
text
:
"
RTL
"
text
:
"
RTL
"
visible
:
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
rtlFlightMode
visible
:
_vehicle
&&
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
rtlFlightMode
onClicked
:
_vehicle
.
flightMode
=
_vehicle
.
rtlFlightMode
onClicked
:
_vehicle
.
flightMode
=
_vehicle
.
rtlFlightMode
}
}
QGCButton
{
QGCButton
{
text
:
"
Take control
"
text
:
"
Take control
"
visible
:
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
takeControlFlightMode
visible
:
_vehicle
&&
_vehicle
.
armed
&&
_vehicle
.
flightMode
!==
_vehicle
.
takeControlFlightMode
onClicked
:
_vehicle
.
flightMode
=
_vehicle
.
takeControlFlightMode
onClicked
:
_vehicle
.
flightMode
=
_vehicle
.
takeControlFlightMode
}
}
}
// Row
}
// Row
...
...
src/QmlControls/QGCViewDialogContainer.qml
View file @
29f66547
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Dialogs
1.3
...
...
src/ui/MainQmlWindow.qml
View file @
29f66547
...
@@ -8,10 +8,10 @@
...
@@ -8,10 +8,10 @@
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
Palette
1.0
...
@@ -23,8 +23,8 @@ import QGroundControl.FlightMap 1.0
...
@@ -23,8 +23,8 @@ import QGroundControl.FlightMap 1.0
/// Native QML top level window
/// Native QML top level window
ApplicationWindow
{
ApplicationWindow
{
id
:
mainWindow
id
:
mainWindow
width
:
1
024
width
:
1
280
height
:
768
height
:
1024
visible
:
true
visible
:
true
readonly
property
real
_topBottomMargins
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
readonly
property
real
_topBottomMargins
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
...
@@ -517,8 +517,9 @@ ApplicationWindow {
...
@@ -517,8 +517,9 @@ ApplicationWindow {
height
:
mainWindow
.
height
*
0.666
height
:
mainWindow
.
height
*
0.666
modal
:
true
modal
:
true
focus
:
true
focus
:
true
x
:
Math
.
round
((
mainWindow
.
width
-
width
)
*
0.5
)
y
:
Math
.
round
((
mainWindow
.
height
-
height
)
*
0.5
)
closePolicy
:
Popup
.
CloseOnEscape
|
Popup
.
CloseOnPressOutside
closePolicy
:
Popup
.
CloseOnEscape
|
Popup
.
CloseOnPressOutside
anchors.centerIn
:
parent
background
:
Rectangle
{
background
:
Rectangle
{
anchors.fill
:
parent
anchors.fill
:
parent
color
:
qgcPal
.
window
color
:
qgcPal
.
window
...
@@ -613,9 +614,9 @@ ApplicationWindow {
...
@@ -613,9 +614,9 @@ ApplicationWindow {
Popup
{
Popup
{
id
:
systemMessageArea
id
:
systemMessageArea
y
:
ScreenTools
.
defaultFontPixelHeight
y
:
ScreenTools
.
defaultFontPixelHeight
x
:
(
mainWindow
.
width
-
width
)
*
0.5
x
:
Math
.
round
((
mainWindow
.
width
-
width
)
*
0.5
)
width
:
mainWindow
.
width
*
0.55
width
:
mainWindow
.
width
*
0.55
height
:
ScreenTools
.
defaultFontPixelHeight
*
6
height
:
ScreenTools
.
defaultFontPixelHeight
*
4
modal
:
false
modal
:
false
focus
:
true
focus
:
true
closePolicy
:
Popup
.
CloseOnEscape
closePolicy
:
Popup
.
CloseOnEscape
...
@@ -651,7 +652,7 @@ ApplicationWindow {
...
@@ -651,7 +652,7 @@ ApplicationWindow {
Flickable
{
Flickable
{
id
:
systemMessageFlick
id
:
systemMessageFlick
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
anchors.fill
:
parent
anchors.fill
:
parent
contentHeight
:
systemMessageText
.
height
contentHeight
:
systemMessageText
.
height
contentWidth
:
systemMessageText
.
width
contentWidth
:
systemMessageText
.
width
...
@@ -739,7 +740,6 @@ ApplicationWindow {
...
@@ -739,7 +740,6 @@ ApplicationWindow {
id
:
loader
id
:
loader
onLoaded
:
{
onLoaded
:
{
indicatorDropdown
.
x
=
mapFromGlobal
(
indicatorDropdown
.
centerX
,
0
).
x
indicatorDropdown
.
x
=
mapFromGlobal
(
indicatorDropdown
.
centerX
,
0
).
x
console
.
log
(
indicatorDropdown
.
x
)
}
}
}
}
onOpened
:
{
onOpened
:
{
...
...
src/ui/toolbar/BatteryIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/GPSIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/GPSRTKIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/JoystickIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/MainToolBarIndicators.qml
View file @
29f66547
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/RCRSSIIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
src/ui/toolbar/TelemetryRSSIIndicator.qml
View file @
29f66547
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*
*
****************************************************************************/
****************************************************************************/
import
QtQuick
2.1
2
import
QtQuick
2.1
1
import
QtQuick
.
Layouts
1.1
2
import
QtQuick
.
Layouts
1.1
1
import
QGroundControl
1.0
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
Controls
1.0
...
...
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