Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f5cdf449
Commit
f5cdf449
authored
Feb 18, 2016
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows fixes
parent
f30a47d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
QGCMapEngine.cpp
src/QtLocationPlugin/QGCMapEngine.cpp
+2
-3
QGeoTiledMappingManagerEngineQGC.cpp
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
+5
-1
QGCMapEngineManager.cc
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
+2
-3
No files found.
src/QtLocationPlugin/QGCMapEngine.cpp
View file @
f5cdf449
...
...
@@ -33,6 +33,7 @@ This file is part of the QGROUNDCONTROL project
#include <QSettings>
#include <QStandardPaths>
#include <QDir>
#include <stdio.h>
#include "QGCMapEngine.h"
#include "QGCMapTileSet.h"
...
...
@@ -208,9 +209,7 @@ QGCMapEngine::cacheTile(UrlFactory::MapType type, const QString& hash, const QBy
QString
QGCMapEngine
::
getTileHash
(
UrlFactory
::
MapType
type
,
int
x
,
int
y
,
int
z
)
{
char
hashSource
[
64
];
snprintf
(
hashSource
,
sizeof
(
hashSource
),
"%04d%08d%08d%03d"
,
(
int
)
type
,
x
,
y
,
z
);
return
QString
(
hashSource
);
return
QString
().
sprintf
(
"%04d%08d%08d%03d"
,
(
int
)
type
,
x
,
y
,
z
);
}
//-----------------------------------------------------------------------------
...
...
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
View file @
f5cdf449
...
...
@@ -226,9 +226,13 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters)
QGeoTileCache
*
pTileCache
=
createTileCacheWithDir
(
cacheDir
);
if
(
pTileCache
)
{
//-- We're basically telling it to use 1kb of disk for cache. It doesn't like
//-- We're basically telling it to use 1kb
(100k for Windows)
of disk for cache. It doesn't like
// values smaller than that and I could not find a way to make it NOT cache.
#ifdef Q_OS_WIN
pTileCache
->
setMaxDiskUsage
(
1024
*
100
);
#else
pTileCache
->
setMaxDiskUsage
(
1024
);
#endif
pTileCache
->
setMaxMemoryUsage
(
memLimit
);
}
}
...
...
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
View file @
f5cdf449
...
...
@@ -30,6 +30,7 @@
#include "QGCMapTileSet.h"
#include "QGCMapUrlEngine.h"
#include <QStorageInfo>
#include <stdio.h>
QGC_LOGGING_CATEGORY
(
QGCMapEngineManagerLog
,
"QGCMapEngineManagerLog"
)
...
...
@@ -378,10 +379,8 @@ QGCMapEngineManager::getUniqueName()
QString
name
;
int
count
=
1
;
while
(
true
)
{
char
numb
[
16
];
snprintf
(
numb
,
sizeof
(
numb
),
"%03d"
,
count
++
);
name
=
test
;
name
+=
numb
;
name
+=
QString
().
sprintf
(
"%03d"
,
count
++
)
;
if
(
!
findName
(
name
))
return
name
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment