HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1395:33102af7bf20

Fixed Qml Custom Model demo header data

Tero Ahola -

r1395:33102af7bf20

parent child

Context file:

r1395:33102af7bf20

Collapse all files

demos/qmlcustomizations/qml/qmlcustomizations/main.qml +1 0

                      PieSeries {
                          id: wheelOfFortune
+                         horizontalPosition: 0.3
                      }
                      SplineSeries {

demos/qmlcustommodel/customtablemodel.cpp +7 -7

                  if (role != Qt::DisplayRole)
                      return QVariant();
-                 if (orientation == Qt::Horizontal) {
-                     if (m_rowHeaders.count() > section)
-                         return m_rowHeaders[section];
+                 if (orientation == Qt::Vertical) {
+                     if (m_verticalHeaders.count() > section)
+                         return m_verticalHeaders[section];
                      else
                          return QAbstractTableModel::headerData(section, orientation, role);
                  } else {
              bool CustomTableModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role)
              {
-                 if (orientation == Qt::Horizontal) {
-                     while (m_rowHeaders.count() <= section)
-                         m_rowHeaders.append(QVariant());
-                     m_rowHeaders.replace(section, value);
+                 if (orientation == Qt::Vertical) {
+                     while (m_verticalHeaders.count() <= section)
+                         m_verticalHeaders.append(QVariant());
+                     m_verticalHeaders.replace(section, value);
                  } else {
                      return QAbstractTableModel::setHeaderData(section, orientation, value, role);
                  }

demos/qmlcustommodel/customtablemodel.h +1 -1

              private:
                  QList<QVector<QVariant> * > m_data;
-                 QList<QVariant> m_rowHeaders;
+                 QList<QVariant> m_verticalHeaders;
                  int m_columnCount;
                  int m_rowCount;
              };

demos/qmlcustommodel/declarativemodel.cpp +12 -11

              #include "declarativemodel.h"
              #include <qdeclarativelist.h>
+             #include <QStringList>
              #include <QDebug>
              ////////////// Table model element ///////////////////
              {
              }
-             QString DeclarativeTableModelElement::rowHeader()
+             {
-                 return m_rowHeader;
+             }
-             void DeclarativeTableModelElement::setRowHeader(QString header)
+             {
-                 m_rowHeader = header;
+             }
              QVariantList DeclarativeTableModelElement::values()
              {
                  return m_values;
                      if (qobject_cast<DeclarativeTableModelElement *>(child)) {
                          DeclarativeTableModelElement *element = qobject_cast<DeclarativeTableModelElement *>(child);
                          append(element->values());
-                         setHeaderData(rowCount() - 1, Qt::Horizontal, element->rowHeader());
                      }
                  }
              }
+             void DeclarativeTableModel::setVerticalHeaders(QStringList headers)
+             {
+                 for (int i(0); i < headers.count(); i++)
+                     setHeaderData(i, Qt::Vertical, headers.at(i));
+             }
+             QStringList DeclarativeTableModel::verticalHeaders()
+             {
+                 return QStringList();
+             }
              QDeclarativeListProperty<QObject> DeclarativeTableModel::modelChildren()
              {
                  return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeTableModel::appendModelChild);

demos/qmlcustommodel/declarativemodel.h +3 -4

              class DeclarativeTableModelElement : public QObject
              {
                  Q_OBJECT
-                 Q_PROPERTY(QString rowHeader READ rowHeader WRITE setRowHeader)
                  Q_PROPERTY(QVariantList values READ values WRITE setValues)
              public:
                  explicit DeclarativeTableModelElement(QObject *parent = 0);
-                 QString rowHeader();
-                 void setRowHeader(QString header);
                  QVariantList values();
                  void setValues(QVariantList values);
              private:
-                 QString m_rowHeader;
                  QVariantList m_values;
              };
                  Q_OBJECT
                  Q_INTERFACES(QDeclarativeParserStatus)
                  Q_PROPERTY(QDeclarativeListProperty<QObject> modelChildren READ modelChildren)
+                 Q_PROPERTY(QStringList verticalHeaders READ verticalHeaders WRITE setVerticalHeaders)
                  Q_CLASSINFO("DefaultProperty", "modelChildren")
              public:
                  explicit DeclarativeTableModel(QObject *parent = 0);
                  QDeclarativeListProperty<QObject> modelChildren();
+                 void setVerticalHeaders(QStringList headers);
+                 QStringList verticalHeaders();
              public: // from QDeclarativeParserStatus
                  void classBegin();

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +8 -7

                      //![2]
                      CustomModel {
                          id: customModel
-                         CustomModelElement { rowHeader: ""; values: [0, "Manufacturer", 0, 1, 2, 3, 4] }
-                         CustomModelElement { rowHeader: "Volkswagen"; values: [1, "Volkswagen", 10.3, 12.0, 12.8, 13.0, 13.8] }
-                         CustomModelElement { rowHeader: "Toyota"; values: [2, "Toyota", 13.8, 13.5, 16.2, 13.7, 10.7] }
-                         CustomModelElement { rowHeader: "Ford"; values: [3, "Ford", 6.4, 7.1, 8.9, 8.2, 8.6] }
-                         CustomModelElement { rowHeader: "Skoda"; values: [4, "Skoda", 4.7, 5.8, 6.9, 8.3, 8.2] }
-                         CustomModelElement { rowHeader: "Volvo"; values: [5, "Volvo", 7.1, 6.7, 6.5, 6.3, 7.0] }
-                         CustomModelElement { rowHeader: "Others"; values: [6, "Others", 57.7, 54.9, 48.7, 50.5, 51.7] }
+                         verticalHeaders: ["Manufacturer", "Volkswagen", "Toyota", "Ford", "Skoda", "Volvo", "Others"]
+                         CustomModelElement { values: [0, "Manufacturer", 0, 1, 2, 3, 4] }
+                         CustomModelElement { values: [1, "Volkswagen", 10.3, 12.0, 12.8, 13.0, 13.8] }
+                         CustomModelElement { values: [2, "Toyota", 13.8, 13.5, 16.2, 13.7, 10.7] }
+                         CustomModelElement { values: [3, "Ford", 6.4, 7.1, 8.9, 8.2, 8.6] }
+                         CustomModelElement { values: [4, "Skoda", 4.7, 5.8, 6.9, 8.3, 8.2] }
+                         CustomModelElement { values: [5, "Volvo", 7.1, 6.7, 6.5, 6.3, 7.0] }
+                         CustomModelElement { values: [6, "Others", 57.7, 54.9, 48.7, 50.5, 51.7] }
                      }
                      //![2]

doc/images/demos_qmlcustommodel.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages