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

[Qt] Simplify setTransitionOptions

Browse Source
This commit is contained in:
Thiago Marcos P. Santos
2016-12-23 01:33:47 -02:00
committed by Thiago Marcos P. Santos
parent 5437c7b5b3
commit b8564299e5
4 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
platform/qt/src/qmapboxgl.cpp
View File

@@ -81,26 +81,6 @@ auto fromQMapboxGLShapeAnnotation(const ShapeAnnotation &shapeAnnotation) {
return mbgl::StyleSourcedAnnotation { std::move(mbglLineString), styleLayer.toStdString() };
}
auto fromQMapboxTransitionOptions(const QMapbox::TransitionOptions &options) {
auto convert = [](auto& value) -> mbgl::optional<mbgl::Duration> {
if (value.isValid()) {
return std::chrono::duration_cast<mbgl::Duration>(mbgl::Milliseconds(value.template value<qint64>()));
};
return {};
};
return mbgl::style::TransitionOptions { convert(options.duration), convert(options.delay) };
}
auto toQMapboxTransitionOptions(const mbgl::style::TransitionOptions &options) {
auto convert = [](auto& value) -> QVariant {
if (value) {
return qint64(std::chrono::duration_cast<mbgl::Milliseconds>(*value).count());
}
return {};
};
return QMapbox::TransitionOptions { convert(options.duration), convert(options.delay) };
}
auto fromQStringList(const QStringList &list)
{
std::vector<std::string> strings;
@@ -485,12 +465,12 @@ QStringList QMapboxGL::getClasses() const
return classNames;
}
QMapbox::TransitionOptions QMapboxGL::getTransitionOptions() const {
return toQMapboxTransitionOptions(d_ptr->mapObj->getTransitionOptions());
}
void QMapboxGL::setTransitionOptions(qint64 duration, qint64 delay) {
static auto convert = [](qint64 value) -> mbgl::optional<mbgl::Duration> {
return std::chrono::duration_cast<mbgl::Duration>(mbgl::Milliseconds(value));
};
void QMapboxGL::setTransitionOptions(const QMapbox::TransitionOptions &options) {
d_ptr->mapObj->setTransitionOptions(fromQMapboxTransitionOptions(options));
d_ptr->mapObj->setTransitionOptions(mbgl::style::TransitionOptions{ convert(duration), convert(delay) });
}
mbgl::Annotation fromPointAnnotation(const PointAnnotation &pointAnnotation) {