summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/scatter3dcontroller.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that the formatter is respected for zero and negative valuesTomi Korpipää2016-11-141-1/+1
| | | | | | | | This also ensures that INF and NaN numbers are also handled correctly Task-number: QTBUG-57075 Change-Id: I8db693cb28303bc13f936c818147fe31b7ee1199 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
| | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix issues with COIN buildsMiikka Heikkinen2015-10-221-0/+7
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f 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>
* 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>
* Clean upTomi Korpipää2014-06-021-5/+0
| | | | | | Task-number: QTRD-3149 Change-Id: I386501dcb489e36a0163109dbd40f29941bd5868 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Some changes to querying series selection Tomi Korpipää2014-05-131-2/+2
| | | | | | | Task-number: QTRD-3047 Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0 Change-Id: I95a3e4d5b4a19f1bca7e92bf1e55918a2f0eb3a0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Scatter data changing optimization.Miikka Heikkinen2014-05-021-9/+33
| | | | | | | | | | No longer reset the entire render item array if single item changes, significantly speeding up this operation. Task-number: QTRD-2190 Change-Id: Ia3de833b761dc6f24acff581ad79668f51c3e9c5 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-101-18/+18
| | | | | | | | | | | | | | 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>
* Axis label dragging support, part 2Tomi Korpipää2014-04-031-0/+2
| | | | | | | | | | | Task-number: QTRD-2367 + Added emitting selection signals + Added an example about creating an input handler for axis label dragging - Snapshot for example docs to be taken Change-Id: I641f4feb9e31c32023727b1c7c695324923accc4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enable querying selection label via APIMiikka Heikkinen2014-04-031-0/+2
| | | | | | | | | | | | Also enable suppressing drawing the label on graph. Selection label formatting was consequently moved from renderers to series. Task-number: QTRD-2896 Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Axis formatter customization exampleMiikka Heikkinen2014-04-011-3/+3
| | | | | | | | | | | | | | | Also refactored the formatter api somewhat: - Removed virtual from allowNegatives and allowZero and added a setter function for those. This will make it cleaner if we need to add similar properties to the axis formatter in the future, as no new virtual methods can be added without breaking BC. - Changed the labelValues array to labelStrings list, as it makes more sense to directly format the strings in recalculate. Change-Id: I3ea005afa984bb756845ca356b999762e0807415 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-2/+2
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added selectedSeries propertyTomi Korpipää2014-02-101-0/+4
| | | | | | | Task-number: QTRD-2806 Change-Id: Icd895915f39e475fe9f2a006bebd956615474202 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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 1Tomi Korpipää2014-01-221-4/+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>
* Selection correction for scatter when data changesMiikka Heikkinen2014-01-211-14/+59
| | | | | | | | Implements item 3) in QTRD-2645 Task-number: QTRD-264 Change-Id: Ibe758bbfb3b4a74b55589a410b402bbdf07ea64f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Adjust selection in item removal and insertMiikka Heikkinen2014-01-171-2/+22
| | | | | | | | Implements item 1) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I5c1cec438089520592a3526e1ff6095cc30afd34 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reintroduced namespace macros, part 2Tomi Korpipää2014-01-171-12/+2
| | | | | | | | Added changes lost in merge Task-number: QTRD-2594 Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Synchronize clicked detection properlyMiikka Heikkinen2014-01-171-10/+12
| | | | | | | | Implements item 2) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement generic clearSelection() method for graphsMiikka Heikkinen2014-01-161-0/+5
| | | | | | | | | Also fixed scene sync related bug on selection. Task-number: QTRD-2606 Task-number: QTRD-2773 Change-Id: I057fd83ae5bf5ee94e413287fb2b3cefa455b156 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-0/+10
| | | | | | | | - 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-4/+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>
* Fix axis range autoadjustment relating to series visibilityMiikka Heikkinen2014-01-131-15/+35
| | | | | | | No need to recalc ranges when a change targets non-visible series. Change-Id: Ifd80b876ba279917a5bded8240721d00d66a6f05 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Invalid point/selection as constant property in qmlMiikka Heikkinen2014-01-091-2/+2
| | | | | | | | Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene Task-number: QTRD-2688 Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-071-6/+6
| | | | | | | | | Moved the '3D' in axis class names so that the classes would be in line with other '3D' classes. Task-number: QTRD-2674 Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Scatter and surface autoadjust ranges to consider all visible seriesMiikka Heikkinen2013-12-111-24/+101
| | | | | | | Task-number: QTRD-2605 Change-Id: I86b843bd478f92a93588394558ba9b983eb8430f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 1Miikka Heikkinen2013-11-291-30/+0
| | | | | | | | Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Example of customising input from QML .Keränen Pasi2013-11-251-0/+5
| | | | | | | | | Example documentation will be done in separate task. Task: QTRD-2562 Change-Id: Ifa63019ba1192ac605b87ba1202a9ef7a530ce7c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-221-2/+2
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multi series selection part 2: scatterMiikka Heikkinen2013-11-211-33/+51
| | | | | | | Task-number: QTRD-2556 Change-Id: I9ee193141dff6603b47db28b0ed0682db6f914c8 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Basic multiseries supportMiikka Heikkinen2013-11-151-32/+38
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multiple set support for scatterTomi Korpipää2013-11-121-2/+3
| | | | | | | | | Task-number: QTRD-2550 - not finished, as QTRD-2548 is not completed Change-Id: I2af9cc134ab7a7359fff311da31a0209ca791c90 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* ES2 support for scatter pointsTomi Korpipää2013-11-061-0/+3
| | | | | | | Task-number: QTRD-2539 Change-Id: I2465322d9a4341ce4c345756fe085a4c5ad2be5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added GL_POINTS for scatter Tomi Korpipää2013-11-061-10/+6
| | | | | | | | Task-number: QTRD-2535 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Change-Id: Icf2d4ab1d8a46ea38864d2b587411ed05c58de38 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Support for non-zero centered data in scatter Tomi Korpipää2013-11-011-10/+12
| | | | | | | | Task-number: QTRD-2311 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Change-Id: I12a60b2d10dd6706d5303cdf127a54f05a819780 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-18/+19
| | | | | | | | | | | | | | | | 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>
* Fix slice view reset on proxy changeMiikka Heikkinen2013-10-111-0/+3
| | | | | Change-Id: I7497da41e60ab0db405e3b44ff63771222ec14b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed double-tap issues with surface slice Tomi Korpipää2013-10-041-1/+0
| | | | | | | | | Task-number: QTRD-2370 Task-number: QTRD-2371 Change-Id: I389f70f68ac4d6d478947b736b602fba62b46bef Change-Id: I389f70f68ac4d6d478947b736b602fba62b46bef Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Replace 'chart' with 'graph'Miikka Heikkinen2013-10-041-1/+1
| | | | | | | Task-number: QTRD-2369 Change-Id: Ic39bc03a0eee4fe75978e71af06ad7a655e958a9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactored MeshStyle and InputState Tomi Korpipää2013-10-021-2/+2
| | | | | | | | Task-number: QTRD-2362 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactored SelectionMode Tomi Korpipää2013-10-021-1/+1
| | | | | | | | Task-number: QTRD-2362 Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9 Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Module renamedTomi Korpipää2013-09-101-0/+269
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>