diff --git a/qmlplugin/declarativescatterseries.cpp b/qmlplugin/declarativescatterseries.cpp index ef72461..2266bd6 100644 --- a/qmlplugin/declarativescatterseries.cpp +++ b/qmlplugin/declarativescatterseries.cpp @@ -1,6 +1,5 @@ #include "declarativescatterseries.h" #include "declarativechart.h" -#include "declarativetablemodel.h" #include "qchart.h" #include "qscatterseries.h" @@ -9,10 +8,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE DeclarativeScatterSeries::DeclarativeScatterSeries(QDeclarativeItem *parent) : QDeclarativeItem(parent), m_chart(0), - m_series(0), - m_model(0), - m_xColumn(0), - m_yColumn(1) + m_series(0) { setFlag(QGraphicsItem::ItemHasNoContents, false); } @@ -32,12 +28,6 @@ void DeclarativeScatterSeries::componentComplete() Q_ASSERT(m_chart); m_series = new QScatterSeries(); -// if (!m_model) -// m_model = new DeclarativeTableModel(); - if (m_model) { - m_series->setModel(m_model); - m_series->setModelMapping(m_xColumn, m_yColumn); - } for (int i(0); i < m_data.count(); i++) { DeclarativeXyPoint *element = m_data.at(i); *m_series << QPointF(element->x(), element->y()); @@ -68,41 +58,6 @@ void DeclarativeScatterSeries::appendData(QDeclarativeListPropertymodel(); - else - return m_model; -} - -void DeclarativeScatterSeries::setModel(DeclarativeTableModel *model) -{ - m_model = model; - if (m_chart && m_series) { - // Hack: remove and add the series to force an update for the chart range - m_chart->removeSeries(m_series); - m_series = new QScatterSeries(); - m_series->setModel(m_model); - m_series->setModelMapping(m_xColumn, m_yColumn); - m_chart->addSeries(m_series); - } -} - -void DeclarativeScatterSeries::setXColumn(int xColumn) -{ - m_xColumn = xColumn; - if (m_series && m_series->model()) - m_series->setModelMapping(m_xColumn, m_yColumn); -} - -void DeclarativeScatterSeries::setYColumn(int yColumn) -{ - m_yColumn = yColumn; - if (m_series && m_series->model()) - m_series->setModelMapping(m_xColumn, m_yColumn); -} - #include "moc_declarativescatterseries.cpp" QTCOMMERCIALCHART_END_NAMESPACE diff --git a/qmlplugin/declarativescatterseries.h b/qmlplugin/declarativescatterseries.h index 385e255..6d892e7 100644 --- a/qmlplugin/declarativescatterseries.h +++ b/qmlplugin/declarativescatterseries.h @@ -2,7 +2,6 @@ #define DECLARATIVESCATTERSERIES_H #include "qchartglobal.h" -#include "declarativetablemodel.h" #include "declarativexypoint.h" #include #include @@ -16,10 +15,6 @@ class DeclarativeScatterSeries : public QDeclarativeItem//, public QDeclarativeP { Q_OBJECT Q_PROPERTY(QDeclarativeListProperty data READ data) - Q_PROPERTY(DeclarativeTableModel *model READ model WRITE setModel) -// Q_PROPERTY(QObject *listModel READ listModel WRITE setListModel) - Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn) - Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn) public: explicit DeclarativeScatterSeries(QDeclarativeItem *parent = 0); @@ -30,14 +25,6 @@ public: // from QDeclarativeParserStatus public: QDeclarativeListProperty data(); - DeclarativeTableModel *model(); - void setModel(DeclarativeTableModel *model); -//QObject *listModel(); -//void setListModel(QObject *model); - int xColumn() { return m_xColumn; } - void setXColumn(int xColumn); - int yColumn() { return m_yColumn; } - void setYColumn(int yColumn); signals: @@ -50,10 +37,7 @@ private slots: public: QChart *m_chart; // not owned QScatterSeries *m_series; // not owned - DeclarativeTableModel *m_model; // not owned QList m_data; - int m_xColumn; - int m_yColumn; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/qmlplugin/declarativetablemodel.cpp b/qmlplugin/declarativetablemodel.cpp deleted file mode 100644 index 74abfbb..0000000 --- a/qmlplugin/declarativetablemodel.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "declarativetablemodel.h" -#include - -DeclarativeTableModel::DeclarativeTableModel(QObject *parent) : - QAbstractTableModel(parent) -{ -} - -int DeclarativeTableModel::rowCount(const QModelIndex &/*parent*/) const -{ - return 5; -} - -int DeclarativeTableModel::columnCount(const QModelIndex &/*parent*/) const -{ - return 4; -} - -QVariant DeclarativeTableModel::headerData(int /*section*/, Qt::Orientation /*orientation*/, int /*role*/) const -{ - return QString("headerData"); -} - -QVariant DeclarativeTableModel::data(const QModelIndex &index, int /*role*/) const -{ -// return QString("data") + QString::number(index.row()) + QString::number(index.column()); - QObject *element = this->findChild("ListElement"); - if (element) - qDebug() << "property: " << element->property("time"); -// element->setProperty("time", "0.1"); - return index.row() + index.column(); -} - -bool DeclarativeTableModel::setData(const QModelIndex &/*index*/, const QVariant &/*value*/, int /*role*/) -{ - return true; -} - -Qt::ItemFlags DeclarativeTableModel::flags(const QModelIndex &/*index*/) const -{ - return 0; -} - -bool DeclarativeTableModel::insertRows(int /*row*/, int /*count*/, const QModelIndex &/*parent*/) -{ - return true; -} - -bool DeclarativeTableModel::removeRows(int /*row*/, int /*count*/, const QModelIndex &/*parent*/) -{ - return true; -} diff --git a/qmlplugin/declarativetablemodel.h b/qmlplugin/declarativetablemodel.h deleted file mode 100644 index 20b98ae..0000000 --- a/qmlplugin/declarativetablemodel.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef DECLARATIVETABLEMODEL_H -#define DECLARATIVETABLEMODEL_H - -#include - -class DeclarativeTableModel : public QAbstractTableModel -{ - Q_OBJECT -public: - explicit DeclarativeTableModel(QObject *parent = 0); - -public: - int rowCount ( const QModelIndex & parent = QModelIndex() ) const; - int columnCount ( const QModelIndex & parent = QModelIndex() ) const; - QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ); - Qt::ItemFlags flags ( const QModelIndex & index ) const; - bool insertRows ( int row, int count, const QModelIndex & parent = QModelIndex() ); - bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex() ); - -signals: - -public slots: - -}; - -#endif // DECLARATIVETABLEMODEL_H diff --git a/qmlplugin/plugin.cpp b/qmlplugin/plugin.cpp index 0638b7d..1c2a359 100644 --- a/qmlplugin/plugin.cpp +++ b/qmlplugin/plugin.cpp @@ -1,7 +1,6 @@ #include #include #include "declarativechart.h" -#include "declarativetablemodel.h" #include "declarativexypoint.h" #include "declarativescatterseries.h" #include "declarativelineseries.h" @@ -19,7 +18,6 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart")); qmlRegisterType(uri, 1, 0, "Chart"); - qmlRegisterType(uri, 1, 0, "ChartTableModel"); qmlRegisterType(uri, 1, 0, "XyPoint"); qmlRegisterType(uri, 1, 0, "ScatterSeries"); qmlRegisterType(uri, 1, 0, "LineSeries"); diff --git a/qmlplugin/qmlplugin.pro b/qmlplugin/qmlplugin.pro index 53e2720..2e44d3a 100644 --- a/qmlplugin/qmlplugin.pro +++ b/qmlplugin/qmlplugin.pro @@ -28,16 +28,14 @@ SOURCES += \ declarativexypoint.cpp \ declarativepieseries.cpp \ declarativelineseries.cpp \ - declarativebarseries.cpp \ - declarativetablemodel.cpp + declarativebarseries.cpp HEADERS += \ declarativechart.h \ declarativescatterseries.h \ declarativexypoint.h \ declarativepieseries.h \ declarativelineseries.h \ - declarativebarseries.h \ - declarativetablemodel.h + declarativebarseries.h TARGETPATH = QtCommercial/Chart target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/test/qmlchart/qml/qmlchart/main.qml b/test/qmlchart/qml/qmlchart/main.qml index 374c1a0..5eadba6 100644 --- a/test/qmlchart/qml/qmlchart/main.qml +++ b/test/qmlchart/qml/qmlchart/main.qml @@ -20,47 +20,11 @@ Rectangle { // } Component.onCompleted: { - console.log("model: " + myModel); // console.log("model:" + myModel.item(0)); // myModel.insert(1, {"time":1.4; "speed":41.1 }); // scatter.appendData(); } - ListModel { - ListElement { - time: 0.0 - speed: 45.2 - } - } - ChartTableModel { - id: myModel - -// ListElement { -// time: 0.0 -// speed: 45.2 -// } -// ListElement { -// time: 0.5 -// speed: 48.9 -// } -// ListElement { -// time: 1.1 -// speed: 42.6 -// } - -// ChartTableElement { -// time: 0.0 -// speed: 45.2 -// } -// ChartTableElement { -// time: 0.5 -// speed: 48.9 -// } -// ChartTableElement { -// time: 1.1 -// speed: 42.6 -// } - } Chart { id: chart1 @@ -70,13 +34,7 @@ Rectangle { height: parent.height / 2 theme: Chart.ThemeBlueCerulean -// BarSeries { -// } - - ScatterSeries { - model: myModel -// xColumn: time -// yColumn: speed + BarSeries { } // PieSeries {