| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Task-number: QTRD-3148
Change-Id: I2c9efa84184819aaac123ee29685bc3a9e35bfe6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3149
Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0
Change-Id: I37ae7bc7e88b7d8a2c81585333ab87e7fcb8fcc0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3149
Change-Id: I386501dcb489e36a0163109dbd40f29941bd5868
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I4a6d4775f3ca578370a9ce23491bddcb0f5486ec
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-2961
Change-Id: I6a344156bd29fa8fb1ede0546af4d0e67e5e2db4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3149
Change-Id: I7db55daf41ea61548604e816d7a49b7bade450d2
Change-Id: I7db55daf41ea61548604e816d7a49b7bade450d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3144
Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3003
Will add an example in a separate commit
Change-Id: I7fa9eb1b504d188c77b66ef8d4b2ee44416667e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-2857
Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3056
Change-Id: I653d8aeec797b76c19d9b542391b79e9370e7501
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3082
Change-Id: I1503b067edcc677904ca16c1501109187809f98b
Change-Id: I1503b067edcc677904ca16c1501109187809f98b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3080
Change-Id: I198930c48fe9bce6a158406aff5fbf31272b9afe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3078
Change-Id: I07ebc2b7edd542cd28e405dfc80282f18b7a7314
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3046
+ Added missing elementSelected signal to QML
Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18
Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3045
Change-Id: Ib5c8f29bcf0148ae604e27b2a81e6f72a2dbca2a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3055
Change-Id: I1e449df7c1bcb48fc639dbae579e2e1499c9ef2b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2428
Change-Id: I51b3a1f8f974d5b72b36ee1188b7557539b9609b
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3010
QML calls properties in "random" (or alphabetical) order, which in this
case causes theme initialization to be called after series basecolor
override, so setting a basecolor to a series to override theme did not
work.
Change-Id: I434f2a278bf2a70512a3d4d73c30d80319bd0e8e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2866
+ Added custom item rendering
Change-Id: If24400fed7c0467d8ebbd554d6e4df3ec5a205f3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2866
+ Added API for adding and removing custom items
+ Added custom data and custom render items
+ Added shaders for textured objects
+ Added custom item rendering draft to scatter
+ Fixed some shaders
- to be continued in part 2
Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2134
Change-Id: I181ee6c784b998886c2292b7548e16ce75d86458
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2787
Change-Id: I6ecff5c3d2047a2c566051951bf237bf3e68ffab
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2410
Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f
Change-Id: I68f2de1db5a66a877cfc12c9b097035ed1eb3f0f
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2787
Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently only used for label formatting.
Also some other preparatory changes for logaxis.
Task-number: QTRD-2787
Note: Not to be merged until 1.0 is released
Change-Id: I2d7ab70b9c51677d0edd5b0226fb779c9e346286
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2869
Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853
Note: Not to be merged until v1.0 is out
Change-Id: I5182c182f15893e70129a95c3cfdd590ed4f0853
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
| |
Also some example tweaking.
Change-Id: If69e9d3617afc37b88fed4fd0e02ae19f0af7f78
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
At least some mac and android environments do not handle
shared contexts properly, leading to slowdowns and/or artifacts.
Disable context sharing on mac and android, and instead
store and restore relevant opengl state.
Also improve renderer and context cleanup
Change-Id: I8fa596b95f6ff20d53c950a34b5c28513acbc18f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2803
Change-Id: If670633f52519741a096abe901d55fd084ddc9c5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
+Fix default theme
Task-number: QTRD-2653
Change-Id: Iccf4161cd19a9dfe6226189568efeb4565ba53ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
+ commented-out code and qDebugs removed
Task-number: QTRD-2398
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2683
Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Implements item 3) in QTRD-2645
Task-number: QTRD-264
Change-Id: Ibe758bbfb3b4a74b55589a410b402bbdf07ea64f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Implements item 2) in QTRD-2645
Task-number: QTRD-2645
Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2594
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
- some links do not work
Task-number: QTRD-2594
Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-2578
Change-Id: Icbd945596334afb03d81f3b1d6a72399077455db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
| |
+Don't call updateScene for every render cycle
+Fixed item label update when format or name changes
+Misc cosmetic fixes
Task-number: QTRD-2736
Task-number: QTRD-2571
Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Also provide axis changed signals both C++ and QML.
Some other minor fixes, too.
Task-number: QTRD-2669
Change-Id: Ib797bffd6720382cf26359a9059e1809efdf58da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
| |
Theme and axes which have similar add/release ownership handling
also have this kind of method, so added it for completeness.
Change-Id: I4ebefb4779bc6e65bcfd96fe3fae155ef2ff667a
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
Now reset the theme properties immediately to new theme type, instead
of waiting for the theme activation. Also make changing theme type
later work consistently.
Task-number: QTRD-2750
Change-Id: I970d69587623119df33ad2a825fbc12367804eae
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Theme ownership now uses similar model as axis and inputhandler
ownership: Graph can own multiple themes, but only one is active
at the time.
Task-number: QTRD-2623
Change-Id: I7134384df6f8cc465cc28fbebb454b7d2e254f83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
|