Browse Source

Add some of the Analyze panels to mobile builds

QGC4.4
Gus Grubba 6 years ago
parent
commit
889639c933
  1. 10
      qgroundcontrol.pro
  2. 29
      src/AnalyzeView/AnalyzeView.qml
  3. 5
      src/QGCApplication.cc

10
qgroundcontrol.pro

@ -614,6 +614,8 @@ HEADERS += \ @@ -614,6 +614,8 @@ HEADERS += \
src/uas/UASInterface.h \
src/uas/UASMessageHandler.h \
src/UTM.h \
src/AnalyzeView/GeoTagController.h \
src/AnalyzeView/ExifParser.h \
AndroidBuild {
@ -648,8 +650,6 @@ HEADERS += \ @@ -648,8 +650,6 @@ HEADERS += \
!MobileBuild {
HEADERS += \
src/AnalyzeView/GeoTagController.h \
src/AnalyzeView/ExifParser.h \
src/GPS/Drivers/src/gps_helper.h \
src/GPS/Drivers/src/rtcm.h \
src/GPS/Drivers/src/ashtech.h \
@ -663,7 +663,6 @@ HEADERS += \ @@ -663,7 +663,6 @@ HEADERS += \
src/GPS/satellite_info.h \
src/GPS/vehicle_gps_position.h \
src/Joystick/JoystickSDL.h \
src/QGCQFileDialog.h \
src/RunGuard.h \
src/comm/LogReplayLink.h \
src/comm/QGCHilLink.h \
@ -790,6 +789,8 @@ SOURCES += \ @@ -790,6 +789,8 @@ SOURCES += \
src/uas/UAS.cc \
src/uas/UASMessageHandler.cc \
src/UTM.cpp \
src/AnalyzeView/GeoTagController.cc \
src/AnalyzeView/ExifParser.cc \
DebugBuild {
SOURCES += \
@ -811,8 +812,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) { @@ -811,8 +812,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
!MobileBuild {
SOURCES += \
src/AnalyzeView/GeoTagController.cc \
src/AnalyzeView/ExifParser.cc \
src/GPS/Drivers/src/gps_helper.cpp \
src/GPS/Drivers/src/rtcm.cpp \
src/GPS/Drivers/src/ashtech.cpp \
@ -822,7 +821,6 @@ SOURCES += \ @@ -822,7 +821,6 @@ SOURCES += \
src/GPS/GPSProvider.cc \
src/GPS/RTCM/RTCMMavlink.cc \
src/Joystick/JoystickSDL.cc \
src/QGCQFileDialog.cc \
src/RunGuard.cc \
src/comm/LogReplayLink.cc \
src/comm/QGCJSBSimLink.cc \

29
src/AnalyzeView/AnalyzeView.qml

@ -88,10 +88,8 @@ Rectangle { @@ -88,10 +88,8 @@ Rectangle {
visible: !ScreenTools.isShortScreen
}
Repeater {
id: buttonRepeater
model: ListModel {
ListModel {
id: desktopModel
ListElement {
buttonImage: "/qmlimages/LogDownloadIcon"
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 {
imageResource: buttonImage
setupIndicator: false

5
src/QGCApplication.cc

@ -99,6 +99,8 @@ @@ -99,6 +99,8 @@
#include "FirmwareImage.h"
#include "MavlinkConsoleController.h"
#include "MAVLinkInspectorController.h"
#include "GeoTagController.h"
#ifndef __mobile__
#include "FirmwareUpgradeController.h"
#endif
@ -108,7 +110,6 @@ @@ -108,7 +110,6 @@
#endif
#ifndef __mobile__
#include "GeoTagController.h"
#include "GPS/GPSManager.h"
#endif
@ -461,8 +462,8 @@ void QGCApplication::_initCommon() @@ -461,8 +462,8 @@ void QGCApplication::_initCommon()
#ifndef NO_SERIAL_LINK
qmlRegisterType<FirmwareUpgradeController> (kQGCControllers, 1, 0, "FirmwareUpgradeController");
#endif
qmlRegisterType<GeoTagController> (kQGCControllers, 1, 0, "GeoTagController");
#endif
qmlRegisterType<GeoTagController> (kQGCControllers, 1, 0, "GeoTagController");
qmlRegisterType<MavlinkConsoleController> (kQGCControllers, 1, 0, "MavlinkConsoleController");
qmlRegisterType<MAVLinkInspectorController> (kQGCControllers, 1, 0, "MAVLinkInspectorController");

Loading…
Cancel
Save