| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Also fix one cosmetic issue.
Change-Id: I80f04dc214b544755d2e4b462a3c30277582c390
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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-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>
|
|
|
|
|
|
|
|
| |
If uninitialized, translate never gets set in cases where
background adjustment would be zero.
Change-Id: I24472febcfc74615d7bfbb33c5c75c4fb5b24a11
Reviewed-by: Tomi Korpipää <tomi.korpipaa@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-2367
+ Added label selection support to surface & scatter
+ Added Y-label selection support to bars
Change-Id: I3153f1e38019604be763492feba66c3af084de14
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Number of grid lines and labels are no longer tied to segment
count.
Change-Id: I517ebc905f1f70e2e00ae86c05fd0e49e922845d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2787
Change-Id: I0ced8e506928df5fba2e8df94258b53457f4412e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2648
Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1
Change-Id: Ibde745807609dab069d93e7cc9b4d4d547fff6f1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2950
Change-Id: Icab3ed5279c671b57921f93c9ffef7efff2da204
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Ie86f773551fe798b8476d3947e2b9d88bbe3855c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Enables us to lose a bunch of hacks.
Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
Quaternions are actually easier to use in most use cases.
Added some convenience functionality for QML to enable using
axis/angle combinations, too.
Change-Id: I61c76e0967b4808aa9adaf43dfe6f4596c9ce353
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Quaternions are pain in the behind to use, especially
in QML, so change them to angle + vector combinations.
Change-Id: I25eb5ea92deaf3a079e2e193cce2e8de89f3c3c4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2809
Change-Id: I009316652475d71d82a66ba23368b045f34c1f9a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2803
Change-Id: If670633f52519741a096abe901d55fd084ddc9c5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2654
Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2805
Change-Id: I7172662b2bed0a222ceb7560718450bcabd2879d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2683
Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
+ implemented the rest of lightColor
Task-number: QTRD-2405
Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2776
Change-Id: I7518d2598280bfa6bd77af6971e753d9415dae96
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
+ 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>
|
|
|
|
|
|
|
|
|
|
|
| |
+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 fixes the wandering selection ball when resizing surface graph.
Change-Id: Iacb29809ee9b240839956142f9f5ba78d0294620
Reviewed-by: Mika Salmela <mika.salmela@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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
|
|
|
|
|
|
|
| |
Task-id: QTRD-2565
Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
+ some misc fixes
Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
|
|
|
|
|
| |
Change-Id: Ie7898f26176845561b16d0e385429e2bf92cd8f0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: Ife92e68b0218c8ce2ee1fdea5b91d485bcc1509d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I0484c8f512299b58109efe68b82480399f66b402
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Now axis orientations are a logical match for surface axes.
Change-Id: Ib04436c5e83a59bf47f152b60b51b6e8559d681a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2667
Change-Id: I460ba87b4bcb639328439f6e1b698ca1323c0968
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|