summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add direction test to tests.proMiikka Heikkinen2014-01-141-1/+2
| | | | | Change-Id: I58d02febb97f6aa9b889393380cbf969727a98e7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add series name propertyMiikka Heikkinen2014-01-1422-20/+135
| | | | | | | | | | | +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-1314-2/+1277
| | | | | | | 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>
* Same mesh used for all series in bar exampleMiikka Heikkinen2014-01-133-34/+28
| | | | | Change-Id: I19e118f44b2fc232c57aaf19d5d4125fc1d5bba6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix axis range autoadjustment relating to series visibilityMiikka Heikkinen2014-01-137-45/+121
| | | | | | | 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-137-32/+102
| | | | | | | Now qml plugin can also be built statically. Change-Id: Id37f565ab9e02529fafaffa024acd69560b3703a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Remove spectrum test from static builds, it doesn't compileMiikka Heikkinen2014-01-101-2/+1
| | | | | Change-Id: I80e1c9665712c658f0162b0fca21fe5049d8c43a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Cache scatter series item sizeMiikka Heikkinen2014-01-103-4/+10
| | | | | | | Task-number: QTRD-2689 Change-Id: I8cd73a74f1ede49ce35c742712fbf3a5357f152e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Remove hacky delete from multigraphMiikka Heikkinen2014-01-101-15/+4
| | | | | Change-Id: I2969a3e30dc4f83801837b6ffa0897749364b361 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement public utility function for AA setupMiikka Heikkinen2014-01-0912-69/+73
| | | | | | | | | | | | 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-099-26/+48
| | | | | | | | 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-0932-99/+373
| | | | | | | | | | 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-0929-50/+194
| | | | | | | | 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-0819-22/+687
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-0760-574/+574
| | | | | | | | | 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-0724-353/+376
| | | | | | | | | | 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-0735-289/+419
| | | | | | | | | | | 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>
* Remove unnecessary triplication of data from qmlscatter exampleMiikka Heikkinen2014-01-032-16/+6
| | | | | Change-Id: Ia7f26aee12dd53bfee4729fbac220ae27cb5f351 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Added a void cast to suppress a warningMika Salmela2013-12-201-2/+2
| | | | | | | Task-number: QTRD-2743 Change-Id: If4d04a935f6780570f60afff12c05d19a862df15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add mention about opaque qml elements hiding graphs to readmeMiikka Heikkinen2013-12-201-0/+6
| | | | | Change-Id: I2bf7567166b990ab1dd6acd726e53b5480015c17 Reviewed-by: Mika Salmela <mika.salmela@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-199-66/+123
| | | | | | | 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>
* Fix minor cosmetic issues in examplesMiikka Heikkinen2013-12-184-2/+4
| | | | | | | Task-id: QTRD-2741 Change-Id: Ifdd49bc9541c2893a7c6f3629cde12e2d15ad7c0 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Talk about alpha, not technology previewMiikka Heikkinen2013-12-183-7/+7
| | | | | Change-Id: I42d3dd9106d751ed07eeba5ea27b49969715dcac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Readme changeMiikka Heikkinen2013-12-181-3/+2
| | | | | Change-Id: I93ce8d0d39911e9c6b0b8fcb4441bb5be442eb5f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix flicker caused by similar coordinates in qmlcustominputMiikka Heikkinen2013-12-182-1059/+1059
| | | | | Change-Id: I0160bf5e4eb1d7c768d782bb3f4d26b2ea0cb5f4 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Update readme and version numbersMiikka Heikkinen2013-12-185-22/+24
| | | | | 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-179-19/+12
| | | | | Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix various issues for previous commitMiikka Heikkinen2013-12-1716-240/+194
| | | | | Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-1735-664/+487
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Another theme colors updateMiikka Heikkinen2013-12-172-11/+46
| | | | | 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-1610-3/+36
| | | | | | | 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-1613-237/+282
| | | | | | | Task-number: QTRD-2222 Change-Id: Ie5456a26ad198611953fc8585c9136b997d39127 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix qmlbars layout and viewer for qml examplesTitta Heikkala2013-12-164-79/+167
| | | | | | | | | | | The ui for the qmlbars is constructed with a layout so that the table and buttons are usable on different platforms. The qtquick2applicationviewer is modified so that the target is set correctly for android. Change-Id: I2121ff891fe3da631bedcdc796b3d4d112e6edd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Remove static linking from android buildMika Salmela2013-12-162-4/+5
| | | | | | | | 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-1311-18/+22
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix qml example button layoutsTitta Heikkala2013-12-137-225/+289
| | | | | | | | The buttons in the qml examples are now set into layouts so that the text is visible on different platforms. Change-Id: Id25d01ea978905b5c744047b40d47e56e6ac14bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs for qmlbars updated Tomi Korpipää2013-12-134-14/+27
| | | | | | | | Task-number: QTRD-2635 Change-Id: I0b7e22dcf568f1ceb43dd94c0cc1e64ea6499115 Change-Id: I0b7e22dcf568f1ceb43dd94c0cc1e64ea6499115 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>