root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-10-06 06:53:21 +02:00
Code Issues Projects Releases Wiki Activity

Include default style in resources + use application specific style load path

Browse Source
This commit is contained in:
Martin Tůma 2018-11-01 18:15:05 +01:00
parent a8cbc962f5
commit 0edb1f0f06
5 changed files with 1706 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pbfplugin.pro
View File

@ -30,6 +30,7 @@ SOURCES += src/pbfplugin.cpp \
src/function.cpp \
src/textpathitem.cpp \
src/textitem.cpp
RESOURCES += pbfplugin.qrc
LIBS += -lprotobuf-lite

5
pbfplugin.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/">
<file>style/style.json</file>
</qresource>
</RCC>

16
src/pbfplugin.cpp
View File

@ -1,20 +1,20 @@
#include <QDir>
#include <QDebug>
#include <QStandardPaths>
#include "pbfplugin.h"
#include "pbfhandler.h"
#include "style.h"
#define GLOBAL_CONFIG "/usr/share/pbf/style.json"
#define USER_CONFIG QDir::homePath() + "/.pbf/style.json"
PBFPlugin::PBFPlugin()
{
_style = new Style(this);
if (!_style->load(USER_CONFIG))
if (!_style->load(GLOBAL_CONFIG))
qCritical() << "Map style not found";
QString style(QStandardPaths::locate(QStandardPaths::AppDataLocation,
"style/style.json"));
if (style.isEmpty() || !_style->load(style)) {
Q_INIT_RESOURCE(pbfplugin);
_style->load(":/style/style.json");
}
}
QImageIOPlugin::Capabilities PBFPlugin::capabilities(QIODevice *device,

13
src/style.cpp
View File

@ -415,12 +415,21 @@ void Style::Layer::drawSymbol(int zoom, const QPainterPath &path,
bool Style::load(const QString &fileName)
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
qCritical() << fileName << ": error opening file";
return false;
}
QByteArray ba(file.readAll());
file.close();
QJsonObject json(QJsonDocument::fromJson(ba).object());
QJsonParseError error;
QJsonDocument doc(QJsonDocument::fromJson(ba, &error));
if (doc.isNull()) {
qCritical() << fileName << ":" << error.errorString();
return false;
}
QJsonObject json(doc.object());
if (json.contains("layers") && json["layers"].isArray()) {
QJsonArray layers = json["layers"].toArray();
for (int i = 0; i < layers.size(); i++)

1681
style/style.json Normal file
View File

File diff suppressed because it is too large Load Diff