summaryrefslogtreecommitdiffstats
path: root/src/charts/xychart
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-13/+14
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia2a1c70299a7bf156285bc35364d0f654390ab36
| * Improve performance on QXYModelMapperTomi Korpipaa2022-06-131-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variable, which is populated by calls to QXYSeries points() in a loop. Additionally add variables for column() and row() to avoid repeated calls to those. Fixes: QTBUG-99190 Change-Id: I3659a571ff7ef57c3db693c599f35f15227201ea Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit bf1eae298e30822dbace46ae126f462368abe791) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-072-8/+16
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I94a191b6b72d34172cdb2e55280f4b057520d4f2
| * Doc: Fix issues in Q[H|V]XYModelMapper documentationTopi Reinio2021-03-022-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The detailed description for these two types were swapped * Clarify the data model used for the mapper, and suggest a table model as a good fit * Link to the example that makes use of a mapper Fixes: QTBUG-80828 Change-Id: If45dce47e74c28eb76d248133bbbfd2e44555750 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit ef331c506ab960d2a6e22c17c4af199b1079ef73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update the commercial license header to Qt Charts files"v5.15.3-lts-lgplTarja Sundqvist2021-03-2214-154/+154
|/ | | | | | | | | | | This reverts commit 9ac57c36d42d083d1767353c7eb817d96817d22e. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ib7588e49cc9322bd72e02ef7cf49c8577191b0ec Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update the commercial license header to Qt Charts filesTarja Sundqvist2021-01-2714-154/+154
| | | | | | | | | | | | | | | | | The commercial license header header.COMM was updated to the tqtc-qtcharts files. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4144 Change-Id: I87f9848863d619d3fa0f3b8d94f21c14a87fe869 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
* Fix deprecation warning against QDateTime(QDate)v5.15.0-beta1Edward Welbourne2020-02-181-1/+1
| | | | | Change-Id: I6330fb72e9d003475227096cdcaeb46cbcba73c2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-041-1/+0
| | | | | | | | | | | | | | | ... and of QLinkedList. Unfortunately, the module contains more than 330 uses of Q_FOREACH, even though, according to my sources, its use was banned in Qt implementation from the get-go. So QT_NO_FOREACH is currently not an option. Java-style iterators are going to be deprecated, or at the very least banned from use in Qt code. Ditto QLinkedList. Change-Id: I505e3472b708fc18a3254dc742e46d14d095fcc1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Switch export macros to standard formv5.13.0-beta2Kai Koehne2019-04-018-8/+8
| | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Task-number: QTBUG-73752 Change-Id: I4ee654eadbbfc6f5c25f3bb0a8123c8c17235c12 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-061-1/+1
| | | | | | | | | | xychart/qxyseries.cpp:1025:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] areachart/areachartitem.cpp:281:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] areachart/areachartitem.cpp:299:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] declarativecategoryaxis.cpp:86:57: warning: ‘void qSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QList<QPair<QString, double> >::iterator; LessThan = bool (*)(const QPair<QString, double>&, const QPair<QString, double>&)]’ is deprecated: Use std::sort [-Wdeprecated-declarations] Change-Id: I0d7705be8690405a439e18ea0ddbfaef433037a4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-171-1/+3
|\ | | | | | | Change-Id: I06e56c1c924c7239aba60404bdfcb3d39cd9ce44
| * Fix printing of labels for line series chartsLars Knoll2018-11-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The labels ended up getting way to big on the printer, because they didn't respect the transform set by the PDF engine when setting the font size. Fix the same problem in AreaChartItem::paint(). Change-Id: I18fd6ebb4c4031c7b2df423cf842b39ff9891135 Fixes: QTBUG-67981 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix namespaced buildLiang Qi2018-10-045-10/+10
|/ | | | | | | | | | | It is not allowed to include files within Qt namespace. This amends a93849d0. See 5b99f3a3 in qtbase dev. Task-number: QTBUG-70907 Change-Id: I37f0924429313f2251f656bcd5b6b248a22ccfbb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta1Liang Qi2018-09-252-2/+2
|\ | | | | | | | | | | | | | | Conflicts: src/chartsqml2/declarativechart_p.h src/chartsqml2/plugins.qmltypes Change-Id: Ib61ca7ee3c40e02cb346c6b8cc9642f8358bf3e9
| * Fully qualify classes in QtCharts namespace in Q_PROPERTYKai Koehne2018-09-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump otherwise cannot make the connection between the type of the property and the QMetaObject. This fixes an issue where Qt Creator was not handling some properties for the QML types properly. Ideally we also would do this for arguments in signals, slots, Q_INVOKABLES. Anyhow, this can be an incompatible change (e.g. if you use string-based connect). Fixes: QTBUG-51704 Change-Id: I3a3b5fc7f7539ff15974be9c2e268df7e1ad7f30 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-303-3/+3
|\| | | | | | | Change-Id: If1c0e127a27ab2cd954da6fdf6b9f5e214fd01ae
| * Doc: Rename C++ module from 'Qt Charts' to 'QtCharts'Topi Reinio2018-06-283-3/+3
| | | | | | | | | | | | | | | | | | | | This is the convention for documentating Qt C++ modules. It has no effect on the user-visible output except for the html file name, while avoiding certain problem for external tools such as PySide/Shiboken. Change-Id: Ibaec4f8a05ef34bf8a8aff2c9695f859f24858db Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Fix data normalization in GLXYSeriesDataManagerAndre de la Rocha2018-06-061-9/+15
|/ | | | | | | | | | | | | | | | | GLXYSeriesDataManager::setPoints() has an optimized path when it detects a regular XY chart, which skips calculateGeometryPoints() and sets up a shader-based transform instead of normalizing vertex data. However, for some series data containing values far away from the origin, which are represented with less absolute precision as floating-point values, by the time the transform is used, precision was already lost in the conversion from double to float, destroying the chart. This change performs proper normalization inside the optimized path, while keeping the same level of performance as before. Task-number: QTBUG-59674 Change-Id: Idc57481815a409c19ca364e1721153483cbc2993 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-124-4/+8
|\ | | | | | | Change-Id: I90e4a4f377c2a70a87ae59eb72ba7432b6b0cdef
| * Add export declarations to private headersPeter Staab2018-01-234-4/+8
| | | | | | | | | | | | | | | | Export declarations were missing in the private headers. Task-number: QTBUG-65774 Change-Id: I933c2cd151563747d0159c78bca70a768dc82835 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-1/+5
|\| | | | | | | Change-Id: I82091207292204b025b7cf3dcc30d38d24ff5455
| * Select min of m_points and pointsMika Salmela2017-09-121-1/+5
| | | | | | | | | | | | | | | | | | | | On QXYSeriesPrivate::drawSeriesPointLabels the loop is based on m_points.size(), but points vector may have less items because of animation. This patch takes the min of vectors. Task-number: QTBUG-63123 Change-Id: I940fd5557abd3a28d064ab2c2737fae650fd7183 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-294-4/+4
|/ | | | | Change-Id: I991b606cab434d02546173778eb3fbf755ea7727 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix for some QXYModelMapper sync issuesJohn Englund2017-06-011-3/+3
| | | | | | | | | - QXYModelMapper was not handling the model's layoutChanged() signal, which could leave points out of order - QXYModelMapper handled dataChanged() by replacing points by value rather than index, which could cause the wrong point to be replaced. This was fixed. Change-Id: I77a49acc5fc6982dabf976a3811c644843d18bb2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Fix link in XYSeries::axisX property docsLeena Miettinen2017-01-251-1/+1
| | | | | | | The link should lead to the QML type, not Qt class. Change-Id: Ibf4d69cd795ea92f6eef1da5ec00a3c5350e7cbc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Edit XY-model mapper class and type docsLeena Miettinen2017-01-232-78/+125
| | | | | Change-Id: I25ba26222da3fdc3abcf4aca40b8f1a574c3c25f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Edit XY-series class and type docs and XYPoint docsLeena Miettinen2017-01-191-161/+207
| | | | | Change-Id: Ie454a9bfb0b0f59d6ef9e1fe7bd871e8037a5632 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-141-1/+2
|\ | | | | | | Change-Id: Ied447b707d607ff7e2d004adcb15a346776a0645
| * Fix crash on charts initialization when useOpenGL is setv5.8.0-rc1Miikka Heikkinen2016-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | In some common QML use cases, presenter can be null in XYChart::refreshGlChart(), leading to a crash. Task-number: QTBUG-57680 Change-Id: I41c7980adfe097039f09d75acfcb213740d50f72 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Respect the reverse setting for a reversed log y axisAndy Shaw2016-12-121-5/+6
|/ | | | | Change-Id: I46585f8374fd3f697d2a5741530605febe782aee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-067-17/+53
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/charts/charts.pro src/charts/glwidget.cpp src/chartsqml2/declarativechart.cpp src/chartsqml2/declarativeopenglrendernode.cpp tests/auto/auto.pro Change-Id: If909b4b13844c474bf4898a66ee01ac111d0a248
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-232-13/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: Ib4e01f2646d87b691c7b2f8bee4ed1f5521e4f6d
| | * Don't print warning at model mapper initialization if model is emptyMiikka Heikkinen2016-08-121-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The warnings are relevant only if model has values. It is expected that initializing data from an empty model will not result in any values. Change-Id: Id696f8ccaf5efa0c577e6832a52c6f8e7b0c6cd8 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Fix issues with reverse axesMiikka Heikkinen2016-08-111-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the reverse axis handling to domains instead of simply mirroring the painter. This fixes the following issues with reverse axes: - QChart mapping functions returned unreversed values - Bounding regions of series were incorrect - Mouse events gave wrong positions - Chart scrolling and zooming didn't account for reversed axes Task-number: QTBUG-54401 Change-Id: I6aed9e13c0d1d956a389dfe70f36f630d79d1ddf Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-116-9/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/charts/glwidget.cpp src/charts/xychart/glxyseriesdata_p.h src/chartsqml2/declarativerendernode.cpp Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
| | * Print console warning when invalid row/column used in model mapperMiikka Heikkinen2016-08-051-8/+21
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-52654 Change-Id: I37fac883307409da349c1923c0e295caa9cf6f8a Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Fix VXYModelMapper documentationMiikka Heikkinen2016-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrectly documented columnCount instead of rowCount. Task-number: QTBUG-53073 Change-Id: I54791d59c5bbc61a3fa4f8d45747c7331ad96554 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Make OpenGL accelerated series obey series visibilityMiikka Heikkinen2016-08-024-0/+24
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54914 Change-Id: Ia55274aee13e3d700f75a1521be26ed78bddba8d Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Add mouse events support for OpenGL accelerated seriesMiikka Heikkinen2016-08-241-0/+2
|/ / | | | | | | | | | | | | | | | | | | On QML side, the mouse events for accelerated series work asynchronously, as the rendering is typically done in a different thread. Change-Id: I08c478768b40ed90b34b0904b7a3e74e315c3caa Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-2/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1
| * clean up INCLUDEPATH handlingOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | in the c++ module, the .pri files add their directories, so there is no point in a centralized common.pri doing it again. the qml plugin doesn't need to add any paths from the c++ module explicitly, as the QT+=charts-private implies that already. Change-Id: I263dd702e9874e4d6188ca7251a482d0df4e570b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * prune redundant DEPENDPATH entriesOswald Buddenhagen2016-05-191-1/+0
| | | | | | | | | | | | | | | | qt5 has depend_includepath enabled by default. Change-Id: I10ffcc9ff83a8b3c2252abe3dbdf7d0d40fcd4f2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-084-4/+4
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-151-1/+1
|\| | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Icdf61d347a6d0b3624867ceb8c1e4220c6c78a76
| * Explicitly update GLWidget when we set new pointsMiikka Heikkinen2016-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget was modified to not trigger some extra paint calls, which charts used to rely on, so now we do explicit updates instead. Change-Id: Ibe06c2f88ac7efe4e61351d582f2eff9d350f073 Task-number: QTBUG-51000 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Add support for reversed axis when useOpenGL is trueAndy Shaw2016-02-092-2/+61
| | | | | | | | | | Change-Id: If8b6690585c767b65eaa4a43e179c86183903637 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Updated licenseMiikka Heikkinen2016-01-1314-126/+238
|/ | | | | | Change-Id: I7ad9838039b56b9e3a7fe2c42a2d8ff818f393fb Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Updated license headersTitta Heikkala2015-10-2014-166/+208
| | | | | Change-Id: Ic72ee3c9723c2b3f3368c79219b7468f5d95aa84 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Made OpenGL series respond to scatter color and size changesMiikka Heikkinen2015-09-302-2/+35
| | | | | Change-Id: I1f88f913affd72d3bf374793f9ad60a626f52645 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 22:44:09 +0000