summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/bars3dcontroller.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Module renamedTomi Korpipää2013-09-101-377/+0
| | | | | | | Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* New 3D scene for lights and camera setup for input handlers.Keränen Pasi2013-09-101-174/+9
| | | | | Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Expose data proxy in QMLMiikka Heikkinen2013-09-061-7/+14
| | | | | Change-Id: I1102520678f2c8ae2932ddb396b41655cfd538e9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Rename axes to avoid conflicts with ChartsMiikka Heikkinen2013-09-041-8/+8
| | | | | | | | + Some doc fixes. Task-number: QTRD-2214 Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Only render the scene when something changes.Miikka Heikkinen2013-09-031-5/+18
| | | | | | | | This seems to improve frame rate, too. Task-number: QTRD-2179 Change-Id: Icb3ddc5ba651ce0982068bcf7ab09c67be183717 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed issues from Improve examples taskTomi Korpipää2013-09-031-1/+1
| | | | | | | | | | | | Task-number: QTRD-2239 + Moved extra-full examples to tests + Removed extra functionality from widget and scatterchart examples + Changed bars default to bevelbar + Changed default label style to nobackground Change-Id: Idffba7a44d5b54dbaf36d7cdbfe616b78e0d4073 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Rename "3d" -> "3D" in class names.Miikka Heikkinen2013-08-301-58/+58
| | | | | Change-Id: I9e861c28f828b3ee5b821e187396fb31c05844cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improved the ownership handling of data proxies and axes.Miikka Heikkinen2013-08-301-24/+27
| | | | | | | Task-number: QTRD-2212 Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-291-5/+19
| | | | | | | | | Chart can now own multiple axes while showing only one. Default axes are no longer modifiable by users. Task-number: QTRD-2212 Change-Id: I028f0d7539dbbf6e3474680290c7ec6bba5a4223 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix rendering artifacts when changing data window sizeMiikka Heikkinen2013-08-271-0/+1
| | | | | Change-Id: I6bc76feca9b4400477cb9de94e46bd6d46e9dabc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed setwindowtitle and made parameters const ref Tomi Korpipää2013-08-261-1/+1
| | | | | | | | Task-number: QTRD-2211 Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection improvements for bars:Miikka Heikkinen2013-08-221-0/+56
| | | | | | | | - Signal to notify of selection change - Setting selection via API Change-Id: I87c71005d76b15dd259f745392ff7b5112d146b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc update: q3dscatterTomi Korpipää2013-08-201-1/+1
| | | | | | | + QSizeF initialization fixes (float -> qreal) Change-Id: I050889a2919a3576214e2960a7141833e5482c82 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Doc update; q3dbars, q3dwindowTomi Korpipää2013-08-191-12/+13
| | | | | | | + api updates Change-Id: I8da49e3cb45025eaa5713ae563bf8475f15cc298 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Small renderer and controller cleanups.Keränen Pasi2013-08-191-26/+14
| | | | | Change-Id: Idf6a39feb1cc19e6d4e36db57ce3c5bef00a904e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix renderer initializationMiikka Heikkinen2013-08-161-0/+1
| | | | | | Task-number: QTRD-2195 Change-Id: Ifeda8025c5ae7be7f0c3dd28a026776bf4999650 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed duplicate codeTomi Korpipää2013-08-161-1/+2
| | | | | | | | + fixed a couple of signal connections Change-Id: I5da54e32472e67b8f40092d0a18b952490e0e62b Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixed zoomlevel cachingMiikka Heikkinen2013-08-161-5/+0
| | | | | | Change-Id: I0bd73c65559ccdde00ef6e5a99b2ecad8cfd0f98 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Support for setting axes in QML.Miikka Heikkinen2013-08-151-1/+1
| | | | | Change-Id: I9dccd7066d286a8a028450997a5ae34d44310ca1 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Moved functions from specific controllers to abstract controllerTomi Korpipää2013-08-151-105/+38
| | | | | | Change-Id: Ib610d313d0708d8bb894e99004ace1530a83d1f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Rearchitecting to ensure we transfer the data model to renderer in correct ↵Keränen Pasi2013-08-151-18/+73
| | | | | | | | step in declarative components. Change-Id: I7d7e646c5e0aed13199e011d5f5f898c21c28095 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Enums moved to a class to be usable from QML and C++Tomi Korpipää2013-08-141-9/+9
| | | | | | | Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add missing methods to scatter proxy apiMiikka Heikkinen2013-08-141-4/+0
| | | | | | | + remove data mutex Change-Id: Ie0f150d3ecb51076a998c2bdc2ba6fec46941793 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactoring function and enum namesTomi Korpipää2013-08-131-2/+2
| | | | | | | + moved an enum to a correct place Change-Id: Iea133f70ccf87e812cb87b61c16fb16be76b2da3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Copyright headers updated Tomi Korpipää2013-08-131-31/+8
| | | | | | | | Task-number: QTRD-2112 Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Change-Id: I0dad7933af2dcd0386b8243f71bbd949f92aab8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add some missing data manipulation methods to bar proxyMiikka Heikkinen2013-08-131-0/+12
| | | | | | | | | + Related widget example changes + Changed shadow perspective to get rid of some artifacts + Accessor for sample space size Change-Id: I7c4d7038479b65016209624d8e2ea77794210005 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Refactor axes to use more properties in preparation of qml supportMiikka Heikkinen2013-08-091-8/+0
| | | | | | | + Removed obsolete unused function. Change-Id: I651b36a11a5b20632e78aeebc786084e33c4e12c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Value axis labels support for barchartMiikka Heikkinen2013-08-091-2/+5
| | | | | | | | + Subtick support for value axes + misc fixes Change-Id: I409670312ec0dede1a1faa33c30c5b6bc7c7ee29 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Tickcount and both automatic and explicit range setting via axesMiikka Heikkinen2013-08-081-22/+27
| | | | | | | | | - Tick count moved to QValueAxis. - QValueAxis adjusts range to data by default on barcharts. - QValueaxis explicit range setting now works for barchart. Change-Id: I2c0afcab34b74a848144fda41d9135dcdb510354 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement axis caching to renderer.Miikka Heikkinen2013-08-071-17/+1
| | | | | | | | Axis properties are passed via signals from controller to renderer. Change-Id: Iaa0e47c4ea4dc0b586480f260b42958af95c028d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* First set of common functionality moved to renderer base class.Keränen Pasi2013-08-061-23/+0
| | | | | | Change-Id: Icbe542b48d820fd6af66ae0611ceff2641139b5f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DBars: Fix for zoom/rotate disabling Tomi Korpipää2013-08-051-2/+1
| | | | | | | | Removed unnecessary if Change-Id: I87e415ea4e1d9e9e728af24845febabda31acbb8 Change-Id: I87e415ea4e1d9e9e728af24845febabda31acbb8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DBars: Disabled zooming and rotating while in slice viewTomi Korpipää2013-08-051-3/+9
| | | | | | | Task-number: QTRD-2143 Change-Id: I4cb391ec2cd46b8c60d7ce1e17d270a07869deb7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Bring new data proxies to mapsMiikka Heikkinen2013-07-121-0/+5
| | | | | | | | | | | | Maps now has the basic QMapDataProxy and the specialized QItemModelMapDataProxy to choose from. Removed the last vestiges of old QDataSet and related classes. Bunch of misc fixes also included. Change-Id: I3993ac2a669b818f89bd771ea9dc8b7e458c4b8c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Refactor data itemMiikka Heikkinen2013-07-091-5/+12
| | | | | | | | | Data items do not need to know about rendering related stuff, so separated that to render items. Renderer will maintain array of render items equal to the sample space. Change-Id: I61c0db96f115b7c667e37ea92aa5ae6b8583c61a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Miscellaneous fixesMiikka Heikkinen2013-07-051-2/+4
| | | | | | | | | | | | | | | | - Widget example now uses default QBarDataProxy directly - Axes store labels in QStringLists instead of vectors - Axes LabelItems as QList<LabelItem *> instead of QVector<LabelItem> This allows better control of when label items are constructed and destructed -> easier to keep track of textures. - Removed label setting from QAbstractDataItem api, it should be replaced with label format setter if we want individual items to have custom labels. - Added functionality to QBarDataItem - Misc bug fixes Change-Id: I01b3a5f3fc4acb8c1a826f19fa2762864430a088 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Data proxy implementation for bars.Miikka Heikkinen2013-07-041-134/+98
| | | | | | | | | | Old QDataSet can be used with custom QOldDataProxy. This will be removed entirely once we have a viable variant based proxy to use, as it provides no real additional value over just using default proxy directly. Change-Id: Iee492152eec5d33b7a488053447fae6027409d71 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Decouple data and axes.Miikka Heikkinen2013-07-011-62/+34
| | | | | | | | | Note: Accessing same axes from renderer thread and main application thread without mutexes is not cool. Axis handling needs further thinking. Change-Id: I5cfd9a095583012a9dccff0a1769916e3da19c22 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Controller base class formed to handle generic propertiesKeränen Pasi2013-06-281-150/+2
| | | | | Change-Id: I6c82446c87e523b7c9fb901f25dbf9c3d00e0113 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Moving public attributes from bars3drenderer to controller.Keränen Pasi2013-06-281-60/+85
| | | | | Change-Id: I6c3997d0d297fbfafdb51764dacff54937c64b46 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Label and grid vanish issue fixed. Tomi Korpipää2013-06-271-6/+0
| | | | | | | | Task-number: QTRD-2113 Change-Id: I694ba82f395f71dabb4f2a1cd3a1649413ef568a Change-Id: I694ba82f395f71dabb4f2a1cd3a1649413ef568a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* High quality shadow issue fix for Q3DBars. Tomi Korpipää2013-06-271-3/+3
| | | | | | | | | | Task-number: QTRD-2107 + some indentation changes Change-Id: Ieb12ce6570efa44ea5fcf43528d6f2ed7a176500 Change-Id: Ieb12ce6570efa44ea5fcf43528d6f2ed7a176500 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* First step in separating input handling from renderer code.Keränen Pasi2013-06-271-46/+256
| | | | | Change-Id: I30594d440ced00fc84bf1fd5a45d851b59aa44d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Moving data set (model) away from the renderer (view).Keränen Pasi2013-06-251-15/+157
| | | | | Change-Id: I5ef80965f8cd977704e5b84af82fedf429374e42 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleanup after initial split.Keränen Pasi2013-06-201-36/+0
| | | | | Change-Id: I267a659f5a76257226193272239b752cc9688f0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* 3D bars renderer vs. controller split started.Keränen Pasi2013-06-201-2112/+63
| | | | | | Change-Id: I250daca9142800c060dcb4ff7cc1927eb8e74d64 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Removed obsolete stuff Tomi Korpipää2013-06-191-16/+13
| | | | | | Change-Id: I550c2691c9067b97fb0e3cb92921aad7f07227b4 Change-Id: I550c2691c9067b97fb0e3cb92921aad7f07227b4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* CameraHelper made non-static to support multiple concurrent 3D views.Keränen Pasi2013-06-191-21/+23
| | | | | Change-Id: I88ba9ff299b4469784459e0409dfe3c629119af3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* QML2 shadows fixed again Tomi Korpipää2013-06-191-14/+8
| | | | | | | | | | Hack solution, may cause trouble later on. Should try to find a better way to fix this. Change-Id: I440252419a451fd26932c6d851f95259a5c60e24 Change-Id: I440252419a451fd26932c6d851f95259a5c60e24 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Fixed depth buffer texture not destroyed when shadows are switched off.Keränen Pasi2013-06-191-1/+3
| | | | | Change-Id: Ibba326a7e8410464e8a727bf3a4eb3b8e2c04191 Reviewed-by: Mika Salmela <mika.salmela@digia.com>