HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r379:ef3b0565576e

Checkbox for anti-alias to chartwidgettest

Tero Ahola -

r379:ef3b0565576e

parent child

Context file:

r379:ef3b0565576e

Collapse all files

test/chartwidgettest/mainwidget.cpp +31 -13

             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent),
                 m_addSerieDialog(0),
-                m_chartWidget(0)
+                m_chartView(0)
             {
-                m_chartWidget = new QChartView(this);
+                m_chartView = new QChartView(this);
-                m_chartWidget->setRubberBandPolicy(QChartView::HorizonalRubberBand);
+                m_chartView->setRubberBandPolicy(QChartView::HorizonalRubberBand);
                 // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
                 initBackroundCombo(grid);
                 initScaleControls(grid);
                 initThemeCombo(grid);
-                QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
+                initCheckboxes(grid);
-                connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartWidget, SLOT(setZoomEnabled(bool)));
-                zoomCheckBox->setChecked(true);
-                grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
             //    mainLayout->addLayout(m_scatterLayout, 1, 0);
                 // Add layouts and the chart widget to the main layout
-                mainLayout->addWidget(m_chartWidget, 0, 1, 3, 1);
+                mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(mainLayout);
             }
                 grid->addWidget(chartTheme, 8, 1);
             }
+            // Different check boxes for customizing chart
+            void MainWidget::initCheckboxes(QGridLayout *grid)
+            {
+                // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
+                QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
+                connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
+                zoomCheckBox->setChecked(true);
+                grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
+                QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
+                connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
+                aliasCheckBox->setChecked(false);
+                grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
+            }
+            void MainWidget::antiAliasToggled(bool enabled)
+            {
+                m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
+            }
             void MainWidget::initPieControls()
             {
                 // Pie series specific settings
                         for (int i(0); i < column.count(); i++) {
                             series->add(i, column.at(i));
                         }
-                        m_chartWidget->addSeries(series);
+                        m_chartView->addSeries(series);
                         setCurrentSeries(series);
                     }
                 } else if (seriesName.contains("scatter", Qt::CaseInsensitive)) {
                         for (int i(0); i < column.count(); i++) {
                            (*series) << QPointF(i, column.at(i));
                         }
-                        m_chartWidget->addSeries(series);
+                        m_chartView->addSeries(series);
                         setCurrentSeries(series);
                     }
                 } else if (seriesName.contains("pie", Qt::CaseInsensitive)) {
                         for (int i(0); i < column.count(); i++) {
                             series->add(column.at(i), labels.at(i));
                         }
-                        m_chartWidget->addSeries(series);
+                        m_chartView->addSeries(series);
                         setCurrentSeries(series);
                     }
                 } else if (seriesName == "Bar"
                     series->setFloatingValuesEnabled(true);
                     series->setToolTipEnabled(true);
                     series->setSeparatorsEnabled(false);
-                    m_chartWidget->addSeries(series);
+                    m_chartView->addSeries(series);
                     setCurrentSeries(series);
                 }
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
-                m_chartWidget->setChartTheme((QChart::ChartTheme) themeIndex);
+                m_chartView->setChartTheme((QChart::ChartTheme) themeIndex);
                 //TODO: remove this hack. This is just to make it so that theme change is seen immediately.
                 QSize s = size();
                 s.setWidth(s.width()+1);

test/chartwidgettest/mainwidget.h +3 -1

                 void initBackroundCombo(QGridLayout *grid);
                 void initScaleControls(QGridLayout *grid);
                 void initThemeCombo(QGridLayout *grid);
+                void initCheckboxes(QGridLayout *grid);
                 void initPieControls();
             private slots:
                 void xMaxChanged(int value);
                 void yMinChanged(int value);
                 void yMaxChanged(int value);
+                void antiAliasToggled(bool enabled);
                 void setCurrentSeries(QSeries *series);
                 void changeChartTheme(int themeIndex);
                 void setPieSizeFactor(double margin);
             private:
                 DataSerieDialog *m_addSerieDialog;
-                QChartView *m_chartWidget;
+                QChartView *m_chartView;
                 QCheckBox *m_autoScaleCheck;
                 QSpinBox *m_xMinSpin;
                 QSpinBox *m_xMaxSpin;

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