diff --git a/src/xychart/qhxymodelmapper.cpp b/src/xychart/qhxymodelmapper.cpp index 5634dbb..ad123a4 100644 --- a/src/xychart/qhxymodelmapper.cpp +++ b/src/xychart/qhxymodelmapper.cpp @@ -5,6 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QHXYModelMapper::QHXYModelMapper(QObject *parent) : QXYModelMapper(parent) { + QXYModelMapper::setOrientation(Qt::Horizontal); } int QHXYModelMapper::xRow() const diff --git a/src/xychart/qvxymodelmapper.cpp b/src/xychart/qvxymodelmapper.cpp index a740093..78539cd 100644 --- a/src/xychart/qvxymodelmapper.cpp +++ b/src/xychart/qvxymodelmapper.cpp @@ -5,6 +5,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QVXYModelMapper::QVXYModelMapper(QObject *parent) : QXYModelMapper(parent) { + QXYModelMapper::setOrientation(Qt::Vertical); } int QVXYModelMapper::xColumn() const diff --git a/tests/tablemodelchart/tablewidget.cpp b/tests/tablemodelchart/tablewidget.cpp index 8c853cc..94361b8 100644 --- a/tests/tablemodelchart/tablewidget.cpp +++ b/tests/tablemodelchart/tablewidget.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "customtablemodel.h" #include #include @@ -135,7 +136,7 @@ TableWidget::TableWidget(QWidget *parent) connect(m_pieRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool))); connect(m_areaRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool))); connect(m_barRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool))); - m_barRadioButton->setChecked(true); + m_lineRadioButton->setChecked(true); // radio buttons layout QVBoxLayout* radioLayout = new QVBoxLayout; @@ -240,14 +241,22 @@ void TableWidget::updateChartType(bool toggle) // series 1 m_series = new QLineSeries; - m_mapper = new QVXYModelMapper; + m_mapper = new QHXYModelMapper; m_mapper->setModel(m_model); m_mapper->setSeries(m_series); - m_mapper->setXColumn(0); - m_mapper->setYColumn(1); + m_mapper->setXRow(0); + m_mapper->setYRow(1); m_mapper->setFirst(3); m_mapper->setCount(4); +// m_mapper = new QVXYModelMapper; +// m_mapper->setModel(m_model); +// m_mapper->setSeries(m_series); +// m_mapper->setXColumn(0); +// m_mapper->setYColumn(1); +// m_mapper->setFirst(3); +// m_mapper->setCount(4); + // m_series->setModelMapping(0,1, Qt::Vertical); // m_series->setModelMappingRange(3, 4); m_chart->addSeries(m_series); @@ -293,13 +302,13 @@ void TableWidget::updateChartType(bool toggle) m_series = new QSplineSeries; // m_series->setModel(m_model); - m_mapper = new QVXYModelMapper; - m_mapper->setSeries(m_series); - m_mapper->setModel(m_model); - m_mapper->setXColumn(0); - m_mapper->setYColumn(1); - m_mapper->setFirst(0); - m_mapper->setCount(-1); +// m_mapper = new QVXYModelMapper; +// m_mapper->setSeries(m_series); +// m_mapper->setModel(m_model); +// m_mapper->setXColumn(0); +// m_mapper->setYColumn(1); +// m_mapper->setFirst(0); +// m_mapper->setCount(-1); // m_series->setModelMapper(mapper); @@ -345,13 +354,13 @@ void TableWidget::updateChartType(bool toggle) // series 1 m_series = new QScatterSeries; - m_mapper = new QVXYModelMapper; - m_mapper->setSeries(m_series); - m_mapper->setModel(m_model); - m_mapper->setXColumn(0); - m_mapper->setYColumn(1); - m_mapper->setFirst(0); - m_mapper->setCount(-1); +// m_mapper = new QVXYModelMapper; +// m_mapper->setSeries(m_series); +// m_mapper->setModel(m_model); +// m_mapper->setXColumn(0); +// m_mapper->setYColumn(1); +// m_mapper->setFirst(0); +// m_mapper->setCount(-1); m_chart->addSeries(m_series); seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper(); diff --git a/tests/tablemodelchart/tablewidget.h b/tests/tablemodelchart/tablewidget.h index ecf33cd..63c7b50 100644 --- a/tests/tablemodelchart/tablewidget.h +++ b/tests/tablemodelchart/tablewidget.h @@ -28,6 +28,7 @@ #include #include #include +#include class CustomTableModel; class QTableView; @@ -62,7 +63,7 @@ public: QChartView* m_chartView; QChart* m_chart; QXYSeries* m_series; - QVXYModelMapper *m_mapper; + QHXYModelMapper *m_mapper; CustomTableModel* m_model; QTableView* m_tableView; QRadioButton* m_lineRadioButton;