[QGIS Commit] [qgis/QGIS] 6bb9df: [FEATURE][composer] Allow for more than one atlas ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: 6bb9dfec00a2906996c3f7af2718b3c4388e128f
      https://github.com/qgis/QGIS/commit/6bb9dfec00a2906996c3f7af2718b3c4388e128f
  Author: Nyall Dawson <nyall.dawson at gmail.com>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M python/core/composer/qgsatlascomposition.sip
    M python/core/composer/qgscomposermap.sip
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgsatlascomposition.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/ui/qgsatlascompositionwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M tests/src/core/qgscompositionchecker.cpp
    M tests/src/core/qgscompositionchecker.h
    M tests/src/core/testqgsatlascomposition.cpp
    M tests/src/python/qgscompositionchecker.py
    M tests/src/python/test_qgsatlascomposition.py
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/osgeo4w_nightly.anomoly.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api2/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/osgeo4w_nightly.anomoly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/ubuntu_12.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api2/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
    A tests/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png

  Log Message:
  -----------
  [FEATURE][composer] Allow for more than one atlas controlled map in compositions (or none), by moving some atlas properties to map items (fix #9248) (fix #6484)


  Commit: 27f5b8d0490ae9f0ce622bf920e83271054d7175
      https://github.com/qgis/QGIS/commit/27f5b8d0490ae9f0ce622bf920e83271054d7175
  Author: Nyall Dawson <nyall.dawson at gmail.com>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M python/core/composer/qgsatlascomposition.sip
    M python/core/composer/qgscomposermap.sip
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgsatlascomposition.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/ui/qgsatlascompositionwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M tests/src/core/qgscompositionchecker.cpp
    M tests/src/core/qgscompositionchecker.h
    M tests/src/core/testqgsatlascomposition.cpp
    M tests/src/python/qgscompositionchecker.py
    M tests/src/python/test_qgsatlascomposition.py
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/osgeo4w_nightly.anomoly.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api1/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png
    A tests/testdata/control_images/expected_atlas_autoscale_old_api2/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/osgeo4w_nightly.anomoly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/ubuntu_12.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api1/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png
    A tests/testdata/control_images/expected_atlas_fixedscale_old_api2/ubuntu_13.04.anomaly.png
    A tests/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
    A tests/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png

  Log Message:
  -----------
  Merge pull request #1072 from nyalldawson/atlas_multimap3

[FEATURE][composer] Allow for more than one atlas controlled map in comp...


Compare: https://github.com/qgis/QGIS/compare/2cdc89654b32...27f5b8d0490a