summaryrefslogtreecommitdiffstats
path: root/src/charts/barchart
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update the commercial license header to Qt Charts files"v5.15.3-lts-lgplTarja Sundqvist2021-03-2247-517/+517
| | | | | | | | | | | 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-2747-517/+517
| | | | | | | | | | | | | | | | | 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>
* Shift the label to be inside the bar if it is going to be cut offAndy Shaw2020-05-182-8/+12
| | | | | | | Change-Id: I5616fa8a08da10f53a6aa43eb838ab44d63a4afb Pick-to: 5.15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 378968011f8a59769f6881358b4f316ebec6c866)
* Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-251-1/+1
| | | | | | | It is being deprecated. Change-Id: I1eafbce147e05028c93830bb882611d9eea58586 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-041-16/+8
| | | | | | | | | | | | | | | ... 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-0129-29/+29
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-251-1/+8
|\ | | | | | | Change-Id: Ia7ebd3f99652dd5d871ed991a5ff45e07c4ac262
| * Fix access to bar sets instantiated inside the moduleMaurice Kalinowski2018-12-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QBarModelMapper allocates QBarSet instances during initialization. While this works for pure C++ applications, on the QML side these need to be of type DeclarativeBarSet to be accessible, but also expose additional properties. The C++ module is not aware of QML, also the QBarModelMapper cannot expose a dynamic allocator without breaking binary compatibility. Hence, the approach is to create a custom allocator function and export it from the C++ module. In case a declarative chart is created, the allocator is replaced with the QML one. Fixes: QTBUG-71013 Change-Id: I1864d637df37f8cd38d28fdba75da0c5608a612c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix namespaced buildLiang Qi2018-10-0419-38/+33
|/ | | | | | | | | | | 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>
* 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>
* Doc: Rename C++ module from 'Qt Charts' to 'QtCharts'Topi Reinio2018-06-2811-11/+11
| | | | | | | | | | 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>
* Add missing overridev5.11.0-rc2v5.11.0-rc1v5.11.0Maurice Kalinowski2018-04-232-0/+6
| | | | | | | | | | | When deleting a series, the matching chartitem is queried for its animation to stop it. As AbstractBarChartItem sets an animation, it has to provide it to the owner to react properly. Task-number: QTBUG-65552 Change-Id: I44c9c4db823558c78f2fb20cd17642f19160e16e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1217-17/+34
|\ | | | | | | Change-Id: I90e4a4f377c2a70a87ae59eb72ba7432b6b0cdef
| * Add export declarations to private headersPeter Staab2018-01-2317-17/+34
| | | | | | | | | | | | | | | | 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 Qi2018-01-201-0/+9
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I03085b7c604cda9c4a173ca8f6dd34d522e59b16
| * Hide labels from removed barsJoni Poikelin2017-12-121-0/+9
| | | | | | | | | | | | Task-number: QTBUG-62210 Change-Id: I9c2ef7a1ef4a6b28fd7348eae51e0068b99d4b3d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add labelsPrecision property to bar chartsKari Oikarinen2017-12-214-3/+49
| | | | | | | | | | | | | | | | | | | | Allow choosing the number of significant digits in the value labels for the bars. Before this this has been hardcoded to 6, so the default value stays as 6 for backward compatibility. Task-number: QTBUG-64370 Change-Id: I022bdad21aca7a7750ed46181b4ec97726bd9dc5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2911-11/+11
|/ | | | | Change-Id: I991b606cab434d02546173778eb3fbf755ea7727 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* BarSeries: Account for labels when hovering over the barAndy Shaw2017-08-081-0/+1
| | | | | | | | | | If you hover over a label then it will send a hoverLeaveEvent() because the label is not accounted for. So we set the labels to not accept hover events to ensure they don't interfere with the bar. Task-number: QTBUG-62137 Change-Id: I59097d14a7ce73948eda7a8332f927d1d465b273 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix GCC warning about comparing the result of comparisonsv5.9.0-beta3v5.9.0-beta2Thiago Macieira2017-04-042-2/+2
| | | | | | | stackedbarchartitem.cpp:66:23: warning: suggest parentheses around comparison in operand of ‘==’ [-Wparentheses] Change-Id: I27b55fdf514247549455fffd14b1abfb3e033b85 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix warning about && inside ||Thiago Macieira2017-04-042-4/+4
| | | | | | | stackedbarchartitem.cpp:172:38: warning: '&&' within '||' [-Wlogical-op-parentheses] Change-Id: I27b55fdf514247549455fffd14b17b67ae3feb34 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Block mouse events for several charts itemsMika Salmela2017-04-031-1/+1
| | | | | | | | | Block mouse events for abstractbarchartitem, boxblotchartitem and candlestickchartitem. Task-number: QTBUG-59835 Change-Id: I065b3429135a8c1195360a961271b287a72d2197 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+36
|\ | | | | | | Change-Id: Iee539241a1b5593414f02f9c19add3fe1c4fbaae
| * Doc: Add missing QML type docsLeena Miettinen2017-01-251-0/+36
| | | | | | | | | | | | Task-number: QTBUG-57539 Change-Id: I14cc8349c56d3a3d538d124f339e7f3ce4dff544 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-242-50/+66
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/charts/barchart/qbarset.cpp Change-Id: Id57f9d6ac8cdf996a6bc77780e4a3ee97cae66d6
| * Doc: fix a broken link in AbstractBarSeries type docsLeena Miettinen2017-01-051-1/+1
| | | | | | | | | | | | Change-Id: I5796425126d54b92cd2436cd0449a7bc1107e899 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Document signals instead of signal handlers (BarSet)Leena Miettinen2017-01-051-3/+9
| | | | | | | | | | | | | | But mention signal handlers in text. Change-Id: I7b69b9e7faac8c51b1751f5de4640ebfc21a2edd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Remove docs for property-changed signals (BarSet)Leena Miettinen2017-01-051-16/+0
| | | | | | | | | | Change-Id: Ia512811dbc6ced0ecdc6f7522333ac7a6ec480fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Fix signal documentation for AbstractBarSeries typeLeena Miettinen2017-01-051-30/+31
| | | | | | | | | | | | | | | | | | | | | | - Remove property-changed signals - Add type name to enum value names - Document signals, not signal handlers (but mention signal handlers in text) - Use QML property types: qreal > real Change-Id: I22926cec349b915b9d758b4a16f86f2e564b4452 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Add method docs for the BarSet typeLeena Miettinen2017-01-051-0/+24
| | | | | | | | | | | | Task-number: QTBUG-57795 Change-Id: Ia104822dd11c07ff280012f86ace679c740ea5b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1211-367/+478
|\| | | | | | | Change-Id: I18a4da7bddb4c48ab85f33e2bd674e49cb9671a0
| * Doc: Edit bar series model mapper class and type docsLeena Miettinen2016-11-173-82/+136
| | | | | | | | | | Change-Id: I9fb47cc6741f089aa9d8f9224f483448a911c249 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Edit abstract bar series class and type docsLeena Miettinen2016-11-171-120/+157
| | | | | | | | | | Change-Id: I8b286b8cf252234def45ab8f949d0c884fab47b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Edit bar set class and type docsLeena Miettinen2016-11-161-102/+107
| | | | | | | | | | Change-Id: I77a27bae091bccafc862fcef30716b16d609889c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Doc: Edit class and type docs for bar seriesLeena Miettinen2016-11-166-63/+78
| | | | | | | | | | Change-Id: I1c6b93b3d16af0a706ee8e219740e725d340ad5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add support for more than one bar seriesMiikka Heikkinen2016-10-0415-288/+584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now charts properly positions bars if there are more than one bar series in the chart. Theming was changed to account for more than one bar series in the chart. This patch also fixes various animation errors that were exposed by adding/removing the series to/from an existing chart. Task-number: QTBUG-52379 Change-Id: I4a8bc7e1675191ff87966ec4ca3d01e2b7cb815d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-5/+12
|\| | | | | | | Change-Id: Id0483d67f009462255ef380c7ffc9f9445c10e28
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-061-5/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-5/+12
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/charts/glwidget.cpp src/charts/xychart/glxyseriesdata_p.h src/chartsqml2/declarativerendernode.cpp Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
| | | * Clarify QML BarSet::values documentationMiikka Heikkinen2016-08-041-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54763 Change-Id: I3f22fcb97fa342d2a7913e30f4aec987d94a4ab7 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | | Optimize barcharts paintingMiikka Heikkinen2016-09-1920-459/+886
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, bar charts used to recreate the bar chart visuals from scratch whenever any change to the bar data occurred. The following changes were made: - Graphics items are generated only for visible bars and labels - Graphics items are reused if layout or data changes - Labels are not generated unless they are visible - Only newly added bars are animated from scratch; existing bars will retain their size, making things more visually pleasing. With these optimizations, the size of the bar series is irrelevant to the painting performance, only thing that matters is how many bars and labels are actually within visible range. Task-number: QTBUG-52442 Change-Id: If3199a86e6819ef6219d2eb5f06d729c0bdbd2ae Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-281-8/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/charts/common.pri One side added to a file the other removed, claiming it is redundant. Change-Id: I57e2901ec14dd9c02c409cf5714a2f553932fb30
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-8/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * prune redundant DEPENDPATH entriesOswald Buddenhagen2016-05-191-8/+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>
* | | Added candlestick chart typeAlexander Mishin2016-05-251-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added QCandlestickSeries - added QCandlestickSet - added QCandlestickLegendMarker - added model mappers - added Candlestick, CandlestickChartItem, CandlestickData - added SeriesTypeCandlestick to SeriesType enum - added LegendMarkerTypeCandlestick to LegendMarkerType enum - added candlestick chart example - added QML candlestick chart example - added candlestick tester - added autotests - added documentation [ChangeLog][CandlestickChart] Added new chart type: Candlestick Chart. Task-number: QTBUG-50544 Change-Id: I17d18dfa23e0ea209bf51ab1e349585b9cb50a8f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0812-11/+12
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-0311-11/+11
| | | | | | | | | | | | | | | | | | | | | | ... 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>
| * Fix model resetting in with model mappersJoni Poikelin2016-03-021-0/+1
| | | | | | | | | | Change-Id: I22afd1d361aaf0561b4d94b6a3656bfe7b0d9812 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Updated licenseMiikka Heikkinen2016-01-1347-423/+799
|/ | | | | | Change-Id: I7ad9838039b56b9e3a7fe2c42a2d8ff818f393fb Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Updated license headersTitta Heikkala2015-10-2047-517/+658
| | | | | Change-Id: Ic72ee3c9723c2b3f3368c79219b7468f5d95aa84 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 23:06:15 +0000