summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
Commit message (Collapse)AuthorAgeFilesLines
* Add row colors for Bar3DSeriesSami Varanka10 days3-3/+16
| | | | | | | | | | | | | Added rowColors property for Bar3DSeries. The property can be used draw the individual rows in the series in different colors. Autotests and a manualtest for the property were added also. Fixes: QTBUG-96682 Change-Id: I5c4f778189d079206500a9289490792584eab2b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Migrate to autogenerated cpp exportsAlexey Edelev2021-09-2716-16/+16
| | | | | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Change the cpp export macro name to the autogenerated one. Task-number: QTBUG-90492 Change-Id: Iff6fbff102297feffd443b8b6fef61f5e8f135e5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add hasSeries method to Abstract3D graphSami Varanka2021-09-247-2/+37
| | | | | | | | | | | | | Added a hasSeries method to Abstract3Dgraph. The method can be used to check whether a series has already been added to the graph. In addition, modified cpp and qml autotests to test the added method. Fixes: QTBUG-96683 Change-Id: I91f70ca15b6c5fbaa7691cd17bbfc2ef460c3d37 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix: QAbstract3DGraph orthoProjection docsSami Varanka2021-09-061-5/+0
| | | | | | | | | | | | | Changed the documentation for QAbstract3DGraph orthoProjection property. The documentation promised too much so the extra lines were removed. Pick-to: 5.15 6.1 6.2 Fixes: QTBUG-96206 Change-Id: I07b42cf359cf6570d2364be737cb2c1bc8294596 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix: change signals to take values by const refSami Varanka2021-09-021-1/+1
| | | | | | | | | | | Changed signals in declaratives to take their arguments as const ref when suitable. Pick-to: 6.1 6.2 Fixes: QTBUG-95941 Change-Id: I3d582422793ee2bfb4cb5251dcacd55d3d3acca9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add: Margin between series columns in Bars3DSami Varanka2021-08-246-6/+88
| | | | | | | | | | | | | | Added a new property to Bars3D. The property controls the margin between the columns of series. It can be used to show bars belonging to same column, but different series side by side. Also added autotest for qml and cpp. Fixes: QTBUG-69036 Change-Id: I3c353e9097a8be8cafc05f8f5120e4266baa4a5c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add: Colorize surfaceseries wireframeSami Varanka2021-08-062-0/+8
| | | | | | | | | | | | | Added color property for surfaceseries wireframe. Modified surfaceseries cpptest and qmltest to test the added property. In addition, the documentation for the property was added. Modified qmlsurface example to use the new property. Fixes: QTBUG-64748 Change-Id: I18f56258cdba2b3270dce7c8313cbf17e499ff39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix: Axis titles do not respect title fixedSami Varanka2021-06-221-0/+20
| | | | | | | | | | | | When a graph is rotated so that it is viewed from below the y axis gets flipped. However, x and z axis were not rotated correctly which caused them to be unvisible. Pick-to: 6.1 Fixes: QTBUG-94441 Change-Id: Ic56b910ce790526fd0460aa895ce978e6efd0b23 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix bargraph labels face wrong directionSami Varanka2021-06-111-3/+7
| | | | | | | | | | | | | | When the camera's X rotation is 180.0f, the labels were rotated to face wrong direction. The axis title labels do not respect the Abstract3DAxis's titleFixed property. Created a new bugreport QTBUG-94441. Pick-to: 5.15 6.1 Fixes: QTBUG-90371 Change-Id: I80115b8b363a7385dfd2cb1f004a05368549ed48 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Modernize and update to latest CMake APIUlf Hermann2021-06-119-24/+26
| | | | | | | | | | Use declarative registration for QML types, and separate the backing library from the plugin. Also, bump the revision numbers to account for Qt6 and drop the "2" from the source directory name. Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix Gradients don't showSami Varanka2021-05-182-2/+9
| | | | | | | | | | | | | Added pointer to graph in Abstract3DController. Controller can use that pointer to check whether the graph is ready when receiving a themetypeChanged signal. Added manual test for gradients. Pick-to: 6.1 Fixes: QTBUG-93506 Change-Id: I13df962b807feb615e3267f580ef57dd62a0b058 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove left-over .pri filesJoerg Bornemann2021-05-051-63/+0
| | | | | | Task-number: QTBUG-88742 Change-Id: I140a038ccb47433ff7fe437bfc002e580bfb21a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove obsolete namespace documentationVolker Hilsheimer2021-04-201-1/+1
| | | | | | | | | | | | | | That there is a 'using namespace QtDataVisualization' statement in the 'galaxy' manual tests suggests that there used to be one, but there isn't anymore. This documentation appears to have been for that long-gone namespace, so remove it to silence qdoc. Fix references to the now global qDefaultSurfaceFormat utility function. Pick-to: 6.1 Change-Id: Ide7689ee30af60f8c97649672f8a0f5ad455c35e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix macOS build that has -Wunused-function as errorTomi Korpipaa2021-02-101-1/+1
| | | | | | | | | | Clang may interpret static inline function as unused, although it should not. Pragma it out for clang. Fixes: QTBUG-91053 Pick-to: 6.1 Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix conan build errorsTomi Korpipaa2021-01-291-1/+1
| | | | | | Fixes: QTBUG-90737 Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove custom namespaceTomi Korpipaa2021-01-2854-109/+109
| | | | | | Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add CMake buildTuomo Pelkonen2021-01-274-33/+38
| | | | | | | Task-number: QTBUG-89299 Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix compilation issues for macOS and Android on Qt 6.0Tuomo Pelkonen2021-01-274-12/+14
| | | | | | Task-number: QTBUG-89297 Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Migrate C++ API rendering path to Qt 6Tomi Korpipaa2020-12-142-3/+5
| | | | | | | | | | Replace QRegExp with QRegularExpression and change usage accordingly. Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header include changes. Task-number: QTBUG-89297 Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add missing overrideAlexander Volkov2020-06-2914-135/+135
| | | | | Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-268-50/+50
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2517-43/+43
| | | | | | | Task-number: QTBUG-84469 Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-261-1/+1
|\
| * Doc: Fix typo in qdoc commandPaul Wicking2020-01-271-1/+1
| | | | | | | | | | | | | | Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-1/+1
| |\ | | | | | | | | | Change-Id: Ibfe56eccd7435d995db91964e2352f19a4272d56
* | | Update dependenciesFriedemann Kleint2020-03-263-3/+5
| | | | | | | | | | | | | | | | | | | | | Add missing Q_MOC_INCLUDE and adapt to OpenGL split. Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-1/+1
|\ \ \ | |/ / |/| / | |/ Change-Id: I08c9b0b57ccefc161815833ccd63208d2768cb54
| * Fix GCC 4.8 build of abstract3drendererVille Voutilainen2019-08-221-1/+1
| | | | | | | | | | | | Task-number: QTBUG-77730 Change-Id: I827d727b103a9923a8b82163bfa4f77c81c0906b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-121-2/+2
|/ | | | | Change-Id: I6050b5269304ac6941d3a9d057c91d439f46b63c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix hanging at application exitTomi Korpipaa2019-04-298-60/+48
| | | | | | | Task-number: QTBUG-75256 Task-number: QTBUG-69627 Change-Id: If4221c8fcf783daf4bf6a38dbf1b9633a20eafb0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix deprecation warningsFriedemann Kleint2019-02-111-1/+1
| | | | | | | | | | | | utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] volumetrictest.cpp:384:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] volumetrictest.cpp:538:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations] Change-Id: I59d0ce39584b11ec239cbdadf067c30cf37ca05a Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove Qt<5.12 workaroundOlivier Goffart2018-04-101-2/+0
| | | | | | | This change partly reverts commit da3c5925d546282e99f13b450a674c7024fde9ed. Change-Id: Ifd09b63a56d5f2e8837e461ca6048d80fcb8c916 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use Qt::Alignment instead of the AlignmentFlag enum to represent flagsOlivier Goffart2018-04-105-9/+11
| | | | | | | | | | | | | Because from Qt 5.12, the the right operator| is found in the Qt namespace instead of in the global namespace. One must still add the 'using' statement so this patch can be integrated using a previous qtbase. But the statement can be removed once qtbase is updated. Task-number: QTBUG-67582 Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-3/+10
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-185-3/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
| | * Fix mixing of vec3 and vec2 for coords_mdlMika Salmela2017-12-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Vec3 used on fragment shader when vec2 used on vertex shader. On surfaceTextureFlat coords_mdl not used at all, so remove it. Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Render custom items at insertion orderMika Salmela2017-11-163-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the rendering order of custom items to insertion order. Task-number: QTBUG-64312 Change-Id: I1ce865a3492c145ffa269cd12baa15ffff8d6a59 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-2/+6
|\ \ \ | |/ / | | | | | | Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-2/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
| | * Set clamp to edge wrap modes for surface texturesMika Salmela2017-09-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default surface textures had wrong wrap modes making the color bleed on edges. This patch changes the texture wrap modes to clamp to edge. Task-number: QTBUG-62996 Change-Id: Iebee66b01a78db6036cb0c833f39237f8e98b6b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-268-8/+8
|/ / | | | | | | | | Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-141-1/+1
|/ | | | | | | | | These document what the arithmetic is actually doing; and save us an ad-hoc use of an approximate value for pi while we're about it. Task-number: QTBUG-58083 Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-244-0/+8
| | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix warning about member initialization out of orderThiago Macieira2017-04-031-1/+1
| | | | | | | | | | | Instead of fixing the order in the constructor, let's fix the order of the declarations to follow the rule of thumb to avoid padding holes. q3dlight.cpp:107:5: warning: field 'q_ptr' will be initialized after field 'm_automaticLight' [-Wreorder] Change-Id: I27b55fdf514247549455fffd14b17abe78cbad28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable transparency for wallsMika Salmela2017-03-103-48/+106
| | | | | | | | | | When alpha value for wall is below 1.0, enable blending for walls. Rearrange code so that solid objects are drawn first and then possible tranparent objects. Task-number: QTBUG-59140 Change-Id: I5087a664a59ecdb4516b17e8fac1f8ff48ad1c16 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dSurface)Leena Miettinen2017-03-021-27/+41
| | | | | | | | Remove property getter docs, because they do not add any info, and move setter docs to separate entries. Change-Id: I78a0dab0ec9652b58b319f09dc5266e36d12e85a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dCamera)Leena Miettinen2017-03-021-54/+63
| | | | | Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QAbstract3dGraph)Leena Miettinen2017-03-021-91/+136
| | | | | Change-Id: I076eafb31ab9710f59eb47287cf91882a56bb8e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dScene)Leena Miettinen2017-02-271-63/+83
| | | | | | Change-Id: I1124ecce8a81256916e4936dc952ea619082a272 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (Q3dBars)Leena Miettinen2017-02-271-32/+62
| | | | | Change-Id: I75cb18ad5ea6b7c88c940d52ccb82753fcc0c7c7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>