summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
Commit message (Collapse)AuthorAgeFilesLines
...
* Removed unused variableTomi Korpipää2014-06-061-1/+0
| | | | | Change-Id: I9659e0492ee2e4f56717f2189f7aece034f778a2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean upTomi Korpipää2014-06-052-2/+0
| | | | | | Task-number: QTRD-3149 Change-Id: Ife8937e93b06b118b369ff909097a137106736cf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter perf improvementMika Salmela2014-06-057-18/+482
| | | | | | | 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 (android compilation fixes) Tomi Korpipää2014-06-041-0/+1
| | | | | | | Task-number: QTRD-3149 Change-Id: Ibfb2cf19c4e97df4d7e278d5c5588feee015cd5b Change-Id: Ibfb2cf19c4e97df4d7e278d5c5588feee015cd5b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Flip surface normals if either rows or columns are descendingMiikka Heikkinen2014-06-032-21/+57
| | | | | | | | | | If both are descending or ascending, do not flip. Flip is needed to make specular highlight work correctly. Task-number: QTRD-3156 Change-Id: Ida256ee4ff96553c6f1cd5bf94e71d2e95ce7cf4 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Clean up input, theme, utils Tomi Korpipää2014-06-0310-22/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cache ObjectHelper instancesMiikka Heikkinen2014-05-222-5/+86
| | | | | | Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimize label rotations a bitMiikka Heikkinen2014-05-192-0/+10
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix texture cleanup.Miikka Heikkinen2014-04-282-3/+6
| | | | | | | | | Make deleteTexture also zero the pointer and do the check if deletion is needed, as those are required anyway on the caller side in most cases. Change-Id: Ia12102c97a647127230db2518c32f81322ce6743 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Color problem fixed Tomi Korpipää2014-04-242-4/+12
| | | | | | | | | | | Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Add custom item support, part 2Tomi Korpipää2014-04-161-2/+4
| | | | | | | | | Task-number: QTRD-2866 + Added custom item rendering Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-101-0/+2
| | | | | | | | | | | | | | Cache all series instead of just the visible ones on all graphs instead of just surface. Changes to one series now trigger data update to only the affected series, which should significantly improve performance in these cases. Task-number: QTRD-2600 Task-number: QTRD-2957 Change-Id: I6db7c689108fce8d25aace6682a193936d6f0eaf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-313-10/+4
| | | | | | | | | | | 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>
* Make axis labels more accurate by using qreals for label valuesMiikka Heikkinen2014-03-262-2/+2
| | | | | | | | | Also refactor axis formatter sub grid array to be one dimensional. There is no need to know which segment each sub grid line belongs to. Change-Id: Ie9813088650fcc0ca844f3c358ea1abae9258367 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added range gradient support for MeshPointsTomi Korpipää2014-03-252-0/+12
| | | | | | | Task-number: QTRD-2701 Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Actually use axis formatter in renderer.Miikka Heikkinen2014-03-252-86/+76
| | | | | | | Task-number: QTRD-2787 Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-1816-44/+33
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries support for surface sliceMika Salmela2014-02-112-0/+8
| | | | | | | Task-number: QTRD-2867 Change-Id: I705e3b743ab9d561d93039a60288d71627db8661 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multiseries support for surfaceMika Salmela2014-02-064-5/+28
| | | | | | | Task-number: QTRD-2767 Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix slice update for bars, too.Miikka Heikkinen2014-02-051-4/+0
| | | | | | | Also revert the incorrect change to surface slice update. Change-Id: If08d5848e5b216f4f6b82e39727eeb7facd463ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-2719-19/+19
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* iOS fixesTomi Korpipää2014-01-272-3/+3
| | | | | | | | | | + texture power-of-two added + input handling changes - surface crashes, will be fixed in separate commit Task-number: QTRD-2802 Change-Id: I1913aec60c4e986b02f307d832dc55dea0be4348 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-2211-83/+16
| | | | | | | | | + 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-1/+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>
* References to alpha and TP removedTomi Korpipää2014-01-202-0/+10
| | | | | | | | + implemented the rest of lightColor Task-number: QTRD-2405 Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-1618-81/+37
| | | | | | | | 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-169-0/+45
| | | | | | | | - 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-1518-36/+36
| | | | | | | | | - 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>
* Implement public utility function for AA setupMiikka Heikkinen2014-01-092-1/+50
| | | | | | | | | | | | qDefaultSurfaceFormat() can be used to set up antialiasing for QML apps in just two lines: ... viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); Task-number: QTRD-2734 Change-Id: I3f7ba728cef6310d794256e1dc4c28cc33b2f9a3 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Check context before attempting to release opengl resourcesMiikka Heikkinen2013-12-202-5/+8
| | | | | | | | | | 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>
* Fix more valgrind issuesMiikka Heikkinen2013-12-131-4/+2
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Label fix Tomi Korpipää2013-12-131-1/+1
| | | | | | Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix uniform color surfacesMiikka Heikkinen2013-12-131-1/+1
| | | | | | | Bug in color conversion from QVector3D to QColor Change-Id: I060619f280cb0dbace65a08b58183d468491dff8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix for updateCoarseRow resetMika Salmela2013-12-111-5/+9
| | | | | | | | | - Also topleft updateSmoothItem Task-number: QTRD-2697 Change-Id: I9a5b03021cbeca28f9d63351580584c5567ea607 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-102-0/+6
| | | | | | | | | | | | 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>
* QML docs + enum movingTomi Korpipää2013-12-052-26/+27
| | | | | | | | Task-number: QTRD-2670 Task-number: QTRD-2505 Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Better proxy API for surfaceMika Salmela2013-12-032-76/+185
| | | | | | | Part 2, item change. More is on the way. Change-Id: Ic41f3a90b5a47502b741391ace990117ef2eaf80 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 2Miikka Heikkinen2013-12-031-1/+3
| | | | | | | | Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 1Miikka Heikkinen2013-11-291-3/+0
| | | | | | | | Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-282-30/+6
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Better proxy API for surfaceMika Salmela2013-11-272-67/+304
| | | | | | | Part 1, row change. More is on the way. Change-Id: I4e152a5160275f2d629e7793d4d40b85082a2fc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-254-11/+11
| | | | | | | | | + 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>
* Initialization for depth textureMika Salmela2013-11-182-1/+19
| | | | | | | | Precaution for using depth texture before nothing has been drawn. Task-number: QTRD-2570 Change-Id: I47ece387542acbd1ffed8d650a70ecc471efb30e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow support for surfaceMika Salmela2013-11-082-2/+12
| | | | | | | Task-number: QTRD-2266 Change-Id: I99fd7a6eda570df3d114ab10a1b07c22736cc86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support part 2Miikka Heikkinen2013-11-082-3/+5
| | | | | | | | Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-074-1/+35
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tech preview RC fixes Tomi Korpipää2013-10-251-3/+16
| | | | | | Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Change-Id: I5a47053c8708b9a9c37b845bc55166f02fc99de3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc: language review datavisualizationNico Vertriest2013-10-252-3/+3
| | | | | | | Task-number: QTBUG-33360 Change-Id: I67eaab3914effa2a7a5be1b72c6d2c59cb2402f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed obsolete function Tomi Korpipää2013-10-212-49/+0
| | | | | | Change-Id: Ic52f1a4775453a4db910ea27b172f82554f7a9b6 Change-Id: Ic52f1a4775453a4db910ea27b172f82554f7a9b6 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Changed depth buffer to 24 bits Tomi Korpipää2013-10-211-1/+1
| | | | | | Change-Id: I706529d5ba9571c0b81c14664bd0680ca318eadc Change-Id: I706529d5ba9571c0b81c14664bd0680ca318eadc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>