summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/drawer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename shader and mesh resource filesTomi Korpipaa2022-10-111-2/+2
| | | | | | | | | | | | | | | WASM gets a conflict with Multimedia if the resource file is named just shaders. Doing the same for meshes to avoid future conflicts with some other modules. Pick-to: 6.4 Fixes: QTBUG-107505 Change-Id: I9107f270d8679d1a50ec8127d15cb0c50856eb7c Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Dilek Akcay <dilek.akcay@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-131-28/+2
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I3b3112f5a36673b90fff0010f973d020886cf08d Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix API review findingTomi Korpipaa2022-02-101-1/+1
| | | | | | | | | | | Rename wireFrameColor to wireframeColor to be consistent with other usage of wirfeframe in QtDataVisualization. Pick-to: 6.3 Change-Id: I1ae6cd7372e46efa2a5d83856126d45355fcff60 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add: Colorize surfaceseries wireframeSami Varanka2021-08-061-0/+4
| | | | | | | | | | | | | 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>
* Remove custom namespaceTomi Korpipaa2021-01-281-2/+2
| | | | | | Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add CMake buildTuomo Pelkonen2021-01-271-1/+2
| | | | | | | 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-271-3/+3
| | | | | | Task-number: QTBUG-89297 Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-261-1/+1
| | | | | | | | | 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 Qt::Alignment instead of the AlignmentFlag enum to represent flagsOlivier Goffart2018-04-101-1/+1
| | | | | | | | | | | | | 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>
* Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
| | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-201-11/+14
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-141-3/+3
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Support larger custom meshes.Miikka Heikkinen2014-11-181-3/+3
| | | | | | | | | | Vertex index was limited to unsigned short, meaning even slightly complex meshes couldn't be used. Changed to unsigned int. Also removed unused vertex indexer methods. Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change copyright headers.Miikka Heikkinen2014-11-071-7/+7
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-291-3/+2
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed recurring GL_INVALID_VALUE OpenGL errors Tomi Korpipää2014-10-091-8/+14
| | | | | | | | | Now that these are not generated all the time, makes it easier to use glGetError to find actual errors. Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Range gradient for points on static optimizationMika Salmela2014-08-281-1/+21
| | | | | Change-Id: Ic44a6a28617f272540d146f02bf50b4bd84cd9c8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement volume rendering supportMiikka Heikkinen2014-08-181-1/+18
| | | | | | | | New subclass of QCustom3DItem, QCustom3DVolume is provided. The documentation for the example will be done in a separate commit. Change-Id: Idb3fdb0654c6bec7606ca012b75852a5a8412397 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter perf improvementMika Salmela2014-06-051-0/+17
| | | | | | | Task-number: QTRD-3148 Change-Id: I2c9efa84184819aaac123ee29685bc3a9e35bfe6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up the rest of engine Tomi Korpipää2014-06-031-3/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Optionally show axis titles on the graphMiikka Heikkinen2014-05-271-4/+5
| | | | | | Task-number: QTRD-2961 Change-Id: I6a344156bd29fa8fb1ede0546af4d0e67e5e2db4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix label alignmentsMiikka Heikkinen2014-05-191-18/+7
| | | | | | | | - Left and right were logically swapped - Horizontal axis labels on slice views were incorrectly aligned Change-Id: I8c13acaeec02961464ee63f8b489e353dcb379e6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize label rotations a bitMiikka Heikkinen2014-05-191-6/+2
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement axis label autorotationMiikka Heikkinen2014-05-191-48/+13
| | | | | | Task-number: QTRD-2857 Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-311-4/+21
| | | | | | | | | | | Task-number: QTRD-2981 + Bars done + Scatter done (= no label selection) - Surface to be done Change-Id: Icd352e40ad6d0ada76380f3dba742f280fd278b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Use GL_LINES for ES2 grid linesTomi Korpipää2014-03-241-2/+38
| | | | | | | | Task-number: QTRD-2527 Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268 Note: Not to be merged until 1.0 is released Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move selection labels to renderer from render itemsMiikka Heikkinen2014-02-241-3/+4
| | | | | | | | | | | | Creating a new label on demand is fast enough, so we don't need to store old labels. Storing labels unnecessarily leads to unchecked use of graphics memory. Optimized bar slices a bit by having separate class of render items for slice items. Change-Id: I5afdecfb3949393341b6c3eaefbc667c65da32e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-2/+3
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-221-2/+2
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-221-2/+0
| | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Optimize theme updateMiikka Heikkinen2014-01-171-24/+4
| | | | | | | | | | | Do not reinitialize shaders in theme update and only update drawer if label related items change. Also fix the bug automerge slipped in in recent rebase. Task-number: QTRD-2778 Change-Id: I4c4317dd36a8e8b60dcaec224f45df81c2ae7f54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-161-7/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-0/+5
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-5/+4
| | | | | | | | | - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Slice view fixes Tomi Korpipää2014-01-151-25/+44
| | | | | | | | | | | | + zero moves, grid doesn't + y-axis label moved closer to grid + label alignment changes Task-number: QTRD-2769 Task-number: QTRD-2738 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Check context before attempting to release opengl resourcesMiikka Heikkinen2013-12-201-1/+2
| | | | | | | | | | In case of QMl ApplicationWindow using applications, openGL context seems to be 0 when the renderer gets destroyed at application shutdown. Work around this by checking for context validity on destructors before attempting to free openGL resources. Change-Id: I5ba5209740f8f4467f4ba2cc8dd195171bcd13c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-4/+8
| | | | | | | | | | | | Colors to series - Multiselection labels in bar slices still buggy - Selection in bars doesn't work correctly if not all series have items in that grid Task-number: QTRD-2557 Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Theme documentedTomi Korpipää2013-12-021-2/+2
| | | | | | | Task-number: QTRD-2633 Change-Id: Ib274ec236f50145df8fd4c2d83f62d4a9154687a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Theme syncTomi Korpipää2013-11-281-3/+9
| | | | | | | Task-number: QTRD-2538 Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-281-5/+5
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-251-3/+3
| | | | | | | | | + Fix default axes to sensible + Fix some rounding errors in surface creation Task-number: QTRD-2622 Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-6/+6
| | | | | | | | | | | | Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added GL_POINTS for scatter Tomi Korpipää2013-11-061-1/+29
| | | | | | | | Task-number: QTRD-2535 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed minimal qml functionality Tomi Korpipää2013-11-011-2/+4
| | | | | | | | Task-number: QTRD-2529 Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for non-zero centered data in barsTomi Korpipää2013-10-301-9/+5
| | | | | | | Task-number: QTRD-2198 Change-Id: Ief48895d93ac9a8ab70743f3da0fdaf7ccd6ea27 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-5/+4
| | | | | | | | | | | | | | | | Selection modes are now proper flags, so you can easily mix and match item, row, and column modes as you wish. Slice flag means automatic slicing control - if user wishes to control slicing himself, he should not set this mode flag. Clicking an item on graph now emits clicked signal from renderer to controller on all graphs instead of setting the selected item. Controller will set the selected item based on this information. Task-number: QTRD-2366 Task-number: QTRD-2491 Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface grid drawer cleanup Tomi Korpipää2013-10-171-10/+0
| | | | | | Change-Id: I64c95f8df29c4500260673b0205cbc8726ea1637 Change-Id: I64c95f8df29c4500260673b0205cbc8726ea1637 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac slice issue fixTomi Korpipää2013-10-141-9/+5
| | | | | | | Task-number: QTRD-2390 Change-Id: Ia691fdbe9f4b3144bbd59e2ce388a7270a7669fd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Slice view shadow fixTomi Korpipää2013-10-141-8/+2
| | | | | | | Task-number: QTRD-2390 Change-Id: If9356e8cf90fd40e5a43c8469b817163d08effbd Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 10:44:04 +0000