summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adjust linechart cliprect to allow drawing on plot area edgesv5.7.1Miikka Heikkinen2016-10-061-0/+8
| | | | | | | | | | | | | Line segments along the plot area edges were not drawn on all edges. The missing edges depended on whether the position of the series item was a round number or a .5 fraction. Adding half a pixel of clip area to each direction fixes both cases without causing line to get out of plot area boundaries. Task-number: QTBUG-56324 Change-Id: Ide05274bc59b80c8000502cdc3b596336b58d12b 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-09-177-19/+20
|\ | | | | | | Change-Id: I65ebe53c4eac112d7e124c19efe7273b6cde3657
| * Fix some flaky QML autotestsMiikka Heikkinen2016-09-067-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | Category axis test was failing randomly because labels position was not explicitly initialized. Pieseries tests failed randomly because Math.random() returned zero or a value very close to zero, causing the fuzzy compare to not register the series sum as changed. Change-Id: Ie7ffa517aad40aaed1282375b35174fb880d5fe6 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-08-307-33/+269
|\| | | | | | | Change-Id: Ibf7679696d7b659621cf511fd5e1d5eda244a810
| * Changes file changeMiikka Heikkinen2016-08-251-0/+1
| | | | | | | | | | | | | | Change-Id: I059c79441226109167418a7804fee7813eaa45d1 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix setting area series edge series after area series is shownMiikka Heikkinen2016-08-256-33/+268
| | | | | | | | | | | | | | | | | | | | Now AreaChartItem properly updates its lower and upper series when they are changed at QAreaSeries. Task-number: QTBUG-55431 Change-Id: I379005e44128f06e5ff42e2aa12a563e5f8ac21c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-2327-207/+291
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: Ib4e01f2646d87b691c7b2f8bee4ed1f5521e4f6d
| * Bump version to 2.1.2Miikka Heikkinen2016-08-224-4/+29
| | | | | | | | | | | | Change-Id: I1910d0ac29c1740d1d6d340749999e21916db9c7 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Disconnect a series from ChartItem when it is removed from a chartMiikka Heikkinen2016-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | If series is not disconnected, modifying points of removed series can crash the application, as the ChartItem is deleted using deleteLater(). Task-number: QTBUG-55348 Change-Id: I5159c5399486f7fb6e4e62578903923aa0108bb9 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix resize handling in Callout exampleMiikka Heikkinen2016-08-164-9/+29
| | | | | | | | | | | | | | | | | | Callouts are now positioned correctly when the chart is resized. Task-number: QTBUG-54492 Change-Id: I5660eb48e58348cc2d649b48965c342488294ae4 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix logarithmic axis for area chartMiikka Heikkinen2016-08-153-16/+24
| | | | | | | | | | | | | | | | | | | | | | If the domain type of an area series differs from the domain type of an edge series of that area series, recreate the edge series domain so that the two domain types match. Task-number: QTRD-1967 Change-Id: Ifb6bbc449816729721cce43c7e0c8d2877bb0eaf Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix setting axis color properties to black for the first timeMiikka Heikkinen2016-08-121-11/+11
| | | | | | | | | | | | | | | | | | | | The color properties didn't correctly check if the default pen/brush was in use and force the color setting in that case. Task-number: QTBUG-53337 Change-Id: Iaafcf105973f601be74e60d6d669f5fd16fa347f Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Disconnect boxplot series from chart's dataset correctlyMiikka Heikkinen2016-08-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | When a boxplot series is removed from the chart, it must disconnect from chart's dataset. However, it only did it when animations were enabled. Task-number: QTBUG-55278 Change-Id: Iad89a586d16dc32299ae71aa63b3beccb4d51fdd Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * 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-1115-166/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix QT_BUILD_INTERNAL usage in autotestsMiikka Heikkinen2016-08-112-2/+4
| | | | | | | | | | | | | | | | | | We need to do the define check after QtTest include, or otherwise the affected tests are always skipped. Change-Id: I472c1222a8c4f98cd722b9190c94412f7cf4808a 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-08-1163-426/+593
|\| | | | | | | | | | | | | | | | | Conflicts: src/charts/glwidget.cpp src/charts/xychart/glxyseriesdata_p.h src/chartsqml2/declarativerendernode.cpp Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
| * Fix axis minimum height in case of multiple axes on same orientationMiikka Heikkinen2016-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | Removed the incorrect multiplicator that doubled the axis minimum height on vertical axes for each axis on the same orientation. Task-number: QTBUG-53949 Change-Id: Ie07d358b7274760f74ea87e036b0a980d6996925 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix BarSet value roundingMiikka Heikkinen2016-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | Values given as points are rounded to integers, because the variant was converted to QPoint instead of QPointF. Task-number: QTBUG-52086 Change-Id: Ifa99d34447de618607145d452ccfdeabaf66d4b5 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * 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>
| * 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>
| * Fix ugly partial antialiasing of the gl accelerated graphMiikka Heikkinen2016-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The unwanted antialising happened when plot area width/height was non-integer. This caused uneven, progressively increasing antialiasing towards the right side of the graph as the difference between plotted points and actual pixels increased. Fixed by rounding off the dimensions of the plot area. Task-number: QTBUG-55098 Change-Id: I9c8691a65b603fb7436a07def19a18540f28f07f Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Ensure the chart is drawn whenever the render node is recreatedMiikka Heikkinen2016-08-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | Some QtQuick backends such as 2D renderer recreate the render node every time the window is shown, so we must ensure the existing chart image is also redrawn when the node is recreated. Task-number: QTBUG-54803 Change-Id: I61e54a0fa608c1ff888a374c838fc974dfb5d5dc Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Make OpenGL accelerated series obey series visibilityMiikka Heikkinen2016-08-028-46/+85
| | | | | | | | | | | | | | Task-number: QTBUG-54914 Change-Id: Ia55274aee13e3d700f75a1521be26ed78bddba8d Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Cleanup examples build systemMichal Klocek2016-08-0149-358/+462
| | | | | | | | | | | | | | | | | | Make the examples self-contained and follow the way examples are compiled in other modules, so they can be easly opened by qtc. Change-Id: I664ba3dc21630ced5b1d14ad878a70eac0763c84 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: Iffb90dd0f1cec2657a8c4cc2bf4e2e6d15744deb
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2919-87/+13
|\| | | | | | | | | | | | | | | | | | | | | 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
| * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | it's done centrally now. Change-Id: I8e025df73f1bd1e5e5129cfb4cbcb40b044374bd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * use standardized test export macrosOswald Buddenhagen2016-05-195-22/+5
| | | | | | | | | | | | | | | | note that debug build != developer build. Change-Id: Ia3e4b4d2f80e7126ad9a2461642c93321099cc27 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * use standardized module export macrosOswald Buddenhagen2016-05-192-14/+9
| | | | | | | | | | | | Change-Id: I11212f72fec22ed73712267d8ff03b0475ecd56b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * remove redundant handling of static buildsOswald Buddenhagen2016-05-191-3/+0
| | | | | | | | | | | | | | | | | | | | the complete qt build automatically follows configure's setting. the only exception are libraries which explicitly request to be always built statically. Change-Id: I2002e3dbea65bd7878e07e40b2876158a9412a0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * don't duplicate functionality from various .prf filesOswald Buddenhagen2016-05-192-9/+0
| | | | | | | | | | | | Change-Id: If716670266e0f663ee600d11c7601df139825c11 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * set up relation with c++ module correctly.Oswald Buddenhagen2016-05-191-5/+2
| | | | | | | | | | | | Change-Id: Iab19363b74b819845d35f418c9f2c95cde94271f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * place load(qt_module) at the end of the project fileOswald Buddenhagen2016-05-191-2/+2
| | | | | | | | | | | | | | | | it's the new convention. Change-Id: I48c83c2cd60ec42178ce2c0b0fdee100da292e76 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * clean up INCLUDEPATH handlingOswald Buddenhagen2016-05-194-24/+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-1914-29/+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>
| * remove debug messageOswald Buddenhagen2016-05-191-1/+0
| | | | | | | | | | | | Change-Id: Ib7511b744ac89e9af1e81c4a6fa7428a254b23a3 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-rc1v5.7.0Liang Qi2016-05-190-0/+0
|\| | | | | | | | | | | | | Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de
| * Doc: Make documentation versioning follow .qmake.confTopi Reinio2016-05-131-5/+5
| | | | | | | | | | | | | | | | No reason to have hard-coded version numbers in .qdocconf, as they are available from env. variables. Change-Id: I4a118fe0127a20f01af157fbc496e3cb0ba69976 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-131-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Task-number: QTBUG-52953 Change-Id: Ie4cd46bf477d958394529cf7ca7b75c7455b1ce9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add 5.7.0 changes fileMiikka Heikkinen2016-04-261-0/+10
| | | | | | | | | | | | Change-Id: I72ac7ecf67786a2fe4491e848863367fdfd54c01 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Doc: Remove the additional "Getting Started" pageVenugopal Shivashankar2016-04-182-126/+5
| | | | | | | | | | | | | | | | Now that the addon is available under opensource license, there are less hurdles to install and use it. Change-Id: Ia8de9ca0f4034e4b5397a9f1a5ed218f068b193a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0856-100/+128
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
| * Bump version to 2.1.1Miikka Heikkinen2016-04-054-4/+12
| | | | | | | | | | | | Change-Id: If426ff4b1278b28afc7406fb42a7a6ad34aa725a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Fix clearing the chart titleMiikka Heikkinen2016-04-052-10/+19
| | | | | | | | | | | | | | Task-number: QTBUG-51725 Change-Id: Idf5c52052f385fb2d07201ac8844415a1b7841ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Fix crash when axis range is infinite.Miikka Heikkinen2016-04-051-1/+7
| | | | | | | | | | | | | | | | | | | | Now instead print out a warning and ignore the invalid range. Task-number: QTBUG-52320 Change-Id: I929f8f61eecaa23a0c61d143c5fa2e8431160d3f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-172-17/+19
| |\ | | | | | | | | | Change-Id: I69de781a63b4492ed7802e1d60b319d56a7bdd01
| | * Fix crash when using linuxfb and 2D rendererrelease-2.1.0Miikka Heikkinen2016-03-012-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer should call any OpenGL functions on QML charts applications if we don't have a valid OpenGL context. Task-number: QTBUG-51387 Change-Id: Ic393f69921e300f19dc42c83fc07677ce7869273 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * | Fix compilation with GCC 6Marc Mutz2016-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtcharts/tests/manual/chartwidgettest/mainwidget.cpp:211:74: error: call of overloaded ‘abs(double)’ is ambiguous newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100)); The file included <cmath>, but used C's math.h abs(), which is integer-only. ^ Change-Id: Iaa7e19f282a460a8c2d79475a14c7372b9740d26 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>