zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add some of the Analyze panels to mobile builds

QGC4.4
Gus Grubba 6 years ago
parent
b5143c6b9c
commit
889639c933
3 changed files with 51 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      qgroundcontrol.pro
  2. 69
      src/AnalyzeView/AnalyzeView.qml
  3. 5
      src/QGCApplication.cc

10
qgroundcontrol.pro
Unescape View File

@ -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 += \
!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 += \
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 += \
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) {
!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 += \
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 \

69
src/AnalyzeView/AnalyzeView.qml
Unescape View File

@ -88,34 +88,53 @@ Rectangle {
visible: !ScreenTools.isShortScreen visible: !ScreenTools.isShortScreen
} }
Repeater { ListModel {
id: buttonRepeater id: desktopModel
ListElement {
model: ListModel { buttonImage: "/qmlimages/LogDownloadIcon"
ListElement { buttonText: qsTr("Log Download")
buttonImage: "/qmlimages/LogDownloadIcon" pageSource: "LogDownloadPage.qml"
buttonText: qsTr("Log Download") }
pageSource: "LogDownloadPage.qml" ListElement {
} buttonImage: "/qmlimages/GeoTagIcon"
ListElement { buttonText: qsTr("GeoTag Images")
buttonImage: "/qmlimages/GeoTagIcon" pageSource: "GeoTagPage.qml"
buttonText: qsTr("GeoTag Images") }
pageSource: "GeoTagPage.qml" ListElement {
} buttonImage: "/qmlimages/MavlinkConsoleIcon"
ListElement { buttonText: qsTr("MAVLink Console")
buttonImage: "/qmlimages/MavlinkConsoleIcon" pageSource: "MavlinkConsolePage.qml"
buttonText: qsTr("MAVLink Console")
pageSource: "MavlinkConsolePage.qml"
}
ListElement {
buttonImage: "/qmlimages/MAVLinkInspector"
buttonText: qsTr("MAVLink Inspector")
pageSource: "MAVLinkInspectorPage.qml"
}
} }
ListElement {
buttonImage: "/qmlimages/MAVLinkInspector"
buttonText: qsTr("MAVLink Inspector")
pageSource: "MAVLinkInspectorPage.qml"
}
}
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

5
src/QGCApplication.cc
Unescape View File

@ -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 @@
#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()
#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
Loading…
Cancel
Save