diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2023-05-19 13:58:19 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2023-06-13 14:23:13 +0300 |
commit | cf7c6bd4900e333b45964740f0a199b9d8709a3d (patch) | |
tree | fb3e56fc1d7e9f7becad52857d282f437630a6b7 /examples/charts/scatterchart | |
parent | 143a6627b30954ae05c49bd59dd5f91427651a97 (diff) |
Revamp examples
Separate gallery example was created for widget and qml examples and
most example code was moved under those two gallery examples.
Examples left outside galleries for various reasons:
- audio: Requires multimedia, which is an optional addon
- openglseries: Requires OpenGL backend
- qmloscilloscope: Complicated hybrid C++/QML example
- qmlweather: Uses optional command line parameter
- zoomlinechart: Uses gestures, which require grabbing main window
Cleaned up the code of the remaining examples to same standard as
galleries.
Examples documentation will be updated in a separate commit.
Task-number: QTBUG-94181
Task-number: QTBUG-111053
Task-number: QTBUG-113655
Change-Id: I6a98a4386364fcb2530e2667aea95760e6ff2983
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 8f4629814f3df83e9ea85aebefb0e0c9929be476)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples/charts/scatterchart')
-rw-r--r-- | examples/charts/scatterchart/CMakeLists.txt | 37 | ||||
-rw-r--r-- | examples/charts/scatterchart/chartview.cpp | 78 | ||||
-rw-r--r-- | examples/charts/scatterchart/chartview.h | 18 | ||||
-rw-r--r-- | examples/charts/scatterchart/main.cpp | 23 | ||||
-rw-r--r-- | examples/charts/scatterchart/scatterchart.pro | 11 |
5 files changed, 0 insertions, 167 deletions
diff --git a/examples/charts/scatterchart/CMakeLists.txt b/examples/charts/scatterchart/CMakeLists.txt deleted file mode 100644 index 70e2c5bf..00000000 --- a/examples/charts/scatterchart/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(scatterchart LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/charts/scatterchart") - -find_package(Qt6 REQUIRED COMPONENTS Charts Core Gui) - -qt_add_executable(scatterchart - chartview.cpp chartview.h - main.cpp -) - -set_target_properties(scatterchart PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(scatterchart PUBLIC - Qt::Charts - Qt::Core - Qt::Gui -) - -install(TARGETS scatterchart - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/charts/scatterchart/chartview.cpp b/examples/charts/scatterchart/chartview.cpp deleted file mode 100644 index 11fd89c5..00000000 --- a/examples/charts/scatterchart/chartview.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#include "chartview.h" -#include <QtCharts/QScatterSeries> -#include <QtCharts/QLegendMarker> -#include <QtGui/QImage> -#include <QtGui/QPainter> -#include <QtCore/QtMath> - -ChartView::ChartView(QWidget *parent) : - QChartView(new QChart(), parent) -{ - //![1] - QScatterSeries *series0 = new QScatterSeries(); - series0->setName("scatter1"); - series0->setMarkerShape(QScatterSeries::MarkerShapeCircle); - series0->setMarkerSize(15.0); - - QScatterSeries *series1 = new QScatterSeries(); - series1->setName("scatter2"); - series1->setMarkerShape(QScatterSeries::MarkerShapeRectangle); - series1->setMarkerSize(20.0); - - QScatterSeries *series2 = new QScatterSeries(); - series2->setName("scatter3"); - series2->setMarkerShape(QScatterSeries::MarkerShapeRectangle); - series2->setMarkerSize(30.0); - //![1] - - //![2] - series0->append(0, 6); - series0->append(2, 4); - series0->append(3, 8); - series0->append(7, 4); - series0->append(10, 5); - - *series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2); - *series2 << QPointF(1, 5) << QPointF(4, 6) << QPointF(6, 3) << QPointF(9, 5); - //![2] - - //![3] - QPainterPath starPath; - starPath.moveTo(28, 15); - for (int i = 1; i < 5; ++i) { - starPath.lineTo(14 + 14 * qCos(0.8 * i * M_PI), - 15 + 14 * qSin(0.8 * i * M_PI)); - } - starPath.closeSubpath(); - - QImage star(30, 30, QImage::Format_ARGB32); - star.fill(Qt::transparent); - - QPainter painter(&star); - painter.setRenderHint(QPainter::Antialiasing); - painter.setPen(QRgb(0xf6a625)); - painter.setBrush(painter.pen().color()); - painter.drawPath(starPath); - - series2->setBrush(star); - series2->setPen(QColor(Qt::transparent)); - //![3] - - //![4] - setRenderHint(QPainter::Antialiasing); - chart()->addSeries(series0); - chart()->addSeries(series1); - chart()->addSeries(series2); - - chart()->setTitle("Simple scatterchart example"); - chart()->createDefaultAxes(); - chart()->setDropShadowEnabled(false); - //![4] - - //![5] - chart()->legend()->setMarkerShape(QLegend::MarkerShapeFromSeries); - //![5] -} diff --git a/examples/charts/scatterchart/chartview.h b/examples/charts/scatterchart/chartview.h deleted file mode 100644 index 5b5533f8..00000000 --- a/examples/charts/scatterchart/chartview.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#ifndef CHARTVIEW_H -#define CHARTVIEW_H - -#include <QtCharts/QChartView> - -QT_USE_NAMESPACE - -class ChartView : public QChartView -{ - Q_OBJECT -public: - explicit ChartView(QWidget *parent = 0); -}; - -#endif // CHARTVIEW_H diff --git a/examples/charts/scatterchart/main.cpp b/examples/charts/scatterchart/main.cpp deleted file mode 100644 index 6ff93771..00000000 --- a/examples/charts/scatterchart/main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#include <QtWidgets/QApplication> -#include <QtWidgets/QMainWindow> -#include "chartview.h" - -QT_USE_NAMESPACE - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - -//![4] - ChartView *chartView = new ChartView(); - QMainWindow window; - window.setCentralWidget(chartView); - window.resize(400, 300); - window.show(); -//![4] - - return a.exec(); -} diff --git a/examples/charts/scatterchart/scatterchart.pro b/examples/charts/scatterchart/scatterchart.pro deleted file mode 100644 index fdb468d6..00000000 --- a/examples/charts/scatterchart/scatterchart.pro +++ /dev/null @@ -1,11 +0,0 @@ -QT += charts - -HEADERS += \ - chartview.h - -SOURCES += \ - chartview.cpp \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/charts/scatterchart -INSTALLS += target |