1 files changed, 108 insertions, 47 deletions
diff --git a/src/datavis3dqml2/declarativemaps_p.h b/src/datavis3dqml2/declarativemaps_p.h
index 7c82f723..2c8484aa 100644
--- a/src/datavis3dqml2/declarativemaps_p.h
+++ b/src/datavis3dqml2/declarativemaps_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(ies).
+** Contact: http://www.qtproject.org/legal
 **
 ** This file is part of the QtDataVis3D module.
 **
@@ -12,7 +12,7 @@
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
 ** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** use the contact form at http://qt.digia.com/contactus.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file LICENSE.LGPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** will be met: http://www.gnu.org/licenses/oldlicenses/lgpl2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
 ** rights.  These rights are described in the Digia Qt LGPL Exception
@@ -41,7 +41,7 @@
 
 //
 //  W A R N I N G
-//  -------------
+//
 //
 // This file is not part of the QtDataVis3D API.  It exists purely as an
 // implementation detail.  This header file may change from version to
@@ -54,71 +54,132 @@
 
 #include "datavis3dglobal_p.h"
 #include "maps3dcontroller_p.h"
+#include "declarativemaps_p.h"
 #include "qitemmodelmapdatamapping.h"
-#include <QString>
+
 #include <QAbstractItemModel>
+#include <QQuickItem>
+#include <QObject>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
-class QDataRow;
-class QDataItem;
-
-class DeclarativeMapsCachedStatePrivate
+class DeclarativeMaps : public QQuickItem
 {
+    Q_OBJECT
+    Q_PROPERTY(QAbstractItemModel *data READ data WRITE setData)
+    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QFont font READ font WRITE setFont)
+    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
+    Q_PROPERTY(QItemModelMapDataMapping *mapping READ mapping WRITE setMapping)
+    Q_ENUMS(SelectionMode)
+    Q_ENUMS(ShadowQuality)
+    Q_ENUMS(LabelTransparency)
+
+public:
+    // Duplicated here to be able to use the same enums
+    enum SelectionMode {
+        ModeNone = 0,
+        ModeBar,
+        ModeBarAndRow,
+        ModeBarAndColumn,
+        ModeBarRowAndColumn,
+        ModeZoomRow,
+        ModeZoomColumn
+    };
+
+    enum ShadowQuality {
+        ShadowNone = 0,
+        ShadowLow = 1,
+        ShadowMedium = 3,
+        ShadowHigh = 5
+    };
+
+    enum LabelTransparency {
+        TransparencyNone = 0,       // Full solid, using colors from theme
+        TransparencyFromTheme,      // Use colors and transparencies from theme
+        TransparencyNoBackground    // Draw just text on transparent background
+    };
+
 public:
-    explicit DeclarativeMapsCachedStatePrivate();
-    ~DeclarativeMapsCachedStatePrivate();
+    explicit DeclarativeMaps(QQuickItem *parent = 0);
+    ~DeclarativeMaps();
+
+    void classBegin();
+    void componentComplete();
+
+    void setData(QAbstractItemModel *data);
+    QAbstractItemModel *data();
+
+    // bar specifications; base thickness in x, y and z, enum to indicate which direction is increased with value
+    // TODO: Start using thickness also in adjustment direction; use it as a relative value.
+    // For example, in AdjustAll mode setting thickness to (0.1f, 1.0f, 0.5f) would apply value to
+    // x at 10%, y at 100% and z at 50%. If a dimension is not included, given thickness states its absolute value.
+    Q_INVOKABLE void setBarSpecs(const QVector3D &thickness = QVector3D(1.0f, 1.0f, 1.0f),
+                     Q3DMaps::AdjustmentDirection direction = Q3DMaps::AdjustHeight);
+
+    // bar type; bars (=cubes), pyramids, cones, cylinders, balls, etc.
+    Q_INVOKABLE void setBarType(BarStyle style, bool smooth = false);
+
+    // override bar type with own mesh
+    Q_INVOKABLE void setMeshFileName(const QString &objFileName);
 
-    void appendData(QDataItem *item);
+    // Select preset camera placement
+    Q_INVOKABLE void setCameraPreset(CameraPreset preset);
 
-    QAbstractItemModel *m_model;
-    QItemModelMapDataMapping *m_mapping;
+    // Set camera rotation if you don't want to use the presets (in horizontal (180...180) and
+    // vertical (0...90) angles and distance in percentage (10...500))
+    Q_INVOKABLE void setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance = 100);
 
-    bool m_isImageSet;
-    QImage m_image;
+    // Set theme (bar colors, shaders, window color, background colors, light intensity and text colors are affected)
+    Q_INVOKABLE void setTheme(ColorTheme theme);
 
-    bool m_isBarSpecsSet;
-    QVector3D m_thickness;
-    Q3DMaps::AdjustmentDirection m_direction;
+    // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
+    Q_INVOKABLE void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
 
-    bool m_isAreaRectSet;
-    QRect m_arearect;
+    // Set area specs
+    Q_INVOKABLE void setAreaSpecs(const QRect &areaRect, const QImage &image);
 
-    bool m_isSelectionModeSet;
-    SelectionMode m_selectionMode;
+    // Set area image
+    Q_INVOKABLE void setImage(const QImage &image);
+    Q_INVOKABLE void setImage(const QString &imageUrl);
 
-    bool m_isLabelTransparencySet;
-    LabelTransparency m_labelTransparency;
+    // Change selection mode; single bar, bar and row, bar and column, or all
+    void setSelectionMode(SelectionMode mode);
+    SelectionMode selectionMode();
 
-    bool m_isShadowQualitySet;
-    ShadowQuality m_shadowQuality;
+    // Font size adjustment
+    void setFontSize(float fontsize);
+    float fontSize();
 
-    float m_fontsize;
+    // Set font
+    void setFont(const QFont &font);
+    QFont font();
 
-    bool m_isBarStyleSet;
-    BarStyle m_barstyle;
-    bool m_barsmooth;
+    // Label transparency adjustment
+    void setLabelTransparency(LabelTransparency transparency);
+    LabelTransparency labelTransparency();
 
-    bool m_isMeshSet;
-    QString m_meshfilename;
+    // Adjust shadow quality
+    void setShadowQuality(ShadowQuality quality);
+    ShadowQuality shadowQuality();
 
-    bool m_isCameraPresetSet;
-    CameraPreset m_camerapreset;
+    QItemModelMapDataMapping *mapping() const;
+    void setMapping(QItemModelMapDataMapping *mapping);
 
-    float m_camhorizontal;
-    float m_camvertical;
-    float m_camdistance;
+protected:
+    Maps3DController *m_shared;
 
-    bool m_isThemeSet;
-    ColorTheme m_theme;
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
 
-    bool m_isColorSet;
-    QColor m_basecolor;
-    QColor m_heightcolor;
-    bool m_coloruniform;
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void wheelEvent(QWheelEvent *event);
 
-    bool m_isFontSet;
-    QFont m_font;
+private:
+    QSize m_initializedSize;
 };
 
 QT_DATAVIS3D_END_NAMESPACE