1 files changed, 57 insertions, 9 deletions

diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index f19b4445..d7394dcf 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -21,6 +21,7 @@
 
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtCore/QAbstractItemModel>
+#include <QtCore/QRegExp>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -29,7 +30,8 @@ class QItemModelBarDataProxyPrivate;
 class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy
 {
     Q_OBJECT
-    Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged)
+    Q_ENUMS(MultiMatchBehavior)
+    Q_PROPERTY(QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged)
     Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole NOTIFY rowRoleChanged)
     Q_PROPERTY(QString columnRole READ columnRole WRITE setColumnRole NOTIFY columnRoleChanged)
     Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY valueRoleChanged)
@@ -39,30 +41,46 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy
     Q_PROPERTY(bool useModelCategories READ useModelCategories WRITE setUseModelCategories NOTIFY useModelCategoriesChanged)
     Q_PROPERTY(bool autoRowCategories READ autoRowCategories WRITE setAutoRowCategories NOTIFY autoRowCategoriesChanged)
     Q_PROPERTY(bool autoColumnCategories READ autoColumnCategories WRITE setAutoColumnCategories NOTIFY autoColumnCategoriesChanged)
+    Q_PROPERTY(QRegExp rowRolePattern READ rowRolePattern WRITE setRowRolePattern NOTIFY rowRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegExp columnRolePattern READ columnRolePattern WRITE setColumnRolePattern NOTIFY columnRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegExp valueRolePattern READ valueRolePattern WRITE setValueRolePattern NOTIFY valueRolePatternChanged REVISION 1)
+    Q_PROPERTY(QRegExp rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1)
+    Q_PROPERTY(QString rowRoleReplace READ rowRoleReplace WRITE setRowRoleReplace NOTIFY rowRoleReplaceChanged REVISION 1)
+    Q_PROPERTY(QString columnRoleReplace READ columnRoleReplace WRITE setColumnRoleReplace NOTIFY columnRoleReplaceChanged REVISION 1)
+    Q_PROPERTY(QString valueRoleReplace READ valueRoleReplace WRITE setValueRoleReplace NOTIFY valueRoleReplaceChanged REVISION 1)
+    Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1)
+    Q_PROPERTY(MultiMatchBehavior multiMatchBehavior READ multiMatchBehavior WRITE setMultiMatchBehavior NOTIFY multiMatchBehaviorChanged REVISION 1)
 
 public:
+    enum MultiMatchBehavior {
+        MMBFirst = 0,
+        MMBLast = 1,
+        MMBAverage = 2,
+        MMBCumulative = 3
+    };
+
     explicit QItemModelBarDataProxy(QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, const QString &valueRole,
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
                            QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, const QString &rowRole,
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                            const QString &columnRole, const QString &valueRole,
                            QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, const QString &rowRole,
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                            const QString &columnRole, const QString &valueRole,
                            const QString &rotationRole, QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, const QString &rowRole,
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                            const QString &columnRole, const QString &valueRole,
                            const QStringList &rowCategories, const QStringList &columnCategories,
                            QObject *parent = 0);
-    QItemModelBarDataProxy(const QAbstractItemModel *itemModel, const QString &rowRole,
+    QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
                            const QString &columnRole, const QString &valueRole,
                            const QString &rotationRole, const QStringList &rowCategories,
                            const QStringList &columnCategories, QObject *parent = 0);
     virtual ~QItemModelBarDataProxy();
 
-    void setItemModel(const QAbstractItemModel *itemModel);
-    const QAbstractItemModel *itemModel() const;
+    void setItemModel(QAbstractItemModel *itemModel);
+    QAbstractItemModel *itemModel() const;
 
     void setRowRole(const QString &role);
     QString rowRole() const;
@@ -93,6 +111,27 @@ public:
     Q_INVOKABLE int rowCategoryIndex(const QString& category);
     Q_INVOKABLE int columnCategoryIndex(const QString& category);
 
+    void setRowRolePattern(const QRegExp &pattern);
+    QRegExp rowRolePattern() const;
+    void setColumnRolePattern(const QRegExp &pattern);
+    QRegExp columnRolePattern() const;
+    void setValueRolePattern(const QRegExp &pattern);
+    QRegExp valueRolePattern() const;
+    void setRotationRolePattern(const QRegExp &pattern);
+    QRegExp rotationRolePattern() const;
+
+    void setRowRoleReplace(const QString &replace);
+    QString rowRoleReplace() const;
+    void setColumnRoleReplace(const QString &replace);
+    QString columnRoleReplace() const;
+    void setValueRoleReplace(const QString &replace);
+    QString valueRoleReplace() const;
+    void setRotationRoleReplace(const QString &replace);
+    QString rotationRoleReplace() const;
+
+    void setMultiMatchBehavior(MultiMatchBehavior behavior);
+    MultiMatchBehavior multiMatchBehavior() const;
+
 signals:
     void itemModelChanged(const QAbstractItemModel* itemModel);
     void rowRoleChanged(const QString &role);
@@ -104,6 +143,15 @@ signals:
     void useModelCategoriesChanged(bool enable);
     void autoRowCategoriesChanged(bool enable);
     void autoColumnCategoriesChanged(bool enable);
+    Q_REVISION(1) void rowRolePatternChanged(const QRegExp &pattern);
+    Q_REVISION(1) void columnRolePatternChanged(const QRegExp &pattern);
+    Q_REVISION(1) void valueRolePatternChanged(const QRegExp &pattern);
+    Q_REVISION(1) void rotationRolePatternChanged(const QRegExp &pattern);
+    Q_REVISION(1) void rowRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1) void columnRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1) void valueRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace);
+    Q_REVISION(1) void multiMatchBehaviorChanged(MultiMatchBehavior behavior);
 
 protected:
     QItemModelBarDataProxyPrivate *dptr();