Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
1,243 additions
and 1,462 deletions.
- +13 −119 python/core/qgspallabeling.sip
- +49 −0 python/core/qgstextrenderer.sip
- +35 −1 python/core/symbology-ng/qgssymbollayerutils.sip
- +150 −135 src/app/qgslabelinggui.cpp
- +17 −13 src/app/qgslabelpreview.cpp
- +1 −1 src/app/qgslabelpreview.h
- +6 −3 src/app/qgslabelpropertydialog.cpp
- +5 −10 src/app/qgsmaptoollabel.cpp
- +3 −7 src/core/composer/qgscomposermap.cpp
- +12 −9 src/core/dxf/qgsdxfexport.cpp
- +346 −911 src/core/qgspallabeling.cpp
- +17 −119 src/core/qgspallabeling.h
- +126 −35 src/core/qgstextrenderer.cpp
- +59 −0 src/core/qgstextrenderer.h
- +3 −14 src/core/qgstextrenderer_p.h
- +6 −0 src/core/qgsunittypes.cpp
- +29 −17 src/core/qgsvectorlayerlabelprovider.cpp
- +44 −0 src/core/symbology-ng/qgssymbollayerutils.cpp
- +34 −1 src/core/symbology-ng/qgssymbollayerutils.h
- +32 −14 tests/src/core/testqgslabelingengine.cpp
- +4 −2 tests/src/core/testqgsmaprotation.cpp
- +1 −0 tests/src/python/CMakeLists.txt
- +10 −4 tests/src/python/test_qgspallabeling_base.py
- +75 −46 tests/src/python/test_qgspallabeling_tests.py
- +95 −0 tests/src/python/test_qgssymbollayerutils.py
- +60 −1 tests/src/python/test_qgstextrenderer.py
- +11 −0 tests/src/python/test_qgsunittypes.py
Oops, something went wrong.