qiurui
/
qtcharts
mirror of https://github.com/qt/qtcharts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use formal parameters for signal handlers in the qmloscilloscope example 

The usage of a generic parameter name in the signal handler causes the
name collision and this sometimes causes the required functionality not
to be updated in the qml oscilloscope example.

This patch makes sure that we pass formal parameters to the signal
handlers in the qml for this example. Also, removed unused signal
animationsEnabled(bool)

Pick-to: 6.8
Change-Id: Ie8d058dd7693393b32e96860c3b6340aaaa1c1e6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Santhosh Kumar 2024-07-24 15:00:40 +02:00
parent 14216751bf
commit 50f5d7be30
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
View File

@ -8,7 +8,6 @@ ColumnLayout {
property alias openGLButton: openGLButton
property alias antialiasButton: antialiasButton
signal animationsEnabled(bool enabled)
signal seriesTypeChanged(string type)
signal refreshRateChanged(variant rate);
signal signalSourceChanged(string source, int signalCount, int sampleCount);
@ -45,7 +44,7 @@ ColumnLayout {
text: "Source: "
items: ["sin", "linear"]
currentSelection: 0
onSelectionChanged: signalSourceChanged(
onSelectionChanged: selection => signalSourceChanged(
selection,
5,
sampleCountButton.items[sampleCountButton.currentSelection]);
@ -56,7 +55,7 @@ ColumnLayout {
text: "Samples: "
items: ["6", "128", "1024", "10000"]
currentSelection: 2
onSelectionChanged: signalSourceChanged(
onSelectionChanged: selection => signalSourceChanged(
signalSourceButton.items[signalSourceButton.currentSelection],
5,
selection);

12
examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml
View File

@ -18,19 +18,17 @@ Item {
anchors.leftMargin: 10
//![1]
onSignalSourceChanged: {
onSignalSourceChanged: (source, signalCount, sampleCount) => {
if (source == "sin")
dataSource.generateData(0, signalCount, sampleCount);
else
dataSource.generateData(1, signalCount, sampleCount);
scopeView.axisX().max = sampleCount;
}
onSeriesTypeChanged: scopeView.changeSeriesType(type);
onRefreshRateChanged: scopeView.changeRefreshRate(rate);
onAntialiasingEnabled: scopeView.antialiasing = enabled;
onOpenGlChanged: {
scopeView.openGL = enabled;
}
onSeriesTypeChanged: type => scopeView.changeSeriesType(type);
onRefreshRateChanged: rate => scopeView.changeRefreshRate(rate);
onAntialiasingEnabled: enabled => scopeView.antialiasing = enabled;
onOpenGlChanged: enabled => scopeView.openGL = enabled;
}
//![2]