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>

2 files changed, 13 insertions, 4 deletions

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;