summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/bars3dcontroller_p.h
Commit message (Collapse)AuthorAgeFilesLines
* New 3D scene for lights and camera setup for input handlers.Keränen Pasi2013-09-101-20/+0
| | | | | Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Rename axes to avoid conflicts with ChartsMiikka Heikkinen2013-09-041-2/+2
| | | | | | | | + 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-3/+0
| | | | | | | | This seems to improve frame rate, too. Task-number: QTRD-2179 Change-Id: Icb3ddc5ba651ce0982068bcf7ab09c67be183717 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Rename "3d" -> "3D" in class names.Miikka Heikkinen2013-08-301-6/+6
| | | | | Change-Id: I9e861c28f828b3ee5b821e187396fb31c05844cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Improved the ownership handling of data proxies and axes.Miikka Heikkinen2013-08-301-4/+2
| | | | | | | Task-number: QTRD-2212 Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make axes ownership more usefulMiikka Heikkinen2013-08-291-0/+3
| | | | | | | | | 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>
* 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-3/+11
| | | | | | | | - 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-5/+5
| | | | | | | + api updates Change-Id: I8da49e3cb45025eaa5713ae563bf8475f15cc298 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed zoomlevel cachingMiikka Heikkinen2013-08-161-3/+1
| | | | | | Change-Id: I0bd73c65559ccdde00ef6e5a99b2ecad8cfd0f98 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Moved functions from specific controllers to abstract controllerTomi Korpipää2013-08-151-53/+3
| | | | | | 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-4/+28
| | | | | | | | 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-5/+5
| | | | | | | Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactoring function and enum namesTomi Korpipää2013-08-131-1/+1
| | | | | | | + 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/+1
| | | | | | | | | + 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-2/+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-1/+1
| | | | | | | | + 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-11/+3
| | | | | | | | | - 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-6/+3
| | | | | | | | 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-10/+0
| | | | | | Change-Id: Icbe542b48d820fd6af66ae0611ceff2641139b5f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactor data itemMiikka Heikkinen2013-07-091-0/+1
| | | | | | | | | 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>
* Data proxy implementation for bars.Miikka Heikkinen2013-07-041-22/+13
| | | | | | | | | | 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>
* Rotation copied from 3dbars. MouseState enums moved to abstract.Mika Salmela2013-07-031-9/+0
| | | | | Change-Id: Ied89bf206098a6452172ecde9231b8cd38fb82f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Decouple data and axes.Miikka Heikkinen2013-07-011-17/+8
| | | | | | | | | 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-64/+2
| | | | | Change-Id: I6c82446c87e523b7c9fb901f25dbf9c3d00e0113 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Moving public attributes from bars3drenderer to controller.Keränen Pasi2013-06-281-10/+28
| | | | | Change-Id: I6c3997d0d297fbfafdb51764dacff54937c64b46 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* High quality shadow issue fix for Q3DBars. Tomi Korpipää2013-06-271-1/+1
| | | | | | | | | | 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-7/+79
| | | | | 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-0/+6
| | | | | Change-Id: I5ef80965f8cd977704e5b84af82fedf429374e42 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Create private global header and move constants thereMiikka Heikkinen2013-06-241-3/+2
| | | | | | | Also some miscellaneous cleanup Change-Id: I0ef0719e763c864311768b40e21017e219f94f65 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Doc fixes and some cleanupMiikka Heikkinen2013-06-241-1/+1
| | | | | | | | | - Now generates enum documentation (not all values documented, though) - Renamed the qdatavis3namespace.h as it was missing a 'd' - Fixes a couple of warnings about deprecated QString constructor Change-Id: Ib8698d8f6d9f5dd37682b71150dbc5731b6dedb4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Cleanup after initial split.Keränen Pasi2013-06-201-26/+1
| | | | | Change-Id: I267a659f5a76257226193272239b752cc9688f0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* 3D bars renderer vs. controller split started.Keränen Pasi2013-06-201-111/+9
| | | | | | Change-Id: I250daca9142800c060dcb4ff7cc1927eb8e74d64 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DMaps: Split startedTomi Korpipää2013-06-191-1/+0
| | | | | | | C++ api works, QML api still to be done Change-Id: I082b7c3428a5e6e79be44bddea19112bf0b2dba1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* CameraHelper made non-static to support multiple concurrent 3D views.Keränen Pasi2013-06-191-0/+2
| | | | | Change-Id: I88ba9ff299b4469784459e0409dfe3c629119af3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Convert mouse position from QML to Qt coordinatesTomi Korpipää2013-06-181-3/+3
| | | | | | | | | QML has (0, 0) at bottom left, Qt at top left. For rotating to work correctly on both, we need to convert QML mouse coordinates before passing them to renderer. Change-Id: Ic85fbaec2f75c0432f81dfb48070f7ab598c8e00 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Implemented passing of mouse events from QtQuick.Keränen Pasi2013-06-181-1/+1
| | | | | Change-Id: I5174c9deb43604924f8a63e217b851897ac2dcd6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Include fix Tomi Korpipää2013-06-171-2/+2
| | | | | | | | | | | Module sources now include our own global headers from local dirs, not from installed dir. + Replaced radian conversions with a qmath function. Change-Id: Ie9f6d561c98022d3225a0dd4964f5118d00f9815 Change-Id: Ie9f6d561c98022d3225a0dd4964f5118d00f9815 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed QML properties not updated and handling of depth FBO.Keränen Pasi2013-06-171-6/+13
| | | | | Change-Id: Iba414954342a74bc3e3efd7436811cca6c422649 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Rendering code placeholder added for 3D Bars.Keränen Pasi2013-06-141-0/+342
Change-Id: I23d815dace8298d034c339c90e7bc0a0a4375d77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>