##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Removed OpenGL button in QML Oscilloscope demo
Tero Ahola -
r2267:92e7d1168aa1
parent child
Show More
Side by Side Unified
Context file:
r2267:92e7d1168aa1 Loading diff...:
Show file before | Show file after | Hide comments
@@ -87,14 +87,6 void DataSource::generateData(int type, int rowCount, int colCount)
87 }
87 }
88 }
88 }
89
89
90 void DataSource::setOpenGL(bool enabled)
91 {
92 if (enabled)
93 m_appViewer->setViewport(new QGLWidget());
94 else
95 m_appViewer->setViewport(0);
96 }
97
98 void DataSource::setAntialiasing(bool enabled)
90 void DataSource::setAntialiasing(bool enabled)
99 {
91 {
100 m_appViewer->setRenderHint(QPainter::Antialiasing, enabled);
92 m_appViewer->setRenderHint(QPainter::Antialiasing, enabled);
Show file before | Show file after | Hide comments
@@ -39,7 +39,6 signals:
39 public slots:
39 public slots:
40 void generateData(int type, int rowCount, int colCount);
40 void generateData(int type, int rowCount, int colCount);
41 void update(QAbstractSeries *series);
41 void update(QAbstractSeries *series);
42 void setOpenGL(bool enabled);
43 void setAntialiasing(bool enabled);
42 void setAntialiasing(bool enabled);
44
43
45 private:
44 private:
Show file before | Show file after | Hide comments
@@ -22,7 +22,6 import QtQuick 1.0
22
22
23 Column {
23 Column {
24 spacing: 5
24 spacing: 5
25 signal openGLEnabled(bool enabled)
26 signal animationsEnabled(bool enabled)
25 signal animationsEnabled(bool enabled)
27 signal seriesTypeChanged(string type)
26 signal seriesTypeChanged(string type)
28 signal refreshRateChanged(variant rate);
27 signal refreshRateChanged(variant rate);
@@ -71,13 +70,6 Column {
71 }
70 }
72
71
73 MultiButton {
72 MultiButton {
74 text: "OpenGL: "
75 items: ["OFF", "ON"]
76 currentSelection: 0
77 onSelectionChanged: openGLEnabled(currentSelection == 1);
78 }
79
80 MultiButton {
81 text: "Animations: "
73 text: "Animations: "
82 items: ["OFF", "ON"]
74 items: ["OFF", "ON"]
83 currentSelection: 0
75 currentSelection: 0
Show file before | Show file after | Hide comments
@@ -42,7 +42,6 Rectangle {
42 else
42 else
43 dataSource.generateData(1, signalCount, sampleCount);
43 dataSource.generateData(1, signalCount, sampleCount);
44 }
44 }
45 onOpenGLEnabled: dataSource.setOpenGL(enabled);
46 onAnimationsEnabled: scopeView.setAnimations(enabled);
45 onAnimationsEnabled: scopeView.setAnimations(enabled);
47 onSeriesTypeChanged: scopeView.changeSeriesType(type);
46 onSeriesTypeChanged: scopeView.changeSeriesType(type);
48 onRefreshRateChanged: scopeView.changeRefreshRate(rate);
47 onRefreshRateChanged: scopeView.changeRefreshRate(rate);
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -13,6 +13,12
13 experiment with the different configurable options of the demo application to find the
13 experiment with the different configurable options of the demo application to find the
14 configuration that gives you the best performance in your environment.
14 configuration that gives you the best performance in your environment.
15
15
16 Note: You can try if enabling OpenGL improves the performance with the following startup
17 parameter:
18 \code
19 -graphicssystem opengl
20 \endcode
21
16 The application window is shared by control and scope views:
22 The application window is shared by control and scope views:
17 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 1
23 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 1
18 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 2
24 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 2
General Comments 0
You need to be logged in to leave comments. Login now