summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3dcontroller.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Clean up Tomi Korpipää2014-06-041-1/+2
| | | | | | | Task-number: QTRD-3149 Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0 Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean upTomi Korpipää2014-06-021-6/+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>
* Bar data item and row changing optimizationsMiikka Heikkinen2014-04-301-19/+16
| | | | | | | | | | No longer reset the entire render item array if single item or row changes, significantly speeding up these operations. Task-number: QTRD-2190 Change-Id: I44b8abd384003e252e4bfc34af5d73ac1dee34bf Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Optimize multiple series rendering.Miikka Heikkinen2014-04-101-27/+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/+7
| | | | | | | | | | | | 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>
* Misc fixesMiikka Heikkinen2014-02-211-3/+5
| | | | | | | | | + Rectangle used as main item in qml examples to make ui consistent + Surface autoaxis adjustment fixes for multiseries case + Qmlsurface example UI tweaks Change-Id: Ie75b0efc08f9a56ca709f079b28865e34caa8641 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-3/+1
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries support for surfaceMika Salmela2014-02-101-37/+36
| | | | | | | | | Multiseries support for item and row changes. Task-number: QTRD-2767 Change-Id: I5702989e7f59913481a2ca888e402effa22a4221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* Multiseries support for surfaceMika Salmela2014-02-061-8/+17
| | | | | | | 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-0/+4
| | | | | | | Also revert the incorrect change to surface slice update. Change-Id: If08d5848e5b216f4f6b82e39727eeb7facd463ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add qmloscilloscope exampleMiikka Heikkinen2014-02-051-17/+13
| | | | | | | | | | +Fix itemAt() in surface proxy +Add itemAt(QPoint) in bar and surface proxies +Misc fixes to other examples Task-number: QTRD-2816 Change-Id: I5e06cfce98f74719a20885e3ca5a1e6fefb23a9c 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-1/+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-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-11/+10
| | | | | | | | 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-9/+14
| | | | | | | | 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-11/+13
| | | | | | | | | - 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-16/+34
| | | | | | | 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-7/+7
| | | | | | | | | 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-25/+101
| | | | | | | Task-number: QTRD-2605 Change-Id: I86b843bd478f92a93588394558ba9b983eb8430f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-29/+0
| | | | | | | | | | | | 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>
* Better proxy API for surfaceMika Salmela2013-12-041-0/+31
| | | | | | | Part 3, add, insert and remove row(s). Change-Id: I4e30d7f129576bebce9216d5cc00a66b2f8af6cd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Better proxy API for surfaceMika Salmela2013-12-031-10/+56
| | | | | | | 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-58/+22
| | | | | | | | Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Better proxy API for surfaceMika Salmela2013-11-271-2/+26
| | | | | | | 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-251-15/+5
| | | | | | | | | + 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>
* Fix documentation related to multiseries changes.Miikka Heikkinen2013-11-251-2/+2
| | | | | | | | Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-221-39/+64
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-1/+1
| | | | | | | | | | | | 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>
* Basic multiseries supportMiikka Heikkinen2013-11-151-63/+63
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Gradient support Part 1Miikka Heikkinen2013-11-071-2/+0
| | | | | | | | | TODO: - Finish scatter - QML (maybe left until data set is sorted, though) Change-Id: I87a8117cb29f147080e0662c55b1098cb2e71689 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q_PROPERTY NOTIFY addition, part 2 Tomi Korpipää2013-11-051-19/+26
| | | | | | | | Task-number: QTRD-2534 Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface toggling API implementedTomi Korpipää2013-11-041-0/+18
| | | | | | | Task-number: QTRD-2337 Change-Id: I59695a042c864faed90839c4e566fcece5cb94f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cleaning controller callbacks from renderers, part 2Miikka Heikkinen2013-10-311-0/+8
| | | | | | | | | Removed m_controller from renderers so it won't accidentally be used again. Replaced the remaining callbacks with queued signals. Task-number: QTRD-2216 Change-Id: Ib10bc661bcdc3d810baa8b2513f5e6dd67f7207e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-11/+107
| | | | | | | | | | | | | | | | 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>
* Doc: language review datavisualizationNico Vertriest2013-10-251-1/+1
| | | | | | | Task-number: QTBUG-33360 Change-Id: I67eaab3914effa2a7a5be1b72c6d2c59cb2402f6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed ES2 gradient problem Tomi Korpipää2013-10-211-1/+1
| | | | | | | | | | Task-number: QTRD-2453 + changed gradient texture to a power-of-two size to avoid gradient errors on Android Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix crashes and bugs when using surface with ES2Miikka Heikkinen2013-10-151-0/+7
| | | | | | | | +Fix compile warnings +Fix qmlsurface example Change-Id: I28bbf38e7aa51b1ec315374182a9daae8eded87c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix surface slice clearing when axis range changesMiikka Heikkinen2013-10-111-0/+6
| | | | | | | Now close slice view in these cases Change-Id: I4561f63a8d82e9168699662ba716fb14a0d5a634 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix slice view reset on proxy changeMiikka Heikkinen2013-10-111-0/+4
| | | | | 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>