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
889639c9
Commit
889639c9
authored
May 15, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some of the Analyze panels to mobile builds
parent
b5143c6b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
33 deletions
+51
-33
qgroundcontrol.pro
qgroundcontrol.pro
+4
-6
AnalyzeView.qml
src/AnalyzeView/AnalyzeView.qml
+44
-25
QGCApplication.cc
src/QGCApplication.cc
+3
-2
No files found.
qgroundcontrol.pro
View file @
889639c9
...
@@ -614,6 +614,8 @@ HEADERS += \
...
@@ -614,6 +614,8 @@ HEADERS += \
src
/
uas
/
UASInterface
.
h
\
src
/
uas
/
UASInterface
.
h
\
src
/
uas
/
UASMessageHandler
.
h
\
src
/
uas
/
UASMessageHandler
.
h
\
src
/
UTM
.
h
\
src
/
UTM
.
h
\
src
/
AnalyzeView
/
GeoTagController
.
h
\
src
/
AnalyzeView
/
ExifParser
.
h
\
AndroidBuild
{
AndroidBuild
{
...
@@ -648,8 +650,6 @@ HEADERS += \
...
@@ -648,8 +650,6 @@ HEADERS += \
!
MobileBuild
{
!
MobileBuild
{
HEADERS
+=
\
HEADERS
+=
\
src
/
AnalyzeView
/
GeoTagController
.
h
\
src
/
AnalyzeView
/
ExifParser
.
h
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
h
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
h
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
h
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
h
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
h
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
h
\
...
@@ -663,7 +663,6 @@ HEADERS += \
...
@@ -663,7 +663,6 @@ HEADERS += \
src
/
GPS
/
satellite_info
.
h
\
src
/
GPS
/
satellite_info
.
h
\
src
/
GPS
/
vehicle_gps_position
.
h
\
src
/
GPS
/
vehicle_gps_position
.
h
\
src
/
Joystick
/
JoystickSDL
.
h
\
src
/
Joystick
/
JoystickSDL
.
h
\
src
/
QGCQFileDialog
.
h
\
src
/
RunGuard
.
h
\
src
/
RunGuard
.
h
\
src
/
comm
/
LogReplayLink
.
h
\
src
/
comm
/
LogReplayLink
.
h
\
src
/
comm
/
QGCHilLink
.
h
\
src
/
comm
/
QGCHilLink
.
h
\
...
@@ -790,6 +789,8 @@ SOURCES += \
...
@@ -790,6 +789,8 @@ SOURCES += \
src
/
uas
/
UAS
.
cc
\
src
/
uas
/
UAS
.
cc
\
src
/
uas
/
UASMessageHandler
.
cc
\
src
/
uas
/
UASMessageHandler
.
cc
\
src
/
UTM
.
cpp
\
src
/
UTM
.
cpp
\
src
/
AnalyzeView
/
GeoTagController
.
cc
\
src
/
AnalyzeView
/
ExifParser
.
cc
\
DebugBuild
{
DebugBuild
{
SOURCES
+=
\
SOURCES
+=
\
...
@@ -811,8 +812,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
...
@@ -811,8 +812,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
!
MobileBuild
{
!
MobileBuild
{
SOURCES
+=
\
SOURCES
+=
\
src
/
AnalyzeView
/
GeoTagController
.
cc
\
src
/
AnalyzeView
/
ExifParser
.
cc
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
cpp
\
...
@@ -822,7 +821,6 @@ SOURCES += \
...
@@ -822,7 +821,6 @@ SOURCES += \
src
/
GPS
/
GPSProvider
.
cc
\
src
/
GPS
/
GPSProvider
.
cc
\
src
/
GPS
/
RTCM
/
RTCMMavlink
.
cc
\
src
/
GPS
/
RTCM
/
RTCMMavlink
.
cc
\
src
/
Joystick
/
JoystickSDL
.
cc
\
src
/
Joystick
/
JoystickSDL
.
cc
\
src
/
QGCQFileDialog
.
cc
\
src
/
RunGuard
.
cc
\
src
/
RunGuard
.
cc
\
src
/
comm
/
LogReplayLink
.
cc
\
src
/
comm
/
LogReplayLink
.
cc
\
src
/
comm
/
QGCJSBSimLink
.
cc
\
src
/
comm
/
QGCJSBSimLink
.
cc
\
...
...
src/AnalyzeView/AnalyzeView.qml
View file @
889639c9
...
@@ -88,10 +88,8 @@ Rectangle {
...
@@ -88,10 +88,8 @@ Rectangle {
visible
:
!
ScreenTools
.
isShortScreen
visible
:
!
ScreenTools
.
isShortScreen
}
}
Repeater
{
ListModel
{
id
:
buttonRepeater
id
:
desktopModel
model
:
ListModel
{
ListElement
{
ListElement
{
buttonImage
:
"
/qmlimages/LogDownloadIcon
"
buttonImage
:
"
/qmlimages/LogDownloadIcon
"
buttonText
:
qsTr
(
"
Log Download
"
)
buttonText
:
qsTr
(
"
Log Download
"
)
...
@@ -114,8 +112,29 @@ Rectangle {
...
@@ -114,8 +112,29 @@ Rectangle {
}
}
}
}
Component.onCompleted
:
itemAt
(
0
).
checked
=
true
ListModel
{
id
:
mobileModel
ListElement
{
buttonImage
:
"
/qmlimages/LogDownloadIcon
"
buttonText
:
qsTr
(
"
Log Download
"
)
pageSource
:
"
LogDownloadPage.qml
"
}
ListElement
{
buttonImage
:
"
/qmlimages/MavlinkConsoleIcon
"
buttonText
:
qsTr
(
"
MAVLink Console
"
)
pageSource
:
"
MavlinkConsolePage.qml
"
}
ListElement
{
buttonImage
:
"
/qmlimages/MAVLinkInspector
"
buttonText
:
qsTr
(
"
MAVLink Inspector
"
)
pageSource
:
"
MAVLinkInspectorPage.qml
"
}
}
Repeater
{
id
:
buttonRepeater
model
:
ScreenTools
.
isMobile
?
mobileModel
:
desktopModel
Component.onCompleted
:
itemAt
(
0
).
checked
=
true
SubMenuButton
{
SubMenuButton
{
imageResource
:
buttonImage
imageResource
:
buttonImage
setupIndicator
:
false
setupIndicator
:
false
...
...
src/QGCApplication.cc
View file @
889639c9
...
@@ -99,6 +99,8 @@
...
@@ -99,6 +99,8 @@
#include "FirmwareImage.h"
#include "FirmwareImage.h"
#include "MavlinkConsoleController.h"
#include "MavlinkConsoleController.h"
#include "MAVLinkInspectorController.h"
#include "MAVLinkInspectorController.h"
#include "GeoTagController.h"
#ifndef __mobile__
#ifndef __mobile__
#include "FirmwareUpgradeController.h"
#include "FirmwareUpgradeController.h"
#endif
#endif
...
@@ -108,7 +110,6 @@
...
@@ -108,7 +110,6 @@
#endif
#endif
#ifndef __mobile__
#ifndef __mobile__
#include "GeoTagController.h"
#include "GPS/GPSManager.h"
#include "GPS/GPSManager.h"
#endif
#endif
...
@@ -461,8 +462,8 @@ void QGCApplication::_initCommon()
...
@@ -461,8 +462,8 @@ void QGCApplication::_initCommon()
#ifndef NO_SERIAL_LINK
#ifndef NO_SERIAL_LINK
qmlRegisterType
<
FirmwareUpgradeController
>
(
kQGCControllers
,
1
,
0
,
"FirmwareUpgradeController"
);
qmlRegisterType
<
FirmwareUpgradeController
>
(
kQGCControllers
,
1
,
0
,
"FirmwareUpgradeController"
);
#endif
#endif
qmlRegisterType
<
GeoTagController
>
(
kQGCControllers
,
1
,
0
,
"GeoTagController"
);
#endif
#endif
qmlRegisterType
<
GeoTagController
>
(
kQGCControllers
,
1
,
0
,
"GeoTagController"
);
qmlRegisterType
<
MavlinkConsoleController
>
(
kQGCControllers
,
1
,
0
,
"MavlinkConsoleController"
);
qmlRegisterType
<
MavlinkConsoleController
>
(
kQGCControllers
,
1
,
0
,
"MavlinkConsoleController"
);
qmlRegisterType
<
MAVLinkInspectorController
>
(
kQGCControllers
,
1
,
0
,
"MAVLinkInspectorController"
);
qmlRegisterType
<
MAVLinkInspectorController
>
(
kQGCControllers
,
1
,
0
,
"MAVLinkInspectorController"
);
...
...
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