HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1910:946c00a01ac4

demos/qmlchart/main.cpp +1 0

                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlchart/loader.qml"));
+                viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();

demos/qmlcustomizations/main.cpp +1 0

                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustomizations/loader.qml"));
+                viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();

demos/qmlcustommodel/main.cpp +1 0

                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustommodel/loader.qml"));
+                viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();

demos/qmlf1legends/main.cpp +1 0

                 QmlApplicationViewer viewer;
                 viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer.setSource(QUrl("qrc:/qml/qmlf1legends/main.qml"));
+                viewer.setRenderHint(QPainter::Antialiasing, true);
                 viewer.showExpanded();
                 return app->exec();
             }

demos/qmloscilloscope/datasource.cpp +7 -2

             #include "datasource.h"
             #include <QXYSeries>
             #include <QAreaSeries>
-            #include <QAbstractScrollArea>
+            #include <QDeclarativeView>
             #include <QGLWidget>
             #include <QDebug>
             #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
-            DataSource::DataSource(QAbstractScrollArea *appViewer, QObject *parent) :
+            DataSource::DataSource(QDeclarativeView *appViewer, QObject *parent) :
                 QObject(parent),
                 m_appViewer(appViewer),
                 m_index(-1)
                 else
                     m_appViewer->setViewport(0);
             }
+            void DataSource::setAntialiasing(bool enabled)
+            {
+                m_appViewer->setRenderHint(QPainter::Antialiasing, enabled);
+            }

demos/qmloscilloscope/datasource.h +4 -3

             #include <QObject>
             #include <QAbstractSeries>
-            class QAbstractScrollArea;
+            class QDeclarativeView;
             QTCOMMERCIALCHART_USE_NAMESPACE
             {
                 Q_OBJECT
             public:
-                explicit DataSource(QAbstractScrollArea *appViewer, QObject *parent = 0);
+                explicit DataSource(QDeclarativeView *appViewer, QObject *parent = 0);
             signals:
                 void generateData(int type, int rowCount, int colCount);
                 void update(QAbstractSeries *series);
                 void setOpenGL(bool enabled);
+                void setAntialiasing(bool enabled);
             private:
-                QAbstractScrollArea *m_appViewer;
+                QDeclarativeView *m_appViewer;
                 QList<QList<QPointF> > m_data;
                 int m_index;
             };

demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml +8 0

                 signal seriesTypeChanged(string type)
                 signal refreshRateChanged(variant rate);
                 signal signalSourceChanged(string source, int signalCount, int sampleCount);
+                signal antialiasingEnabled(bool enabled)
                 Text {
                     text: "Oscilloscope"
                     currentSelection: 0
                     onSelectionChanged: animationsEnabled(currentSelection == 1);
                 }
+                MultiButton {
+                    text: "Antialias: "
+                    items: ["OFF", "ON"]
+                    currentSelection: 0
+                    onSelectionChanged: antialiasingEnabled(currentSelection == 1);
+                }
             }

demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml +1 -1

             Rectangle {
                 id: button
                 width: 120
-                height: 35
+                height: 30
                 border.color: "gray"
                 radius: 7
                 property string text: "Option: "

demos/qmloscilloscope/qml/qmloscilloscope/main.qml +1 0

                     onAnimationsEnabled: scopeView.setAnimations(enabled);
                     onSeriesTypeChanged: scopeView.changeSeriesType(type);
                     onRefreshRateChanged: scopeView.changeRefreshRate(rate);
+                    onAntialiasingEnabled: dataSource.setAntialiasing(enabled);
                 }
             //![2]

demos/qmlweather/main.cpp +1 0

                 }
                 viewer.rootContext()->setContextProperty("weatherAppKey", appKey);
                 viewer.setSource(QUrl("qrc:/qml/qmlweather/main.qml"));
+                viewer.setRenderHint(QPainter::Antialiasing, true);
                 viewer.showExpanded();
                 return app->exec();
             }

examples/qmlpiechart/main.cpp +1 0

                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlpiechart/main.qml"));
+                viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();

plugins/declarative/declarativechart.cpp 0 -10

                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
-            //    m_chart->axisX()->setNiceNumbersEnabled(false);
                 //TODO: check what should be really here margins or platArea ?!
                 m_chartMargins = m_chart->minimumMargins();
                 connect(m_chart, SIGNAL(marginsChanged(QRectF)), this, SLOT(handleMarginsChanged(QRectF)));
                 QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
             }
-            void DeclarativeChart::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-                Q_UNUSED(option)
-                Q_UNUSED(widget)
-                // TODO: optimized?
-                painter->setRenderHint(QPainter::Antialiasing, true);
             void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
             {
                 QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;

plugins/declarative/declarativechart.h 0 -1

                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
-                void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
             public:
                 void setTheme(DeclarativeChart::Theme theme);

tests/qmlchartproperties/main.cpp +1 0

                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlchartproperties/loader.qml"));
+                viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();

	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