mirror of
https://github.com/tumic0/QtPBFImagePlugin.git
synced 2025-07-01 05:29:15 +02:00
Compare commits
102 Commits
1.4
...
cb86e30fab
Author | SHA1 | Date | |
---|---|---|---|
cb86e30fab | |||
407f543039 | |||
f24a8a47a9 | |||
ce7b3d9158 | |||
f064148a0f | |||
733375fb74 | |||
440f7f91a4 | |||
dbcfd9b9d3 | |||
672de3919b | |||
0a696a6ab8 | |||
d8a521623a | |||
f5f006dc7b | |||
c86eb7bac2 | |||
3ef6c55d20 | |||
98933deb0e | |||
6e1bc09d62 | |||
ea98da4a74 | |||
8261ee2e79 | |||
d5c315efbe | |||
39ffdaf616 | |||
38b6e2320b | |||
b36fb5fa92 | |||
a7b7d16f4f | |||
8cf73b5bb5 | |||
038f4e7d64 | |||
aaff1c0bdb | |||
37c6c36204 | |||
f901243baa | |||
19c6b9854f | |||
52d15c63bd | |||
71331b06f1 | |||
d6a24a4498 | |||
a26c86dbd8 | |||
0db93fd5ee | |||
f8044efda6 | |||
450a1458a3 | |||
bff8c7229c | |||
ff569644b6 | |||
6a32f0a447 | |||
1051a1c5b2 | |||
11e360d9a4 | |||
5577590f6b | |||
9dba35082b | |||
76f1a23f8d | |||
f931b653c4 | |||
b0885a4b05 | |||
7c34a2c4e1 | |||
0cb3edda05 | |||
871aad37da | |||
12c878d8e2 | |||
44862114ab | |||
1065a27bfb | |||
3c22cd7823 | |||
1afd242302 | |||
ae8b2f00db | |||
e22ea9aa12 | |||
62a78fdaae | |||
63f86a900e | |||
ea8819a381 | |||
ee49c05eb9 | |||
29d4008068 | |||
60691060ea | |||
9b63d1d362 | |||
7822bdd42c | |||
fe97e9d238 | |||
fd02b83b47 | |||
7684f4fdcf | |||
9772c2f67f | |||
e3c940dd07 | |||
e2bb9f5b14 | |||
032c699e8b | |||
a298cfc47d | |||
402e1e3adc | |||
254e93e583 | |||
95d4fee453 | |||
a6547d27d3 | |||
3e065f87fa | |||
61291bb202 | |||
154114dd2a | |||
c0a7d64a1d | |||
d8df5cb595 | |||
543bf63017 | |||
7ea19d260c | |||
0185cd904f | |||
ec6302d524 | |||
0916d6330c | |||
cc0c16cfd6 | |||
8da172c0ff | |||
148f79eaef | |||
1c42f104d1 | |||
536cad2d61 | |||
ff1c29e078 | |||
e8e9139740 | |||
a58962ab93 | |||
aacc42c25d | |||
3f6b5faa2c | |||
5b6a222999 | |||
e00c8feab6 | |||
82308857ba | |||
044e95e061 | |||
f5c15ece52 | |||
df4134c03a |
32
.appveyor.yml
Normal file
32
.appveyor.yml
Normal file
@ -0,0 +1,32 @@
|
||||
version: 3.0.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
||||
image:
|
||||
- Visual Studio 2022
|
||||
|
||||
environment:
|
||||
VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md
|
||||
matrix:
|
||||
- QTDIR: C:\Qt\5.15\msvc2019_64
|
||||
- QTDIR: C:\Qt\6.5\msvc2019_64
|
||||
|
||||
install:
|
||||
- cmd: |-
|
||||
set PATH=%QTDIR%\bin;%VCPKGDIR%\tools\protobuf;%PATH%
|
||||
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
|
||||
vcpkg install protobuf:x64-windows-static-md
|
||||
vcpkg install zlib:x64-windows-static-md
|
||||
copy /y %VCPKGDIR%\lib\zlib.lib %VCPKGDIR%\lib\zlibstatic.lib
|
||||
|
||||
build_script:
|
||||
- cmd: |-
|
||||
qmake PROTOBUF=%VCPKGDIR% ZLIB=%VCPKGDIR% pbfplugin.pro
|
||||
nmake release
|
||||
|
||||
artifacts:
|
||||
- path: release\pbf3.dll
|
||||
|
||||
cache:
|
||||
- C:\tools\vcpkg\installed\
|
1
.github/FUNDING.yml
vendored
Normal file
1
.github/FUNDING.yml
vendored
Normal file
@ -0,0 +1 @@
|
||||
github: tumic0
|
54
.github/workflows/android.yml
vendored
Normal file
54
.github/workflows/android.yml
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
name: Android
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: QtPBFImagePlugin
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install protobuf compiler
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install protobuf-compiler
|
||||
- name: set up JDK 11
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '11'
|
||||
- name: Setup Android SDK
|
||||
uses: android-actions/setup-android@v2
|
||||
- name: Run sdkmanager update
|
||||
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
|
||||
- name: Install android platform, platform-tools, build-tools and ndk
|
||||
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
|
||||
- name: Setup NDK path
|
||||
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
|
||||
- name: Install Qt (Desktop)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==3.1.*'
|
||||
version: '6.4.0'
|
||||
- name: Install Qt (Android)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==3.1.*'
|
||||
version: '6.4.0'
|
||||
target: 'android'
|
||||
arch: 'android_arm64_v8a'
|
||||
- name: Install Android Google Protocol Buffers
|
||||
run: git clone https://github.com/tumic0/android_protobuf.git
|
||||
- name: Configure build
|
||||
run: qmake pbfplugin.pro PROTOBUF=android_protobuf
|
||||
- name: Build project
|
||||
run: make -j2
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: libplugins_imageformats_libpbf_arm64-v8a.so
|
||||
path: plugins/libpbf/libplugins_imageformats_libpbf_arm64-v8a.so
|
22
.github/workflows/linux.yml
vendored
Normal file
22
.github/workflows/linux.yml
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
name: Linux
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: QtPBFImagePlugin
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake libprotobuf-dev protobuf-compiler zlib1g-dev
|
||||
- name: Configure build
|
||||
run: qmake pbfplugin.pro
|
||||
- name: Build project
|
||||
run: make -j2
|
37
.github/workflows/osx.yml
vendored
Normal file
37
.github/workflows/osx.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
name: OS X
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
qt5:
|
||||
name: QtPBFImagePlugin Qt5 build
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@5/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt@5 protobuf@21
|
||||
- name: Configure build
|
||||
run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro
|
||||
- name: Build project
|
||||
run: make -j3
|
||||
|
||||
qt6:
|
||||
name: QtPBFImagePlugin Qt6 build
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@6/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt@6 protobuf@21
|
||||
- name: Configure build
|
||||
run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro
|
||||
- name: Build project
|
||||
run: make -j3
|
17
.gitignore
vendored
Normal file
17
.gitignore
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
# Object files
|
||||
*.o
|
||||
|
||||
# Protobuf stuff
|
||||
protobuf/vector_tile.pb.cc
|
||||
protobuf/vector_tile.pb.h
|
||||
|
||||
# Qt stuff
|
||||
/.qmake.stash
|
||||
moc_*.cpp
|
||||
moc_*.h
|
||||
qrc_*.cpp
|
||||
Makefile*
|
||||
|
||||
# lib
|
||||
libpbf.so
|
||||
pbf.dylib
|
22
.travis.yml
22
.travis.yml
@ -1,22 +0,0 @@
|
||||
language: c++
|
||||
dist: xenial
|
||||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
|
||||
env:
|
||||
- QT_SELECT=qt5
|
||||
|
||||
before_install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
|
||||
|
||||
install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt protobuf; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake libprotobuf-dev protobuf-compiler; fi
|
||||
|
||||
script:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then qmake PROTOBUF=/usr/local pbfplugin.pro; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then qmake pbfplugin.pro; fi
|
||||
- make
|
106
README.md
106
README.md
@ -7,40 +7,67 @@ displaying raster MBTiles maps or raster XYZ online maps to also display
|
||||
PBF(MVT) vector tiles without (almost, see usage) any application modifications.
|
||||
|
||||
Standard Mapbox GL Styles are used for styling the maps. Most relevant style
|
||||
features used by [Maputnik](http://editor.openmaptiles.org) are supported.
|
||||
The style is loaded from the
|
||||
[$AppDataLocation](http://doc.qt.io/qt-5/qstandardpaths.html)/style/style.json
|
||||
file on plugin load. If the style uses a sprite, the sprite JSON file must
|
||||
be named sprite.json and the sprite image sprite.png and both files must be
|
||||
placed in the same directory as the style itself. A default fallback style
|
||||
(OSM-Liberty) for OpenMapTiles is part of the plugin.
|
||||
features used by [Maputnik](https://maputnik.github.io/editor) are supported.
|
||||
A default fallback style (OSM-Liberty) for OpenMapTiles is part of the plugin.
|
||||
|
||||
"Plain" PBF files as well as gzip compressed files (as used in MBTiles) are
|
||||
supported by the plugin.
|
||||
supported by the plugin. The tile size is (since version 2.0 of the plugin) 512px
|
||||
to fit the styles and available data (OpenMapTiles, Mapbox tiles).
|
||||
|
||||
## Usage
|
||||
Due to a major design flaw in the Mapbox vector tiles specification - the zoom
|
||||
is not part of the PBF data - the plugin can not be used "as is", but passing
|
||||
the zoom level is necessary. This is done by exploiting the optional *format*
|
||||
parameter of the QImage constructor or the QImage::fromData() or
|
||||
QPixmap::loadFromData() functions. The zoom number is passed as ASCII string
|
||||
parameter of the QImage constructor or the *QImage::loadFromData()* or
|
||||
*QPixmap::loadFromData()* functions. The zoom number is passed as ASCII string
|
||||
to the functions:
|
||||
```cpp
|
||||
QPixmap pm;
|
||||
pm.loadFromData(tileData, QString::number(zoom).toLatin1());
|
||||
QImage img;
|
||||
img.loadFromData(data, QByteArray::number(zoom));
|
||||
```
|
||||
The plugin supports vector scaling using QImageReader's setScaledSize() method,
|
||||
|
||||
For a complete code sample see the [pbf2png](https://github.com/tumic0/pbf2png)
|
||||
conversion utility.
|
||||
|
||||
### HiDPI
|
||||
The plugin supports vector scaling using QImageReader's *setScaledSize()* method,
|
||||
so when used like in the following example:
|
||||
```cpp
|
||||
QImageReader reader(file, QString::number(zoom).toLatin1());
|
||||
reader.setScaledSize(QSize(512, 512));
|
||||
reader.read(&image);
|
||||
QImage img;
|
||||
QImageReader reader(file, QByteArray::number(zoom));
|
||||
reader.setScaledSize(QSize(1024, 1024));
|
||||
reader.read(&img);
|
||||
```
|
||||
you will get 512x512px tiles with a pixel ratio of 2 (= HiDPI tiles).
|
||||
you will get 1024x1024px tiles with a pixel ratio of 2 (= HiDPI tiles).
|
||||
|
||||
### Overzoom
|
||||
Since version 3 of the plugin tile overzoom is supported. If you set *format*
|
||||
to `$zoom;$overzoom`:
|
||||
```cpp
|
||||
QImage img;
|
||||
QByteArray fmt(QByteArray::number(zoom) + ';' + QByteArray::number(overzoom));
|
||||
img.loadFromData(data, fmt);
|
||||
```
|
||||
you will get (512<<overzoom)x(512<<overzoom)px tiles with a pixel ratio of 1.
|
||||
When overzoom is combined with setScaledSize(), the base size is the overzoomed
|
||||
tile size.
|
||||
|
||||
## Styles
|
||||
The map style is loaded from the
|
||||
[$AppDataLocation](http://doc.qt.io/qt-5/qstandardpaths.html)/style/style.json
|
||||
file on plugin load. If the style uses a sprite, the sprite JSON file must
|
||||
be named `sprite.json` and the sprite image `sprite.png` and both files must be
|
||||
placed in the same directory as the style itself. *A style compatible with the
|
||||
tiles data schema (Mapbox, OpenMapTiles, Tilezen, Ordnance Survey, Esri, ...)
|
||||
must be used.*
|
||||
|
||||
For a list of "ready to use" styles see the
|
||||
[QtPBFImagePlugin-styles](https://github.com/tumic0/QtPBFImagePlugin-styles)
|
||||
repository.
|
||||
|
||||
## Build
|
||||
### Requirements
|
||||
* Qt >= 5.4 (5.6 for HiDPI support)
|
||||
* Qt5 >= 5.11 or Qt6
|
||||
* Google Protocol Buffers (protobuf-lite)
|
||||
* Zlib
|
||||
|
||||
@ -72,22 +99,45 @@ for most common distros available on OBS.
|
||||
style are ignored.
|
||||
* Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text layout
|
||||
algorithm to work properly.
|
||||
* Expressions are not supported in the styles, only property functions are implemented.
|
||||
|
||||
## Changelog
|
||||
[Changelog](https://build.opensuse.org/package/view_file/home:tumic:QtPBFImagePlugin/QtPBFImagePlugin/libqt5-qtpbfimageformat.changes)
|
||||
|
||||
## Status
|
||||
A picture is worth a thousand words. Data and styles from https://openmaptiles.org.
|
||||
#### OSM-liberty
|
||||

|
||||
A picture is worth a thousand words.
|
||||
#### OpenMapTiles
|
||||
|
||||
* Data: [MapTiler](https://github.com/tumic0/GPXSee-maps/blob/master/World/MapTiler.tpl)
|
||||
* Style: [OSM-liberty](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/OpenMapTiles/osm-liberty/style.json)
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
#### Klokantech-basic
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
#### Mapbox
|
||||
|
||||
* Data: [Mapbox](https://github.com/tumic0/GPXSee-maps/blob/master/World/Mapbox.tpl)
|
||||
* Style: [Bright](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/Mapbox/bright/style.json)
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
#### Tilezen
|
||||
|
||||
* Data: [HERE](https://github.com/tumic0/GPXSee-maps/blob/master/World/here-vector.tpl)
|
||||
* Style: [Apollo-Bright](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/Tilezen/apollo-bright/style.json)
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
## Applications using QtPBFImagePlugin
|
||||
* [GPXSee](https://www.gpxsee.org)
|
||||
|
@ -2,6 +2,7 @@ TARGET = pbf
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin
|
||||
QT += gui
|
||||
VERSION = 3.0
|
||||
|
||||
PROTOS = protobuf/vector_tile.proto
|
||||
include(protobuf/vector_tile.pri)
|
||||
@ -20,8 +21,7 @@ HEADERS += src/pbfhandler.h \
|
||||
src/textpointitem.h \
|
||||
src/font.h \
|
||||
src/textitem.h \
|
||||
src/sprites.h \
|
||||
src/config.h
|
||||
src/sprites.h
|
||||
SOURCES += src/pbfplugin.cpp \
|
||||
src/pbfhandler.cpp \
|
||||
src/gzip.cpp \
|
||||
@ -37,21 +37,36 @@ SOURCES += src/pbfplugin.cpp \
|
||||
src/textitem.cpp
|
||||
RESOURCES += pbfplugin.qrc
|
||||
|
||||
unix:!macx{
|
||||
DEFINES += QT_NO_DEPRECATED_WARNINGS
|
||||
|
||||
unix:!macx:!android {
|
||||
LIBS += -lprotobuf-lite \
|
||||
-lz
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
||||
INSTALLS += target
|
||||
}
|
||||
win32 {
|
||||
INCLUDEPATH += $$PROTOBUF/include \
|
||||
$$ZLIB/include
|
||||
LIBS += $$PROTOBUF/lib/libprotobuf-lite.lib \
|
||||
$$ZLIB/lib/zlibstatic.lib
|
||||
|
||||
QMAKE_TARGET_PRODUCT = QtPBFImagePlugin
|
||||
QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin
|
||||
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2023 Martin Tuma
|
||||
}
|
||||
macx {
|
||||
INCLUDEPATH += $$PROTOBUF/include
|
||||
LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \
|
||||
-lz
|
||||
}
|
||||
android {
|
||||
INCLUDEPATH += $$PROTOBUF/include
|
||||
LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \
|
||||
-lz
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
||||
INSTALLS += target
|
||||
top_builddir=$$shadowed($$PWD)
|
||||
DESTDIR = $$top_builddir/plugins/libpbf
|
||||
TARGET = $$qt5LibraryTarget(libpbf, "plugins/imageformats/")
|
||||
}
|
||||
|
10
src/config.h
10
src/config.h
@ -1,10 +0,0 @@
|
||||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
|
||||
#define ENABLE_HIDPI
|
||||
#endif // QT >= 5.6
|
||||
|
||||
#endif // CONFIG_H
|
@ -34,13 +34,19 @@ static QColor interpolate(const QPair<qreal, QColor> &p0,
|
||||
? progress / difference
|
||||
: (pow(base, progress) - 1) / (pow(base, difference) - 1);
|
||||
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
qreal p0h, p0s, p0l, p0a;
|
||||
p0.second.getHslF(&p0h, &p0s, &p0l, &p0a);
|
||||
qreal p1h, p1s, p1l, p1a;
|
||||
#else // QT6
|
||||
float p0h, p0s, p0l, p0a;
|
||||
float p1h, p1s, p1l, p1a;
|
||||
#endif // QT6
|
||||
p0.second.getHslF(&p0h, &p0s, &p0l, &p0a);
|
||||
p1.second.getHslF(&p1h, &p1s, &p1l, &p1a);
|
||||
|
||||
return QColor::fromHslF(f(p0h, p1h, ratio), f(p0s, p1s, ratio),
|
||||
/* Qt returns a hue of -1 for achromatic colors. We convert it to a hue of 1
|
||||
using qAbs() to enable interpolation of grayscale colors */
|
||||
return QColor::fromHslF(f(qAbs(p0h), qAbs(p1h), ratio), f(p0s, p1s, ratio),
|
||||
f(p0l, p1l, ratio), f(p0a, p1a, ratio));
|
||||
}
|
||||
|
||||
|
69
src/gzip.cpp
69
src/gzip.cpp
@ -1,35 +1,58 @@
|
||||
#include <QtEndian>
|
||||
#include <QDebug>
|
||||
#include <QIODevice>
|
||||
#include <zlib.h>
|
||||
#include "gzip.h"
|
||||
|
||||
#define CHUNK 16384
|
||||
|
||||
QByteArray Gzip::uncompress(const QByteArray &data)
|
||||
QByteArray Gzip::uncompress(QIODevice *device, int limit)
|
||||
{
|
||||
int ret = Z_STREAM_END;
|
||||
z_stream strm;
|
||||
unsigned char in[CHUNK];
|
||||
unsigned char out[CHUNK];
|
||||
qint64 rs;
|
||||
QByteArray uba;
|
||||
z_stream stream;
|
||||
|
||||
quint32 *size = (quint32*)(data.constData() + data.size() - sizeof(quint32));
|
||||
uba.resize(qFromLittleEndian(*size));
|
||||
|
||||
stream.zalloc = Z_NULL;
|
||||
stream.zfree = Z_NULL;
|
||||
stream.opaque = Z_NULL;
|
||||
strm.zalloc = Z_NULL;
|
||||
strm.zfree = Z_NULL;
|
||||
strm.opaque = Z_NULL;
|
||||
strm.avail_in = 0;
|
||||
strm.next_in = Z_NULL;
|
||||
if (inflateInit2(&strm, MAX_WBITS + 16) != Z_OK)
|
||||
return QByteArray();
|
||||
|
||||
stream.next_in = (Bytef*)data.constData();
|
||||
stream.avail_in = data.size();
|
||||
stream.next_out = (Bytef*)uba.data();
|
||||
stream.avail_out = uba.size();
|
||||
do {
|
||||
rs = device->read((char*)in, CHUNK);
|
||||
if (rs < 0) {
|
||||
(void)inflateEnd(&strm);
|
||||
return QByteArray();
|
||||
} else if (rs == 0)
|
||||
break;
|
||||
else
|
||||
strm.avail_in = (uInt)rs;
|
||||
strm.next_in = in;
|
||||
|
||||
if (inflateInit2(&stream, MAX_WBITS + 16) != Z_OK)
|
||||
return uba;
|
||||
do {
|
||||
strm.avail_out = CHUNK;
|
||||
strm.next_out = out;
|
||||
ret = inflate(&strm, Z_NO_FLUSH);
|
||||
Q_ASSERT(ret != Z_STREAM_ERROR);
|
||||
switch (ret) {
|
||||
case Z_NEED_DICT:
|
||||
case Z_DATA_ERROR:
|
||||
case Z_MEM_ERROR:
|
||||
(void)inflateEnd(&strm);
|
||||
return QByteArray();
|
||||
}
|
||||
uba.append((char*)out, CHUNK - strm.avail_out);
|
||||
if (limit && uba.size() >= limit) {
|
||||
(void)inflateEnd(&strm);
|
||||
return uba;
|
||||
}
|
||||
} while (!strm.avail_out);
|
||||
} while (ret != Z_STREAM_END);
|
||||
|
||||
if (inflate(&stream, Z_NO_FLUSH) != Z_STREAM_END) {
|
||||
qCritical() << "Invalid gzip data";
|
||||
uba = QByteArray();
|
||||
}
|
||||
|
||||
inflateEnd(&stream);
|
||||
|
||||
return uba;
|
||||
(void)inflateEnd(&strm);
|
||||
return (ret == Z_STREAM_END) ? uba : QByteArray();
|
||||
}
|
||||
|
@ -3,9 +3,11 @@
|
||||
|
||||
#include <QByteArray>
|
||||
|
||||
class QIODevice;
|
||||
|
||||
namespace Gzip
|
||||
{
|
||||
QByteArray uncompress(const QByteArray &data);
|
||||
QByteArray uncompress(QIODevice *device, int limit = 0);
|
||||
}
|
||||
|
||||
#endif // GZIP_H
|
||||
|
@ -100,7 +100,7 @@ PBF::Layer::Layer(const vector_tile::Tile_Layer *data) : _data(data)
|
||||
_features.reserve(data->features_size());
|
||||
for (int i = 0; i < data->features_size(); i++)
|
||||
_features.append(Feature(&(data->features(i)), this));
|
||||
qSort(_features.begin(), _features.end());
|
||||
std::sort(_features.begin(), _features.end());
|
||||
}
|
||||
|
||||
PBF::PBF(const vector_tile::Tile &tile)
|
||||
@ -113,7 +113,5 @@ PBF::PBF(const vector_tile::Tile &tile)
|
||||
|
||||
PBF::~PBF()
|
||||
{
|
||||
for (QHash<QString, Layer*>::iterator it = _layers.begin();
|
||||
it != _layers.end(); it++)
|
||||
delete *it;
|
||||
qDeleteAll(_layers);
|
||||
}
|
||||
|
@ -8,24 +8,24 @@
|
||||
#include "pbfhandler.h"
|
||||
|
||||
|
||||
#define TILE_SIZE 256
|
||||
#define TILE_SIZE 512
|
||||
|
||||
#define GZIP_MAGIC 0x1F8B0800
|
||||
#define GZIP_MAGIC_MASK 0xFFFFFF00
|
||||
#define PBF_MAGIC 0x1A000000
|
||||
#define PBF_MAGIC_MASK 0xFF000000
|
||||
#define GZIP_MAGIC 0x1F8B
|
||||
#define GZIP_MAGIC_MASK 0xFFFF
|
||||
#define PBF_MAGIC 0x1A00
|
||||
#define PBF_MAGIC_MASK 0xFF00
|
||||
|
||||
static bool isMagic(quint32 magic, quint32 mask, quint32 value)
|
||||
static bool isMagic(quint16 magic, quint16 mask, quint16 value)
|
||||
{
|
||||
return ((qFromBigEndian(value) & mask) == magic);
|
||||
}
|
||||
|
||||
static bool isGZIPPBF(quint32 magic)
|
||||
static bool isGZIPPBF(quint16 magic)
|
||||
{
|
||||
return isMagic(GZIP_MAGIC, GZIP_MAGIC_MASK, magic);
|
||||
}
|
||||
|
||||
static bool isPlainPBF(quint32 magic)
|
||||
static bool isPlainPBF(quint16 magic)
|
||||
{
|
||||
return isMagic(PBF_MAGIC, PBF_MAGIC_MASK, magic);
|
||||
}
|
||||
@ -34,7 +34,7 @@ static bool isPlainPBF(quint32 magic)
|
||||
bool PBFHandler::canRead() const
|
||||
{
|
||||
if (canRead(device())) {
|
||||
setFormat("pbf");
|
||||
setFormat("mvt");
|
||||
return true;
|
||||
} else
|
||||
return false;
|
||||
@ -42,43 +42,56 @@ bool PBFHandler::canRead() const
|
||||
|
||||
bool PBFHandler::canRead(QIODevice *device)
|
||||
{
|
||||
quint32 magic;
|
||||
quint16 magic;
|
||||
qint64 size = device->peek((char*)&magic, sizeof(magic));
|
||||
if (size != sizeof(magic))
|
||||
return false;
|
||||
|
||||
return (isGZIPPBF(magic) || isPlainPBF(magic));
|
||||
if (isPlainPBF(magic))
|
||||
return true;
|
||||
else if (isGZIPPBF(magic)) {
|
||||
QByteArray ba(Gzip::uncompress(device, sizeof(magic)));
|
||||
if (ba.size() < (int)sizeof(magic))
|
||||
return false;
|
||||
return isPlainPBF(*((quint16*)ba.constData()));
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
|
||||
bool PBFHandler::read(QImage *image)
|
||||
{
|
||||
quint32 magic;
|
||||
quint16 magic;
|
||||
if (device()->peek((char*)&magic, sizeof(magic)) != sizeof(magic))
|
||||
return false;
|
||||
|
||||
QByteArray ba;
|
||||
if (isGZIPPBF(magic))
|
||||
ba = Gzip::uncompress(device()->readAll());
|
||||
else if (isPlainPBF(magic))
|
||||
if (isGZIPPBF(magic)) {
|
||||
ba = Gzip::uncompress(device());
|
||||
if (ba.isNull()) {
|
||||
qCritical() << "Invalid gzip data";
|
||||
return false;
|
||||
}
|
||||
} else if (isPlainPBF(magic))
|
||||
ba = device()->readAll();
|
||||
if (ba.isNull())
|
||||
return false;
|
||||
vector_tile::Tile data;
|
||||
if (!data.ParseFromArray(ba.constData(), ba.size())) {
|
||||
qCritical() << "Invalid PBF data";
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ok;
|
||||
int zoom = format().toInt(&ok);
|
||||
QList<QByteArray> list(format().split(';'));
|
||||
int zoom = list.size() ? list.first().toInt() : 0;
|
||||
int overzoom = (list.size() > 1) ? list.at(1).toInt() : 0;
|
||||
|
||||
QSize scaledSize(_scaledSize.isValid()
|
||||
? _scaledSize : QSize(TILE_SIZE, TILE_SIZE));
|
||||
QSize size(scaledSize.width()<<overzoom,
|
||||
scaledSize.height()<<overzoom);
|
||||
QPointF scale((qreal)scaledSize.width() / TILE_SIZE,
|
||||
(qreal)scaledSize.height() / TILE_SIZE);
|
||||
|
||||
QSize size = _scaledSize.isValid()
|
||||
? _scaledSize : QSize(TILE_SIZE, TILE_SIZE);
|
||||
QPointF scale = _scaledSize.isValid()
|
||||
? QPointF(_scaledSize.width() / TILE_SIZE, _scaledSize.height() / TILE_SIZE)
|
||||
: QPointF(1.0, 1.0);
|
||||
*image = QImage(size, QImage::Format_ARGB32_Premultiplied);
|
||||
Tile tile(image, ok ? zoom : -1, scale);
|
||||
Tile tile(image, zoom, scale);
|
||||
|
||||
_style->render(data, tile);
|
||||
|
||||
|
@ -9,9 +9,9 @@
|
||||
Loading the sprites atlas image must be deferred until all image plugins
|
||||
are loaded, otherwise reading the image will cause a deadlock!
|
||||
*/
|
||||
static const QImage *atlas(const QString &fileName)
|
||||
static const QImage &atlas(const QString &fileName)
|
||||
{
|
||||
static QImage *img = new QImage(fileName);
|
||||
static QImage img(fileName);
|
||||
return img;
|
||||
}
|
||||
|
||||
@ -86,18 +86,18 @@ QImage Sprites::icon(const QString &name) const
|
||||
if (_imageFile.isEmpty())
|
||||
return QImage();
|
||||
|
||||
const QImage *img = atlas(_imageFile);
|
||||
if (img->isNull())
|
||||
const QImage &img = atlas(_imageFile);
|
||||
if (img.isNull())
|
||||
return QImage();
|
||||
|
||||
QMap<QString, Sprite>::const_iterator it = _sprites.find(name);
|
||||
if (it == _sprites.constEnd())
|
||||
return QImage();
|
||||
|
||||
if (!img->rect().contains(it->rect()))
|
||||
if (!img.rect().contains(it->rect()))
|
||||
return QImage();
|
||||
|
||||
QImage ret(img->copy(it->rect()));
|
||||
QImage ret(img.copy(it->rect()));
|
||||
ret.setDevicePixelRatio(it->pixelRatio());
|
||||
|
||||
return ret;
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <QJsonArray>
|
||||
#include <QFileInfo>
|
||||
#include <QDir>
|
||||
#include <QRegularExpression>
|
||||
#include <QDebug>
|
||||
#include "text.h"
|
||||
#include "color.h"
|
||||
@ -138,22 +139,46 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
|
||||
if (!(v = feature.value(_kv.first)))
|
||||
return false;
|
||||
else
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
return *v > _kv.second;
|
||||
#else // QT6
|
||||
return (QVariant::compare(*v, _kv.second)
|
||||
== QPartialOrdering::Greater);
|
||||
#endif // QT6
|
||||
case GE:
|
||||
if (!(v = feature.value(_kv.first)))
|
||||
{if (!(v = feature.value(_kv.first)))
|
||||
return false;
|
||||
else
|
||||
else {
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
return *v >= _kv.second;
|
||||
#else // QT6
|
||||
QPartialOrdering res = QVariant::compare(*v, _kv.second);
|
||||
return (res == QPartialOrdering::Greater
|
||||
|| res == QPartialOrdering::Equivalent);
|
||||
#endif // QT6
|
||||
}}
|
||||
case LT:
|
||||
if (!(v = feature.value(_kv.first)))
|
||||
return false;
|
||||
else
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
return *v < _kv.second;
|
||||
#else // QT6
|
||||
return (QVariant::compare(*v, _kv.second)
|
||||
== QPartialOrdering::Less);
|
||||
#endif // QT6
|
||||
case LE:
|
||||
if (!(v = feature.value(_kv.first)))
|
||||
{if (!(v = feature.value(_kv.first)))
|
||||
return false;
|
||||
else
|
||||
else {
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
return *v <= _kv.second;
|
||||
#else // QT6
|
||||
QPartialOrdering res = QVariant::compare(*v, _kv.second);
|
||||
return (res == QPartialOrdering::Less
|
||||
|| res == QPartialOrdering::Equivalent);
|
||||
#endif // QT6
|
||||
}}
|
||||
case In:
|
||||
if (!(v = feature.value(_kv.first)))
|
||||
return _not;
|
||||
@ -172,7 +197,7 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
|
||||
return true;
|
||||
return false;
|
||||
case GeometryType:
|
||||
return feature.type() == _kv.second.toUInt();
|
||||
return feature.type() == _kv.second.toInt();
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
@ -180,15 +205,15 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
|
||||
|
||||
QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const
|
||||
{
|
||||
QRegExp rx = QRegExp("\\{[^\\}]*\\}");
|
||||
QRegularExpression rx("\\{[^\\}]*\\}");
|
||||
QString text(_field.value(zoom));
|
||||
QRegularExpressionMatchIterator it = rx.globalMatch(text);
|
||||
QStringList keys;
|
||||
int pos = 0;
|
||||
|
||||
while ((pos = rx.indexIn(text, pos)) != -1) {
|
||||
QString match = rx.capturedTexts().first();
|
||||
keys.append(match.mid(1, match.size() - 2));
|
||||
pos += rx.matchedLength();
|
||||
while (it.hasNext()) {
|
||||
QRegularExpressionMatch match = it.next();
|
||||
QString val = match.captured(0);
|
||||
keys.append(val.mid(1, val.size() - 2));
|
||||
}
|
||||
for (int i = 0; i < keys.size(); i++) {
|
||||
const QString &key = keys.at(i);
|
||||
@ -348,6 +373,12 @@ Style::Layer::Layout::Layout(const QJsonObject &json)
|
||||
|
||||
// symbol
|
||||
_symbolPlacement = FunctionS(json["symbol-placement"]);
|
||||
|
||||
// visibility
|
||||
if (json.contains("visibility") && json["visibility"].isString())
|
||||
_visible = !(json["visibility"].toString() == "none");
|
||||
else
|
||||
_visible = true;
|
||||
}
|
||||
|
||||
QFont Style::Layer::Layout::font(int zoom) const
|
||||
@ -437,7 +468,7 @@ Text::RotationAlignment Style::Layer::Layout::textRotationAlignment(int zoom)
|
||||
}
|
||||
|
||||
Style::Layer::Layer(const QJsonObject &json)
|
||||
: _type(Unknown), _minZoom(-1), _maxZoom(-1)
|
||||
: _type(Unknown), _minZoom(0), _maxZoom(24)
|
||||
{
|
||||
// type
|
||||
QString type(json["type"].toString());
|
||||
@ -475,12 +506,8 @@ Style::Layer::Layer(const QJsonObject &json)
|
||||
|
||||
bool Style::Layer::match(int zoom, const PBF::Feature &feature) const
|
||||
{
|
||||
if (zoom >= 0) {
|
||||
if (_minZoom > 0 && zoom < _minZoom)
|
||||
return false;
|
||||
if (_maxZoom > 0 && zoom > _maxZoom)
|
||||
return false;
|
||||
}
|
||||
if (zoom >= 0 && (zoom < _minZoom || zoom > _maxZoom))
|
||||
return false;
|
||||
|
||||
return _filter.match(feature);
|
||||
}
|
||||
@ -573,22 +600,15 @@ bool Style::load(const QString &fileName)
|
||||
|
||||
QDir styleDir = QFileInfo(fileName).absoluteDir();
|
||||
loadSprites(styleDir, "sprite.json", "sprite.png", _sprites);
|
||||
#ifdef ENABLE_HIDPI
|
||||
loadSprites(styleDir, "sprite@2x.json", "sprite@2x.png", _sprites2x);
|
||||
#endif // ENABLE_HIDPI
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
const Sprites &Style::sprites(const QPointF &scale) const
|
||||
{
|
||||
#ifdef ENABLE_HIDPI
|
||||
return (scale.x() > 1.0 || scale.y() > 1.0)
|
||||
&& !_sprites2x.isNull() ? _sprites2x : _sprites;
|
||||
#else // ENABLE_HIDPI
|
||||
Q_UNUSED(scale);
|
||||
return _sprites;
|
||||
#endif // ENABLE_HIDPI
|
||||
}
|
||||
|
||||
void Style::setupLayer(Tile &tile, const Layer &layer) const
|
||||
@ -601,7 +621,8 @@ void Style::setupLayer(Tile &tile, const Layer &layer) const
|
||||
|
||||
void Style::drawBackground(Tile &tile) const
|
||||
{
|
||||
QRectF rect(QPointF(0, 0), tile.size());
|
||||
QRectF rect(QPointF(0, 0), QSizeF(tile.size().width() / tile.scale().x(),
|
||||
tile.size().height() / tile.scale().y()));
|
||||
QPainterPath path;
|
||||
path.addRect(rect);
|
||||
|
||||
@ -640,6 +661,9 @@ void Style::drawLayer(const PBF::Layer &pbfLayer, const Layer &styleLayer,
|
||||
if (pbfLayer.data()->version() > 2)
|
||||
return;
|
||||
|
||||
if (!styleLayer.isVisible())
|
||||
return;
|
||||
|
||||
QSizeF factor(tile.size().width() / tile.scale().x() /
|
||||
(qreal)pbfLayer.data()->extent(), tile.size().height() / tile.scale().y()
|
||||
/ (qreal)pbfLayer.data()->extent());
|
||||
|
13
src/style.h
13
src/style.h
@ -12,7 +12,6 @@
|
||||
#include <QBrush>
|
||||
#include <QFont>
|
||||
#include "pbf.h"
|
||||
#include "config.h"
|
||||
#include "text.h"
|
||||
#include "function.h"
|
||||
#include "sprites.h"
|
||||
@ -35,13 +34,14 @@ public:
|
||||
private:
|
||||
class Layer {
|
||||
public:
|
||||
Layer() : _type(Unknown), _minZoom(-1), _maxZoom(-1) {}
|
||||
Layer() : _type(Unknown), _minZoom(0), _maxZoom(24) {}
|
||||
Layer(const QJsonObject &json);
|
||||
|
||||
const QString &sourceLayer() const {return _sourceLayer;}
|
||||
bool isPath() const {return (_type == Line || _type == Fill);}
|
||||
bool isBackground() const {return (_type == Background);}
|
||||
bool isSymbol() const {return (_type == Symbol);}
|
||||
bool isVisible() const {return (_layout.visible());}
|
||||
|
||||
bool match(int zoom, const PBF::Feature &feature) const;
|
||||
void setPathPainter(Tile &tile, const Sprites &sprites) const;
|
||||
@ -92,7 +92,7 @@ private:
|
||||
class Layout {
|
||||
public:
|
||||
Layout() : _textSize(16), _textMaxWidth(10), _textMaxAngle(45),
|
||||
_font("Open Sans") {}
|
||||
_font("Open Sans"), _visible(true) {}
|
||||
Layout(const QJsonObject &json);
|
||||
|
||||
qreal maxTextWidth(int zoom) const
|
||||
@ -109,6 +109,7 @@ private:
|
||||
Text::Anchor textAnchor(int zoom) const;
|
||||
Text::SymbolPlacement symbolPlacement(int zoom) const;
|
||||
Text::RotationAlignment textRotationAlignment(int zoom) const;
|
||||
bool visible() const {return _visible;}
|
||||
|
||||
private:
|
||||
QFont::Capitalization textTransform(int zoom) const;
|
||||
@ -125,6 +126,7 @@ private:
|
||||
FunctionS _symbolPlacement;
|
||||
FunctionS _textRotationAlignment;
|
||||
QFont _font;
|
||||
bool _visible;
|
||||
};
|
||||
|
||||
class Paint {
|
||||
@ -176,10 +178,7 @@ private:
|
||||
Tile &tile) const;
|
||||
|
||||
QVector<Layer> _layers;
|
||||
Sprites _sprites;
|
||||
#ifdef ENABLE_HIDPI
|
||||
Sprites _sprites2x;
|
||||
#endif // QT >= 5.6
|
||||
Sprites _sprites, _sprites2x;
|
||||
};
|
||||
|
||||
#endif // STYLE_H
|
||||
|
46
src/text.cpp
46
src/text.cpp
@ -1,6 +1,7 @@
|
||||
#include <QFontMetrics>
|
||||
#include <QPainter>
|
||||
#include <QSet>
|
||||
#include <QMap>
|
||||
#include "text.h"
|
||||
#include "textpointitem.h"
|
||||
#include "textpathitem.h"
|
||||
@ -8,8 +9,7 @@
|
||||
|
||||
Text::~Text()
|
||||
{
|
||||
for (int i = 0; i < _items.size(); i++)
|
||||
delete _items[i];
|
||||
qDeleteAll(_items);
|
||||
}
|
||||
|
||||
void Text::render(QPainter *painter) const
|
||||
@ -31,22 +31,36 @@ void Text::addLabel(const QString &text, const QImage &icon,
|
||||
{
|
||||
TextItem *ti;
|
||||
|
||||
switch (_placement) {
|
||||
case Line:
|
||||
if (_alignment == Viewport)
|
||||
if (_alignment == Viewport) {
|
||||
QMap<qreal, int> map;
|
||||
for (int j = 0; j < path.elementCount(); j++) {
|
||||
QLineF l(path.elementAt(j), _sceneRect.center());
|
||||
map.insert(l.length(), j);
|
||||
}
|
||||
QMap<qreal, int>::const_iterator jt = map.constBegin();
|
||||
ti = new TextPointItem(text, path.elementAt(jt.value()), _font,
|
||||
_maxWidth, _anchor, icon);
|
||||
while (true) {
|
||||
if (_sceneRect.contains(ti->boundingRect()))
|
||||
break;
|
||||
if (++jt == map.constEnd())
|
||||
break;
|
||||
static_cast<TextPointItem*>(ti)->setPos(path.elementAt(
|
||||
jt.value()));
|
||||
}
|
||||
} else {
|
||||
switch (_placement) {
|
||||
case Line:
|
||||
ti = new TextPathItem(text, path, _font, _maxAngle, _sceneRect);
|
||||
break;
|
||||
case LineCenter:
|
||||
ti = new TextPointItem(text, path.pointAtPercent(0.5), _font,
|
||||
_maxWidth, _anchor, icon);
|
||||
break;
|
||||
default:
|
||||
ti = new TextPointItem(text, path.elementAt(0), _font,
|
||||
_maxWidth, _anchor, icon);
|
||||
else
|
||||
ti = new TextPathItem(text, path, _font, _maxAngle, _sceneRect);
|
||||
break;
|
||||
case LineCenter:
|
||||
ti = new TextPointItem(text, path.pointAtPercent(0.5), _font,
|
||||
_maxWidth, _anchor, icon);
|
||||
break;
|
||||
default:
|
||||
ti = new TextPointItem(text, path.elementAt(0), _font, _maxWidth,
|
||||
_anchor, icon);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Note: empty path == point geometry (single move)
|
||||
|
@ -11,7 +11,7 @@ bool TextItem::collidesWithItem(const TextItem *other) const
|
||||
return other->shape().intersects(shape());
|
||||
}
|
||||
|
||||
int TextItem::avgCharWidth() const
|
||||
qreal TextItem::avgCharWidth() const
|
||||
{
|
||||
qreal ratio;
|
||||
ushort cp = _text.at(0).unicode();
|
||||
@ -21,14 +21,18 @@ int TextItem::avgCharWidth() const
|
||||
ratio = 1.0;
|
||||
// Greek & Cyrilic
|
||||
else if (cp >= 0x03FF && cp <= 0x04FF) {
|
||||
ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.75 : 0.67;
|
||||
ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.80 : 0.70;
|
||||
if (_font.bold())
|
||||
ratio *= 1.1;
|
||||
if (_font.italic())
|
||||
ratio *= 0.9;
|
||||
// The rest (Latin scripts, Arabic, ...)
|
||||
} else {
|
||||
ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.7 : 0.58;
|
||||
ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.75 : 0.60;
|
||||
if (_font.bold())
|
||||
ratio *= 1.1;
|
||||
if (_font.italic())
|
||||
ratio *= 0.9;
|
||||
}
|
||||
|
||||
return ratio * _font.pixelSize();
|
||||
|
@ -34,7 +34,7 @@ public:
|
||||
bool collidesWithItem(const TextItem *other) const;
|
||||
|
||||
protected:
|
||||
int avgCharWidth() const;
|
||||
qreal avgCharWidth() const;
|
||||
|
||||
private:
|
||||
QString _text;
|
||||
|
@ -3,41 +3,101 @@
|
||||
#include "textpathitem.h"
|
||||
|
||||
|
||||
static QPointF intersection(const QLineF &line, const QRectF &rect)
|
||||
{
|
||||
QPointF p;
|
||||
if (line.intersect(QLineF(rect.topLeft(), rect.topRight()), &p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return p;
|
||||
if (line.intersect(QLineF(rect.topLeft(), rect.bottomLeft()), &p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return p;
|
||||
if (line.intersect(QLineF(rect.bottomRight(), rect.bottomLeft()), &p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return p;
|
||||
if (line.intersect(QLineF(rect.bottomRight(), rect.topRight()), &p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return p;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
#define INTERSECTS intersect
|
||||
#else // QT 5.15
|
||||
#define INTERSECTS intersects
|
||||
#endif // QT 5.15
|
||||
|
||||
return rect.center();
|
||||
static void swap(const QLineF &line, QPointF *p1, QPointF *p2)
|
||||
{
|
||||
|
||||
QPointF lp1(line.p1());
|
||||
QPointF lp2(line.p2());
|
||||
|
||||
if ((lp1.rx() < lp2.rx() && p1->rx() > p2->rx())
|
||||
|| (lp1.ry() < lp2.ry() && p1->ry() > p2->ry())
|
||||
|| (lp1.rx() > lp2.rx() && p1->rx() < p2->rx())
|
||||
|| (lp1.ry() > lp2.ry() && p1->ry() < p2->ry())) {
|
||||
QPointF tmp(*p2);
|
||||
*p2 = *p1;
|
||||
*p1 = tmp;
|
||||
}
|
||||
}
|
||||
|
||||
static QPainterPath subpath(const QList<QLineF> &lines, int start, int end,
|
||||
static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
|
||||
QPointF *p2)
|
||||
{
|
||||
QPointF *p = p1;
|
||||
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
p = p2;
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
return true;
|
||||
}
|
||||
p = p2;
|
||||
}
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
return true;
|
||||
}
|
||||
p = p2;
|
||||
}
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection) {
|
||||
if (p == p2) {
|
||||
swap(line, p1, p2);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Q_ASSERT(p != p2);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p)
|
||||
{
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
|
||||
== QLineF::BoundedIntersection)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static QPainterPath subpath(const QPolygonF &path, int start, int end,
|
||||
qreal cut)
|
||||
{
|
||||
qreal ss = 0, es = 0;
|
||||
int si = start, ei = end;
|
||||
|
||||
for (int i = start; i <= end; i++) {
|
||||
qreal len = lines.at(i).length();
|
||||
for (int i = start; i < end; i++) {
|
||||
QLineF l(path.at(i), path.at(i+1));
|
||||
qreal len = l.length();
|
||||
if (ss + len < cut / 2) {
|
||||
ss += len;
|
||||
si++;
|
||||
} else
|
||||
break;
|
||||
}
|
||||
for (int i = end; i >= start; i--) {
|
||||
qreal len = lines.at(i).length();
|
||||
for (int i = end; i > start; i--) {
|
||||
QLineF l(path.at(i), path.at(i-1));
|
||||
qreal len = l.length();
|
||||
if (es + len < cut / 2) {
|
||||
es += len;
|
||||
ei--;
|
||||
@ -45,83 +105,117 @@ static QPainterPath subpath(const QList<QLineF> &lines, int start, int end,
|
||||
break;
|
||||
}
|
||||
|
||||
QLineF sl(lines.at(si).p2(), lines.at(si).p1());
|
||||
QLineF sl(path.at(si+1), path.at(si));
|
||||
sl.setLength(sl.length() - (cut / 2 - ss));
|
||||
QLineF el(lines.at(ei));
|
||||
QLineF el(path.at(ei-1), path.at(ei));
|
||||
el.setLength(el.length() - (cut / 2 - es));
|
||||
|
||||
QPainterPath p(sl.p2());
|
||||
for (int i = si; i <= ei; i++)
|
||||
p.lineTo(lines.at(i).p2());
|
||||
p.setElementPositionAt(p.elementCount() - 1, el.p2().x(), el.p2().y());
|
||||
for (int i = si + 1; i < ei; i++)
|
||||
p.lineTo(path.at(i));
|
||||
p.lineTo(el.p2());
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
static QList<QLineF> lineString(const QPainterPath &path,
|
||||
const QRectF &boundingRect)
|
||||
static QList<QPolygonF> polyLines(const QPainterPath &path, const QRectF &rect)
|
||||
{
|
||||
QList<QLineF> lines;
|
||||
int start = 0, end = path.elementCount() - 1;
|
||||
QList<QPolygonF> lines;
|
||||
QPolygonF line;
|
||||
bool lastIn = rect.contains(path.elementAt(0));
|
||||
|
||||
for (int i = 0; i < path.elementCount(); i++) {
|
||||
if (boundingRect.contains(path.elementAt(i))) {
|
||||
start = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (int i = path.elementCount() - 1; i >= 0; i--) {
|
||||
if (boundingRect.contains(path.elementAt(i))) {
|
||||
end = i;
|
||||
break;
|
||||
for (int i = 1; i < path.elementCount(); i++) {
|
||||
if (rect.contains(path.elementAt(i))) {
|
||||
if (lastIn) {
|
||||
if (line.isEmpty())
|
||||
line.append(path.elementAt(i-1));
|
||||
line.append(path.elementAt(i));
|
||||
} else {
|
||||
QPointF p;
|
||||
QLineF l(path.elementAt(i-1), path.elementAt(i));
|
||||
|
||||
if (intersection(l, rect, &p))
|
||||
line.append(p);
|
||||
line.append(path.elementAt(i));
|
||||
}
|
||||
|
||||
lastIn = true;
|
||||
} else {
|
||||
QLineF l(path.elementAt(i-1), path.elementAt(i));
|
||||
|
||||
if (lastIn) {
|
||||
QPointF p;
|
||||
if (line.isEmpty())
|
||||
line.append(path.elementAt(i-1));
|
||||
if (intersection(l, rect, &p))
|
||||
line.append(p);
|
||||
lines.append(line);
|
||||
line.clear();
|
||||
} else {
|
||||
QPointF p1, p2;
|
||||
if (intersection(l, rect, &p1, &p2)) {
|
||||
line.append(p1);
|
||||
line.append(p2);
|
||||
lines.append(line);
|
||||
line.clear();
|
||||
}
|
||||
}
|
||||
|
||||
lastIn = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (start > 0) {
|
||||
QLineF l(path.elementAt(start-1), path.elementAt(start));
|
||||
QPointF p(intersection(l, boundingRect));
|
||||
if (p != boundingRect.center())
|
||||
lines.append(QLineF(p, path.elementAt(start)));
|
||||
}
|
||||
for (int i = start + 1; i <= end; i++)
|
||||
lines.append(QLineF(path.elementAt(i-1), path.elementAt(i)));
|
||||
if (end < path.elementCount() - 1) {
|
||||
QLineF l(path.elementAt(end), path.elementAt(end+1));
|
||||
QPointF p(intersection(l, boundingRect));
|
||||
if (p != boundingRect.center())
|
||||
lines.append(QLineF(path.elementAt(end), p));
|
||||
}
|
||||
if (!line.isEmpty())
|
||||
lines.append(line);
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
static qreal diff(qreal a1, qreal a2)
|
||||
{
|
||||
qreal d = qAbs(a1 - a2);
|
||||
return (d > 180) ? 360 - d : d;
|
||||
}
|
||||
|
||||
static QPainterPath textPath(const QPainterPath &path, qreal textWidth,
|
||||
qreal maxAngle, qreal charWidth, const QRectF &tileRect)
|
||||
{
|
||||
QList<QLineF> lines(lineString(path, tileRect));
|
||||
qreal length = 0;
|
||||
qreal angle = lines.first().angle();
|
||||
int last = 0;
|
||||
if (path.isEmpty())
|
||||
return QPainterPath();
|
||||
|
||||
QList<QPolygonF> lines(polyLines(path, tileRect));
|
||||
|
||||
for (int i = 0; i < lines.size(); i++) {
|
||||
qreal sl = lines.at(i).length();
|
||||
qreal a = lines.at(i).angle();
|
||||
const QPolygonF &pl = lines.at(i);
|
||||
qreal angle = 0, length = 0;
|
||||
int last = 0;
|
||||
|
||||
if (!tileRect.contains(lines.at(i).p2()) || sl < charWidth
|
||||
|| qAbs(angle - a) > maxAngle) {
|
||||
if (length > textWidth)
|
||||
return subpath(lines, last, i - 1, length - textWidth);
|
||||
last = i;
|
||||
length = 0;
|
||||
} else
|
||||
length += sl;
|
||||
for (int j = 1; j < pl.size(); j ++) {
|
||||
QLineF l(pl.at(j-1), pl.at(j));
|
||||
qreal sl = l.length();
|
||||
qreal a = l.angle();
|
||||
|
||||
angle = a;
|
||||
if (sl < charWidth) {
|
||||
if (length > textWidth)
|
||||
return subpath(pl, last, j - 1, length - textWidth);
|
||||
last = j;
|
||||
length = 0;
|
||||
} else if (j > 1 && diff(angle, a) > maxAngle) {
|
||||
if (length > textWidth)
|
||||
return subpath(pl, last, j - 1, length - textWidth);
|
||||
last = j - 1;
|
||||
length = sl;
|
||||
} else
|
||||
length += sl;
|
||||
|
||||
angle = a;
|
||||
}
|
||||
|
||||
if (length > textWidth)
|
||||
return subpath(pl, last, pl.size() - 1, length - textWidth);
|
||||
}
|
||||
|
||||
return (length > textWidth)
|
||||
? subpath(lines, last, lines.size() - 1, length - textWidth)
|
||||
: QPainterPath();
|
||||
return QPainterPath();
|
||||
}
|
||||
|
||||
static bool reverse(const QPainterPath &path)
|
||||
@ -136,7 +230,7 @@ TextPathItem::TextPathItem(const QString &text, const QPainterPath &path,
|
||||
const QFont &font, int maxAngle, const QRectF &tileRect)
|
||||
: TextItem(text, font)
|
||||
{
|
||||
int cw = avgCharWidth();
|
||||
qreal cw = avgCharWidth();
|
||||
int textWidth = text.size() * cw;
|
||||
if (textWidth > path.length())
|
||||
return;
|
||||
@ -156,11 +250,8 @@ TextPathItem::TextPathItem(const QString &text, const QPainterPath &path,
|
||||
|
||||
void TextPathItem::paint(QPainter *painter) const
|
||||
{
|
||||
//painter->setPen(Qt::red);
|
||||
//painter->drawPath(_shape);
|
||||
|
||||
QFontMetrics fm(font());
|
||||
int textWidth = fm.width(text());
|
||||
int textWidth = fm.boundingRect(text()).width();
|
||||
|
||||
qreal factor = (textWidth) / qMax(_path.length(), (qreal)textWidth);
|
||||
qreal percent = (1.0 - factor) / 2.0;
|
||||
@ -187,7 +278,7 @@ void TextPathItem::paint(QPainter *painter) const
|
||||
painter->drawText(QPoint(1, fm.descent()), text().at(i));
|
||||
painter->setTransform(t);
|
||||
|
||||
int width = fm.charWidth(text(), i);
|
||||
int width = fm.horizontalAdvance(text().at(i));
|
||||
percent += ((qreal)width / (qreal)textWidth) * factor;
|
||||
}
|
||||
|
||||
@ -204,7 +295,12 @@ void TextPathItem::paint(QPainter *painter) const
|
||||
painter->drawText(QPoint(0, fm.descent()), text().at(i));
|
||||
painter->setTransform(t);
|
||||
|
||||
int width = fm.charWidth(text(), i);
|
||||
int width = fm.horizontalAdvance(text().at(i));
|
||||
percent += ((qreal)width / (qreal)textWidth) * factor;
|
||||
}
|
||||
|
||||
//painter->setBrush(Qt::NoBrush);
|
||||
//painter->setPen(Qt::red);
|
||||
//painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
//painter->drawPath(_shape);
|
||||
}
|
||||
|
@ -1,34 +1,19 @@
|
||||
#include <QPainter>
|
||||
#include <QtMath>
|
||||
#include "config.h"
|
||||
#include <QStaticText>
|
||||
#include "textpointitem.h"
|
||||
|
||||
|
||||
#define FLAGS (Qt::AlignCenter | Qt::TextWordWrap | Qt::TextDontClip)
|
||||
|
||||
QRectF TextPointItem::exactBoundingRect() const
|
||||
{
|
||||
QFontMetrics fm(font());
|
||||
int limit = font().pixelSize() * _maxWidth;
|
||||
// Italic fonts overflow the computed bounding rect, so reduce it
|
||||
// a little bit.
|
||||
if (font().italic())
|
||||
limit -= font().pixelSize() / 2.0;
|
||||
|
||||
QRect br = fm.boundingRect(QRect(0, 0, limit, 0), FLAGS, text());
|
||||
Q_ASSERT(br.isValid());
|
||||
// Expand the bounding rect back to the real content size
|
||||
if (font().italic())
|
||||
br.adjust(-font().pixelSize() / 4.0, 0, font().pixelSize() / 4.0, 0);
|
||||
|
||||
return br;
|
||||
}
|
||||
|
||||
QRectF TextPointItem::fuzzyBoundingRect() const
|
||||
{
|
||||
int limit = font().pixelSize() * _maxWidth;
|
||||
int fs = font().pixelSize();
|
||||
if (text().size() <= 3)
|
||||
return QRectF(0, 0, text().size() * fs, fs * 1.6);
|
||||
|
||||
int limit = fs * _maxWidth;
|
||||
qreal cw = avgCharWidth();
|
||||
qreal lh = font().pixelSize() * 1.25;
|
||||
int width = 0, lines = 0;
|
||||
|
||||
QStringList l(text().split('\n'));
|
||||
@ -44,7 +29,7 @@ QRectF TextPointItem::fuzzyBoundingRect() const
|
||||
if (wl + pl < limit) {
|
||||
pl += wl + cw;
|
||||
} else {
|
||||
if (wl > limit) {
|
||||
if (wl >= limit) {
|
||||
if (pl > 0)
|
||||
lines++;
|
||||
} else
|
||||
@ -61,32 +46,26 @@ QRectF TextPointItem::fuzzyBoundingRect() const
|
||||
}
|
||||
}
|
||||
|
||||
return QRectF(0, 0, width, lines * lh);
|
||||
return QRectF(0, 0, width, lines * fs * 1.6);
|
||||
}
|
||||
|
||||
|
||||
QRectF TextPointItem::computeTextRect(bool exact) const
|
||||
QRectF TextPointItem::moveTextRect(const QRectF &rect) const
|
||||
{
|
||||
#ifdef ENABLE_HIDPI
|
||||
QRectF iconRect = _icon.isNull() ? QRectF()
|
||||
: QRectF(QPointF(0, 0), QSizeF(_icon.size()) / _icon.devicePixelRatioF());
|
||||
#else // ENABLE_HIDPI
|
||||
QRectF iconRect = _icon.isNull() ? QRectF() : QRectF(QPointF(0, 0),
|
||||
QSizeF(_icon.size()));
|
||||
#endif // ENABLE_HIDPI
|
||||
QRectF textRect = exact ? exactBoundingRect() : fuzzyBoundingRect();
|
||||
QRectF textRect(rect);
|
||||
|
||||
switch (_anchor) {
|
||||
case Text::Center:
|
||||
textRect.moveCenter(_pos);
|
||||
break;
|
||||
case Text::Left:
|
||||
textRect.moveTopLeft(_pos - QPointF(-iconRect.width() / 2,
|
||||
textRect.height() / 2));
|
||||
textRect.moveTopLeft(_pos - QPointF(-iconRect.width() / 2
|
||||
- font().pixelSize()/4.0, textRect.height() / 2));
|
||||
break;
|
||||
case Text::Right:
|
||||
textRect.moveTopRight(_pos - QPointF(iconRect.width() / 2,
|
||||
textRect.height() / 2));
|
||||
textRect.moveTopRight(_pos - QPointF(iconRect.width() / 2
|
||||
+ font().pixelSize()/4.0, textRect.height() / 2));
|
||||
break;
|
||||
case Text::Bottom:
|
||||
textRect.moveTopLeft(_pos - QPointF(textRect.width() / 2,
|
||||
@ -106,15 +85,12 @@ TextPointItem::TextPointItem(const QString &text, const QPointF &pos,
|
||||
: TextItem(text, font), _pos(pos), _icon(icon), _maxWidth(maxWidth),
|
||||
_anchor(anchor)
|
||||
{
|
||||
_boundingRect = computeTextRect(false);
|
||||
_textRect = fuzzyBoundingRect();
|
||||
_boundingRect = moveTextRect(_textRect);
|
||||
|
||||
if (!_icon.isNull()) {
|
||||
#ifdef ENABLE_HIDPI
|
||||
QRectF iconRect(QPointF(0, 0), QSizeF(_icon.size())
|
||||
/ _icon.devicePixelRatioF());
|
||||
#else // ENABLE_HIDPI
|
||||
QRectF iconRect(QPointF(0, 0), QSizeF(_icon.size()));
|
||||
#endif // ENABLE_HIDPI
|
||||
iconRect.moveCenter(pos);
|
||||
_boundingRect |= iconRect;
|
||||
}
|
||||
@ -122,53 +98,54 @@ TextPointItem::TextPointItem(const QString &text, const QPointF &pos,
|
||||
_shape.addRect(_boundingRect);
|
||||
}
|
||||
|
||||
void TextPointItem::setPos(const QPointF &pos)
|
||||
{
|
||||
QPointF d(_boundingRect.left() - _pos.x(), _boundingRect.top() - _pos.y());
|
||||
_boundingRect.moveTopLeft(pos + d);
|
||||
_shape = QPainterPath();
|
||||
_shape.addRect(_boundingRect);
|
||||
_pos = pos;
|
||||
}
|
||||
|
||||
void TextPointItem::paint(QPainter *painter) const
|
||||
{
|
||||
//painter->setPen(Qt::red);
|
||||
//painter->drawRect(_boundingRect);
|
||||
|
||||
QRectF textRect;
|
||||
bool hasHalo = halo().color().isValid() && halo().width() > 0;
|
||||
|
||||
painter->setFont(font());
|
||||
painter->setPen(pen());
|
||||
|
||||
if (!_icon.isNull()) {
|
||||
textRect = (_anchor != Text::Center || hasHalo)
|
||||
? computeTextRect(true) : _boundingRect;
|
||||
#ifdef ENABLE_HIDPI
|
||||
textRect = moveTextRect(painter->boundingRect(_textRect, FLAGS, text()));
|
||||
painter->drawImage(_pos - QPointF(_icon.width()
|
||||
/ _icon.devicePixelRatioF() / 2, _icon.height()
|
||||
/ _icon.devicePixelRatioF() / 2), _icon);
|
||||
#else // ENABLE_HIDPI
|
||||
painter->drawImage(_pos - QPointF(_icon.width() / 2,
|
||||
_icon.height() / 2), _icon);
|
||||
#endif // ENABLE_HIDPI
|
||||
} else
|
||||
textRect = hasHalo ? computeTextRect(true) : _boundingRect;
|
||||
textRect = _boundingRect;
|
||||
|
||||
if (hasHalo()) {
|
||||
QStaticText st(text());
|
||||
st.setTextFormat(Qt::PlainText);
|
||||
st.setTextWidth(textRect.width());
|
||||
st.setTextOption(QTextOption(Qt::AlignHCenter));
|
||||
st.setPerformanceHint(QStaticText::AggressiveCaching);
|
||||
|
||||
if (hasHalo) {
|
||||
QRect ir(textRect.toRect());
|
||||
QImage img(ir.size(), QImage::Format_ARGB32_Premultiplied);
|
||||
img.fill(Qt::transparent);
|
||||
QPainter ip(&img);
|
||||
ip.setPen(halo().color());
|
||||
ip.setFont(font());
|
||||
ip.drawText(img.rect(), FLAGS, text());
|
||||
|
||||
painter->drawImage(ir.x() - 1, ir.y() - 1, img);
|
||||
painter->drawImage(ir.x() + 1, ir.y() + 1, img);
|
||||
painter->drawImage(ir.x() - 1, ir.y() + 1, img);
|
||||
painter->drawImage(ir.x() + 1, ir.y() - 1, img);
|
||||
painter->drawImage(ir.x(), ir.y() - 1, img);
|
||||
painter->drawImage(ir.x(), ir.y() + 1, img);
|
||||
painter->drawImage(ir.x() - 1, ir.y(), img);
|
||||
painter->drawImage(ir.x() + 1, ir.y(), img);
|
||||
|
||||
painter->setFont(font());
|
||||
painter->setPen(pen());
|
||||
painter->drawText(ir, FLAGS, text());
|
||||
} else {
|
||||
painter->setFont(font());
|
||||
painter->setPen(halo().color());
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(-1, -1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(+1, +1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(-1, +1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(+1, -1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(0, -1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(0, +1), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(-1, 0), st);
|
||||
painter->drawStaticText(textRect.topLeft() + QPointF(+1, 0), st);
|
||||
painter->setPen(pen());
|
||||
painter->drawStaticText(textRect.topLeft(), st);
|
||||
} else
|
||||
painter->drawText(textRect, FLAGS, text());
|
||||
}
|
||||
|
||||
//painter->setBrush(Qt::NoBrush);
|
||||
//painter->setPen(Qt::red);
|
||||
//painter->drawRect(_boundingRect);
|
||||
//painter->setPen(Qt::blue);
|
||||
//painter->drawRect(textRect);
|
||||
}
|
||||
|
@ -15,14 +15,17 @@ public:
|
||||
QPainterPath shape() const {return _shape;}
|
||||
void paint(QPainter *painter) const;
|
||||
|
||||
void setPos(const QPointF &pos);
|
||||
|
||||
private:
|
||||
QRectF exactBoundingRect() const;
|
||||
QRectF fuzzyBoundingRect() const;
|
||||
QRectF computeTextRect(bool exact) const;
|
||||
QRectF moveTextRect(const QRectF &rect) const;
|
||||
bool hasHalo() const
|
||||
{return halo().color().isValid() && halo().width() > 0;}
|
||||
|
||||
QPointF _pos;
|
||||
QPainterPath _shape;
|
||||
QRectF _boundingRect;
|
||||
QRectF _textRect, _boundingRect;
|
||||
QImage _icon;
|
||||
int _maxWidth;
|
||||
Text::Anchor _anchor;
|
||||
|
@ -11,7 +11,10 @@ public:
|
||||
: _zoom(zoom), _size(img->size()), _scale(scale),
|
||||
_text(QSize(img->size().width() / scale.x(),
|
||||
img->size().height() / scale.y())), _painter(img)
|
||||
{_painter.scale(scale.x(), scale.y());}
|
||||
{
|
||||
img->fill(Qt::transparent);
|
||||
_painter.scale(scale.x(), scale.y());
|
||||
}
|
||||
|
||||
int zoom() const {return _zoom;}
|
||||
const QSize &size() const {return _size;}
|
||||
|
@ -2265,7 +2265,6 @@
|
||||
"source": "openmaptiles",
|
||||
"source-layer": "building",
|
||||
"minzoom": 13,
|
||||
"maxzoom": 14,
|
||||
"layout": {
|
||||
"visibility": "visible"
|
||||
},
|
||||
@ -4059,4 +4058,4 @@
|
||||
}
|
||||
],
|
||||
"id": "osm-liberty"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user