15 Commits

Author SHA1 Message Date
Martin Dobias
68e29511c3 Allow cancellation of PAL labeling computation 2013-11-18 14:28:55 +07:00
Larry Shaffer
15fe9926ce Add data defined option to always show a label, unless overridden
- Label is skipped during PAL priority calculation, permitting collisions and overlaps
- Overridden by layer and data defined 'scale/pixel size visibility' and data defined 'show label'  options
- Add option to Change Label tool
2012-11-10 00:49:50 -07:00
Marco Hugentobler
0c7f729612 [Feature]: Merge diagram improvements provided by Matthias Kuhn 2012-09-05 09:29:19 +02:00
Larry Shaffer
a584a9a7e4 Add 'show all labels' setting to individual PAL layers
- Implements a version of #5874
- Show-all labels are not obstacles for other PAL layer labels during collisions
(i.e. they will overlap or underlie other labels depending upon render order)
2012-09-04 17:22:45 -06:00
Matthias Kuhn
48bc5c5ccd draw smaller diagrams on top 2012-08-09 17:05:09 +02:00
Juergen E. Fischer
92e57dadb5 fix lenny build and some warnings 2011-08-20 23:32:22 +02:00
jef
6455628219 fix gcc 4.6 warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@15857 c8812cc2-4d05-0410-92ff-de0c093fc19c
2011-04-30 12:09:19 +00:00
jef
621ee62280 semi-automatic indentation update
git-svn-id: http://svn.osgeo.org/qgis/trunk@12177 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-11-18 20:51:28 +00:00
jef
8421c00f79 fix windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk@12144 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-11-16 15:51:28 +00:00
wonder
976748cdf3 Fixed potential segfault in PAL code (thanks Juergen for discovering that)
git-svn-id: http://svn.osgeo.org/qgis/trunk@12143 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-11-16 12:55:24 +00:00
wonder
961742e243 Symbology-NG branch merged to trunk. This includes also work on labeling done during my GSoC'09.
git-svn-id: http://svn.osgeo.org/qgis/trunk@12139 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-11-16 10:36:24 +00:00
jef
788e6545c7 fix various warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@10535 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-11 19:52:01 +00:00
jef
39b28ed518 automatic indentation update (r10457-r10488)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10489 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-06 18:46:07 +00:00
jef
472848e036 fix msvc build errors
git-svn-id: http://svn.osgeo.org/qgis/trunk@10485 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-06 12:52:56 +00:00
mhugent
846a43c658 Merge vector overlay branch (diagram plugin)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10484 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-06 11:53:45 +00:00