Showing with 5,344 additions and 1,384 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 doc/CONTRIBUTORS
  3. +3 −0 images/images.qrc
  4. BIN images/themes/default/histogram.png
  5. +786 −0 images/themes/default/histogram.svg
  6. BIN images/themes/default/pie-chart.png
  7. +755 −0 images/themes/default/pie-chart.svg
  8. BIN images/themes/default/text.png
  9. +766 −0 images/themes/default/text.svg
  10. +1 −1 src/analysis/network/qgslinevectorlayerdirector.cpp
  11. +2 −0 src/app/CMakeLists.txt
  12. +581 −0 src/app/qgsdiagramproperties.cpp
  13. +57 −0 src/app/qgsdiagramproperties.h
  14. +15 −385 src/app/qgsvectorlayerproperties.cpp
  15. +4 −14 src/app/qgsvectorlayerproperties.h
  16. +12 −2 src/core/CMakeLists.txt
  17. +71 −0 src/core/diagram/qgsdiagram.cpp
  18. +79 −0 src/core/diagram/qgsdiagram.h
  19. +167 −0 src/core/diagram/qgshistogramdiagram.cpp
  20. +52 −0 src/core/diagram/qgshistogramdiagram.h
  21. +150 −0 src/core/diagram/qgspiediagram.cpp
  22. +50 −0 src/core/diagram/qgspiediagram.h
  23. +62 −98 src/core/{qgsdiagram.cpp → diagram/qgstextdiagram.cpp}
  24. +11 −33 src/core/{qgsdiagram.h → diagram/qgstextdiagram.h}
  25. +19 −0 src/core/pal/problem.cpp
  26. +2 −0 src/core/pal/problem.h
  27. +128 −30 src/core/qgsdiagramrendererv2.cpp
  28. +275 −247 src/core/qgsdiagramrendererv2.h
  29. +1 −1 src/core/qgspallabeling.cpp
  30. +7 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  31. +6 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  32. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  33. +7 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  34. +16 −3 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  35. +3 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  36. +6 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  37. +7 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  38. +4 −0 src/core/symbology-ng/qgssymbollayerv2.h
  39. +34 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  40. +3 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  41. +23 −1 src/core/symbology-ng/qgssymbolv2.cpp
  42. +9 −0 src/core/symbology-ng/qgssymbolv2.h
  43. +14 −4 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  44. +1 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  45. +11 −1 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  46. +1 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  47. +72 −26 src/gui/symbology-ng/qgsrendererv2widget.cpp
  48. +14 −7 src/gui/symbology-ng/qgsrendererv2widget.h
  49. +7 −1 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  50. +1 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  51. +1,023 −0 src/ui/qgsdiagrampropertiesbase.ui
  52. +4 −4 src/ui/qgsengineconfigdialog.ui
  53. +13 −524 src/ui/qgsvectorlayerpropertiesbase.ui
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ scripts/RelWithDebInfo
/CMakeLists.txt.user
qgis-test.ctest
i18n/*.qm
.project
1 change: 1 addition & 0 deletions doc/CONTRIBUTORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Mark Baas
Markus Neteler
Mathias Walker
Matt Amos
Matthias Kuhn
Maurizio Napolitano
Mayeul Kauffmann
Milena Nowotarska
Expand Down
3 changes: 3 additions & 0 deletions images/images.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file added images/themes/default/histogram.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading