summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Added a custom bar (weird thing) to Q3DMaps example Tomi Korpipää2013-05-073-1/+1238
| | | | | | Change-Id: Ic8ea6543adcaebb05f18f07517aeccc8dae6033b Change-Id: Ic8ea6543adcaebb05f18f07517aeccc8dae6033b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Q3DMaps: Value application dimension changing added to example Tomi Korpipää2013-05-039-21/+2637
| | | | | | Change-Id: Id85cae69cd66e838f8df1b1c53593091be67d648 Change-Id: Id85cae69cd66e838f8df1b1c53593091be67d648 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Q3DMaps: Label updating after changes doneTomi Korpipää2013-05-0310-306/+184
| | | | | Change-Id: I74b2408c3772e2983a921d7fab8ceab38d91e993 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Selection label position bug fix Tomi Korpipää2013-05-032-19/+16
| | | | | | | | 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-0310-110/+251
| | | | | | | | 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-0217-18/+2242
| | | | | | | | | 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-3023-600/+424
| | | | | | | | 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-2910-18/+188
| | | | | | | | 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>
* Added font changing to widget exampleTomi Korpipää2013-04-263-1/+40
| | | | | Change-Id: I519a042e53ccda3a4d24f98328749b562d27e002 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Bug fixesTomi Korpipää2013-04-252-159/+168
| | | | | | | | 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-242-4/+4
| | | | | | 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-2411-96/+99
| | | | | 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>
* Added more data to example Tomi Korpipää2013-04-232-32/+17
| | | | | | Change-Id: I46f3b1cdffe1327162597469f6bae11ecfac1b66 Change-Id: I46f3b1cdffe1327162597469f6bae11ecfac1b66 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* More adjustable properties added to exampleTomi Korpipää2013-04-234-14/+105
| | | | | Change-Id: Iefb7736daf47ca0e5af5ca2582fed0434df9c734 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* More stuff to widget example Tomi Korpipää2013-04-234-58/+157
| | | | | | 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-2213-213/+666
| | | | | | | Initial version, more to be added Change-Id: I9c947f2e5ac525ab1821fc06e2f02c67da37fe70 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Crash fix Tomi Korpipää2013-04-193-43/+61
| | | | | | | | | ..when returning from zoom view and there were no label items for rows/columns Change-Id: Ia9b5da595185adf6ef3fff3c8c926f1b36f8eb8e Change-Id: Ia9b5da595185adf6ef3fff3c8c926f1b36f8eb8e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Correct selection method works nowTomi Korpipää2013-04-195-73/+161
| | | | | | Change-Id: If14437dae2a9298bfffc72b5678d401c42c3218f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed labeling for 0 -valued barsTomi Korpipää2013-04-191-30/+40
| | | | | | | Change-Id: Ia2a2cbf33374793c256e95f67670b97efd0a1aa2 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Separate selection label support added Tomi Korpipää2013-04-187-88/+115
| | | | | | | Change-Id: Icc880024a44f97da6de8d8b32183087931342126 Change-Id: Icc880024a44f97da6de8d8b32183087931342126 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Axis label drawing added Tomi Korpipää2013-04-188-197/+293
| | | | | | | | | Fixed some bugs Change-Id: I6a904ef435cf109a33d9b65a1c8c289864553468 Change-Id: I6a904ef435cf109a33d9b65a1c8c289864553468 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added bar label drawing in zoom selection view Tomi Korpipää2013-04-1710-120/+433
| | | | | | Change-Id: Iae58ef8395d7ad41df72e8698a2deca723e9b29c Change-Id: Iae58ef8395d7ad41df72e8698a2deca723e9b29c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Object drawing and label generation moved to their own classTomi Korpipää2013-04-1627-570/+803
| | | | | Change-Id: I3721b201dd83b471cb6d55f0dd7def908c4ab0be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Moved object drawing to a separate function Tomi Korpipää2013-04-162-183/+118
| | | | | | Change-Id: I0ec8538e7291e475ce54d1d30ad6d7917f77e9db Change-Id: I0ec8538e7291e475ce54d1d30ad6d7917f77e9db Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Optimized label texture creationTomi Korpipää2013-04-156-47/+67
| | | | | Change-Id: I2c97fb82c1ea2fa22bf603675658e53ac82e0298 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Preset camera function moved to camerahelper Tomi Korpipää2013-04-154-109/+121
| | | | | | Change-Id: I6b96abd8a951622496abab0495f44fcd4ec1764b Change-Id: I6b96abd8a951622496abab0495f44fcd4ec1764b Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fixed label printing in ZoomColumn mode Tomi Korpipää2013-04-151-13/+6
| | | | | | Change-Id: I5e6341c7365051958798fac16fa899f44b25efeb Change-Id: I5e6341c7365051958798fac16fa899f44b25efeb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Copyright changes Tomi Korpipää2013-04-1549-59/+190
| | | | | | Change-Id: I71ca8308f318f9c869fe0d708e96b4855b9bae59 Change-Id: I71ca8308f318f9c869fe0d708e96b4855b9bae59 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added drawing the label of selected bar in non-QPainter version Tomi Korpipää2013-04-158-89/+190
| | | | | | | | Moved label drawing into it's own function. Change-Id: I4408e077b28f5d05de2c80adb2a97208271a9c3c Change-Id: I4408e077b28f5d05de2c80adb2a97208271a9c3c Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Added support for setting font Tomi Korpipää2013-04-125-5/+20
| | | | | | Change-Id: Id56bd700820ea5b2b7982d0bb4b20dcad838bf78 Change-Id: Id56bd700820ea5b2b7982d0bb4b20dcad838bf78 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Improved label drawing and font size adjustment Tomi Korpipää2013-04-128-73/+132
| | | | | | Change-Id: I3421b6f6774b44b02aecef87afc1ceaafebc9fbe Change-Id: I3421b6f6774b44b02aecef87afc1ceaafebc9fbe Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Theme moved to it's own class Tomi Korpipää2013-04-126-221/+417
| | | | | | | Change-Id: Ib5888622f94b163fb9bda97ceb5339e88a9497ae Change-Id: Ib5888622f94b163fb9bda97ceb5339e88a9497ae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implemented label printing using opengl (QPainter version ifdeffed, either ↵Tomi Korpipää2013-04-1216-128/+347
| | | | | | | | | | one can be used) Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6 Change-Id: Id7d6761b0ad447c7f4f18f0933d065f190ad82b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>