| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Task-number: QTRD-3052
Change-Id: I05b09df72534e5eae803d58e330b2a8045f47038
Change-Id: I05b09df72534e5eae803d58e330b2a8045f47038
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3053
Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1
Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1
Reviewed-by: Mika Salmela <mika.salmela@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-3048
Change-Id: I90e6fbee38bae858c2e0910178684e28eacc6472
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3043
+ surface selection bug fix
- snapshot to be added
Change-Id: I17276e39c304cbf1a58eaa2334eff2268656dbf4
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>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3033
Change-Id: I07c9a9e8795f0e282e8cbd696a627bc2dc8776bc
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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: 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>
|
|
|
|
|
|
|
|
| |
- Selection highlighting fixed
Change-Id: Ieba8af12d8947f27b199d61591a77d295dbc9c48
Change-Id: Ieba8af12d8947f27b199d61591a77d295dbc9c48
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Change-Id: I3c9cc0698c22c242126e8b4d1881e8fdf2d50168
Change-Id: I3c9cc0698c22c242126e8b4d1881e8fdf2d50168
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2701
Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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-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-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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2950
Change-Id: Icab3ed5279c671b57921f93c9ffef7efff2da204
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Separate shader for slice surfaces.
Change-Id: I29f89dc718a4a5dde8d78e1f602283889087bf23
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
According to customer feedback, the lack of proper scoping makes
it impossible to use the traditional style SIGNAL() macro when
making connections.
Change-Id: I3fbead5400bbd8b5fad62e4facecc6610c36c9a6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac
Change-Id: I13b06175a1be0eb92acd7c1aac2ea860e02d6fac
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Ie86f773551fe798b8476d3947e2b9d88bbe3855c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
| |
Single row/column graphs added extra row when autoadjusting.
Change-Id: Ie6b79257c33cbf4647fe4855e8cbc655052a133c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
|
|
|
|
|
|
|
|
|
|
|
| |
- QAbstract3DAxis
- QAbstract3dSeries
- QAbstract3DGraph
- QAbstract3DInputHandler
Change-Id: Ida248755523fb3de7d2f9dfda274429200525737
Change-Id: Ida248755523fb3de7d2f9dfda274429200525737
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
- Q3DObject
- Q3DTheme
Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b
Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Id33645c7f921ad7289c2e368a656ee1c7b2d69ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: I97e4bd37243ae94ce4537ee849fd11ee59a570bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005
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>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2889
Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I7111837454e901dc44a7aaf094f1762dcf14455c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98
Change-Id: I067d02c448fbff9b0e381760c247a1275a0f9b98
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Y -> Z
Change-Id: I793b956212ba51c523f965c5f99db250d0cac1cf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-2515
Change-Id: Id3611533c4dd333b68b96669c7230707506b68ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
+ 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>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-2887
Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f
Change-Id: I37938a86fe4b414cd969fda819d096dc885fa48f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|