summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
Commit message (Collapse)AuthorAgeFilesLines
* InputState enum dividedTomi Korpipää2014-01-216-8/+16
| | | | | | | Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection correction for scatter when data changesMiikka Heikkinen2014-01-216-45/+120
| | | | | | | | Implements item 3) in QTRD-2645 Task-number: QTRD-264 Change-Id: Ibe758bbfb3b4a74b55589a410b402bbdf07ea64f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed disappearing of shadows on background Tomi Korpipää2014-01-205-75/+13
| | | | | | | | Task-number: QTRD-2627 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* References to alpha and TP removedTomi Korpipää2014-01-2016-38/+93
| | | | | | | | + implemented the rest of lightColor Task-number: QTRD-2405 Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Optimize theme updateMiikka Heikkinen2014-01-174-44/+16
| | | | | | | | | | | Do not reinitialize shaders in theme update and only update drawer if label related items change. Also fix the bug automerge slipped in in recent rebase. Task-number: QTRD-2778 Change-Id: I4c4317dd36a8e8b60dcaec224f45df81c2ae7f54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Slice view selection label update fixedTomi Korpipää2014-01-171-2/+4
| | | | | | | Task-number: QTRD-2776 Change-Id: I7518d2598280bfa6bd77af6971e753d9415dae96 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Adjust selection in item removal and insertMiikka Heikkinen2014-01-173-6/+66
| | | | | | | | Implements item 1) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I5c1cec438089520592a3526e1ff6095cc30afd34 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qml enums added Tomi Korpipää2014-01-171-0/+2
| | | | | | | | Task-number: QTRD-2636 Change-Id: I90a123432172d32fab7efa2ef18ee79d06139b5b Change-Id: I90a123432172d32fab7efa2ef18ee79d06139b5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Scatter selection label position fix Tomi Korpipää2014-01-171-5/+12
| | | | | | Change-Id: I96a0bfacd074152941618beb2c5a65a36781ceb3 Change-Id: I96a0bfacd074152941618beb2c5a65a36781ceb3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reintroduced namespace macros, part 2Tomi Korpipää2014-01-1710-63/+22
| | | | | | | | Added changes lost in merge Task-number: QTRD-2594 Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Synchronize clicked detection properlyMiikka Heikkinen2014-01-1716-61/+106
| | | | | | | | Implements item 2) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-1640-171/+96
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implement generic clearSelection() method for graphsMiikka Heikkinen2014-01-1610-3/+34
| | | | | | | | | Also fixed scene sync related bug on selection. Task-number: QTRD-2606 Task-number: QTRD-2773 Change-Id: I057fd83ae5bf5ee94e413287fb2b3cefa455b156 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-1622-112/+207
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Better control of series ordering and 'primary' series for barsMiikka Heikkinen2014-01-156-34/+144
| | | | | | Task-number: QTRD-2578 Change-Id: Icbd945596334afb03d81f3b1d6a72399077455db Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-1550-283/+356
| | | | | | | | | - 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>
* Slice view fixes Tomi Korpipää2014-01-153-80/+117
| | | | | | | | | | | | + 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>
* Documentation additionsMiikka Heikkinen2014-01-141-0/+6
| | | | | | | Task-number: QTRD-2735 Change-Id: I4b28ac2876ad025c262f861e7620aa4d6de6ff60 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add series name propertyMiikka Heikkinen2014-01-1412-13/+68
| | | | | | | | | | | +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-135-2/+840
| | | | | | | 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>
* 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-091-10/+7
| | | | | | | | | | | | 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-0913-54/+165
| | | | | | | | | | 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-0910-16/+25
| | | | | | | | 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-083-0/+20
| | | | | | | | + other minor fixes Task-number: QTRD-2749 Change-Id: I654d41fd4124d6596f9df3ace7019706452d8bfa Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rename axis classesMiikka Heikkinen2014-01-0722-249/+249
| | | | | | | | | 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-072-0/+14
| | | | | | | | | | 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-0711-90/+109
| | | | | | | | | | | 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-204-20/+26
| | | | | | | | | | 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>
* 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>
* 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>
* Fixes update on move to retina display on Mac OS X and Qt 5.2Keränen Pasi2013-12-182-7/+13
| | | | | | | Task-id: QTRD-2565 Change-Id: I4c6fdf0b595f44bc83c1f7fa3540ee311a74e17e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* fix rendering issuesMiikka Heikkinen2013-12-176-17/+9
| | | | | Change-Id: I5dee557f2f4857f586412d604040ffbeda0e78a1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix various issues for previous commitMiikka Heikkinen2013-12-179-216/+170
| | | | | Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-1721-462/+328
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix minimal applicationsMiikka Heikkinen2013-12-163-3/+9
| | | | | | | Also added minimal applications to tests Change-Id: Ie4cb702dfb1ff8e771c2de68e74099ac12f32e23 Reviewed-by: Titta Heikkala <titta.heikkala@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>
* Fix more valgrind issuesMiikka Heikkinen2013-12-134-4/+9
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fix a few valgrind errorsMiikka Heikkinen2013-12-132-4/+4
| | | | | Change-Id: Ie7898f26176845561b16d0e385429e2bf92cd8f0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Control for surface visibility featuresMika Salmela2013-12-131-7/+11
| | | | | | | | Task-number: QTRD-2628 Change-Id: Ic03e2a71231665c478a918044ebd3e5b2d22b445 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* 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>
* Bar autoadjust ranges to consider all visible seriesMiikka Heikkinen2013-12-111-34/+81
| | | | | | | Task-number: QTRD-2605 Change-Id: I3a155d97ec362eb6a912688c4be32ae82166b126 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix slice labels for multiseriesMiikka Heikkinen2013-12-112-71/+60
| | | | | Change-Id: Ife92e68b0218c8ce2ee1fdea5b91d485bcc1509d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>