HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1012:63ded67c2d2b

For BarChart labels for legend are now taken from model's headerData (row or column)

Marek Rosa -

r1012:63ded67c2d2b

parent child

Context file:

r1012:63ded67c2d2b

src/barchart/qbarseries.cpp +2 -3

             QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_categories(categories),
-                m_model(0),
                 m_mapCategories(-1),
                 m_mapBarBottom(-1),
                 m_mapBarTop(-1),
                     }
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
-                        QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
+                        QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
                         for(int m = 0; m < m_model->rowCount(); m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
                         q->appendBarSet(barSet);
                     }
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
-                        QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
+                        QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString());
                         for(int m = 0; m < m_model->columnCount(); m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
                         q->appendBarSet(barSet);

src/barchart/qbarseries_p.h 0 -1

                 QList<QBarSet *> m_barSets;
                 QBarCategories m_categories;
-                QAbstractItemModel* m_model;
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;

test/tablemodelchart/tablewidget.cpp +7 -2

                 //    tableView->setMinimumSize(340, 480);
                 //    tableView->setItemDelegate(new QStyledItemDelegate);
                 m_chart = new QChart;
+                m_chart->legend()->setVisible(true);
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);
                 // this if is needed, so that the function is only called once.
                 // For the radioButton that was enabled.
                 if (toggle) {
                     m_chart->removeAllSeries();
+                    m_chart->axisX()->setNiceNumbersEnabled(false);
+                    m_chart->axisY()->setNiceNumbersEnabled(false);
                     // renable axes of the chart (pie hides them)
                     // x axis
                     }
-                    m_chart->axisX()->setRange(0, 500);
+                    if (!m_barRadioButton->isChecked())
+                        m_chart->axisX()->setRange(0, 500);
                     m_chart->axisY()->setRange(0, 120);
+                    m_chart->legend()->setVisible(true);
                     // repaint table view colors
                     m_tableView->repaint();

General Comments 0

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

No TODOs yet

	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