summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/utils.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix issues with COIN buildsMiikka Heikkinen2015-10-221-8/+11
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f 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>
* 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>
* Added flags to software renderer test Tomi Korpipää2014-11-051-0/+2
| | | | | | Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fixed font size jumping in ES2 Tomi Korpipää2014-11-051-1/+1
| | | | | | | | Task-number: QTRD-3412 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Force software renderer to using ES2 Tomi Korpipää2014-11-051-1/+7
| | | | | | | Task-number: QTRD-3410 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-301-4/+3
| | | | | | | | | Android doesn't like creating extra QWindows, so changed dummy surfaces used to do static initialization and cleanup to use QOffscreenSurface. Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix crash when initializing QCustom3DLabel out of context.Miikka Heikkinen2014-10-291-32/+39
| | | | | | Task-number: QTRD-3391 Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add missing includes to utils.cpp.Miikka Heikkinen2014-10-291-0/+2
| | | | | Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-291-58/+86
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Squeeze labels on ES2Mika Salmela2014-10-281-6/+25
| | | | | | | | | | If the label text with slightly smaller font would fit into smaller texture, force to use the smaller one. Task-number: QTRD-3395 Change-Id: Ib70f6722ea8403e4aa25ed190b21c059d9d0e062 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* If GL_MAX_TEXTURE_SIZE cannot be read, don't check for itMiikka Heikkinen2014-10-101-1/+1
| | | | | | | | | | In QML apps, the texture for custom labels can get created before glGenIntegerv returns a valid value for GL_MAX_TEXTURE_SIZE. Do not check for max size when it is zero. Change-Id: I114ac8494bd5aa509490bd38ae58827fd21e2729 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Reduce font size if label gets too wide to fit textureTomi Korpipää2014-10-011-19/+56
| | | | | | | | Task-number: QTRD-3230 Change-Id: I0cb76f077c1930033c03f833c9c9f2d347c41f9c Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added possibility to change graph's localeMiikka Heikkinen2014-09-191-30/+55
| | | | | | | | | | Locale affects how axis labels are formatted. Default locale is still the "C". Task-number: QTRD-3229 Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Unified gradient for pointsMika Salmela2014-08-291-3/+6
| | | | | | | | | | Made gradient image same size as the texture and similar calculation for the pixel. Result should be more coherent for all. Task-number: QTRD-3295 Change-Id: I666dacc6f525258ccefda288e26cac480cb385cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Texture power-of-two for ES2Tomi Korpipää2014-06-121-4/+4
| | | | | | | Force power-of-2 for all ES2 devices instead of just Android and iOS. Change-Id: I6b64182f18b02153833776c82ce8378907443b85 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up input, theme, utils Tomi Korpipää2014-06-031-5/+0
| | | | | | | Task-number: QTRD-3149 Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Change-Id: I47e1a1590043c14ccd5d1ad11f0fa643b883cded Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimize label rotations a bitMiikka Heikkinen2014-05-191-0/+9
| | | | | Change-Id: Ie6075aefa70228769d5a2717e9d96c23b9fee494 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Color problem fixed Tomi Korpipää2014-04-241-3/+10
| | | | | | | | | | | Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Row/colun selection using axis labels, part 1Tomi Korpipää2014-03-311-4/+3
| | | | | | | | | | | Task-number: QTRD-2981 + Bars done + Scatter done (= no label selection) - Surface to be done Change-Id: Icd352e40ad6d0ada76380f3dba742f280fd278b3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Make axis labels more accurate by using qreals for label valuesMiikka Heikkinen2014-03-261-1/+1
| | | | | | | | | Also refactor axis formatter sub grid array to be one dimensional. There is no need to know which segment each sub grid line belongs to. Change-Id: Ie9813088650fcc0ca844f3c358ea1abae9258367 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added range gradient support for MeshPointsTomi Korpipää2014-03-251-0/+10
| | | | | | | Task-number: QTRD-2701 Change-Id: Id3f096099ef584a6feaaebcbecc084810ec27967 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Clean up public API and includes usageMiikka Heikkinen2014-02-181-7/+6
| | | | | Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* iOS fixesTomi Korpipää2014-01-271-2/+2
| | | | | | | | | | + texture power-of-two added + input handling changes - surface crashes, will be fixed in separate commit Task-number: QTRD-2802 Change-Id: I1913aec60c4e986b02f307d832dc55dea0be4348 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-221-21/+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-7/+2
| | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Docs updated after namespace macro removalTomi Korpipää2014-01-161-0/+5
| | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Removed QDataVis and namespace macrosTomi Korpipää2014-01-151-2/+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>
* Fix more valgrind issuesMiikka Heikkinen2013-12-131-4/+2
| | | | | | | | + some misc fixes Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* Label fix Tomi Korpipää2013-12-131-1/+1
| | | | | | Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Change-Id: I990edbead0066f61f10b146ed0dc2c6299d6eb0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix uniform color surfacesMiikka Heikkinen2013-12-131-1/+1
| | | | | | | Bug in color conversion from QVector3D to QColor Change-Id: I060619f280cb0dbace65a08b58183d468491dff8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Move series specific visual elements to series, part 4Miikka Heikkinen2013-12-101-0/+5
| | | | | | | | | | | | 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>
* Visual properties moved to themeTomi Korpipää2013-11-281-29/+5
| | | | | | | Task-number: QTRD-2632 Change-Id: I91eaa8fa26e232de24fe89ef0c8a2fc53f31fb8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change qreals to floatsMiikka Heikkinen2013-11-251-2/+2
| | | | | | | | | + Fix default axes to sensible + Fix some rounding errors in surface creation Task-number: QTRD-2622 Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed ES2 gradient problem Tomi Korpipää2013-10-211-1/+1
| | | | | | | | | | Task-number: QTRD-2453 + changed gradient texture to a power-of-two size to avoid gradient errors on Android Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Change-Id: I67b1c87d3143073ceb2523017e3968d16d0cd503 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Mac compilation fixesTomi Korpipää2013-10-101-2/+2
| | | | | Change-Id: I050b25f0921dfb12cb064002b3d020d499d4c953 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added Camera QML API and ExampleKeränen Pasi2013-10-081-0/+21
| | | | | Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix for text clipping Tomi Korpipää2013-10-021-3/+4
| | | | | | | | Task-number: QTRD-2314 Change-Id: Iccc54db3f214a10b97a55138368c9b3282b477b4 Change-Id: Iccc54db3f214a10b97a55138368c9b3282b477b4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactored LabelTransparency and ShadowQualityTomi Korpipää2013-10-021-7/+7
| | | | | | | Task-number: QTRD-2362 Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Label "skewing" fixedTomi Korpipää2013-09-231-13/+18
| | | | | | | | Task-number: QTRD-2322 Change-Id: Ie4bb95dc4f62bad1fef605461452168ea260fa26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Theme draft 3 Tomi Korpipää2013-09-181-3/+9
| | | | | | | | | | Task-number: QTRD-2277 + added control over label borders to theme Change-Id: Ib0047233d920bcf8cdaf5cc6165d9d17513b209a Change-Id: Ib0047233d920bcf8cdaf5cc6165d9d17513b209a Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Android selection label fix Tomi Korpipää2013-09-161-77/+4
| | | | | | | | Task-number: QTRD-2294 Change-Id: I339a375efc99de4faa966ed1cd0324ad13b5898d Change-Id: I339a375efc99de4faa966ed1cd0324ad13b5898d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Module renamedTomi Korpipää2013-09-101-0/+303
Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>