tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add clang-format (#1086)

Browse Source 
Co-authored-by: mwilsnd <mwilsnd@gmail.com>
This commit is contained in:
Bart Louwers
2023-05-01 16:57:37 +02:00
committed by GitHub
parent 403a12bd1b
commit 71f6da2722
1018 changed files with 27876 additions and 25862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
platform/qt/app/mapwindow.cpp
View File

@@ -12,20 +12,17 @@
int kAnimationDuration = 10000;
MapWindow::MapWindow(const QMapLibreGL::Settings &settings)
: m_settings(settings)
{
: m_settings(settings) {
setWindowIcon(QIcon(":icon.png"));
}
MapWindow::~MapWindow()
{
MapWindow::~MapWindow() {
// Make sure we have a valid context so we
// can delete the QMapLibreGL::Map.
makeCurrent();
}
void MapWindow::selfTest()
{
void MapWindow::selfTest() {
if (m_bearingAnimation) {
m_bearingAnimation->setDuration(kAnimationDuration);
m_bearingAnimation->setEndValue(m_map->bearing() + 360 * 4);
@@ -43,25 +40,21 @@ qreal MapWindow::pixelRatio() {
return devicePixelRatioF();
}
void MapWindow::animationFinished()
{
qDebug() << "Animation ticks/s: " << m_animationTicks / static_cast<float>(kAnimationDuration) * 1000.;
qDebug() << "Frame draws/s: " << m_frameDraws / static_cast<float>(kAnimationDuration) * 1000.;
void MapWindow::animationFinished() {
qDebug() << "Animation ticks/s: " << m_animationTicks / static_cast<float>(kAnimationDuration) * 1000.;
qDebug() << "Frame draws/s: " << m_frameDraws / static_cast<float>(kAnimationDuration) * 1000.;
qApp->quit();
}
void MapWindow::animationValueChanged()
{
void MapWindow::animationValueChanged() {
m_animationTicks++;
}
void MapWindow::changeStyle()
{
void MapWindow::changeStyle() {
static uint8_t currentStyleIndex;
auto& styles = m_map->defaultStyles();
auto &styles = m_map->defaultStyles();
m_map->setStyleUrl(styles[currentStyleIndex].first);
setWindowTitle(QString("MapLibre GL: ") + styles[currentStyleIndex].second);
@@ -73,13 +66,12 @@ void MapWindow::changeStyle()
m_sourceAdded = false;
}
void MapWindow::keyPressEvent(QKeyEvent *ev)
{
void MapWindow::keyPressEvent(QKeyEvent *ev) {
switch (ev->key()) {
case Qt::Key_S:
changeStyle();
break;
case Qt::Key_L: {
case Qt::Key_S:
changeStyle();
break;
case Qt::Key_L: {
if (m_sourceAdded) {
return;
}
@@ -246,25 +238,23 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
extrusionBase["property"] = "min_height";
m_map->setPaintProperty("3d-buildings", "fill-extrusion-base", extrusionBase);
}
break;
case Qt::Key_1: {
} break;
case Qt::Key_1: {
if (m_symbolAnnotationId.isNull()) {
QMapLibreGL::Coordinate coordinate = m_map->coordinate();
QMapLibreGL::SymbolAnnotation symbol { coordinate, "default_marker" };
QMapLibreGL::SymbolAnnotation symbol{coordinate, "default_marker"};
m_map->addAnnotationIcon("default_marker", QImage(":default_marker.svg"));
m_symbolAnnotationId = m_map->addAnnotation(QVariant::fromValue<QMapLibreGL::SymbolAnnotation>(symbol));
} else {
m_map->removeAnnotation(m_symbolAnnotationId.toUInt());
m_symbolAnnotationId.clear();
}
}
break;
case Qt::Key_2: {
} break;
case Qt::Key_2: {
if (m_lineAnnotationId.isNull()) {
QMapLibreGL::Coordinates coordinates;
coordinates.push_back(m_map->coordinateForPixel({ 0, 0 }));
coordinates.push_back(m_map->coordinateForPixel({ qreal(size().width()), qreal(size().height()) }));
coordinates.push_back(m_map->coordinateForPixel({0, 0}));
coordinates.push_back(m_map->coordinateForPixel({qreal(size().width()), qreal(size().height())}));
QMapLibreGL::CoordinatesCollection collection;
collection.push_back(coordinates);
@@ -272,7 +262,8 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
QMapLibreGL::CoordinatesCollections lineGeometry;
lineGeometry.push_back(collection);
QMapLibreGL::ShapeAnnotationGeometry annotationGeometry(QMapLibreGL::ShapeAnnotationGeometry::LineStringType, lineGeometry);
QMapLibreGL::ShapeAnnotationGeometry annotationGeometry(
QMapLibreGL::ShapeAnnotationGeometry::LineStringType, lineGeometry);
QMapLibreGL::LineAnnotation line;
line.geometry = annotationGeometry;
@@ -284,15 +275,14 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
m_map->removeAnnotation(m_lineAnnotationId.toUInt());
m_lineAnnotationId.clear();
}
}
break;
case Qt::Key_3: {
} break;
case Qt::Key_3: {
if (m_fillAnnotationId.isNull()) {
QMapLibreGL::Coordinates coordinates;
coordinates.push_back(m_map->coordinateForPixel({ qreal(size().width()), 0 }));
coordinates.push_back(m_map->coordinateForPixel({ qreal(size().width()), qreal(size().height()) }));
coordinates.push_back(m_map->coordinateForPixel({ 0, qreal(size().height()) }));
coordinates.push_back(m_map->coordinateForPixel({ 0, 0 }));
coordinates.push_back(m_map->coordinateForPixel({qreal(size().width()), 0}));
coordinates.push_back(m_map->coordinateForPixel({qreal(size().width()), qreal(size().height())}));
coordinates.push_back(m_map->coordinateForPixel({0, qreal(size().height())}));
coordinates.push_back(m_map->coordinateForPixel({0, 0}));
QMapLibreGL::CoordinatesCollection collection;
collection.push_back(coordinates);
@@ -300,7 +290,8 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
QMapLibreGL::CoordinatesCollections fillGeometry;
fillGeometry.push_back(collection);
QMapLibreGL::ShapeAnnotationGeometry annotationGeometry(QMapLibreGL::ShapeAnnotationGeometry::PolygonType, fillGeometry);
QMapLibreGL::ShapeAnnotationGeometry annotationGeometry(
QMapLibreGL::ShapeAnnotationGeometry::PolygonType, fillGeometry);
QMapLibreGL::FillAnnotation fill;
fill.geometry = annotationGeometry;
@@ -312,9 +303,8 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
m_map->removeAnnotation(m_fillAnnotationId.toUInt());
m_fillAnnotationId.clear();
}
}
break;
case Qt::Key_5: {
} break;
case Qt::Key_5: {
if (m_map->layerExists("circleLayer")) {
m_map->removeLayer("circleLayer");
m_map->removeSource("circleSource");
@@ -344,53 +334,37 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
m_map->setPaintProperty("circleLayer", "circle-radius", 10.0);
m_map->setPaintProperty("circleLayer", "circle-color", QColor("black"));
}
}
break;
case Qt::Key_6: {
} break;
case Qt::Key_6: {
if (m_map->layerExists("innerCirclesLayer") || m_map->layerExists("outerCirclesLayer")) {
m_map->removeLayer("innerCirclesLayer");
m_map->removeLayer("outerCirclesLayer");
m_map->removeSource("innerCirclesSource");
m_map->removeSource("outerCirclesSource");
} else {
auto makePoint = [&] (double dx, double dy, const QString &color) {
auto makePoint = [&](double dx, double dy, const QString &color) {
auto coordinate = m_map->coordinate();
coordinate.first += dx;
coordinate.second += dy;
return QMapLibreGL::Feature{QMapLibreGL::Feature::PointType,
{{{coordinate}}}, {{"color", color}}, {}};
return QMapLibreGL::Feature{
QMapLibreGL::Feature::PointType, {{{coordinate}}}, {{"color", color}}, {}};
};
// multiple features by QVector<QMapLibreGL::Feature>
QVector<QMapLibreGL::Feature> inner{
makePoint(0.001, 0, "red"),
makePoint(0, 0.001, "green"),
makePoint(0, -0.001, "blue")
};
makePoint(0.001, 0, "red"), makePoint(0, 0.001, "green"), makePoint(0, -0.001, "blue")};
m_map->addSource("innerCirclesSource",
{{"type", "geojson"}, {"data", QVariant::fromValue(inner)}});
m_map->addLayer({
{"id", "innerCirclesLayer"},
{"type", "circle"},
{"source", "innerCirclesSource"}
});
m_map->addSource("innerCirclesSource", {{"type", "geojson"}, {"data", QVariant::fromValue(inner)}});
m_map->addLayer({{"id", "innerCirclesLayer"}, {"type", "circle"}, {"source", "innerCirclesSource"}});
// multiple features by QList<QMapLibreGL::Feature>
QList<QMapLibreGL::Feature> outer{
makePoint( 0.002, 0.002, "cyan"),
makePoint(-0.002, 0.002, "magenta"),
makePoint( 0.002, -0.002, "yellow"),
makePoint(-0.002, -0.002, "black")
};
QList<QMapLibreGL::Feature> outer{makePoint(0.002, 0.002, "cyan"),
makePoint(-0.002, 0.002, "magenta"),
makePoint(0.002, -0.002, "yellow"),
makePoint(-0.002, -0.002, "black")};
m_map->addSource("outerCirclesSource",
{{"type", "geojson"}, {"data", QVariant::fromValue(outer)}});
m_map->addLayer({
{"id", "outerCirclesLayer"},
{"type", "circle"},
{"source", "outerCirclesSource"}
});
m_map->addSource("outerCirclesSource", {{"type", "geojson"}, {"data", QVariant::fromValue(outer)}});
m_map->addLayer({{"id", "outerCirclesLayer"}, {"type", "circle"}, {"source", "outerCirclesSource"}});
QVariantList getColor{"get", "color"};
m_map->setPaintProperty("innerCirclesLayer", "circle-radius", 10.0);
@@ -398,17 +372,15 @@ void MapWindow::keyPressEvent(QKeyEvent *ev)
m_map->setPaintProperty("outerCirclesLayer", "circle-radius", 15.0);
m_map->setPaintProperty("outerCirclesLayer", "circle-color", getColor);
}
}
break;
default:
break;
} break;
default:
break;
}
ev->accept();
}
void MapWindow::mousePressEvent(QMouseEvent *ev)
{
void MapWindow::mousePressEvent(QMouseEvent *ev) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_lastPos = ev->position();
#else
@@ -432,8 +404,7 @@ void MapWindow::mousePressEvent(QMouseEvent *ev)
ev->accept();
}
void MapWindow::mouseMoveEvent(QMouseEvent *ev)
{
void MapWindow::mouseMoveEvent(QMouseEvent *ev) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QPointF &position = ev->position();
#else
@@ -455,8 +426,7 @@ void MapWindow::mouseMoveEvent(QMouseEvent *ev)
ev->accept();
}
void MapWindow::wheelEvent(QWheelEvent *ev)
{
void MapWindow::wheelEvent(QWheelEvent *ev) {
if (ev->angleDelta().y() == 0) {
return;
}
@@ -474,8 +444,7 @@ void MapWindow::wheelEvent(QWheelEvent *ev)
ev->accept();
}
void MapWindow::initializeGL()
{
void MapWindow::initializeGL() {
m_map.reset(new QMapLibreGL::Map(nullptr, m_settings, size(), pixelRatio()));
connect(m_map.get(), SIGNAL(needsRendering()), this, SLOT(update()));
@@ -497,8 +466,7 @@ void MapWindow::initializeGL()
connect(m_zoomAnimation, &QPropertyAnimation::valueChanged, this, &MapWindow::animationValueChanged);
}
void MapWindow::paintGL()
{
void MapWindow::paintGL() {
m_frameDraws++;
m_map->resize(size());
m_map->setFramebufferObject(defaultFramebufferObject(), size() * pixelRatio());