diff options
Diffstat (limited to 'src/datavis3dqml2/declarativemaps.cpp')
| -rw-r--r-- | src/datavis3dqml2/declarativemaps.cpp | 298 |
1 files changed, 35 insertions, 263 deletions
diff --git a/src/datavis3dqml2/declarativemaps.cpp b/src/datavis3dqml2/declarativemaps.cpp index f8ab70cf..758d2d5e 100644 --- a/src/datavis3dqml2/declarativemaps.cpp +++ b/src/datavis3dqml2/declarativemaps.cpp @@ -39,23 +39,16 @@ ** ****************************************************************************/ -#include "declarativemaps.h" -#include "maps3dcontroller_p.h" +#include "declarativemaps_p.h" +#include "declarativemapsrenderer_p.h" #include "qitemmodelmapdataproxy.h" -#include <QQuickWindow> -#include <QOpenGLFramebufferObject> -#include <QOpenGLContext> -#include <QGuiApplication> -#include <QThread> -#include <QDebug> QT_DATAVIS3D_BEGIN_NAMESPACE DeclarativeMaps::DeclarativeMaps(QQuickItem *parent) : QQuickItem(parent), m_shared(0), - m_cachedState(new DeclarativeMapsCachedStatePrivate()), - m_initializedSize(0,0) + m_initializedSize(0, 0) { setFlags(QQuickItem::ItemHasContents); setAcceptedMouseButtons(Qt::AllButtons); @@ -80,19 +73,6 @@ void DeclarativeMaps::componentComplete() qDebug() << "componentComplete"; } -void DeclarativeMaps::setData(QAbstractItemModel *data) -{ - m_cachedState->m_model = data; -} - -QAbstractItemModel *DeclarativeMaps::data() -{ - if (m_cachedState->m_model) - return m_cachedState->m_model; - else - return static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->itemModel(); -} - QSGNode *DeclarativeMaps::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { if (!m_shared) { @@ -101,96 +81,6 @@ QSGNode *DeclarativeMaps::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData m_shared->initializeOpenGL(); } - if (m_cachedState->m_model) { - static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->setItemModel(m_cachedState->m_model); - m_cachedState->m_model = 0; - } - - if (m_cachedState->m_mapping) { - static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->setMapping(m_cachedState->m_mapping); - m_cachedState->m_mapping = 0; - } - - // Check if properites have changed that need to be applied while on the SGRenderThread - if (m_cachedState->m_isAreaRectSet) { - m_shared->setAreaSpecs(m_cachedState->m_arearect, m_cachedState->m_image); - m_cachedState->m_isAreaRectSet = false; - } - - if (m_cachedState->m_isImageSet) { - m_shared->setImage(m_cachedState->m_image); - m_cachedState->m_isImageSet = false; - } - - if (m_cachedState->m_isBarSpecsSet) { - m_shared->setBarSpecs(m_cachedState->m_thickness, m_cachedState->m_direction); - m_cachedState->m_isBarSpecsSet = false; - } - - if (m_cachedState->m_isSelectionModeSet) { - m_shared->setSelectionMode(m_cachedState->m_selectionMode); - m_cachedState->m_isSelectionModeSet = false; - } - - if (m_cachedState->m_isLabelTransparencySet) { - m_shared->setLabelTransparency(m_cachedState->m_labelTransparency); - m_cachedState->m_isLabelTransparencySet = false; - } - - if (m_cachedState->m_isShadowQualitySet) { - m_shared->setShadowQuality(m_cachedState->m_shadowQuality); - m_cachedState->m_isShadowQualitySet = false; - } - - if (m_cachedState->m_fontsize) { - m_shared->setFontSize(m_cachedState->m_fontsize); - m_cachedState->m_fontsize = 0.0; - } - - if (m_cachedState->m_isBarStyleSet) { - m_shared->setBarType(m_cachedState->m_barstyle, m_cachedState->m_barsmooth); - m_cachedState->m_isBarStyleSet = false; - } - - if (m_cachedState->m_isMeshSet) { - m_shared->setMeshFileName(m_cachedState->m_meshfilename); - m_cachedState->m_isMeshSet = false; - } - - if (m_cachedState->m_isCameraPresetSet) { - m_shared->setCameraPreset(m_cachedState->m_camerapreset); - m_cachedState->m_isCameraPresetSet = false; - } - - if (m_cachedState->m_camdistance) { - m_shared->setCameraPosition(m_cachedState->m_camhorizontal, - m_cachedState->m_camvertical, - m_cachedState->m_camdistance); - m_cachedState->m_camdistance = 0.0f; - } - - if (m_cachedState->m_isThemeSet) { - m_shared->setTheme(m_cachedState->m_theme); - m_cachedState->m_isThemeSet = false; - } - - if (m_cachedState->m_isColorSet) { - m_shared->setBarColor(m_cachedState->m_basecolor, - m_cachedState->m_heightcolor, - m_cachedState->m_coloruniform); - m_cachedState->m_isColorSet = false; - } - - if (m_cachedState->m_isFontSet) { - m_shared->setFont(m_cachedState->m_font); - m_cachedState->m_isFontSet = false; - } - - if (m_cachedState->m_isLabelTransparencySet) { - m_shared->setLabelTransparency(m_cachedState->m_labelTransparency); - m_cachedState->m_isLabelTransparencySet = false; - } - // If old node exists and has right size, reuse it. if (oldNode && m_initializedSize == boundingRect().size().toSize()) { // Update bounding rectangle (that has same size as before). @@ -212,167 +102,125 @@ QSGNode *DeclarativeMaps::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData return node; } +void DeclarativeMaps::setData(QAbstractItemModel *data) +{ + static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->setItemModel(data); +} + +QAbstractItemModel *DeclarativeMaps::data() +{ + return static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->itemModel(); +} + void DeclarativeMaps::setBarSpecs(const QVector3D &thickness, Q3DMaps::AdjustmentDirection direction) { - m_cachedState->m_thickness = thickness; - m_cachedState->m_direction = direction; - m_cachedState->m_isBarSpecsSet = true; - update(); + m_shared->setBarSpecs(thickness, direction); } void DeclarativeMaps::setBarType(BarStyle style, bool smooth) { - m_cachedState->m_barstyle = style; - m_cachedState->m_barsmooth = smooth; - m_cachedState->m_isBarStyleSet = true; - update(); + m_shared->setBarType(style, smooth); } void DeclarativeMaps::setMeshFileName(const QString &objFileName) { - m_cachedState->m_meshfilename = objFileName; - m_cachedState->m_isMeshSet = true; - update(); + m_shared->setMeshFileName(objFileName); } void DeclarativeMaps::setCameraPreset(CameraPreset preset) { - m_cachedState->m_camerapreset = preset; - m_cachedState->m_isCameraPresetSet = true; - update(); + m_shared->setCameraPreset(preset); } void DeclarativeMaps::setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance) { - m_cachedState->m_camhorizontal = horizontal; - m_cachedState->m_camvertical = vertical; - m_cachedState->m_camdistance = distance; - update(); + m_shared->setCameraPosition(horizontal, vertical, distance); } void DeclarativeMaps::setTheme(ColorTheme theme) { - m_cachedState->m_theme = theme; - m_cachedState->m_isThemeSet = true; - update(); + m_shared->setTheme(theme); } void DeclarativeMaps::setBarColor(QColor baseColor, QColor heightColor, bool uniform) { - m_cachedState->m_basecolor = baseColor; - m_cachedState->m_heightcolor = heightColor; - m_cachedState->m_coloruniform = uniform; - m_cachedState->m_isColorSet = true; - update(); + m_shared->setBarColor(baseColor, heightColor, uniform); } void DeclarativeMaps::setAreaSpecs(const QRect &areaRect, const QImage &image) { - m_cachedState->m_arearect = areaRect; - m_cachedState->m_isAreaRectSet = true; - m_cachedState->m_image = image; - update(); + m_shared->setAreaSpecs(areaRect, image); } void DeclarativeMaps::setImage(const QImage &image) { - m_cachedState->m_image = image; - m_cachedState->m_isImageSet = true; - update(); + m_shared->setImage(image); } void DeclarativeMaps::setImage(const QString &imageUrl) { - m_cachedState->m_image = QImage(imageUrl); - m_cachedState->m_isImageSet = true; - update(); + m_shared->setImage(QImage(imageUrl)); } void DeclarativeMaps::setSelectionMode(DeclarativeMaps::SelectionMode mode) { - m_cachedState->m_selectionMode = QtDataVis3D::SelectionMode(mode); - m_cachedState->m_isSelectionModeSet = true; - update(); + m_shared->setSelectionMode(QtDataVis3D::SelectionMode(mode)); } DeclarativeMaps::SelectionMode DeclarativeMaps::selectionMode() { - if (m_shared) - return DeclarativeMaps::SelectionMode(m_shared->selectionMode()); - else - return DeclarativeMaps::ModeBar; + return DeclarativeMaps::SelectionMode(m_shared->selectionMode()); } void DeclarativeMaps::setFontSize(float fontsize) { - m_cachedState->m_fontsize = fontsize; + m_shared->setFontSize(fontsize); } float DeclarativeMaps::fontSize() { - if (m_shared) - return m_shared->fontSize(); - else - return QFont(QStringLiteral("Arial")).pointSizeF(); + return m_shared->fontSize(); } void DeclarativeMaps::setFont(const QFont &font) { - m_cachedState->m_font = font; - m_cachedState->m_isFontSet = true; - update(); + m_shared->setFont(font); } QFont DeclarativeMaps::font() { - if (m_shared) - return m_shared->font(); - else - return QFont(QStringLiteral("Arial")); + return m_shared->font(); } void DeclarativeMaps::setLabelTransparency(DeclarativeMaps::LabelTransparency transparency) { - m_cachedState->m_labelTransparency = QtDataVis3D::LabelTransparency(transparency); - m_cachedState->m_isLabelTransparencySet = true; - update(); + m_shared->setLabelTransparency(QtDataVis3D::LabelTransparency(transparency)); } DeclarativeMaps::LabelTransparency DeclarativeMaps::labelTransparency() { - if (m_shared) - return DeclarativeMaps::LabelTransparency(m_shared->labelTransparency()); - else - return DeclarativeMaps::TransparencyFromTheme; + return DeclarativeMaps::LabelTransparency(m_shared->labelTransparency()); } void DeclarativeMaps::setShadowQuality(DeclarativeMaps::ShadowQuality quality) { - m_cachedState->m_shadowQuality = QtDataVis3D::ShadowQuality(quality); - m_cachedState->m_isShadowQualitySet = true; - update(); + m_shared->setShadowQuality(QtDataVis3D::ShadowQuality(quality)); } DeclarativeMaps::ShadowQuality DeclarativeMaps::shadowQuality() { - if (m_shared) - return DeclarativeMaps::ShadowQuality(m_shared->shadowQuality()); - else - return DeclarativeMaps::ShadowLow; + return DeclarativeMaps::ShadowQuality(m_shared->shadowQuality()); } QItemModelMapDataMapping *DeclarativeMaps::mapping() const { - if (m_cachedState->m_mapping) - return m_cachedState->m_mapping; - else - return static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->mapping(); + return static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->mapping(); } void DeclarativeMaps::setMapping(QItemModelMapDataMapping *mapping) { - m_cachedState->m_mapping = mapping; + static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->setMapping(mapping); } void DeclarativeMaps::mousePressEvent(QMouseEvent *event) @@ -401,80 +249,4 @@ void DeclarativeMaps::wheelEvent(QWheelEvent *event) m_shared->wheelEvent(event); } -DeclarativeMapsRenderer::DeclarativeMapsRenderer(QQuickWindow *window, Maps3DController *renderer) - : m_fbo(0), - m_texture(0), - m_window(window), - m_mapsRenderer(renderer) -{ - connect(m_window, SIGNAL(beforeRendering()), this, SLOT(render()), Qt::DirectConnection); -} - -DeclarativeMapsRenderer::~DeclarativeMapsRenderer() -{ - delete m_texture; - delete m_fbo; -} - -void DeclarativeMapsRenderer::render() -{ - QSize size = rect().size().toSize(); - - // Create FBO - if (!m_fbo) { - QOpenGLFramebufferObjectFormat format; - format.setAttachment(QOpenGLFramebufferObject::Depth); - m_fbo = new QOpenGLFramebufferObject(size, format); - m_texture = m_window->createTextureFromId(m_fbo->texture(), size); - - setTexture(m_texture); - - // Flip texture - // TODO: Can be gotten rid of once support for texture flipping becomes available (in Qt5.2) - QSize ts = m_texture->textureSize(); - QRectF sourceRect(0, 0, ts.width(), ts.height()); - float tmp = sourceRect.top(); - sourceRect.setTop(sourceRect.bottom()); - sourceRect.setBottom(tmp); - QSGGeometry *geometry = this->geometry(); - QSGGeometry::updateTexturedRectGeometry(geometry, rect(), - m_texture->convertToNormalizedSourceRect(sourceRect)); - markDirty(DirtyMaterial); - //qDebug() << "create node" << m_fbo->handle() << m_texture->textureId() << m_fbo->size(); - } - - // Call the shared rendering function - m_fbo->bind(); - - m_mapsRenderer->render(m_fbo->handle()); - - m_fbo->release(); - - // New view is in the FBO, request repaint of scene graph - m_window->update(); -} - - -DeclarativeMapsCachedStatePrivate::DeclarativeMapsCachedStatePrivate() - : m_isImageSet(false), - m_isBarSpecsSet(false), - m_isAreaRectSet(false), - m_isSelectionModeSet(false), - m_isLabelTransparencySet(false), - m_isShadowQualitySet(false), - m_fontsize(0.0f), - m_isBarStyleSet(false), - m_isMeshSet(false), - m_isCameraPresetSet(false), - m_camdistance(0.0f), - m_isThemeSet(false), - m_isColorSet(false), - m_isFontSet(false) -{ -} - -DeclarativeMapsCachedStatePrivate::~DeclarativeMapsCachedStatePrivate() -{ -} - QT_DATAVIS3D_END_NAMESPACE |