Skip to content
Permalink
Browse files

[Feature]: Merge diagram improvements provided by Matthias Kuhn

  • Loading branch information
Marco Hugentobler
Marco Hugentobler committed Sep 5, 2012
2 parents cfa15ff + aa31c8c commit 0c7f729612ad400972fe6fa76943965c2397dd5d
Showing with 5,343 additions and 1,384 deletions.
  1. +1 −0 .gitignore
  2. +3 −0 images/images.qrc
  3. BIN images/themes/default/histogram.png
  4. +786 −0 images/themes/default/histogram.svg
  5. BIN images/themes/default/pie-chart.png
  6. +755 −0 images/themes/default/pie-chart.svg
  7. BIN images/themes/default/text.png
  8. +766 −0 images/themes/default/text.svg
  9. +1 −1 src/analysis/network/qgslinevectorlayerdirector.cpp
  10. +2 −0 src/app/CMakeLists.txt
  11. +581 −0 src/app/qgsdiagramproperties.cpp
  12. +57 −0 src/app/qgsdiagramproperties.h
  13. +15 −385 src/app/qgsvectorlayerproperties.cpp
  14. +4 −14 src/app/qgsvectorlayerproperties.h
  15. +12 −2 src/core/CMakeLists.txt
  16. +71 −0 src/core/diagram/qgsdiagram.cpp
  17. +79 −0 src/core/diagram/qgsdiagram.h
  18. +167 −0 src/core/diagram/qgshistogramdiagram.cpp
  19. +52 −0 src/core/diagram/qgshistogramdiagram.h
  20. +150 −0 src/core/diagram/qgspiediagram.cpp
  21. +50 −0 src/core/diagram/qgspiediagram.h
  22. +62 −98 src/core/{qgsdiagram.cpp → diagram/qgstextdiagram.cpp}
  23. +11 −33 src/core/{qgsdiagram.h → diagram/qgstextdiagram.h}
  24. +19 −0 src/core/pal/problem.cpp
  25. +2 −0 src/core/pal/problem.h
  26. +128 −30 src/core/qgsdiagramrendererv2.cpp
  27. +275 −247 src/core/qgsdiagramrendererv2.h
  28. +1 −1 src/core/qgspallabeling.cpp
  29. +7 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  30. +6 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  31. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  32. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  33. +16 −3 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  34. +3 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  35. +6 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  36. +7 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  37. +4 −0 src/core/symbology-ng/qgssymbollayerv2.h
  38. +34 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  39. +3 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  40. +23 −1 src/core/symbology-ng/qgssymbolv2.cpp
  41. +9 −0 src/core/symbology-ng/qgssymbolv2.h
  42. +14 −4 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  43. +1 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  44. +11 −1 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  45. +1 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  46. +72 −26 src/gui/symbology-ng/qgsrendererv2widget.cpp
  47. +14 −7 src/gui/symbology-ng/qgsrendererv2widget.h
  48. +7 −1 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  49. +1 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  50. +1,023 −0 src/ui/qgsdiagrampropertiesbase.ui
  51. +4 −4 src/ui/qgsengineconfigdialog.ui
  52. +13 −524 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -43,3 +43,4 @@ scripts/RelWithDebInfo
/CMakeLists.txt.user
qgis-test.ctest
i18n/*.qm
.project
@@ -462,6 +462,9 @@
<file>flags/en_US.png</file>
<file>flags/da_DK.png</file>
<file>flags/et_EE.png</file>
<file>themes/default/text.png</file>
<file>themes/default/histogram.png</file>
<file>themes/default/pie-chart.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Binary file not shown.

0 comments on commit 0c7f729

Please sign in to comment.
You can’t perform that action at this time.