summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Mac fix Tomi Korpipää2013-05-201-6/+1
| | | | | | | | | Different initialization order not needed anymore. Causes crash if used. Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50 Change-Id: I5c58f57c5352ea0e18719d6b569b22385e62be50 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Background lighting fix Tomi Korpipää2013-05-203-4/+4
| | | | | | | | | Example tweaks. Default label transparanecy changed. Change-Id: Icfe198152a0c0ad74638651e486018be06dbbf0b Change-Id: Icfe198152a0c0ad74638651e486018be06dbbf0b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed scaling in zoom mode Tomi Korpipää2013-05-201-3/+4
| | | | | | | | When aspect ratio differs from default, zoom mode didn't scale correctly. Change-Id: I1e27425d0b29d92932d85869a49ff554df3060f3 Change-Id: I1e27425d0b29d92932d85869a49ff554df3060f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Light positioning fixed in zoom mode Tomi Korpipää2013-05-201-3/+5
| | | | | | | | Moved light below camera to avoid specular glare. Change-Id: I928522a3d397983b1a2a6f5215bbb3262c03d7a0 Change-Id: I928522a3d397983b1a2a6f5215bbb3262c03d7a0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added datavis3d back under srcHeikkinen Miikka2013-05-1782-22/+24
| | | | | Change-Id: I209e8b3228b2ce0085c897db6fb2ea78e93afa67 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added support for setting tick count Tomi Korpipää2013-05-1711-114/+114
| | | | | | Change-Id: I1dc92d0241d1ae64d0e515595edfaefb50cb22bd Change-Id: I1dc92d0241d1ae64d0e515595edfaefb50cb22bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Made grid lines subject to shadows Tomi Korpipää2013-05-171-10/+88
| | | | | | Change-Id: Iae09c937b9b1d26c4ac4a120ec5447ec790061a7 Change-Id: Iae09c937b9b1d26c4ac4a120ec5447ec790061a7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Themes updated Tomi Korpipää2013-05-173-55/+68
| | | | | | | | | | Updated colors. Adjusted lights. Added grid line color to themes. Change-Id: I855182bd62ae997268ef26b2475ff0ec8cab6c58 Change-Id: I855182bd62ae997268ef26b2475ff0ec8cab6c58 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Adjusted shadows and default colors Tomi Korpipää2013-05-163-9/+9
| | | | | | Change-Id: I1325a3ec78cc474df78ba3dde8d59c58aeff81ea Change-Id: I1325a3ec78cc474df78ba3dde8d59c58aeff81ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Lighting fixed Tomi Korpipää2013-05-164-144/+44
| | | | | | | | The inverted transpose matrix needed for getting object's normals correctly had to be made from untranslated and unrotated model matrix. Change-Id: I09a2c87407efb875865793fabe8b2bf9618e3b0e Change-Id: I09a2c87407efb875865793fabe8b2bf9618e3b0e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadows improvedTomi Korpipää2013-05-1610-22/+119
| | | | | | | | Fixed bugs. Change-Id: I7dc704387eb12d5dfec4bfb90ba4824a64e5d3d9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shadow quality adjustment via API added Tomi Korpipää2013-05-159-156/+306
| | | | | | | | Added adjustment option to widget and mapdata examples Change-Id: I18d06b171c8caf9c4d21aad588d460447eb8edc3 Change-Id: I18d06b171c8caf9c4d21aad588d460447eb8edc3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Hack to fix zoom mode shadow problems Tomi Korpipää2013-05-141-1/+2
| | | | | | | | To be fixed. Change-Id: Ic5b9ea0ae6e4e552606c6e1528685f657cb90723 Change-Id: Ic5b9ea0ae6e4e552606c6e1528685f657cb90723 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Poisson disk sampling added to shadow shaders Tomi Korpipää2013-05-143-9/+124
| | | | | | Change-Id: I5a70cc738239409652db4978f91de0d792539597 Change-Id: I5a70cc738239409652db4978f91de0d792539597 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadows improved Tomi Korpipää2013-05-147-43/+137
| | | | | | | | | | | Shadow shader version 2 works and has no self-shadowing issues, but gives a bit jagged shadows. The issue may be improved with poisson sampling, which will be implemented next. Other way is to increase depth texture size, but it may cause problems for devices with low GPU memory. Change-Id: I0259d025706be1c37456fa797e60e1cda0521fbd Change-Id: I0259d025706be1c37456fa797e60e1cda0521fbd Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps: Bar shadow support addedTomi Korpipää2013-05-146-37/+98
| | | | | | | | Issues found. Self-shadowing causes problems. Change-Id: I0b13dbb0f7e7d7316a0834b6bb5ac6820b98305f Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DBars: Added shadow supportTomi Korpipää2013-05-145-20/+250
| | | | | | | | Now shadows are cast on other bars as well, although still very faintly Change-Id: I5329983234e6a02cc7f5a843dae4fd67d0ad95a0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shader changes Tomi Korpipää2013-05-137-49/+58
| | | | | | | | Upgraded most shaders to version 120 Change-Id: I9ad111bc26c00662adba0b1459bd7fe2359daa79 Change-Id: I9ad111bc26c00662adba0b1459bd7fe2359daa79 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shadows fixedTomi Korpipää2013-05-1310-55/+84
| | | | | Change-Id: Id0e8aa840211b1cea7e86077b965e72b7253e86c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Directory structure reorganizedTomi Korpipää2013-05-0880-24/+22
| | | | | | | | Unnecessary subdirectory levels deleted from examples and src Change-Id: I88892b4fc92784e706be2264eeb7d6208250a50f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Shadow mapping implementationTomi Korpipää2013-05-0810-105/+136
| | | | | | | Partially works, but mostly doesn't. Change-Id: I415833d07148d2aeae64c0c311e14766ab29ad5e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added depth texture support to drawObject Tomi Korpipää2013-05-073-61/+25
| | | | | | Change-Id: I718d751bf623d5db526ae34ee6673e53c237f649 Change-Id: I718d751bf623d5db526ae34ee6673e53c237f649 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Shadow mapping implementation draft Tomi Korpipää2013-05-0714-35/+440
| | | | | | | | Does not work yet Change-Id: Ic08c6b12fa5d5aa4f76ddef82fa81eab6982dd69 Change-Id: Ic08c6b12fa5d5aa4f76ddef82fa81eab6982dd69 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps: Value application dimension changing added to example Tomi Korpipää2013-05-036-1/+2552
| | | | | | Change-Id: Id85cae69cd66e838f8df1b1c53593091be67d648 Change-Id: Id85cae69cd66e838f8df1b1c53593091be67d648 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps: Label updating after changes doneTomi Korpipää2013-05-036-8/+11
| | | | | Change-Id: I74b2408c3772e2983a921d7fab8ceab38d91e993 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection label position bug fix Tomi Korpipää2013-05-031-15/+12
| | | | | | | | Added z compensation to position->translation calculation Change-Id: I18ff0978d97e6a721cd2de5282e1a02c21446db2 Change-Id: I18ff0978d97e6a721cd2de5282e1a02c21446db2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Bug fix Tomi Korpipää2013-05-031-2/+4
| | | | | | | | QDataItem's setLabel did not work with prepend -flag set Change-Id: I8c91854d9713926ede805f4a0f7e3fc929400a28 Change-Id: I8c91854d9713926ede805f4a0f7e3fc929400a28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DBars: Bug fix (compilation error if DISPLAY_FULL_DATA_ON_SELECTION was ↵Tomi Korpipää2013-05-031-1/+1
| | | | | | | | | not defined) Change-Id: I109e9c400bca16babbf51300506da1d09d769a2c Change-Id: I109e9c400bca16babbf51300506da1d09d769a2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DMaps: Added support for visualizing value in selected dimensionTomi Korpipää2013-05-034-84/+203
| | | | | | | | Value can now be visualized in height, width, depth, radius (=width+depth) or all Added some real data to example. More will be added. Change-Id: Ib0effe13ff295f3dc82ba82220b195b6aebf0ed4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Bug fix Tomi Korpipää2013-05-021-0/+6
| | | | | | | | Added null checks to QImages in texturehelper Change-Id: I26102f9501fb6c44ddf1440e8c01305ddf21afaa Change-Id: I26102f9501fb6c44ddf1440e8c01305ddf21afaa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Font size adjustment bug fix Tomi Korpipää2013-05-022-4/+1
| | | | | | Change-Id: I80a0f20bb66e3d77f0ca4157743efaf6e02ead2f Change-Id: I80a0f20bb66e3d77f0ca4157743efaf6e02ead2f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps visualization type added Tomi Korpipää2013-05-0210-17/+1585
| | | | | | | | | Very early draft. Also added early draft of an example using it. Change-Id: Ib6470607056748e979090ea0d9e751998ec1b3c9 Change-Id: Ib6470607056748e979090ea0d9e751998ec1b3c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Bug fix Tomi Korpipää2013-04-301-1/+1
| | | | | | | | Row limit value calculation was flawed (else if instead of if) Change-Id: Iaa965a32474e14eca1794b623da6cb83bff61e7b Change-Id: Iaa965a32474e14eca1794b623da6cb83bff61e7b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Refactoring to get ready for a second vis typeTomi Korpipää2013-04-3019-546/+370
| | | | | | | | Moved enums to global header. Moved drawLabel to Drawer. Change-Id: Ifb103467254b4288dee1ef6f7bb0c2aa23868dab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Grid lines implemented Tomi Korpipää2013-04-295-8/+159
| | | | | | | | Height labels still to be done Change-Id: I04c7ab87a5ca745a33399b154181b5f9ff95dc77 Change-Id: I04c7ab87a5ca745a33399b154181b5f9ff95dc77 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Label alignments implemented Tomi Korpipää2013-04-292-12/+47
| | | | | | Change-Id: I66fcd746b7406918964d71a200de9713d49314ab Change-Id: I66fcd746b7406918964d71a200de9713d49314ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Crash fix Tomi Korpipää2013-04-261-4/+13
| | | | | | | | Row/column labeling crashed when there were no label items for them. Added a check. Change-Id: Ia49d823e3e95869858b2691410ad4fbf95200373 Change-Id: Ia49d823e3e95869858b2691410ad4fbf95200373 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Bug fixesTomi Korpipää2013-04-251-2/+11
| | | | | | | | Selection texture needed re-initializing after resize. Label rotations fixed in zoom mode. Change-Id: I98f14e1f98c27c08521da3ac14a348a154135e3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Row/column label flipping with rotations implementedTomi Korpipää2013-04-252-54/+51
| | | | | Change-Id: I597d1d164ef55ed93d5ad6418691279fa06b717c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Implemented row and column labeling in normal view Tomi Korpipää2013-04-252-14/+102
| | | | | | | | Initial version; neither optimized nor quite finished.. Change-Id: I9c19dc4bef25bd43a84824329acdcd39dd73c173 Change-Id: I9c19dc4bef25bd43a84824329acdcd39dd73c173 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Autozoom based on aspect ratio Tomi Korpipää2013-04-252-14/+17
| | | | | | Change-Id: I3bdc9863d08f0d8c9aa1629871397729ce207bb9 Change-Id: I3bdc9863d08f0d8c9aa1629871397729ce207bb9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Bug fix. Update bar labels if drawer changes (font, theme, label transparency) Tomi Korpipää2013-04-242-6/+29
| | | | | | Change-Id: I31fd360c51d26f41ae8709d2a112cb8229b4770a Change-Id: I31fd360c51d26f41ae8709d2a112cb8229b4770a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed bar scaling Tomi Korpipää2013-04-241-2/+2
| | | | | | Change-Id: I509deb13c24b59f329524825e77216e9e76b7820 Change-Id: I509deb13c24b59f329524825e77216e9e76b7820 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Scene autoscaling improved Tomi Korpipää2013-04-242-22/+12
| | | | | | Change-Id: I0be0cfdf4284e76d5c088f9a0b2c96500876abfe Change-Id: I0be0cfdf4284e76d5c088f9a0b2c96500876abfe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Replaced QPoints with QPairs and QSizes where applicableTomi Korpipää2013-04-247-79/+82
| | | | | Change-Id: I0368be22d506fe99258d1430bdc5cbfccd1d38e8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Y adjustment for labels and zoom view done Tomi Korpipää2013-04-232-96/+23
| | | | | | | | 2 label positions need more work (or are to be removed if not needed) Change-Id: Ib72bf2679e5f32fecfebc6f08485043db8e1e7a0 Change-Id: Ib72bf2679e5f32fecfebc6f08485043db8e1e7a0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Automatic y positioning implemented based on bar min and max heightsTomi Korpipää2013-04-236-26/+58
| | | | | | | Zoom mode adjustments and label adjustments need to be implemented Change-Id: I6bba344da12351738b25fcfc23f157fc2679d4e8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* More adjustable properties added to exampleTomi Korpipää2013-04-231-9/+24
| | | | | Change-Id: Iefb7736daf47ca0e5af5ca2582fed0434df9c734 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* More stuff to widget example Tomi Korpipää2013-04-231-0/+7
| | | | | | Change-Id: I7ae74f65ba739808b75b3f5a70c00eb92f2ab334 Change-Id: I7ae74f65ba739808b75b3f5a70c00eb92f2ab334 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added example on how to use 3d bars on qwidgetTomi Korpipää2013-04-222-64/+85
| | | | | | | Initial version, more to be added Change-Id: I9c947f2e5ac525ab1821fc06e2f02c67da37fe70 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>