summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Example update Tomi Korpipää2014-01-221-2/+2
| | | | | | | | Task-number: QTRD-2635 Change-Id: Ia957c3512e528816d708c113b631acb298672dfa Change-Id: Ia957c3512e528816d708c113b631acb298672dfa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed accessing series during render Tomi Korpipää2014-01-221-6/+2
| | | | | | | | Task-number: QTRD-2791 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-2263-286/+176
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-2220-85/+1
| | | | | | | | - 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>
* InputState enum moved to private Tomi Korpipää2014-01-2210-111/+92
| | | | | | | | Task-number: QTRD-2784 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* InputState enum dividedTomi Korpipää2014-01-2112-32/+86
| | | | | | | Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection correction for scatter when data changesMiikka Heikkinen2014-01-2119-98/+480
| | | | | | | | 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-2021-48/+106
| | | | | | | | + 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-175-68/+24
| | | | | | | | | | | 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-178-8/+80
| | | | | | | | 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-178-0/+19
| | | | | | | | 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-1721-109/+65
| | | | | | | | 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-16163-968/+392
| | | | | | | | 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-1617-23/+115
| | | | | | | | | 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-1668-289/+622
| | | | | | | | - 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-1513-45/+433
| | | | | | Task-number: QTRD-2578 Change-Id: Icbd945596334afb03d81f3b1d6a72399077455db Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-15204-834/+784
| | | | | | | | | - 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-1410-2/+80
| | | | | | | Task-number: QTRD-2735 Change-Id: I4b28ac2876ad025c262f861e7620aa4d6de6ff60 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* 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>