[QGIS Commit] [qgis/Quantum-GIS] 3039f9: Change vertical alignment

GitHub noreply at github.com
Wed Sep 5 00:55:15 PDT 2012


  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 3039f9354bfd361e57e03afc2910d796c36475ed
      https://github.com/qgis/Quantum-GIS/commit/3039f9354bfd361e57e03afc2910d796c36475ed
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  Change vertical alignment

Use x-height for vertical offset rather than font-height/2


  Commit: 35e747b28c553688c0f6d202c03df1a352d6cdcc
      https://github.com/qgis/Quantum-GIS/commit/35e747b28c553688c0f6d202c03df1a352d6cdcc
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Text diagrams: new label placement method (x-height)


  Commit: d81df7c4051dd083b78f23aa75d773b75750cac0
      https://github.com/qgis/Quantum-GIS/commit/d81df7c4051dd083b78f23aa75d773b75750cac0
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add .project file to .gitignore (eclipse)


  Commit: bb8f1d6386ab1020c742fe17044b7bf71e274658
      https://github.com/qgis/Quantum-GIS/commit/bb8f1d6386ab1020c742fe17044b7bf71e274658
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Add minimum size option for diagrams. (Will be scaled if smaller)


  Commit: 98e637cf972e139656ea1419a6506bcbbe4e3dd4
      https://github.com/qgis/Quantum-GIS/commit/98e637cf972e139656ea1419a6506bcbbe4e3dd4
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h

  Log Message:
  -----------
  Save settings for scaling small diagrams


  Commit: 79d537a9ef13b7c5870b4337a61bd08cce165300
      https://github.com/qgis/Quantum-GIS/commit/79d537a9ef13b7c5870b4337a61bd08cce165300
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  Place pie charts on point


  Commit: 20f97d27dc741959980f78cd711f945b1147e3aa
      https://github.com/qgis/Quantum-GIS/commit/20f97d27dc741959980f78cd711f945b1147e3aa
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  revert bad patch (placement)


  Commit: 2c6b15210cdbe64924b64ab9c4e2275e88e17c4b
      https://github.com/qgis/Quantum-GIS/commit/2c6b15210cdbe64924b64ab9c4e2275e88e17c4b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagram.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Add histogram


  Commit: cceb1fbcb3a8ab949b3e15e8088c98c7a02d4a0b
      https://github.com/qgis/Quantum-GIS/commit/cceb1fbcb3a8ab949b3e15e8088c98c7a02d4a0b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Make bar width configurable


  Commit: 05dee08ef54f9c821c9cccfe2e397d97f415a41d
      https://github.com/qgis/Quantum-GIS/commit/05dee08ef54f9c821c9cccfe2e397d97f415a41d
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  Change vertical alignment

Use x-height for vertical offset rather than font-height/2


  Commit: d5531b6708c9e98adbcd175f029c7e477442b874
      https://github.com/qgis/Quantum-GIS/commit/d5531b6708c9e98adbcd175f029c7e477442b874
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Text diagrams: new label placement method (x-height)


  Commit: 83ea4ba0f3e818b2557047c80866a737da1ec150
      https://github.com/qgis/Quantum-GIS/commit/83ea4ba0f3e818b2557047c80866a737da1ec150
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add .project file to .gitignore (eclipse)


  Commit: fc66a9742643ef4c7df4db3c12ccdb7308bdf911
      https://github.com/qgis/Quantum-GIS/commit/fc66a9742643ef4c7df4db3c12ccdb7308bdf911
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Add minimum size option for diagrams. (Will be scaled if smaller)


  Commit: 0594725f875e41cf0fb2fc23806b9400294f6e50
      https://github.com/qgis/Quantum-GIS/commit/0594725f875e41cf0fb2fc23806b9400294f6e50
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h

  Log Message:
  -----------
  Save settings for scaling small diagrams


  Commit: 51ee16703c120b8a7450cc5b037251b9cae868b9
      https://github.com/qgis/Quantum-GIS/commit/51ee16703c120b8a7450cc5b037251b9cae868b9
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  Place pie charts on point


  Commit: 35f3a37d156fe8ac022ec3a5ec8eccfea0cf5b2b
      https://github.com/qgis/Quantum-GIS/commit/35f3a37d156fe8ac022ec3a5ec8eccfea0cf5b2b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  revert bad patch (placement)


  Commit: 04fd6b69b7e381deabd97538fa82641f10638b8a
      https://github.com/qgis/Quantum-GIS/commit/04fd6b69b7e381deabd97538fa82641f10638b8a
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagram.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Add histogram


  Commit: 55ff09ec3e72b05722ab1bc8f5df64fc79a0bab1
      https://github.com/qgis/Quantum-GIS/commit/55ff09ec3e72b05722ab1bc8f5df64fc79a0bab1
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Make bar width configurable


  Commit: 07839fab88f44cf0f5967bdec158734133ecfa2b
      https://github.com/qgis/Quantum-GIS/commit/07839fab88f44cf0f5967bdec158734133ecfa2b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagram.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h

  Log Message:
  -----------
  let diagrams decide how much space they need themselves


  Commit: d1cd6dbe7bab81cd05ea6147f1d64e919b0fb367
      https://github.com/qgis/Quantum-GIS/commit/d1cd6dbe7bab81cd05ea6147f1d64e919b0fb367
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsdiagram.cpp

  Log Message:
  -----------
  area accuracy for circular diagrams


  Commit: 8b2b60171311ba1bc647a125f9e3d22bdef2336b
      https://github.com/qgis/Quantum-GIS/commit/8b2b60171311ba1bc647a125f9e3d22bdef2336b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp

  Log Message:
  -----------
  insert default bar width


  Commit: d6f62fa33bebcd52870da99805555a33f3afec39
      https://github.com/qgis/Quantum-GIS/commit/d6f62fa33bebcd52870da99805555a33f3afec39
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Log Message:
  -----------
  draw smaller diagrams on top


  Commit: 48bc5c5ccdc4ab1b1512ba1d87ea0bb21ab8fd3e
      https://github.com/qgis/Quantum-GIS/commit/48bc5c5ccdc4ab1b1512ba1d87ea0bb21ab8fd3e
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/pal/problem.cpp
    M src/core/pal/problem.h

  Log Message:
  -----------
  draw smaller diagrams on top


  Commit: f148e8f23fb018925480fcf91964c658769cb70e
      https://github.com/qgis/Quantum-GIS/commit/f148e8f23fb018925480fcf91964c658769cb70e
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/CMakeLists.txt
    A src/core/diagram/qgsdiagram.cpp
    A src/core/diagram/qgsdiagram.h
    A src/core/diagram/qgshistogramdiagram.cpp
    A src/core/diagram/qgshistogramdiagram.h
    A src/core/diagram/qgspiediagram.cpp
    A src/core/diagram/qgspiediagram.h
    A src/core/diagram/qgstextdiagram.cpp
    A src/core/diagram/qgstextdiagram.h

  Log Message:
  -----------
  split diagram code into seperate files


  Commit: 6c0f85dad417e1607a064999c01703f63f53a6f3
      https://github.com/qgis/Quantum-GIS/commit/6c0f85dad417e1607a064999c01703f63f53a6f3
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    R src/core/qgsdiagram.cpp
    R src/core/qgsdiagram.h

  Log Message:
  -----------
  remove unsplit diagram files


  Commit: c5b1181acdf0476b4c486e4a5098b49fe596a423
      https://github.com/qgis/Quantum-GIS/commit/c5b1181acdf0476b4c486e4a5098b49fe596a423
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp
    M src/core/diagram/qgshistogramdiagram.h
    M src/core/diagram/qgspiediagram.cpp
    M src/core/diagram/qgspiediagram.h
    M src/core/diagram/qgstextdiagram.cpp
    M src/core/diagram/qgstextdiagram.h

  Log Message:
  -----------
  Adjust file header information


  Commit: d05f7f83aef120e81921d5c396916becbf7dea63
      https://github.com/qgis/Quantum-GIS/commit/d05f7f83aef120e81921d5c396916becbf7dea63
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgspallabeling.cpp

  Log Message:
  -----------
  Adjust include path of diagram files


  Commit: 901d2e1cac18bf8d21dc7400af5384e095f3c2c5
      https://github.com/qgis/Quantum-GIS/commit/901d2e1cac18bf8d21dc7400af5384e095f3c2c5
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp

  Log Message:
  -----------
  Adjust include paths for diagrams


  Commit: 234f2f0ccccee02f3b1dc4ad982bde7c5823a291
      https://github.com/qgis/Quantum-GIS/commit/234f2f0ccccee02f3b1dc4ad982bde7c5823a291
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Diagram size correction (important for placement with PAL)


  Commit: 313163d8a85e7497afc7b7eff3e20818dec04df7
      https://github.com/qgis/Quantum-GIS/commit/313163d8a85e7497afc7b7eff3e20818dec04df7
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Diagram width was not correctly calculated


  Commit: edd14f71a9fa8520a7f93fd2912ef1d7256dbf63
      https://github.com/qgis/Quantum-GIS/commit/edd14f71a9fa8520a7f93fd2912ef1d7256dbf63
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/core/diagram/qgspiediagram.cpp

  Log Message:
  -----------
  Let scale value for pie diagrams denote diameter rather than area


  Commit: 2c9a3a7d36b71cf36c1eeec9b0ed98ab54b4ef6c
      https://github.com/qgis/Quantum-GIS/commit/2c9a3a7d36b71cf36c1eeec9b0ed98ab54b4ef6c
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Diagram option page reloaded, pt. 1


  Commit: 468650bad6b595b6ea6cdfbb21efc06cc3b3b1d9
      https://github.com/qgis/Quantum-GIS/commit/468650bad6b595b6ea6cdfbb21efc06cc3b3b1d9
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/diagram/qgstextdiagram.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Add option to scale by area/scale by diameter for PieChart and Text Diagram


  Commit: e0e5f1a9531f8b17da1e3371e2e16b7f5e6a8608
      https://github.com/qgis/Quantum-GIS/commit/e0e5f1a9531f8b17da1e3371e2e16b7f5e6a8608
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/qgsdiagramrendererv2.cpp

  Log Message:
  -----------
  Save scale by area/diameter setting


  Commit: f378a2ae519a21ce756f4599526bcd0a80e73d8f
      https://github.com/qgis/Quantum-GIS/commit/f378a2ae519a21ce756f4599526bcd0a80e73d8f
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M src/gui/symbology-ng/qgsrendererv2widget.cpp

  Log Message:
  -----------
  Add "scale area / scale diameter" radio buttons to scale menu


  Commit: ca9d49bfc6c1af7d7f8269cf015746c819d8fe72
      https://github.com/qgis/Quantum-GIS/commit/ca9d49bfc6c1af7d7f8269cf015746c819d8fe72
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
    M src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
    M src/core/symbology-ng/qgsmarkersymbollayerv2.h
    M src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
    M src/core/symbology-ng/qgssinglesymbolrendererv2.h
    M src/core/symbology-ng/qgssymbollayerv2.h
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.h
    M src/core/symbology-ng/qgssymbolv2.cpp
    M src/core/symbology-ng/qgssymbolv2.h
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrendererv2widget.h
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h

  Log Message:
  -----------
  Added possibility to scale a markers area. Up to now, only the diameter could be scaled.


  Commit: bd4a85ac16806f6714a2f7979fe2eb2474988ce2
      https://github.com/qgis/Quantum-GIS/commit/bd4a85ac16806f6714a2f7979fe2eb2474988ce2
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M src/app/qgsvectorlayerproperties.cpp

  Log Message:
  -----------
  Fix startup state of diagram option widgets


  Commit: 69767722889f670947244319a501e1e89d96edf7
      https://github.com/qgis/Quantum-GIS/commit/69767722889f670947244319a501e1e89d96edf7
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/app/CMakeLists.txt
    A src/app/qgsdiagramproperties.cpp
    A src/app/qgsdiagramproperties.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    A src/ui/qgsdiagrampropertiesbase.ui
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  Major reorganisation and refactoring of diagram widget


  Commit: 4f9e623b91e8ddcb77d8297b0b9d3216280cee63
      https://github.com/qgis/Quantum-GIS/commit/4f9e623b91e8ddcb77d8297b0b9d3216280cee63
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Fix histogram orientation bug (left <-> right exchanged)


  Commit: 1009c74f6270c0d198c51e6898a61875f5760a35
      https://github.com/qgis/Quantum-GIS/commit/1009c74f6270c0d198c51e6898a61875f5760a35
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  - Line options only shown when available
- Default value for text diagram => label placment option
-


  Commit: 3ab9580cfd16a9b994fabd9102159fa5b1acd459
      https://github.com/qgis/Quantum-GIS/commit/3ab9580cfd16a9b994fabd9102159fa5b1acd459
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  - Fix default textdiagram => label placment option
- Add warning if unknown diagram type is specified


  Commit: 194b0f2479ea98c7c92978a34fc6822bb8f7dac3
      https://github.com/qgis/Quantum-GIS/commit/194b0f2479ea98c7c92978a34fc6822bb8f7dac3
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsdiagramproperties.h
    M src/core/diagram/qgspiediagram.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Transparency test...


  Commit: c325424dd675eb4ddf7c7f40011860a913d9e438
      https://github.com/qgis/Quantum-GIS/commit/c325424dd675eb4ddf7c7f40011860a913d9e438
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/gui/symbology-ng/qgsrendererv2widget.h

  Log Message:
  -----------
  Fix wrong include


  Commit: 7b99a722e7c68f53ab3d450501fc4e6c003c8fac
      https://github.com/qgis/Quantum-GIS/commit/7b99a722e7c68f53ab3d450501fc4e6c003c8fac
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M src/analysis/network/qgslinevectorlayerdirector.cpp

  Log Message:
  -----------
  Use Q_UNUSED instead of self-assignment


  Commit: f22d23e901e937d79fab4397d1ffb68071f0bfd3
      https://github.com/qgis/Quantum-GIS/commit/f22d23e901e937d79fab4397d1ffb68071f0bfd3
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsdiagramproperties.h

  Log Message:
  -----------
  Remove unused slot


  Commit: ef3a086a95cdbbd1232d23da7a29d65319c53340
      https://github.com/qgis/Quantum-GIS/commit/ef3a086a95cdbbd1232d23da7a29d65319c53340
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Fixed scale factor for histogram diagrams.


  Commit: a9008d0c8339ea1a6a043279d7c57431859077d4
      https://github.com/qgis/Quantum-GIS/commit/a9008d0c8339ea1a6a043279d7c57431859077d4
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  add transparency for diagrams


  Commit: e323df97ee709d0bbb8bcb98362920eb7b885b72
      https://github.com/qgis/Quantum-GIS/commit/e323df97ee709d0bbb8bcb98362920eb7b885b72
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h

  Log Message:
  -----------
  Fixed scale method (area/diameter) for graduated and categorized markers


  Commit: e0f38d03ffc4a5872fc3beb9a62bdf6b6efb0e3c
      https://github.com/qgis/Quantum-GIS/commit/e0f38d03ffc4a5872fc3beb9a62bdf6b6efb0e3c
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

  Log Message:
  -----------
  Save scale method for graduated and categorized symbols


  Commit: 97a542750cb5c0afac04d3c7d824db4ceb233bfa
      https://github.com/qgis/Quantum-GIS/commit/97a542750cb5c0afac04d3c7d824db4ceb233bfa
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/core/diagram/qgspiediagram.cpp

  Log Message:
  -----------
  PieDiagram: draw empty circle if all attribute values == 0


  Commit: 2a48a61dcc0c8767b28380536c3390d7d93e249a
      https://github.com/qgis/Quantum-GIS/commit/2a48a61dcc0c8767b28380536c3390d7d93e249a
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsdiagramproperties.h
    M src/ui/qgsdiagrampropertiesbase.ui
    M src/ui/qgsengineconfigdialog.ui

  Log Message:
  -----------
  Add direct link to PAL engine settings to diagram tab


  Commit: 91e6563436902b7c160f0e05f14ba567fb32ce46
      https://github.com/qgis/Quantum-GIS/commit/91e6563436902b7c160f0e05f14ba567fb32ce46
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Renamed "Engine settings" to "PAL engine settings"


  Commit: 82c0a0ad13dd67f5e7d68d94694c7d29fb985322
      https://github.com/qgis/Quantum-GIS/commit/82c0a0ad13dd67f5e7d68d94694c7d29fb985322
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Fix attribute list (transparent colors, disappearing items)


  Commit: 97b6075aa3eba6fe28ee589918e3ba1e08760a57
      https://github.com/qgis/Quantum-GIS/commit/97b6075aa3eba6fe28ee589918e3ba1e08760a57
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  add icons to diagram dropdown


  Commit: 429eb403b18f3a5d89224716424e074d2ff103eb
      https://github.com/qgis/Quantum-GIS/commit/429eb403b18f3a5d89224716424e074d2ff103eb
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/core/diagram/qgshistogramdiagram.h
    M src/core/diagram/qgspiediagram.h
    M src/core/diagram/qgstextdiagram.h

  Log Message:
  -----------
  Identify selected items based on id's rather than translated text


  Commit: 033bd79762a75d0963af64c26f76902c2d9a9de7
      https://github.com/qgis/Quantum-GIS/commit/033bd79762a75d0963af64c26f76902c2d9a9de7
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/core/qgsdiagramrendererv2.h

  Log Message:
  -----------
  Identify selected items based on id's rather than translated text


  Commit: d845a0a458e9ba61dccbe9468b28145c0e6c46d2
      https://github.com/qgis/Quantum-GIS/commit/d845a0a458e9ba61dccbe9468b28145c0e6c46d2
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M images/images.qrc
    A images/themes/default/histogram.png
    A images/themes/default/histogram.svg
    A images/themes/default/pie-chart.png
    A images/themes/default/pie-chart.svg
    A images/themes/default/text.png
    A images/themes/default/text.svg
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Add icons to the diagram dropdown


  Commit: 13ed4e05413177544e67516aeb7de4fa921ab624
      https://github.com/qgis/Quantum-GIS/commit/13ed4e05413177544e67516aeb7de4fa921ab624
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M images/images.qrc
    A images/themes/default/histogram.png
    A images/themes/default/histogram.svg
    A images/themes/default/pie-chart.png
    A images/themes/default/pie-chart.svg
    A images/themes/default/text.png
    A images/themes/default/text.svg
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Merge diagram icons

Conflicts:
	src/app/qgsdiagramproperties.cpp


  Commit: 55b5dcbcc877af09435dc648826b9ff2384f07ea
      https://github.com/qgis/Quantum-GIS/commit/55b5dcbcc877af09435dc648826b9ff2384f07ea
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Diagram type not properly selected in properties dialog


  Commit: dae596a2516fc800591a703c74d548d35c82f643
      https://github.com/qgis/Quantum-GIS/commit/dae596a2516fc800591a703c74d548d35c82f643
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsdiagramproperties.h

  Log Message:
  -----------
  Change diagram properties dialog dropdown to use id instead of translated text


  Commit: bf23608080001c4d7090ac125156352cf8f45986
      https://github.com/qgis/Quantum-GIS/commit/bf23608080001c4d7090ac125156352cf8f45986
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.cpp
    M src/core/diagram/qgsdiagram.h
    M src/core/diagram/qgshistogramdiagram.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/diagram/qgspiediagram.h
    M src/core/diagram/qgstextdiagram.cpp

  Log Message:
  -----------
  Fix diagram printing
When units are set to mm convert first to units that PAL expects for arrangement.


  Commit: 244e7d1875d57d4ca30f7fc3d4b59bb0681c7a02
      https://github.com/qgis/Quantum-GIS/commit/244e7d1875d57d4ca30f7fc3d4b59bb0681c7a02
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Fix compile problem: define variable


  Commit: a531626d3e1a0efaa9110f950c74513d5180382b
      https://github.com/qgis/Quantum-GIS/commit/a531626d3e1a0efaa9110f950c74513d5180382b
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/core/qgsdiagramrendererv2.cpp

  Log Message:
  -----------
  Do not apply diagram transparency to pen
but instead save custom pen alpha value


  Commit: 59e3ad2fbc4dee00fa719629a640de1aa2eb9a23
      https://github.com/qgis/Quantum-GIS/commit/59e3ad2fbc4dee00fa719629a640de1aa2eb9a23
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/core/diagram/qgspiediagram.cpp

  Log Message:
  -----------
  piechart: draw circle if only one value > 0


  Commit: b97f2fc060913a46dbb9812ec6d074eab4a9e90d
      https://github.com/qgis/Quantum-GIS/commit/b97f2fc060913a46dbb9812ec6d074eab4a9e90d
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  do not override pen alpha when a transparency is set


  Commit: c8a3321287049eed27ef618a5975ef59303b5e2a
      https://github.com/qgis/Quantum-GIS/commit/c8a3321287049eed27ef618a5975ef59303b5e2a
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsdiagramproperties.h

  Log Message:
  -----------
  Fix text diagram
Assign userData properly to text diagram combobox item.
Use id's instead of translated text for selected item identification in combobox.


  Commit: 0eab9697c09d950c076206ac16ae9023296155d0
      https://github.com/qgis/Quantum-GIS/commit/0eab9697c09d950c076206ac16ae9023296155d0
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/qgsdiagramrendererv2.cpp

  Log Message:
  -----------
  Merge branch 'diagram-additional-fix'


  Commit: 260a182f62bad01dc0a648522aa25572bfe5f95e
      https://github.com/qgis/Quantum-GIS/commit/260a182f62bad01dc0a648522aa25572bfe5f95e
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/matthias-kuhn/Quantum-GIS

Conflicts:
	src/app/qgsdiagramproperties.cpp


  Commit: 4e914c6657961c9f88b5494db7ebd987f8de979e
      https://github.com/qgis/Quantum-GIS/commit/4e914c6657961c9f88b5494db7ebd987f8de979e
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Default width for histogram


  Commit: 6f97d1eb591766248cb95d1a49313b715e67781e
      https://github.com/qgis/Quantum-GIS/commit/6f97d1eb591766248cb95d1a49313b715e67781e
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.cpp
    M src/core/diagram/qgsdiagram.h
    M src/core/diagram/qgshistogramdiagram.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/diagram/qgspiediagram.h
    M src/core/diagram/qgstextdiagram.cpp

  Log Message:
  -----------
  Merge branch 'print-diagram'


  Commit: 83b4caae0cae3827218d59b0923c9888319ed469
      https://github.com/qgis/Quantum-GIS/commit/83b4caae0cae3827218d59b0923c9888319ed469
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Draw histogram diagrams in assigned space (no half-bar-width offset)


  Commit: 573d57ff69304ca1a4e99b82b2784ade6f4368e4
      https://github.com/qgis/Quantum-GIS/commit/573d57ff69304ca1a4e99b82b2784ade6f4368e4
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.cpp
    M src/core/diagram/qgsdiagram.h
    M src/core/diagram/qgshistogramdiagram.cpp
    M src/core/diagram/qgspiediagram.cpp
    M src/core/diagram/qgstextdiagram.cpp

  Log Message:
  -----------
  Revert print scale fix.
Use Marco Hugentobler's print scale fix. It's cleaner


  Commit: 8f891c5e742205e095b8ae8daddc6213eef0e5e2
      https://github.com/qgis/Quantum-GIS/commit/8f891c5e742205e095b8ae8daddc6213eef0e5e2
  Author: Marco Hugentobler <marco at hugis1.(none)>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M src/core/qgsdiagramrendererv2.cpp

  Log Message:
  -----------
  Fix diagram scaling for print


  Commit: af29da6f70d4ab7b556e822c482a23567c1ab295
      https://github.com/qgis/Quantum-GIS/commit/af29da6f70d4ab7b556e822c482a23567c1ab295
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Use QToolBox instead of QTabWidget in diagram properties


  Commit: 9271ef3b2f28c2a0d6dfd02f93e86409e9a5edd6
      https://github.com/qgis/Quantum-GIS/commit/9271ef3b2f28c2a0d6dfd02f93e86409e9a5edd6
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/app/qgsdiagramproperties.cpp

  Log Message:
  -----------
  Add warning if no reference value for diagram scaling has been selected.


  Commit: 52075ebd8f1aed3966a5a380fb518d7bdbf44ac8
      https://github.com/qgis/Quantum-GIS/commit/52075ebd8f1aed3966a5a380fb518d7bdbf44ac8
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Selection mode for diagram attributes adjusted


  Commit: b84baeb1504d3ffe4ead4cceecd7c81a413c0558
      https://github.com/qgis/Quantum-GIS/commit/b84baeb1504d3ffe4ead4cceecd7c81a413c0558
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.h

  Log Message:
  -----------
  Comments for documentation


  Commit: dc790ff1721a843ff9dc6c956d494f7bdd91f115
      https://github.com/qgis/Quantum-GIS/commit/dc790ff1721a843ff9dc6c956d494f7bdd91f115
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Enable diagram size options based on sizeType selection


  Commit: 25f0f1fe2815ef222ef97283c3d183e0eebfad1a
      https://github.com/qgis/Quantum-GIS/commit/25f0f1fe2815ef222ef97283c3d183e0eebfad1a
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/ui/qgsdiagrampropertiesbase.ui

  Log Message:
  -----------
  Allow smaller numbers in size spin box


  Commit: 9c4d67c241b284aa5a67eda18547f8a465e22bc1
      https://github.com/qgis/Quantum-GIS/commit/9c4d67c241b284aa5a67eda18547f8a465e22bc1
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/core/diagram/qgshistogramdiagram.cpp

  Log Message:
  -----------
  Calculate size for PAL correctly also if same attribute is used multiple times.


  Commit: aa31c8c6ba11325d3a47abb0f477d3bcf1131e8f
      https://github.com/qgis/Quantum-GIS/commit/aa31c8c6ba11325d3a47abb0f477d3bcf1131e8f
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.cpp
    M src/core/diagram/qgsdiagram.h

  Log Message:
  -----------
  sizePainterUnits: Calculate based on specified size instead of size in QgsDiagramSettings


  Commit: 0c7f729612ad400972fe6fa76943965c2397dd5d
      https://github.com/qgis/Quantum-GIS/commit/0c7f729612ad400972fe6fa76943965c2397dd5d
  Author: Marco Hugentobler <marco at hugis1.(none)>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M .gitignore
    M images/images.qrc
    A images/themes/default/histogram.png
    A images/themes/default/histogram.svg
    A images/themes/default/pie-chart.png
    A images/themes/default/pie-chart.svg
    A images/themes/default/text.png
    A images/themes/default/text.svg
    M src/analysis/network/qgslinevectorlayerdirector.cpp
    M src/app/CMakeLists.txt
    A src/app/qgsdiagramproperties.cpp
    A src/app/qgsdiagramproperties.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/CMakeLists.txt
    A src/core/diagram/qgsdiagram.cpp
    A src/core/diagram/qgsdiagram.h
    A src/core/diagram/qgshistogramdiagram.cpp
    A src/core/diagram/qgshistogramdiagram.h
    A src/core/diagram/qgspiediagram.cpp
    A src/core/diagram/qgspiediagram.h
    A src/core/diagram/qgstextdiagram.cpp
    A src/core/diagram/qgstextdiagram.h
    M src/core/pal/problem.cpp
    M src/core/pal/problem.h
    R src/core/qgsdiagram.cpp
    R src/core/qgsdiagram.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/core/qgspallabeling.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
    M src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
    M src/core/symbology-ng/qgsmarkersymbollayerv2.h
    M src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
    M src/core/symbology-ng/qgssinglesymbolrendererv2.h
    M src/core/symbology-ng/qgssymbollayerv2.h
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.h
    M src/core/symbology-ng/qgssymbolv2.cpp
    M src/core/symbology-ng/qgssymbolv2.h
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrendererv2widget.h
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
    A src/ui/qgsdiagrampropertiesbase.ui
    M src/ui/qgsengineconfigdialog.ui
    M src/ui/qgsvectorlayerpropertiesbase.ui

  Log Message:
  -----------
  [Feature]: Merge diagram improvements provided by Matthias Kuhn


  Commit: 1497cbbabc7be5c3e980cc72699c320e045005bd
      https://github.com/qgis/Quantum-GIS/commit/1497cbbabc7be5c3e980cc72699c320e045005bd
  Author: Marco Hugentobler <marco at hugis1.(none)>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M src/core/diagram/qgsdiagram.cpp

  Log Message:
  -----------
  Fix printing of pie and text diagrams


  Commit: 9d5b16e8423a9eb4230595d55a17f8113176515a
      https://github.com/qgis/Quantum-GIS/commit/9d5b16e8423a9eb4230595d55a17f8113176515a
  Author: Marco Hugentobler <marco at hugis1.(none)>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M doc/CONTRIBUTORS

  Log Message:
  -----------
  Added Matthias to contributor list


  Commit: 66626012a6bc67328028ddc9d4563214b5e8b79f
      https://github.com/qgis/Quantum-GIS/commit/66626012a6bc67328028ddc9d4563214b5e8b79f
  Author: Marco Hugentobler <marco at hugis1.(none)>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M src/plugins/plugin_template/README

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


Compare: https://github.com/qgis/Quantum-GIS/compare/1e1cdb83b3f0...66626012a6bc


More information about the QGIS-commit mailing list