Commit 889639c9 authored by Gus Grubba's avatar Gus Grubba

Add some of the Analyze panels to mobile builds

parent b5143c6b
...@@ -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 \
......
...@@ -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
......
...@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment