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

Merge pull request #5151 from dogmaphobic/offlineMaps 

Fixes to offline maps import/export.
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
d5592f49b1 e6618294f6
commit
c7a9943c43
4 changed files with 15 additions and 117 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. 6
      src/QGCQFileDialog.h
  2. 118
      src/QtLocationPlugin/QMLControl/OfflineMap.qml
  3. 4
      src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
  4. 4
      src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h

6
src/QGCQFileDialog.h
Unescape View File

@ -74,7 +74,7 @@ public: @@ -74,7 +74,7 @@ public:
const QString& caption = QString(),
const QString& dir = QString(),
const QString& filter = QString(),
Options options = 0);
Options options = Options());
//! Static helper that invokes a File Open dialog where the user can select one or more files to be opened.
/*!
@ -91,7 +91,7 @@ public: @@ -91,7 +91,7 @@ public:
const QString& caption = QString(),
const QString& dir = QString(),
const QString& filter = QString(),
Options options = 0);
Options options = Options());
//! Static helper that invokes a File Save dialog where the user can select a directory and enter a filename to be saved.
/*!
@ -117,7 +117,7 @@ public: @@ -117,7 +117,7 @@ public:
const QString& filter = QString(),
const QString& defaultSuffix = QString(),
bool strict = false,
Options options = 0);
Options options = Options());
private slots:
/// @brief The exec slot is private because we only want QGCQFileDialog users to use the static methods. Otherwise it will break

118
src/QtLocationPlugin/QMLControl/OfflineMap.qml
Unescape View File

@ -936,7 +936,10 @@ QGCView { @@ -936,7 +936,10 @@ QGCView {
text: qsTr("Import")
width: _buttonSize
visible: !ScreenTools.isMobile
onClicked: rootLoader.sourceComponent = importDialog
onClicked: {
QGroundControl.mapEngineManager.importAction = QGCMapEngineManager.ActionNone
rootLoader.sourceComponent = importDialog
}
}
QGCButton {
text: qsTr("Export")
@ -1003,7 +1006,7 @@ QGCView { @@ -1003,7 +1006,7 @@ QGCView {
onClicked: QGroundControl.mapEngineManager.selectNone()
}
QGCButton {
text: qsTr("Export to Disk")
text: qsTr("Export")
width: _bigButtonSize
enabled: QGroundControl.mapEngineManager.selectedCount > 0
onClicked: {
@ -1014,14 +1017,6 @@ QGCView { @@ -1014,14 +1017,6 @@ QGCView {
}
}
QGCButton {
text: qsTr("Export to Device")
width: _bigButtonSize
enabled: QGroundControl.mapEngineManager.selectedCount > 0
onClicked: {
rootLoader.sourceComponent = exportToDevice
}
}
QGCButton {
text: qsTr("Cancel")
width: _bigButtonSize
onClicked: showList()
@ -1062,8 +1057,8 @@ QGCView { @@ -1062,8 +1057,8 @@ QGCView {
anchors.horizontalCenter: parent.horizontalCenter
}
BusyIndicator {
visible: QGroundControl.mapEngineManager ? QGroundControl.mapEngineManager.exporting : false
running: QGroundControl.mapEngineManager ? QGroundControl.mapEngineManager.exporting : false
visible: QGroundControl.mapEngineManager ? QGroundControl.mapEngineManager.importAction === QGCMapEngineManager.ActionExporting : false
running: QGroundControl.mapEngineManager ? QGroundControl.mapEngineManager.importAction === QGCMapEngineManager.ActionExporting : false
width: exportCloseButton.height
height: exportCloseButton.height
anchors.horizontalCenter: parent.horizontalCenter
@ -1166,7 +1161,7 @@ QGCView { @@ -1166,7 +1161,7 @@ QGCView {
visible: QGroundControl.mapEngineManager.importAction === QGCMapEngineManager.ActionNone
anchors.horizontalCenter: parent.horizontalCenter
QGCButton {
text: qsTr("Import From Disk")
text: qsTr("Import")
width: _bigButtonSize * 1.25
onClicked: {
if(!QGroundControl.mapEngineManager.importSets()) {
@ -1176,13 +1171,6 @@ QGCView { @@ -1176,13 +1171,6 @@ QGCView {
}
}
QGCButton {
text: qsTr("Import From Device")
width: _bigButtonSize * 1.25
onClicked: {
rootLoader.sourceComponent = importFromDevice
}
}
QGCButton {
text: qsTr("Cancel")
width: _bigButtonSize * 1.25
onClicked: {
@ -1196,94 +1184,4 @@ QGCView { @@ -1196,94 +1184,4 @@ QGCView {
}
}
Component {
id: importFromDevice
Rectangle {
width: mainWindow.width
height: mainWindow.height
color: "black"
anchors.centerIn: parent
Rectangle {
width: parent.width * 0.45
height: importCol.height * 1.5
radius: ScreenTools.defaultFontPixelWidth
color: qgcPal.windowShadeDark
border.color: qgcPal.text
anchors.centerIn: parent
Column {
id: importCol
spacing: ScreenTools.defaultFontPixelHeight
width: parent.width
anchors.centerIn: parent
QGCLabel {
text: qsTr("Map Tile Set Import From Device");
font.family: ScreenTools.demiboldFontFamily
font.pointSize: ScreenTools.mediumFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
text: qsTr("NOT YET IMPLEMENTED");
font.family: ScreenTools.demiboldFontFamily
font.pointSize: ScreenTools.mediumFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
text: qsTr("Close")
width: _bigButtonSize * 1.25
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
showList();
rootLoader.sourceComponent = null
}
}
}
}
}
}
Component {
id: exportToDevice
Rectangle {
width: mainWindow.width
height: mainWindow.height
color: "black"
anchors.centerIn: parent
Rectangle {
width: parent.width * 0.45
height: importCol.height * 1.5
radius: ScreenTools.defaultFontPixelWidth
color: qgcPal.windowShadeDark
border.color: qgcPal.text
anchors.centerIn: parent
Column {
id: importCol
spacing: ScreenTools.defaultFontPixelHeight
width: parent.width
anchors.centerIn: parent
QGCLabel {
text: qsTr("Map Tile Set Export To Device");
font.family: ScreenTools.demiboldFontFamily
font.pointSize: ScreenTools.mediumFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
text: qsTr("NOT YET IMPLEMENTED");
font.family: ScreenTools.demiboldFontFamily
font.pointSize: ScreenTools.mediumFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
text: qsTr("Close")
width: _bigButtonSize * 1.25
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
showList();
rootLoader.sourceComponent = null
}
}
}
}
}
}
} // QGCView

4
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
Unescape View File

@ -421,8 +421,8 @@ QGCMapEngineManager::importSets(QString path) { @@ -421,8 +421,8 @@ QGCMapEngineManager::importSets(QString path) {
dir = QDir(QDir::homePath()).filePath(QString("export_%1.db").arg(QDateTime::currentDateTime().toTime_t()));
#else
dir = QGCQFileDialog::getOpenFileName(
MainWindow::instance(),
"Export Tile Set",
NULL,
"Import Tile Set",
QDir::homePath(),
"Tile Sets (*.qgctiledb)");
#endif

4
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h
Unescape View File

@ -58,7 +58,7 @@ public: @@ -58,7 +58,7 @@ public:
//-- Tile set export
Q_PROPERTY(int selectedCount READ selectedCount NOTIFY selectedCountChanged)
Q_PROPERTY(int actionProgress READ actionProgress NOTIFY actionProgressChanged)
Q_PROPERTY(ImportAction importAction READ importAction NOTIFY importActionChanged)
Q_PROPERTY(ImportAction importAction READ importAction WRITE setImportAction NOTIFY importActionChanged)
Q_PROPERTY(bool importReplace READ importReplace WRITE setImportReplace NOTIFY importReplaceChanged)
@ -103,7 +103,7 @@ public: @@ -103,7 +103,7 @@ public:
void setMaxMemCache (quint32 size);
void setMaxDiskCache (quint32 size);
void setImportReplace (bool replace) { _importReplace = replace; emit importReplaceChanged(); }
void setImportAction (ImportAction action) {_importAction = action; emit importActionChanged(); }
void setErrorMessage (const QString& error) { _errorMessage = error; emit errorMessageChanged(); }
// Override from QGCTool

Write Preview
Loading…
Cancel
Save