summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add series name propertyMiikka Heikkinen2014-01-1415-14/+100
| | | | | | | | | | | +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>
* Direction for scatter itemsMika Salmela2014-01-1310-2/+858
| | | | | | | Task-number: QTRD-2654 Change-Id: Ib21e6d75fa43de45387ad6225973aa8a11ffc0c9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix highlight color in slice modeMiikka Heikkinen2014-01-133-36/+35
| | | | | | | Also fixes the wandering selection ball when resizing surface graph. Change-Id: Iacb29809ee9b240839956142f9f5ba78d0294620 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix axis range autoadjustment relating to series visibilityMiikka Heikkinen2014-01-134-45/+108
| | | | | | | No need to recalc ranges when a change targets non-visible series. Change-Id: Ifd80b876ba279917a5bded8240721d00d66a6f05 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Base color/gradient disconnection Tomi Korpipää2014-01-132-0/+19
| | | | | | | | Task-number: QTRD-2758 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Change-Id: I3dabbef0d37ad6e8cb7835ef5ef54ba29e23b272 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Improve static build support.Miikka Heikkinen2014-01-135-3/+12
| | | | | | | Now qml plugin can also be built statically. Change-Id: Id37f565ab9e02529fafaffa024acd69560b3703a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Cache scatter series item sizeMiikka Heikkinen2014-01-102-4/+7
| | | | | | | Task-number: QTRD-2689 Change-Id: I8cd73a74f1ede49ce35c742712fbf3a5357f152e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Implement public utility function for AA setupMiikka Heikkinen2014-01-095-13/+59
| | | | | | | | | | | | qDefaultSurfaceFormat() can be used to set up antialiasing for QML apps in just two lines: ... viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); Task-number: QTRD-2734 Change-Id: I3f7ba728cef6310d794256e1dc4c28cc33b2f9a3 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Enable using custom surface format for c++ graphsMiikka Heikkinen2014-01-098-25/+40
| | | | | | | | Main benefit is to be able to opt out of antialiasing. Task-number: QTRD-2734 Change-Id: Ic0681356f93d55e87535910a533be3f845703044 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Make active axes properties in C++Miikka Heikkinen2014-01-0924-99/+246
| | | | | | | | | | 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>
* Add a methor for getting list of added input handlersMiikka Heikkinen2014-01-094-0/+17
| | | | | | | | 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>
* Invalid point/selection as constant property in qmlMiikka Heikkinen2014-01-0928-49/+193
| | | | | | | | 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>
* Enable showing multiple graphs in QMLMiikka Heikkinen2014-01-089-20/+91
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-0745-517/+517
| | | | | | | | | 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>
* Abstract base class for graphsMiikka Heikkinen2014-01-0715-495/+211
| | | | | | | | | | Rename the Q3DWindow -> QAbstract3DGraph Moved common properties and functionality from subclasses to QAbstract3DGraph Task-number: QTRD-2213 Change-Id: Icc1733f7efb1b06bdda024f1cf42b8bc24d96885 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix setting theme typeMiikka Heikkinen2014-01-079-301/+344
| | | | | | | | | | 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>
* Fix theme ownershipMiikka Heikkinen2014-01-0718-176/+256
| | | | | | | | | | | 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>
* Check context before attempting to release opengl resourcesMiikka Heikkinen2013-12-206-25/+34
| | | | | | | | | | 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>
* Documentation and example fixesMiikka Heikkinen2013-12-194-61/+117
| | | | | | | Task-id: QTRD-2744 Change-Id: I901f05b737e24c363d7ed897e1baadc9f9a03333 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* IFDEFs for fillDepthTextureMika Salmela2013-12-191-1/+4
| | | | | | | Task-number: QTRD-2742 Change-Id: Iab7787196bfd56ee57f5ed6604bb6dd04e5be4f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clear the depth texture when surface not visibleMika Salmela2013-12-191-10/+13
| | | | | | | | Also grid and surface visibility should not affect on updates. Task-number: QTRD-2742 Change-Id: I9605897599d571b1ee39dab7f6c93d5c80110f0c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Talk about alpha, not technology previewMiikka Heikkinen2013-12-182-4/+4
| | | | | Change-Id: I42d3dd9106d751ed07eeba5ea27b49969715dcac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Update readme and version numbersMiikka Heikkinen2013-12-182-7/+7
| | | | | Change-Id: Idc97177fe3cdb3b781920291a14cb5cb44c1d9ca Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixes QML surface selections.Keränen Pasi2013-12-181-0/+11
| | | | | | | Task-id: QTRD-2565 Change-Id: I7864e2e71b1d7b7cfab8ad4d9a3e9376d832c0d6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix proxy deletionMiikka Heikkinen2013-12-181-1/+0
| | | | | | | | | | Proxies that are added to the series are set as children of the series, so they will get deleted anyway without explicitly deleting them at series destructor. Change-Id: I026946af82ce37c7df42c3f5c53d18af6a8e2bb0 Task-id: QTRD-2739 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixes update on move to retina display on Mac OS X and Qt 5.2Keränen Pasi2013-12-184-19/+23
| | | | | | | Task-id: QTRD-2565 Change-Id: I4c6fdf0b595f44bc83c1f7fa3540ee311a74e17e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* fix rendering issuesMiikka Heikkinen2013-12-178-19/+9
| | | | | Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix various issues for previous commitMiikka Heikkinen2013-12-1710-220/+173
| | | | | Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-1729-663/+422
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Another theme colors updateMiikka Heikkinen2013-12-171-10/+10
| | | | | Change-Id: Ic5eab8d4d64e89c4bf240fe871454d01ba8ac106 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix qml crash when qml launched by external launcherMiikka Heikkinen2013-12-172-30/+35
| | | | | | | Task-number: QTRD-2658 Change-Id: Ibf7242f6004a3021fbe1da865545dacb461b8022 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix minimal applicationsMiikka Heikkinen2013-12-166-3/+12
| | | | | | | Also added minimal applications to tests Change-Id: Ie4cb702dfb1ff8e771c2de68e74099ac12f32e23 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* New color codes for themesMika Salmela2013-12-161-11/+11
| | | | | Change-Id: I33cafe96897e95b415cec91838e27bf6bcb0dfd4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move unnecessary public functionality to private in Q3DWindowMiikka Heikkinen2013-12-1612-237/+281
| | | | | | | Task-number: QTRD-2222 Change-Id: Ie5456a26ad198611953fc8585c9136b997d39127 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Remove static linking from android buildMika Salmela2013-12-161-4/+0
| | | | | | | | Task-number: QTRD-2641 Change-Id: Ic136f43edb3a118aef6570b2dcb71532563a292c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Fix more valgrind issuesMiikka Heikkinen2013-12-136-8/+12
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Remove redundant gridEnabled signalMika Salmela2013-12-131-1/+0
| | | | | | | surfaceGridEnabledChanged not used anymore Change-Id: Ia862aa1d3976b57778d3743674b8d520a2d09943 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix a few valgrind errorsMiikka Heikkinen2013-12-133-5/+6
| | | | | Change-Id: Ie7898f26176845561b16d0e385429e2bf92cd8f0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Label fix Tomi Korpipää2013-12-131-1/+1
| | | | | | Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix uniform color surfacesMiikka Heikkinen2013-12-131-1/+1
| | | | | | | Bug in color conversion from QVector3D to QColor Change-Id: I060619f280cb0dbace65a08b58183d468491dff8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Theme color update Tomi Korpipää2013-12-132-17/+17
| | | | | | | | + mingw warning fix Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531 Change-Id: I1dd89d27fccbdcde2b209a4e8f947f775066b531 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Control for surface visibility featuresMika Salmela2013-12-134-23/+49
| | | | | | | | Task-number: QTRD-2628 Change-Id: Ic03e2a71231665c478a918044ebd3e5b2d22b445 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Theme colors updated by Diana's specs Tomi Korpipää2013-12-131-30/+30
| | | | | | Change-Id: Ie1e1013cc57cb2e462b8c25b3824dbfe8759545a Change-Id: Ie1e1013cc57cb2e462b8c25b3824dbfe8759545a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix customproxy and itemmodel examples docsMiikka Heikkinen2013-12-123-4/+4
| | | | | | | Task-number: QTRD-2635 Change-Id: Ibb187e5cf05efc6d7afa6ec03372346d08addc82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix custominput exampleMiikka Heikkinen2013-12-121-3/+3
| | | | | | | | | - Adjusted the data to cause less flicker - Shadows default to medium, as those don't flicker during animations Task-number: QTRD-2635 Change-Id: I6178dd91b9793ca1b06beb34b6e355357b256873 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Real multiseries colors for Qt themeTomi Korpipää2013-12-121-4/+4
| | | | | Change-Id: Iefcb40f8a72f12d8962a90fda6db6a684f45fee5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix Audiolevels and Bars examples & documentation for TP2Miikka Heikkinen2013-12-121-5/+2
| | | | | | | Task-number: QTRD-2635 Change-Id: I0468a92e4e8eeccbeff61d8f9b551366970e0c0d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Multiseries support for theme colors and gradients, part 2Tomi Korpipää2013-12-117-242/+340
| | | | | | | Task-number: QTRD-2611 Change-Id: I280f3b7c22a212ed46813bd28c639d255107f9f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add a paragraph about series to Data Handling articleMiikka Heikkinen2013-12-113-6/+31
| | | | | | | | Also other minor fixes. Task-number: QTRD-2593 Change-Id: I2491090cf00b6a081b11a62a577cc192b8a2ad03 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Scatter and surface autoadjust ranges to consider all visible seriesMiikka Heikkinen2013-12-113-124/+275
| | | | | | | Task-number: QTRD-2605 Change-Id: I86b843bd478f92a93588394558ba9b983eb8430f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>