From e46fb69a87c46e812cc09b3f131462c99aae85d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 13:34:51 +0200 Subject: [PATCH] Move chart example to manual test Pick-to: 6.5 6.6 Change-Id: I95a40834853a0157d8fa6137431bfd86ce855b2f Reviewed-by: Volker Hilsheimer --- examples/widgets/doc/src/chart.qdoc | 58 ------------------- examples/widgets/itemviews/CMakeLists.txt | 1 - examples/widgets/itemviews/itemviews.pro | 1 - .../widgets/itemviews/chart/CMakeLists.txt | 0 .../widgets/itemviews/chart/chart.pro | 0 .../widgets/itemviews/chart/chart.qrc | 0 .../widgets/itemviews/chart/main.cpp | 0 .../widgets/itemviews/chart/mainwindow.cpp | 0 .../widgets/itemviews/chart/mainwindow.h | 0 .../widgets/itemviews/chart/pieview.cpp | 0 .../widgets/itemviews/chart/pieview.h | 0 .../widgets/itemviews/chart/qtdata.cht | 0 12 files changed, 60 deletions(-) delete mode 100644 examples/widgets/doc/src/chart.qdoc rename {examples => tests/manual/examples}/widgets/itemviews/chart/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/chart.pro (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/chart.qrc (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/main.cpp (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/mainwindow.cpp (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/mainwindow.h (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/pieview.cpp (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/pieview.h (100%) rename {examples => tests/manual/examples}/widgets/itemviews/chart/qtdata.cht (100%) diff --git a/examples/widgets/doc/src/chart.qdoc b/examples/widgets/doc/src/chart.qdoc deleted file mode 100644 index abb1b3ab7e..0000000000 --- a/examples/widgets/doc/src/chart.qdoc +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example itemviews/chart - \title Chart Example - \ingroup examples-itemviews - \brief The Chart example shows how to create a custom view for the model/view framework. - - \image chart-example.png - - In this example, the items in a table model are represented as slices in a pie chart, - relying on the flexibility of the model/view architecture to handle custom editing - and selection features. - - \b{Note that you only need to create a new view class if your data requires a - specialized representation.} You should first consider using a standard QListView, - QTableView, or QTreeView with a custom QItemDelegate subclass if you need to - represent data in a special way. - - \omit - \section1 PieView Class Definition - - The \c PieView class is a subclass of QAbstractItemView. The base class provides - much of the functionality required by view classes, so we only need to provide - implementations for three public functions: visualRect(), scrollTo(), and - indexAt(). However, the view needs to maintain strict control over its look and - feel, so we also provide implementations for a number of other functions: - - \snippet itemviews/chart/pieview.h 0 - - - - \section1 PieView Class Implementation - - The paint event renders the data from the standard item model as a pie chart. - We interpret the data in the following way: - - \list - \li Column 0 contains data in two different roles: - The \l{Qt::ItemDataRole}{DisplayRole} contains a label, and the - \l{Qt::ItemDataRole}{DecorationRole} contains the color of the pie slice. - \li Column 1 contains a quantity which we will convert to the angular extent of - the slice. - \endlist - - The figure is always drawn with the chart on the left and the key on - the right. This means that we must try and obtain an area that is wider - than it is tall. We do this by imposing a particular aspect ratio on - the chart and applying it to the available vertical space. This ensures - that we always obtain the maximum horizontal space for the aspect ratio - used. - We also apply fixed size margin around the figure. - - We use logical coordinates to draw the chart and key, and position them - on the view using viewports. - \endomit -*/ diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt index 4a30dc3729..b2ef8c416a 100644 --- a/examples/widgets/itemviews/CMakeLists.txt +++ b/examples/widgets/itemviews/CMakeLists.txt @@ -3,7 +3,6 @@ qt_internal_add_example(addressbook) qt_internal_add_example(basicsortfiltermodel) -qt_internal_add_example(chart) qt_internal_add_example(coloreditorfactory) qt_internal_add_example(combowidgetmapper) qt_internal_add_example(customsortfiltermodel) diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro index 3f941679c7..802920952e 100644 --- a/examples/widgets/itemviews/itemviews.pro +++ b/examples/widgets/itemviews/itemviews.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS = addressbook \ basicsortfiltermodel \ - chart \ coloreditorfactory \ combowidgetmapper \ customsortfiltermodel \ diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/tests/manual/examples/widgets/itemviews/chart/CMakeLists.txt similarity index 100% rename from examples/widgets/itemviews/chart/CMakeLists.txt rename to tests/manual/examples/widgets/itemviews/chart/CMakeLists.txt diff --git a/examples/widgets/itemviews/chart/chart.pro b/tests/manual/examples/widgets/itemviews/chart/chart.pro similarity index 100% rename from examples/widgets/itemviews/chart/chart.pro rename to tests/manual/examples/widgets/itemviews/chart/chart.pro diff --git a/examples/widgets/itemviews/chart/chart.qrc b/tests/manual/examples/widgets/itemviews/chart/chart.qrc similarity index 100% rename from examples/widgets/itemviews/chart/chart.qrc rename to tests/manual/examples/widgets/itemviews/chart/chart.qrc diff --git a/examples/widgets/itemviews/chart/main.cpp b/tests/manual/examples/widgets/itemviews/chart/main.cpp similarity index 100% rename from examples/widgets/itemviews/chart/main.cpp rename to tests/manual/examples/widgets/itemviews/chart/main.cpp diff --git a/examples/widgets/itemviews/chart/mainwindow.cpp b/tests/manual/examples/widgets/itemviews/chart/mainwindow.cpp similarity index 100% rename from examples/widgets/itemviews/chart/mainwindow.cpp rename to tests/manual/examples/widgets/itemviews/chart/mainwindow.cpp diff --git a/examples/widgets/itemviews/chart/mainwindow.h b/tests/manual/examples/widgets/itemviews/chart/mainwindow.h similarity index 100% rename from examples/widgets/itemviews/chart/mainwindow.h rename to tests/manual/examples/widgets/itemviews/chart/mainwindow.h diff --git a/examples/widgets/itemviews/chart/pieview.cpp b/tests/manual/examples/widgets/itemviews/chart/pieview.cpp similarity index 100% rename from examples/widgets/itemviews/chart/pieview.cpp rename to tests/manual/examples/widgets/itemviews/chart/pieview.cpp diff --git a/examples/widgets/itemviews/chart/pieview.h b/tests/manual/examples/widgets/itemviews/chart/pieview.h similarity index 100% rename from examples/widgets/itemviews/chart/pieview.h rename to tests/manual/examples/widgets/itemviews/chart/pieview.h diff --git a/examples/widgets/itemviews/chart/qtdata.cht b/tests/manual/examples/widgets/itemviews/chart/qtdata.cht similarity index 100% rename from examples/widgets/itemviews/chart/qtdata.cht rename to tests/manual/examples/widgets/itemviews/chart/qtdata.cht