summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/q3dsurface.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Copyright file update to GPLMiikka Heikkinen2016-01-121-9/+17
|/ | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-201-11/+14
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-171-1/+1
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-141-3/+3
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-071-7/+7
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Add flipHorizontalGrid property for surfaceMiikka Heikkinen2014-06-261-0/+4
| | | | | | | | | | | | This property allows drawind the horizontal grid and axis labels on top of the graph rather than on the bottom. This is useful when surface graph is used for 2D spectrograms in orthographic mode, as otherwise the grid is covered by the surface itself. Particularly relevant for polar plots of the same. Task-number: QTRD-3184 Change-Id: I9dbcdbfc754e13af52d2cf31a1d9991ef4b241f7 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-4/+2
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added selectedSeries propertyTomi Korpipää2014-02-101-0/+4
| | | | | | | Task-number: QTRD-2806 Change-Id: Icd895915f39e475fe9f2a006bebd956615474202 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix copyright yearMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Add missing consts to public apisMiikka Heikkinen2014-01-271-1/+1
| | | | | | | Task-number: QTRD-2807 Change-Id: I74a6735ab37a8b3d97548adba99ca79ce2c7975c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-221-1/+1
| | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Reintroduced namespace macros Tomi Korpipää2014-01-161-2/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-3/+2
| | | | | | | | | - 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>
* Enable using custom surface format for c++ graphsMiikka Heikkinen2014-01-091-1/+1
| | | | | | | | 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-091-0/+9
| | | | | | | | | | 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>
* Rename axis classesMiikka Heikkinen2014-01-071-10/+10
| | | | | | | | | 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-071-26/+2
| | | | | | | | | | 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 theme ownershipMiikka Heikkinen2014-01-071-6/+0
| | | | | | | | | | | 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>
* Antialiasing and direct rendering with QML.Keränen Pasi2013-12-171-1/+0
| | | | | | | Task-id: QTRD-2565 Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move unnecessary public functionality to private in Q3DWindowMiikka Heikkinen2013-12-161-3/+4
| | | | | | | Task-number: QTRD-2222 Change-Id: Ie5456a26ad198611953fc8585c9136b997d39127 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-6/+0
| | | | | | | | | | | | Colors to series - Multiselection labels in bar slices still buggy - Selection in bars doesn't work correctly if not all series have items in that grid Task-number: QTRD-2557 Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 2Miikka Heikkinen2013-12-031-10/+0
| | | | | | | | Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Visual properties moved to themeTomi Korpipää2013-11-281-20/+0
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix documentation related to multiseries changes.Miikka Heikkinen2013-11-251-1/+0
| | | | | | | | Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Multi series selection part 3: surfaceMiikka Heikkinen2013-11-221-5/+0
| | | | | | | Task-number: QTRD-2556 Change-Id: I3a465c1bfff95f6c89d2f473f9e235c6079b8116 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* User-modifiable themes, part 1Tomi Korpipää2013-11-221-5/+5
| | | | | | | | | | | | Task-number: QTRD-2120 + old functionality remade - new functionality to be added + fixed a compilation error in qbarseries for mingw Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964 Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Basic multiseries supportMiikka Heikkinen2013-11-151-10/+4
| | | | | | | | Task-number: QTRD-2548 Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Q_PROPERTY NOTIFY addition, part 2 Tomi Korpipää2013-11-051-10/+20
| | | | | | | | Task-number: QTRD-2534 Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Change-Id: I243f1457aef986d54cb27a5a24b411b2291d8c0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Surface toggling API implementedTomi Korpipää2013-11-041-0/+4
| | | | | | | Task-number: QTRD-2337 Change-Id: I59695a042c864faed90839c4e566fcece5cb94f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Selection overhaulMiikka Heikkinen2013-10-301-7/+11
| | | | | | | | | | | | | | | | Selection modes are now proper flags, so you can easily mix and match item, row, and column modes as you wish. Slice flag means automatic slicing control - if user wishes to control slicing himself, he should not set this mode flag. Clicking an item on graph now emits clicked signal from renderer to controller on all graphs instead of setting the selected item. Controller will set the selected item based on this information. Task-number: QTRD-2366 Task-number: QTRD-2491 Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added Camera QML API and ExampleKeränen Pasi2013-10-081-6/+4
| | | | | Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactored LabelTransparency and ShadowQualityTomi Korpipää2013-10-021-4/+4
| | | | | | | Task-number: QTRD-2362 Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactored ColorTheme -> Theme Tomi Korpipää2013-10-021-3/+3
| | | | | | | | Task-number: QTRD-2362 Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8 Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added camera control to surface apiMiikka Heikkinen2013-10-011-0/+9
| | | | | Change-Id: I2492c520f4f8142be36e4008fead29dbc02a93c7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Touch support updateTomi Korpipää2013-10-011-3/+0
| | | | | | | Task-number: QTRD-2345 Change-Id: Ia6b6fd8d19cffcdfdba3aaab2bff0bbf941cf5a6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Slice view implementedMika Salmela2013-09-261-0/+3
| | | | | | | | | | Implemented slice view and fixed selection mechanism. Task-number: QTRD-2321 Task-number: QTRD-2307 Change-Id: I492bd96678bb1bdb8020448e122931a0deccdc0d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Gradient setting API added to SurfaceTomi Korpipää2013-09-241-4/+7
| | | | | | | Task-number: QTRD-2288 Change-Id: Ibe8db55cb0435db71c1d2a9081e2dab746b46c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added device pixel ratio change detection to widgetsKeränen Pasi2013-09-231-1/+0
| | | | | Change-Id: I7c0677c5e6b862589150d1be8a5c5a8a0e5b4445 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Documentation for Q3DSurface and QSurfaceDataProxyMika Salmela2013-09-191-5/+0
| | | | | | | | Task-number: QTRD-2284 Change-Id: I1488e420656eab9e622f82860c896b55f87d7596 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Misc bug fixesMika Salmela2013-09-171-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | - Enabled zooming on Surface C++ api - User modified gradient takes effect - Scene pointer is updated to selection pointer - Font changing is listened on selection pointer and label's are generated using selected font - Selection label format copied from scatter. Looks to be very handy. - Check for OpenGL 1.5 version and block coarse surface if below - Added some theme handling. Not sure if the bug is fully fixed. Probably requires shadow fixes to be fully similar to others. - HAHAA. Now even single rows and columns supported. Even one value will produce surface Task-number: QTRD-2279 Task-number: QTRD-2265 Task-number: QTRD-2261 Task-number: QTRD-2269 Task-number: QTRD-2268 Task-number: QTRD-2272 Change-Id: Id34d843b2898e4cf1e4dde10ce23e0eaab4738a7 Signed-off-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Axis setRange selects region from dataMika Salmela2013-09-131-3/+0
| | | | | | | Task-number: QTRD-2280 Change-Id: I6313ac321f84fbd6d9a06c198caccccd805d336b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QML documentationTomi Korpipää2013-09-121-6/+6
| | | | | | | Task-number: QTRD-2133 Change-Id: I2568b3cd6e83ee933536d7fec2e48f9f121b213e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Module renamedTomi Korpipää2013-09-101-0/+106
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>