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

Merge pull request #2337 from dogmaphobic/mobileTweaks 

Mobile tweaks
QGC4.4
Gus Grubba 10 years ago
parent
f29410b7a3 7a15f9e190
commit
0581a1dee8
13 changed files with 121 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      qgroundcontrol.pro
  2. 2
      src/FactSystem/FactSystemTestBase.cc
  3. 6
      src/comm/LinkConfiguration.cc
  4. 4
      src/comm/LinkConfiguration.h
  5. 14
      src/comm/LinkManager.cc
  6. 2
      src/comm/LinkManager.h
  7. 2
      src/ui/MainWindow.cc
  8. 8
      src/ui/MainWindow.h
  9. 2
      src/ui/MainWindow.qml
  10. 10
      src/ui/MainWindowLeftPanel.qml
  11. 8
      src/ui/QGCCommConfiguration.cc
  12. 2
      src/ui/QGCLinkConfiguration.cc
  13. 2
      src/ui/preferences/LinkSettings.qml

46
qgroundcontrol.pro
Unescape View File

@ -186,14 +186,11 @@ INCLUDEPATH += \ @@ -186,14 +186,11 @@ INCLUDEPATH += \
FORMS += \
src/QGCQmlWidgetHolder.ui \
src/ui/LogReplayLinkConfigurationWidget.ui \
src/ui/MainWindow.ui \
src/ui/MAVLinkSettingsWidget.ui \
src/ui/MockLinkConfiguration.ui \
src/ui/QGCCommConfiguration.ui \
src/ui/QGCLinkConfiguration.ui \
src/ui/QGCMapRCToParamDialog.ui \
src/ui/QGCMAVLinkLogPlayer.ui \
src/ui/QGCPluginHost.ui \
src/ui/QGCTCPLinkConfiguration.ui \
src/ui/QGCUDPLinkConfiguration.ui \
@ -201,6 +198,11 @@ FORMS += \ @@ -201,6 +198,11 @@ FORMS += \
src/ui/uas/QGCUnconnectedInfoWidget.ui \
src/ui/uas/UASMessageView.ui \
DebugBuild {
FORMS += \
src/ui/MockLinkConfiguration.ui \
}
!iOSBuild {
FORMS += \
src/ui/SerialSettings.ui \
@ -208,6 +210,8 @@ FORMS += \ @@ -208,6 +210,8 @@ FORMS += \
!MobileBuild {
FORMS += \
src/ui/LogReplayLinkConfigurationWidget.ui \
src/ui/QGCMAVLinkLogPlayer.ui \
src/ui/Linechart.ui \
src/ui/MultiVehicleDockWidget.ui \
src/ui/QGCDataPlot2D.ui \
@ -230,11 +234,7 @@ HEADERS += \ @@ -230,11 +234,7 @@ HEADERS += \
src/comm/LinkConfiguration.h \
src/comm/LinkInterface.h \
src/comm/LinkManager.h \
src/comm/LogReplayLink.h \
src/comm/MAVLinkProtocol.h \
src/comm/MockLink.h \
src/comm/MockLinkFileServer.h \
src/comm/MockLinkMissionItemHandler.h \
src/comm/ProtocolInterface.h \
src/comm/QGCMAVLink.h \
src/comm/TCPLink.h \
@ -276,15 +276,12 @@ HEADERS += \ @@ -276,15 +276,12 @@ HEADERS += \
src/uas/UAS.h \
src/uas/UASInterface.h \
src/uas/UASMessageHandler.h \
src/ui/LogReplayLinkConfigurationWidget.h \
src/ui/MainWindow.h \
src/ui/MAVLinkDecoder.h \
src/ui/MAVLinkSettingsWidget.h \
src/ui/MockLinkConfiguration.h \
src/ui/QGCCommConfiguration.h \
src/ui/QGCLinkConfiguration.h \
src/ui/QGCMapRCToParamDialog.h \
src/ui/QGCMAVLinkLogPlayer.h \
src/ui/QGCPluginHost.h \
src/ui/QGCTCPLinkConfiguration.h \
src/ui/QGCUDPLinkConfiguration.h \
@ -295,6 +292,14 @@ HEADERS += \ @@ -295,6 +292,14 @@ HEADERS += \
src/AutoPilotPlugins/PX4/PX4AirframeLoader.h \
src/QmlControls/QGCImageProvider.h \
DebugBuild {
HEADERS += \
src/comm/MockLink.h \
src/comm/MockLinkFileServer.h \
src/comm/MockLinkMissionItemHandler.h \
src/ui/MockLinkConfiguration.h \
}
WindowsBuild {
PRECOMPILED_HEADER += src/stable_headers.h
HEADERS += src/stable_headers.h
@ -309,6 +314,9 @@ HEADERS += \ @@ -309,6 +314,9 @@ HEADERS += \
!MobileBuild {
HEADERS += \
src/comm/LogReplayLink.h \
src/ui/LogReplayLinkConfigurationWidget.h \
src/ui/QGCMAVLinkLogPlayer.h \
src/comm/QGCFlightGearLink.h \
src/comm/QGCHilLink.h \
src/comm/QGCJSBSimLink.h \
@ -348,11 +356,7 @@ SOURCES += \ @@ -348,11 +356,7 @@ SOURCES += \
src/CmdLineOptParser.cc \
src/comm/LinkConfiguration.cc \
src/comm/LinkManager.cc \
src/comm/LogReplayLink.cc \
src/comm/MAVLinkProtocol.cc \
src/comm/MockLink.cc \
src/comm/MockLinkFileServer.cc \
src/comm/MockLinkMissionItemHandler.cc \
src/comm/TCPLink.cc \
src/comm/UDPLink.cc \
src/FlightDisplay/FlightDisplayViewController.cc \
@ -388,15 +392,12 @@ SOURCES += \ @@ -388,15 +392,12 @@ SOURCES += \
src/uas/FileManager.cc \
src/uas/UAS.cc \
src/uas/UASMessageHandler.cc \
src/ui/LogReplayLinkConfigurationWidget.cc \
src/ui/MainWindow.cc \
src/ui/MAVLinkDecoder.cc \
src/ui/MAVLinkSettingsWidget.cc \
src/ui/MockLinkConfiguration.cc \
src/ui/QGCCommConfiguration.cc \
src/ui/QGCLinkConfiguration.cc \
src/ui/QGCMapRCToParamDialog.cpp \
src/ui/QGCMAVLinkLogPlayer.cc \
src/ui/QGCPluginHost.cc \
src/ui/QGCTCPLinkConfiguration.cc \
src/ui/QGCUDPLinkConfiguration.cc \
@ -407,6 +408,14 @@ SOURCES += \ @@ -407,6 +408,14 @@ SOURCES += \
src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc \
src/QmlControls/QGCImageProvider.cc \
DebugBuild {
SOURCES += \
src/comm/MockLink.cc \
src/comm/MockLinkFileServer.cc \
src/comm/MockLinkMissionItemHandler.cc \
src/ui/MockLinkConfiguration.cc \
}
!iOSBuild {
SOURCES += \
src/comm/QGCSerialPortInfo.cc \
@ -416,6 +425,9 @@ SOURCES += \ @@ -416,6 +425,9 @@ SOURCES += \
!MobileBuild {
SOURCES += \
src/comm/LogReplayLink.cc \
src/ui/LogReplayLinkConfigurationWidget.cc \
src/ui/QGCMAVLinkLogPlayer.cc \
src/comm/QGCFlightGearLink.cc \
src/comm/QGCJSBSimLink.cc \
src/comm/QGCXPlaneLink.cc \

2
src/FactSystem/FactSystemTestBase.cc
Unescape View File

@ -26,7 +26,9 @@ @@ -26,7 +26,9 @@
#include "FactSystemTestBase.h"
#include "LinkManager.h"
#ifdef QT_DEBUG
#include "MockLink.h"
#endif
#include "MultiVehicleManager.h"
#include "QGCApplication.h"
#include "QGCMessageBox.h"

6
src/comm/LinkConfiguration.cc
Unescape View File

@ -33,7 +33,9 @@ This file is part of the QGROUNDCONTROL project @@ -33,7 +33,9 @@ This file is part of the QGROUNDCONTROL project
#endif
#include "UDPLink.h"
#include "TCPLink.h"
#ifndef __mobile__
#include "LogReplayLink.h"
#endif
#ifdef QT_DEBUG
#include "MockLink.h"
@ -99,9 +101,11 @@ LinkConfiguration* LinkConfiguration::createSettings(int type, const QString& na @@ -99,9 +101,11 @@ LinkConfiguration* LinkConfiguration::createSettings(int type, const QString& na
case LinkConfiguration::TypeTcp:
config = new TCPConfiguration(name);
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay:
config = new LogReplayLinkConfiguration(name);
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock:
config = new MockConfiguration(name);
@ -130,9 +134,11 @@ LinkConfiguration* LinkConfiguration::duplicateSettings(LinkConfiguration* sourc @@ -130,9 +134,11 @@ LinkConfiguration* LinkConfiguration::duplicateSettings(LinkConfiguration* sourc
case TypeTcp:
dupe = new TCPConfiguration(dynamic_cast<TCPConfiguration*>(source));
break;
#ifndef __mobile__
case TypeLogReplay:
dupe = new LogReplayLinkConfiguration(dynamic_cast<LogReplayLinkConfiguration*>(source));
break;
#endif
#ifdef QT_DEBUG
case TypeMock:
dupe = new MockConfiguration(dynamic_cast<MockConfiguration*>(source));

4
src/comm/LinkConfiguration.h
Unescape View File

@ -69,8 +69,12 @@ public: @@ -69,8 +69,12 @@ public:
TypeXbee, ///< XBee Proprietary Link
TypeOpal, ///< Opal-RT Link
#endif
#ifdef QT_DEBUG
TypeMock, ///< Mock Link for Unitesting
#endif
#ifndef __mobile__
TypeLogReplay,
#endif
TypeLast // Last type value (type >= TypeLast == invalid)
};

14
src/comm/LinkManager.cc
Unescape View File

@ -124,9 +124,11 @@ LinkInterface* LinkManager::createConnectedLink(LinkConfiguration* config) @@ -124,9 +124,11 @@ LinkInterface* LinkManager::createConnectedLink(LinkConfiguration* config)
case LinkConfiguration::TypeTcp:
pLink = new TCPLink(dynamic_cast<TCPConfiguration*>(config));
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay:
pLink = new LogReplayLink(dynamic_cast<LogReplayLinkConfiguration*>(config));
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock:
pLink = new MockLink(dynamic_cast<MockConfiguration*>(config));
@ -357,9 +359,11 @@ void LinkManager::loadLinkConfigurationList() @@ -357,9 +359,11 @@ void LinkManager::loadLinkConfigurationList()
case LinkConfiguration::TypeTcp:
pLink = (LinkConfiguration*)new TCPConfiguration(name);
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay:
pLink = (LinkConfiguration*)new LogReplayLinkConfiguration(name);
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock:
pLink = (LinkConfiguration*)new MockConfiguration(name);
@ -697,8 +701,12 @@ QStringList LinkManager::linkTypeStrings(void) const @@ -697,8 +701,12 @@ QStringList LinkManager::linkTypeStrings(void) const
#endif
list += "UDP";
list += "TCP";
#ifdef QT_DEBUG
list += "Mock Link";
#endif
#ifndef __mobile__
list += "Log Replay";
#endif
}
return list;
}
@ -771,16 +779,20 @@ bool LinkManager::endCreateConfiguration(LinkConfiguration* config) @@ -771,16 +779,20 @@ bool LinkManager::endCreateConfiguration(LinkConfiguration* config)
LinkConfiguration* LinkManager::createConfiguration(int type, const QString& name)
{
#ifndef __ios__
if((LinkConfiguration::LinkType)type == LinkConfiguration::TypeSerial)
_updateSerialPorts();
#endif
return LinkConfiguration::createSettings(type, name);
}
LinkConfiguration* LinkManager::startConfigurationEditing(LinkConfiguration* config)
{
Q_ASSERT(config != NULL);
#ifndef __ios__
if(config->type() == LinkConfiguration::TypeSerial)
_updateSerialPorts();
#endif
return LinkConfiguration::duplicateSettings(config);
}
@ -816,6 +828,7 @@ void LinkManager::_fixUnnamed(LinkConfiguration* config) @@ -816,6 +828,7 @@ void LinkManager::_fixUnnamed(LinkConfiguration* config)
}
}
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay: {
LogReplayLinkConfiguration* tconfig = dynamic_cast<LogReplayLinkConfiguration*>(config);
if(tconfig) {
@ -823,6 +836,7 @@ void LinkManager::_fixUnnamed(LinkConfiguration* config) @@ -823,6 +836,7 @@ void LinkManager::_fixUnnamed(LinkConfiguration* config)
}
}
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock:
config->setName(

2
src/comm/LinkManager.h
Unescape View File

@ -37,7 +37,9 @@ This file is part of the PIXHAWK project @@ -37,7 +37,9 @@ This file is part of the PIXHAWK project
#include "QGCToolbox.h"
#include "ProtocolInterface.h"
#include "MAVLinkProtocol.h"
#ifndef __mobile__
#include "LogReplayLink.h"
#endif
#include "QmlObjectListModel.h"
#ifndef __ios__

2
src/ui/MainWindow.cc
Unescape View File

@ -43,7 +43,9 @@ This file is part of the QGROUNDCONTROL project @@ -43,7 +43,9 @@ This file is part of the QGROUNDCONTROL project
#include "MAVLinkProtocol.h"
#include "MainWindow.h"
#include "GAudioOutput.h"
#ifndef __mobile__
#include "QGCMAVLinkLogPlayer.h"
#endif
#include "SettingsDialog.h"
#include "MAVLinkDecoder.h"
#include "QGCApplication.h"

8
src/ui/MainWindow.h
Unescape View File

@ -42,7 +42,9 @@ This file is part of the QGROUNDCONTROL project @@ -42,7 +42,9 @@ This file is part of the QGROUNDCONTROL project
#include "UASInterface.h"
#include "LogCompressor.h"
#include "QGCMAVLinkInspector.h"
#ifndef __mobile__
#include "QGCMAVLinkLogPlayer.h"
#endif
#include "MAVLinkDecoder.h"
#include "Vehicle.h"
#include "QGCDockWidget.h"
@ -157,11 +159,12 @@ signals: @@ -157,11 +159,12 @@ signals:
#endif //QGC_MOUSE_ENABLED_LINUX
public:
#ifndef __mobile__
QGCMAVLinkLogPlayer* getLogPlayer()
{
return logPlayer;
}
#endif
protected:
void connectCommonActions();
@ -171,8 +174,9 @@ protected: @@ -171,8 +174,9 @@ protected:
QSettings settings;
QPointer<MAVLinkDecoder> mavlinkDecoder;
#ifndef __mobile__
QGCMAVLinkLogPlayer* logPlayer;
#endif
#ifdef QGC_MOUSE_ENABLED_WIN
/** @brief 3d Mouse support (WIN only) */
Mouse3DInput* mouseInput; ///< 3dConnexion 3dMouse SDK

2
src/ui/MainWindow.qml
Unescape View File

@ -44,7 +44,7 @@ Item { @@ -44,7 +44,7 @@ Item {
property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.05)) : ScreenTools.defaultFontPixelSize * 4
property int tbCellHeight: tbHeight * 0.75
property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54
property real tbButtonWidth: tbCellHeight * 1.3
property real tbButtonWidth: tbCellHeight * 1.35
property real availableHeight: height - tbHeight
property real menuButtonWidth: (tbButtonWidth * 2) + (tbSpacing * 4) + 1

10
src/ui/MainWindowLeftPanel.qml
Unescape View File

@ -149,7 +149,7 @@ Item { @@ -149,7 +149,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
width: parent.width * 0.8
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "General"
exclusiveGroup: panelActionGroup
@ -162,7 +162,7 @@ Item { @@ -162,7 +162,7 @@ Item {
}
}
QGCButton {
width: parent.width * 0.8
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Comm Links"
exclusiveGroup: panelActionGroup
@ -175,7 +175,7 @@ Item { @@ -175,7 +175,7 @@ Item {
}
}
QGCButton {
width: parent.width * 0.8
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "MavLink"
exclusiveGroup: panelActionGroup
@ -188,7 +188,7 @@ Item { @@ -188,7 +188,7 @@ Item {
}
}
QGCButton {
width: parent.width * 0.8
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Mock Link"
visible: ScreenTools.isDebug
@ -202,7 +202,7 @@ Item { @@ -202,7 +202,7 @@ Item {
}
}
QGCButton {
width: parent.width * 0.8
width: parent.width * 0.85
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Debug"
visible: ScreenTools.isDebug

8
src/ui/QGCCommConfiguration.cc
Unescape View File

@ -36,8 +36,12 @@ This file is part of the QGROUNDCONTROL project @@ -36,8 +36,12 @@ This file is part of the QGROUNDCONTROL project
#endif
#include "QGCUDPLinkConfiguration.h"
#include "QGCTCPLinkConfiguration.h"
#ifdef QT_DEBUG
#include "MockLinkConfiguration.h"
#endif
#ifndef __mobile__
#include "LogReplayLinkConfigurationWidget.h"
#endif
#include "QGCCommConfiguration.h"
#include "ui_QGCCommConfiguration.h"
@ -54,7 +58,9 @@ QGCCommConfiguration::QGCCommConfiguration(QWidget *parent, LinkConfiguration *c @@ -54,7 +58,9 @@ QGCCommConfiguration::QGCCommConfiguration(QWidget *parent, LinkConfiguration *c
#endif
_ui->typeCombo->addItem(tr("UDP"), LinkConfiguration::TypeUdp);
_ui->typeCombo->addItem(tr("TCP"), LinkConfiguration::TypeTcp);
#ifndef __mobile__
_ui->typeCombo->addItem(tr("Log replay"), LinkConfiguration::TypeLogReplay);
#endif
#ifdef QT_DEBUG
_ui->typeCombo->addItem(tr("Mock"), LinkConfiguration::TypeMock);
#endif
@ -143,6 +149,7 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type) @@ -143,6 +149,7 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type)
_ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeTcp));
}
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay: {
QWidget* conf = new LogReplayLinkConfigurationWidget((LogReplayLinkConfiguration*)_config, this);
_ui->linkScrollArea->setWidget(conf);
@ -150,6 +157,7 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type) @@ -150,6 +157,7 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type)
_ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeLogReplay));
}
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock: {
QWidget* conf = new MockLinkConfiguration((MockConfiguration*)_config, this);

2
src/ui/QGCLinkConfiguration.cc
Unescape View File

@ -165,6 +165,7 @@ void QGCLinkConfiguration::_fixUnnamed(LinkConfiguration* config) @@ -165,6 +165,7 @@ void QGCLinkConfiguration::_fixUnnamed(LinkConfiguration* config)
}
}
break;
#ifndef __mobile__
case LinkConfiguration::TypeLogReplay: {
LogReplayLinkConfiguration* tconfig = dynamic_cast<LogReplayLinkConfiguration*>(config);
if(tconfig) {
@ -172,6 +173,7 @@ void QGCLinkConfiguration::_fixUnnamed(LinkConfiguration* config) @@ -172,6 +173,7 @@ void QGCLinkConfiguration::_fixUnnamed(LinkConfiguration* config)
}
}
break;
#endif
#ifdef QT_DEBUG
case LinkConfiguration::TypeMock:
config->setName(

2
src/ui/preferences/LinkSettings.qml
Unescape View File

@ -333,7 +333,7 @@ Rectangle { @@ -333,7 +333,7 @@ Rectangle {
spacing: ScreenTools.defaultFontPixelWidth
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
anchors.right: parent.right
QGCButton {
width: ScreenTools.defaultFontPixelWidth * 10
text: "OK"

Write Preview
Loading…
Cancel
Save