From 29eac6e74027164daf07a65e0811cbac6d28d64d 2012-04-04 14:45:45 From: Marek Rosa Date: 2012-04-04 14:45:45 Subject: [PATCH] Minor changes to spline and model examples --- diff --git a/examples/modeldata/customtablemodel.cpp b/examples/modeldata/customtablemodel.cpp index 90480ee..04ffac8 100644 --- a/examples/modeldata/customtablemodel.cpp +++ b/examples/modeldata/customtablemodel.cpp @@ -118,8 +118,3 @@ void CustomTableModel::addMapping(QString color, QRect area) { m_mapping.insertMulti(color, area); } - -void CustomTableModel::addMapping(QString color, int left, int top, int right, int bottom) -{ - addMapping(color, QRect(QPoint(left, top), QPoint(right, bottom))); -} diff --git a/examples/modeldata/customtablemodel.h b/examples/modeldata/customtablemodel.h index b144f41..64d5f19 100644 --- a/examples/modeldata/customtablemodel.h +++ b/examples/modeldata/customtablemodel.h @@ -22,9 +22,6 @@ #define XYPOINTSMODEL_H #include -#include -#include -//#include #include #include @@ -42,7 +39,6 @@ public: Qt::ItemFlags flags ( const QModelIndex & index ) const; void addMapping(QString color, QRect area); - void addMapping(QString color, int left, int top, int right, int bottom); void clearMapping() { m_mapping.clear(); } private: diff --git a/examples/modeldata/tablewidget.cpp b/examples/modeldata/tablewidget.cpp index ee54ebc..30727bc 100644 --- a/examples/modeldata/tablewidget.cpp +++ b/examples/modeldata/tablewidget.cpp @@ -38,13 +38,12 @@ TableWidget::TableWidget(QWidget *parent) // create table view and add model to it QTableView *tableView = new QTableView; tableView->setModel(model); - tableView->setMinimumWidth(200); -// tableView->setMaximumWidth(200); - // m_tableView->resizeColumnsToContents(); - tableView->setColumnWidth(0, 50); - tableView->setColumnWidth(1, 50); - tableView->setColumnWidth(2, 50); - tableView->setColumnWidth(3, 50); +// tableView-> +// tableView->setMinimumWidth(200); + tableView->setColumnWidth(0, 56); + tableView->setColumnWidth(1, 56); + tableView->setColumnWidth(2, 56); + tableView->setColumnWidth(3, 56); QChart *m_chart = new QChart; m_chart->setAnimationOptions(QChart::AllAnimations); @@ -75,13 +74,11 @@ TableWidget::TableWidget(QWidget *parent) seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper(); model->addMapping(seriesColorHex, QRect(2, 0, 2, model->rowCount())); -// m_chart->axisX()->setRange(0, 800); -// m_chart->axisY()->setRange(0, 120); - // create main layout QGridLayout* mainLayout = new QGridLayout; mainLayout->addWidget(tableView, 1, 0); mainLayout->addWidget(m_chartView, 1, 1); mainLayout->setColumnStretch(1, 1); + mainLayout->setColumnStretch(0, 0); setLayout(mainLayout); } diff --git a/examples/splinechart/main.cpp b/examples/splinechart/main.cpp index c72009a..a14d6b5 100644 --- a/examples/splinechart/main.cpp +++ b/examples/splinechart/main.cpp @@ -49,6 +49,7 @@ int main(int argc, char *argv[]) QChart* chart = new QChart(); chart->addSeries(series); chart->setTitle("Simple spline chart example"); + chart->axisY()->setRange(0, 10); //![3] //![4]