Improve qmlbarchart example

+ Fix building of surface example
+ Some warnings fixed

Task-number: QTRD-2239
Change-Id: If957d86fdd3499f8f81e283b06c79e547b6ba09c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

10 files changed, 57 insertions, 20 deletions

diff --git a/examples/qmlbarchart/qml/qmlbarchart/axes.qml b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
index 6bbfef9e..8b97c52e 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/axes.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
@@ -27,7 +27,7 @@ Item {
 
     CategoryAxis {
         id: rowAxis
-        categoryLabels: ["2000", "2001", "2002", "2003", "2004"]
+        categoryLabels: ["2000", "2001", "2002", "2003"]
     }
     CategoryAxis {
         id: columnAxis
diff --git a/examples/qmlbarchart/qml/qmlbarchart/data.qml b/examples/qmlbarchart/qml/qmlbarchart/data.qml
index da053734..f7fef334 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/data.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/data.qml
@@ -28,7 +28,7 @@ Item {
         rowRole: "year"
         columnRole: "month"
         valueRole: "expenses"
-        rowCategories: ["2000", "2001", "2002", "2003", "2004"]
+        rowCategories: ["2000", "2001", "2002", "2003"]
         columnCategories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
             "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
     }
@@ -78,6 +78,13 @@ Item {
         ListElement{ year: "2003"; month: "Feb"; expenses: "4";  income: "8"  }
         ListElement{ year: "2003"; month: "Mar"; expenses: "7";  income: "12"  }
         ListElement{ year: "2003"; month: "Apr"; expenses: "9";  income: "15"  }
-        // rest of 2003 missing on purpose, as well as whole of 2004
+        ListElement{ year: "2003"; month: "May"; expenses: "7";  income: "19"  }
+        ListElement{ year: "2003"; month: "Jun"; expenses: "9";  income: "18"  }
+        ListElement{ year: "2003"; month: "Jul"; expenses: "13"; income: "17"  }
+        ListElement{ year: "2003"; month: "Aug"; expenses: "5";  income: "9"  }
+        ListElement{ year: "2003"; month: "Sep"; expenses: "3";  income: "8"  }
+        ListElement{ year: "2003"; month: "Oct"; expenses: "13"; income: "15"  }
+        ListElement{ year: "2003"; month: "Nov"; expenses: "8";  income: "17"  }
+        ListElement{ year: "2003"; month: "Dec"; expenses: "7";  income: "10"  }
     }
 }
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index 89e4198d..8de31903 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -23,8 +23,8 @@ import "."
 
 Item {
     id: mainview
-    width: 800
-    height: 600
+    width: 1280
+    height: 1024
     visible: true
 
     Data {
@@ -52,7 +52,7 @@ Item {
             selectionMode: Bars3D.ModeItem
             labelTransparency: Bars3D.TransparencyNone
             theme: Bars3D.ThemeBrownSand
-            rows: 5
+            rows: 4
             columns: 12
             mapping: chartData.mapping
             barThickness: 0.5
@@ -63,6 +63,7 @@ Item {
             columnAxis: chartAxes.column
             valueAxis: chartAxes.expenses
             itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel"
+            backgroundVisible: true
 
             onDataResolved: {
                 // Can't select a bar until data has been resolved from model to proxy
@@ -79,13 +80,19 @@ Item {
         id: tableView
         x: 0
         y: 0
-        width: 300
+        width: 298
         height: parent.height - mappingToggle.height - shadowToggle.height
         TableViewColumn{ role: "year"  ; title: "Year" ; width: 80 }
         TableViewColumn{ role: "month" ; title: "Month" ; width: 80 }
-        TableViewColumn{ role: "expenses" ; title: "Expenses" ; width: 70 }
-        TableViewColumn{ role: "income" ; title: "Income" ; width: 70 }
+        TableViewColumn{ role: "expenses" ; title: "Expenses" ; width: 60 }
+        TableViewColumn{ role: "income" ; title: "Income" ; width: 60 }
         model: chartData.model
+
+        onClicked: {
+            var rowIndex = testchart.mapping.rowCategoryIndex(chartData.model.get(row).year)
+            var colIndex = testchart.mapping.columnCategoryIndex(chartData.model.get(row).month)
+            testchart.selectedBarPos = Qt.point(rowIndex, colIndex)
+        }
     }
 
     Button {
diff --git a/examples/surfacechart/surfacechart.pro b/examples/surfacechart/surfacechart.pro
index 69cc270e..6b3067ae 100644
--- a/examples/surfacechart/surfacechart.pro
+++ b/examples/surfacechart/surfacechart.pro
@@ -11,3 +11,5 @@ INSTALLS += target
 
 HEADERS += \
     chartmodifier.h
+
+QT += widgets
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.cpp b/src/datavis3d/data/qitemmodelbardatamapping.cpp
index d9b8403b..8877f891 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.cpp
+++ b/src/datavis3d/data/qitemmodelbardatamapping.cpp
@@ -188,6 +188,16 @@ void QItemModelBarDataMapping::remap(const QString &rowRole,
     emit mappingChanged();
 }
 
+int QItemModelBarDataMapping::rowCategoryIndex(const QString &category)
+{
+    return dptr()->m_rowCategories.indexOf(category);
+}
+
+int QItemModelBarDataMapping::columnCategoryIndex(const QString &category)
+{
+    return dptr()->m_columnCategories.indexOf(category);
+}
+
 /*!
  * \internal
  */
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h
index 377cd1e7..7a989919 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavis3d/data/qitemmodelbardatamapping.h
@@ -44,10 +44,6 @@ public:
                              const QStringList &columnCategories, QObject *parent = 0);
     virtual ~QItemModelBarDataMapping();
 
-    // If row categories or column categories is an empty list, use item models's rows and columns for rows and columns.
-    // If the categories are both defined, ignore item model's rows and columns and figure out the rows and columns from
-    // the values of the set roles for each item.
-
     void setRowRole(const QString &role);
     QString rowRole() const;
     void setColumnRole(const QString &role);
@@ -64,6 +60,9 @@ public:
                const QString &valueRole, const QStringList &rowCategories,
                const QStringList &columnCategories);
 
+    Q_INVOKABLE int rowCategoryIndex(const QString& category);
+    Q_INVOKABLE int columnCategoryIndex(const QString& category);
+
 protected:
     QItemModelBarDataMappingPrivate *dptr();
     const QItemModelBarDataMappingPrivate *dptrc() const;
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index d1c4d198..72141c42 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -355,20 +355,22 @@ QString DeclarativeBars::itemLabelFormat()
     return m_shared->activeDataProxy()->itemLabelFormat();
 }
 
-void DeclarativeBars::setSelectedBarPos(const QPoint &position)
+void DeclarativeBars::setSelectedBarPos(const QPointF &position)
 {
-    m_shared->setSelectedBarPos(position);
+    m_shared->setSelectedBarPos(position.toPoint());
 }
 
-QPoint DeclarativeBars::selectedBarPos() const
+QPointF DeclarativeBars::selectedBarPos() const
 {
-    return m_shared->selectedBarPos();
+    return QPointF(m_shared->selectedBarPos());
 }
 
 void DeclarativeBars::mouseDoubleClickEvent(QMouseEvent *event)
 {
 #if defined(Q_OS_ANDROID)
     m_shared->mouseDoubleClickEvent(event);
+#else
+    Q_UNUSED(event)
 #endif
 }
 
@@ -377,6 +379,8 @@ void DeclarativeBars::touchEvent(QTouchEvent *event)
 #if defined(Q_OS_ANDROID)
     m_shared->touchEvent(event);
     update();
+#else
+    Q_UNUSED(event)
 #endif
 }
 
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index 877af645..4a2a74ad 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -68,7 +68,7 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(int rows READ rows WRITE setRows)
     Q_PROPERTY(int columns READ columns WRITE setColumns)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
-    Q_PROPERTY(QPoint selectedBarPos READ selectedBarPos WRITE setSelectedBarPos)
+    Q_PROPERTY(QPointF selectedBarPos READ selectedBarPos WRITE setSelectedBarPos)
     Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
     Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
     Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
@@ -177,8 +177,8 @@ public:
     void setItemLabelFormat(const QString &format);
     QString itemLabelFormat();
 
-    void setSelectedBarPos(const QPoint &position);
-    QPoint selectedBarPos() const;
+    void setSelectedBarPos(const QPointF &position);
+    QPointF selectedBarPos() const;
 
 signals:
     // Signals shadow quality changes.
diff --git a/src/datavis3dqml2/declarativemaps.cpp b/src/datavis3dqml2/declarativemaps.cpp
index a3346a0a..962654a0 100644
--- a/src/datavis3dqml2/declarativemaps.cpp
+++ b/src/datavis3dqml2/declarativemaps.cpp
@@ -194,6 +194,8 @@ void DeclarativeMaps::mouseDoubleClickEvent(QMouseEvent *event)
 {
 #if defined(Q_OS_ANDROID)
     m_shared->mouseDoubleClickEvent(event);
+#else
+    Q_UNUSED(event)
 #endif
 }
 
@@ -202,6 +204,8 @@ void DeclarativeMaps::touchEvent(QTouchEvent *event)
 #if defined(Q_OS_ANDROID)
     m_shared->touchEvent(event);
     update();
+#else
+    Q_UNUSED(event)
 #endif
 }
 
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index c6744f17..9bd568ce 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -303,6 +303,8 @@ void DeclarativeScatter::mouseDoubleClickEvent(QMouseEvent *event)
 {
 #if defined(Q_OS_ANDROID)
     m_shared->mouseDoubleClickEvent(event);
+#else
+    Q_UNUSED(event)
 #endif
 }
 
@@ -311,6 +313,8 @@ void DeclarativeScatter::touchEvent(QTouchEvent *event)
 #if defined(Q_OS_ANDROID)
     m_shared->touchEvent(event);
     update();
+#else
+    Q_UNUSED(event)
 #endif
 }