[QGIS Commit] [qgis/Quantum-GIS] cba87d: Add CORE_EXPORT to QgsAtlasRendering
GitHub
noreply at github.com
Sat Oct 6 02:46:17 PDT 2012
Branch: refs/heads/master
Home: https://github.com/qgis/Quantum-GIS
Commit: cba87de1af5a3561332775a6d578441bf5acd81a
https://github.com/qgis/Quantum-GIS/commit/cba87de1af5a3561332775a6d578441bf5acd81a
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M src/core/composer/qgscomposition.h
Log Message:
-----------
Add CORE_EXPORT to QgsAtlasRendering
Commit: aab22b2e7c0c8088f0d9477a109f4d6f56ec3f7f
https://github.com/qgis/Quantum-GIS/commit/aab22b2e7c0c8088f0d9477a109f4d6f56ec3f7f
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M tests/src/core/testqgscomposerlabel.cpp
Log Message:
-----------
Fix QgsComposerLabel unit test
Commit: 2aa566d316f5c2d3bc5dde030e0ade2b9c588cec
https://github.com/qgis/Quantum-GIS/commit/2aa566d316f5c2d3bc5dde030e0ade2b9c588cec
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M python/core/composer/qgscomposerlabel.sip
M python/core/composer/qgscomposermap.sip
M python/core/composer/qgscomposition.sip
Log Message:
-----------
Add/Fix SIP for QgsComposition, QgsComposerMap and QgsAtlasRendering
Commit: ce6ae6ecbc21a53a078a8b0d7f271562c41b1b71
https://github.com/qgis/Quantum-GIS/commit/ce6ae6ecbc21a53a078a8b0d7f271562c41b1b71
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M tests/src/python/CMakeLists.txt
A tests/src/python/test_qgscomposerlabel.py
A tests/src/python/test_qgscomposermapatlas.py
Log Message:
-----------
Add Python unit tests for atlas rendering
Commit: 371efa07bb8921d0feb7abdf0e180a06867afe1b
https://github.com/qgis/Quantum-GIS/commit/371efa07bb8921d0feb7abdf0e180a06867afe1b
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M src/app/composer/qgscomposermapwidget.cpp
M src/app/composer/qgscomposermapwidget.h
Log Message:
-----------
Add synchronization between canvas layers addition / removal and atlas GUI
Commit: 45593bf4b52f56e277b418d1c7859ea97e2b5dcb
https://github.com/qgis/Quantum-GIS/commit/45593bf4b52f56e277b418d1c7859ea97e2b5dcb
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M python/core/qgsexpression.sip
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposerlabelwidget.cpp
M src/app/composer/qgscomposerlabelwidget.h
M src/app/composer/qgscomposermapwidget.cpp
M src/app/composer/qgscomposermapwidget.h
M src/core/composer/qgscomposeritem.h
M src/core/composer/qgscomposerlabel.cpp
M src/core/composer/qgscomposerlabel.h
M src/core/composer/qgscomposermap.cpp
M src/core/composer/qgscomposermap.h
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/core/qgsexpression.cpp
M src/core/qgsexpression.h
M src/core/qgsexpressionparser.yy
M src/gui/qgscomposerview.cpp
M src/gui/qgsexpressionbuilderwidget.cpp
M src/ui/qgscomposerlabelwidgetbase.ui
M src/ui/qgscomposerlegendwidgetbase.ui
M src/ui/qgscomposermapwidgetbase.ui
M tests/src/core/CMakeLists.txt
A tests/src/core/testqgscomposerlabel.cpp
A tests/src/core/testqgscomposermapatlas.cpp
M tests/src/core/testqgsexpression.cpp
A tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
A tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
A tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
A tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
A tests/testdata/control_images/expected_composermapatlas/hiding_0.png
A tests/testdata/control_images/expected_composermapatlas/hiding_1.png
A tests/testdata/france_parts.dbf
A tests/testdata/france_parts.prj
A tests/testdata/france_parts.qpj
A tests/testdata/france_parts.shp
A tests/testdata/france_parts.shx
Log Message:
-----------
Revert "Revert "Merge pull request #245 from Oslandia/atlas_integration""
This reverts commit 8a1953b9e710ea25dac502b32eab9e0e8d652b10.
Commit: b5f736ad218255781635edf6e462d2cecb050799
https://github.com/qgis/Quantum-GIS/commit/b5f736ad218255781635edf6e462d2cecb050799
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M python/core/composer/qgscomposition.sip
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
Log Message:
-----------
Revert "Resolved merge conflicts when reverting 686f632"
This reverts commit a654e274a352ef29354de0bcb13e96444868c806.
Commit: e4364f36157af14c7a3159c9657a11b8b098aede
https://github.com/qgis/Quantum-GIS/commit/e4364f36157af14c7a3159c9657a11b8b098aede
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M python/core/composer/qgscomposerlabel.sip
M python/core/composer/qgscomposermap.sip
M src/app/composer/qgscomposermapwidget.cpp
M src/app/composer/qgscomposermapwidget.h
M tests/src/core/testqgscomposerlabel.cpp
M tests/src/python/CMakeLists.txt
A tests/src/python/test_qgscomposerlabel.py
A tests/src/python/test_qgscomposermapatlas.py
Log Message:
-----------
Merge branch 'atlas' into atlas2
Conflicts:
python/core/composer/qgscomposition.sip
tests/src/python/CMakeLists.txt
Commit: ea44e0f362a6802950298fb3c6f9eda4572057db
https://github.com/qgis/Quantum-GIS/commit/ea44e0f362a6802950298fb3c6f9eda4572057db
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
M tests/src/core/testqgscomposermapatlas.cpp
M tests/src/python/test_qgscomposermapatlas.py
M tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
M tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
M tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
M tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
M tests/testdata/control_images/expected_composermapatlas/hiding_0.png
M tests/testdata/control_images/expected_composermapatlas/hiding_1.png
Log Message:
-----------
Update atlas unit tests (fix the overview map frame style)
Commit: a588e1bc3c0dfa847043381dd1ef96e13f2df0b8
https://github.com/qgis/Quantum-GIS/commit/a588e1bc3c0dfa847043381dd1ef96e13f2df0b8
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-04 (Thu, 04 Oct 2012)
Changed paths:
A resources/function_help/$feature-en_US
A resources/function_help/$numfeatures-en_US
A resources/function_help/$numpages-en_US
A resources/function_help/$page-en_US
Log Message:
-----------
Add function helps for $page, $numpages, $feature and $numfeatures
Commit: e4371d826fa1051b06c0c08316592f3385736127
https://github.com/qgis/Quantum-GIS/commit/e4371d826fa1051b06c0c08316592f3385736127
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M src/app/CMakeLists.txt
A src/app/composer/qgsatlascompositionwidget.cpp
A src/app/composer/qgsatlascompositionwidget.h
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/app/composer/qgscomposermapwidget.cpp
M src/app/composer/qgscomposermapwidget.h
M src/core/CMakeLists.txt
A src/core/composer/qgsatlascomposition.cpp
A 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/core/composer/qgscomposition.h
A src/ui/qgsatlascompositionwidgetbase.ui
M src/ui/qgscomposermapwidgetbase.ui
M tests/src/core/CMakeLists.txt
A tests/src/core/testqgsatlascomposition.cpp
R tests/src/core/testqgscomposermapatlas.cpp
Log Message:
-----------
Update atlas.
* Store every parameters and expose operations in a new QgsAtlasComposition class
* Restructure the GUI part. The atlas configuration panel is now independant
Commit: d904da4ce1898c3e86d02dc0143c3e550c46b56e
https://github.com/qgis/Quantum-GIS/commit/d904da4ce1898c3e86d02dc0143c3e550c46b56e
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
A python/core/composer/qgsatlascomposition.sip
M python/core/composer/qgscomposermap.sip
M python/core/composer/qgscomposition.sip
M python/core/core.sip
M tests/src/python/CMakeLists.txt
A tests/src/python/test_qgsatlascomposition.py
R tests/src/python/test_qgscomposermapatlas.py
Log Message:
-----------
Update of QgsAtlasComposition SIP (with Python unit tests as well)
Commit: e3536e4d838770c5ff05b8d5bc78734ee9e9f7c3
https://github.com/qgis/Quantum-GIS/commit/e3536e4d838770c5ff05b8d5bc78734ee9e9f7c3
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M src/app/composer/qgsatlascompositionwidget.cpp
M src/core/composer/qgsatlascomposition.cpp
Log Message:
-----------
Fix atlas segfaults
Commit: 77761b089458710f2157bd7b01a33b50e6c8bc7a
https://github.com/qgis/Quantum-GIS/commit/77761b089458710f2157bd7b01a33b50e6c8bc7a
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
A .gitattributes
R .project
R .pydevproject
M CMakeLists.txt
A cmake/QsciAPI.cmake
M debian/changelog
A debian/compat.quantal
A debian/control.quantal
A debian/python-qgis.install.quantal
M doc/AUTHORS
M doc/TRANSLATORS
M doc/build.sh
M i18n/qgis_af.ts
M i18n/qgis_ar.ts
M i18n/qgis_bg.ts
M i18n/qgis_ca_ES.ts
M i18n/qgis_cs_CZ.ts
M i18n/qgis_da_DK.ts
M i18n/qgis_de.ts
M i18n/qgis_el_GR.ts
M i18n/qgis_es.ts
M i18n/qgis_et_EE.ts
M i18n/qgis_fa.ts
M i18n/qgis_fi.ts
M i18n/qgis_fr.ts
M i18n/qgis_gl_ES.ts
M i18n/qgis_he.ts
M i18n/qgis_hr_HR.ts
M i18n/qgis_hu.ts
M i18n/qgis_id.ts
M i18n/qgis_is.ts
M i18n/qgis_it.ts
M i18n/qgis_ja.ts
M i18n/qgis_ka_GE.ts
M i18n/qgis_ko_KR.ts
M i18n/qgis_lo.ts
M i18n/qgis_lt.ts
M i18n/qgis_lv.ts
M i18n/qgis_mn.ts
M i18n/qgis_nl.ts
M i18n/qgis_no.ts
M i18n/qgis_pl_PL.ts
M i18n/qgis_pt_BR.ts
M i18n/qgis_pt_PT.ts
M i18n/qgis_ro.ts
M i18n/qgis_ru.ts
M i18n/qgis_sk.ts
M i18n/qgis_sl_SI.ts
M i18n/qgis_sq_AL.ts
M i18n/qgis_sr_CS-Latn.ts
M i18n/qgis_sv.ts
M i18n/qgis_ta.ts
M i18n/qgis_th.ts
M i18n/qgis_tr.ts
M i18n/qgis_uk.ts
M i18n/qgis_vi.ts
M i18n/qgis_xh.ts
M i18n/qgis_zh_CN.ts
M i18n/qgis_zh_TW.ts
M images/icons/mac/browser/CMakeLists.txt
M mac/extras/1-release-extra.sh
M mac/extras/2-release-extra-qt.sh
M mac/extras/3-dmg.sh
M mac/extras/install-extra.sh
M mac/extras/release-check.sh
M mac/extras/release-extra-grass.sh
M mac/extras/release-extra-py.sh
M mac/extras/release-extra-qt.sh
M mac/extras/release-extra.sh
M mac/extras/release-strip.sh
M mac/xcode/bundle-template.sh
M mac/xcode/src/x_python_dummy.cpp
M ms-windows/quickpackage.sh
M python/CMakeLists.txt
M python/__init__.py
R python/api/CMakeLists.txt
R python/api/PyQGIS_1.8.api
R python/api/osgeo_gdal-ogr_1.9.1-1.api
R python/api/pyqgis_master.pap
M python/console_sci.py
M python/core/raster/qgsrasterlayer.sip
M python/core/symbology-ng/qgssymbollayerv2.sip
M python/gui/qgisinterface.sip
M python/help.py
R python/helpConsole/js/jquery-1.8.2.min.js
R python/helpConsole/js/jquery.i18n.min.js
M python/plugins/fTools/tools/doMergeShapes.py
M python/plugins/fTools/tools/ftools_utils.py
M python/plugins/osm/OsmAddRelationDlg.py
M python/plugins/osm/OsmDatabaseManager.py
M python/plugins/osm/OsmDownloadDlg.py
M python/plugins/osm/OsmFeatureDW.py
M python/plugins/osm/OsmImportDlg.py
M python/plugins/osm/OsmLoadDlg.py
M python/plugins/osm/OsmSaveDlg.py
M python/plugins/osm/OsmTags.py
M python/plugins/osm/OsmUndoRedoDW.py
M python/plugins/osm/OsmUploadDlg.py
M python/plugins/osm/map_tools/OsmCreateLineMT.py
M python/plugins/osm/map_tools/OsmCreatePointMT.py
M python/plugins/osm/map_tools/OsmCreatePolygonMT.py
M python/plugins/osm/map_tools/OsmIdentifyMT.py
M python/plugins/osm/map_tools/OsmMoveMT.py
M python/plugins/sextante/CMakeLists.txt
M python/plugins/sextante/SextantePlugin.py
M python/plugins/sextante/__init__.py
M python/plugins/sextante/about/AboutDialog.py
M python/plugins/sextante/about/CMakeLists.txt
R python/plugins/sextante/about/about.htm
A python/plugins/sextante/about/aboutdialogbase.ui
R python/plugins/sextante/about/sextante_logo.png
M python/plugins/sextante/algs/AddTableField.py
M python/plugins/sextante/algs/AutoincrementalField.py
M python/plugins/sextante/algs/EquivalentNumField.py
M python/plugins/sextante/algs/Explode.py
M python/plugins/sextante/algs/FieldPyculator.py
M python/plugins/sextante/algs/FieldsCalculator.py
M python/plugins/sextante/algs/SaveSelectedFeatures.py
M python/plugins/sextante/algs/SextanteAlgorithmProvider.py
M python/plugins/sextante/algs/SextanteVectorWriter.py
M python/plugins/sextante/core/AlgorithmProvider.py
M python/plugins/sextante/core/SextanteVectorWriter.py
R python/plugins/sextante/ftools/BasicStatistics.py
A python/plugins/sextante/ftools/BasicStatisticsNumbers.py
A python/plugins/sextante/ftools/BasicStatisticsStrings.py
M python/plugins/sextante/ftools/Buffer.py
M python/plugins/sextante/ftools/Centroids.py
M python/plugins/sextante/ftools/Clip.py
M python/plugins/sextante/ftools/ConvexHull.py
M python/plugins/sextante/ftools/Delaunay.py
A python/plugins/sextante/ftools/DensifyGeometries.py
M python/plugins/sextante/ftools/Difference.py
M python/plugins/sextante/ftools/Dissolve.py
M python/plugins/sextante/ftools/ExportGeometryInfo.py
M python/plugins/sextante/ftools/ExtentFromLayer.py
M python/plugins/sextante/ftools/ExtractNodes.py
M python/plugins/sextante/ftools/FToolsAlgorithmProvider.py
A python/plugins/sextante/ftools/FToolsUtils.py
M python/plugins/sextante/ftools/FixedDistanceBuffer.py
M python/plugins/sextante/ftools/Intersection.py
R python/plugins/sextante/ftools/LayerFromExtent.py
M python/plugins/sextante/ftools/LinesIntersection.py
M python/plugins/sextante/ftools/LinesToPolygons.py
M python/plugins/sextante/ftools/MeanCoords.py
M python/plugins/sextante/ftools/MultipartToSingleparts.py
M python/plugins/sextante/ftools/NearestNeighbourAnalysis.py
M python/plugins/sextante/ftools/PointDistance.py
M python/plugins/sextante/ftools/PointsInPolygon.py
M python/plugins/sextante/ftools/PolygonsToLines.py
M python/plugins/sextante/ftools/RandomSelection.py
M python/plugins/sextante/ftools/RandomSelectionWithinSubsets.py
M python/plugins/sextante/ftools/SelectByLocation.py
M python/plugins/sextante/ftools/SimplifyGeometries.py
M python/plugins/sextante/ftools/SinglePartsToMultiparts.py
M python/plugins/sextante/ftools/SumLines.py
M python/plugins/sextante/ftools/Union.py
M python/plugins/sextante/ftools/UniqueValues.py
M python/plugins/sextante/ftools/VariableDistanceBuffer.py
M python/plugins/sextante/ftools/VoronoiPolygons.py
M python/plugins/sextante/ftools/ftools_utils.py
M python/plugins/sextante/ftools/voronoi.py
M python/plugins/sextante/gdal/GdalAlgorithm.py
M python/plugins/sextante/gdal/GdalAlgorithmProvider.py
M python/plugins/sextante/gdal/GdalUtils.py
M python/plugins/sextante/gdal/information.py
M python/plugins/sextante/gdal/merge.py
M python/plugins/sextante/gdal/nearblack.py
M python/plugins/sextante/gdal/pct2rgb.py
M python/plugins/sextante/gdal/polygonize.py
M python/plugins/sextante/gdal/rgb2pct.py
M python/plugins/sextante/gdal/scripts/fillnodata.py
M python/plugins/sextante/gdal/scripts/proximity.py
M python/plugins/sextante/gdal/scripts/sieve.py
M python/plugins/sextante/gdal/translate.py
M python/plugins/sextante/gdal/warp.py
M python/plugins/sextante/gui/InputLayerSelectorPanel.py
M python/plugins/sextante/gui/SextanteToolbox.py
M python/plugins/sextante/gui/ToolboxAction.py
A python/plugins/sextante/images/sextante_logo.png
M python/plugins/sextante/lidar/LidarToolsAlgorithmProvider.py
M python/plugins/sextante/lidar/fusion/CanopyMaxima.py
M python/plugins/sextante/lidar/fusion/CanopyModel.py
M python/plugins/sextante/lidar/fusion/ClipData.py
M python/plugins/sextante/lidar/fusion/CloudMetrics.py
M python/plugins/sextante/lidar/fusion/Cover.py
M python/plugins/sextante/lidar/fusion/DensityMetrics.py
M python/plugins/sextante/lidar/fusion/FilterData.py
M python/plugins/sextante/lidar/fusion/FusionAlgorithm.py
M python/plugins/sextante/lidar/fusion/FusionUtils.py
M python/plugins/sextante/lidar/fusion/GridMetrics.py
M python/plugins/sextante/lidar/fusion/GridSurfaceCreate.py
M python/plugins/sextante/lidar/fusion/GroundFilter.py
M python/plugins/sextante/lidar/fusion/MergeData.py
M python/plugins/sextante/lidar/fusion/OpenViewerAction.py
M python/plugins/sextante/lidar/lastools/LasToolsAlgorithm.py
M python/plugins/sextante/lidar/lastools/LasToolsUtils.py
M python/plugins/sextante/lidar/lastools/las2dem.py
M python/plugins/sextante/lidar/lastools/las2iso.py
M python/plugins/sextante/lidar/lastools/las2shp.py
M python/plugins/sextante/lidar/lastools/lasboundary.py
M python/plugins/sextante/lidar/lastools/lasclassify.py
M python/plugins/sextante/lidar/lastools/lasclip.py
M python/plugins/sextante/lidar/lastools/lasgrid.py
M python/plugins/sextante/lidar/lastools/lasground.py
M python/plugins/sextante/lidar/lastools/lasheight.py
M python/plugins/sextante/lidar/lastools/lasinfo.py
M python/plugins/sextante/lidar/lastools/lasprecision.py
M python/plugins/sextante/lidar/lastools/lassplit.py
M python/plugins/sextante/metadata.txt
M python/plugins/sextante/modeler/CalculatorModelerAlgorithm.py
M python/plugins/sextante/modeler/CalculatorModelerParametersDialog.py
M python/plugins/sextante/modeler/CreateNewModelAction.py
M python/plugins/sextante/modeler/DeleteModelAction.py
M python/plugins/sextante/modeler/EditModelAction.py
M python/plugins/sextante/modeler/ModelerAlgorithm.py
M python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
M python/plugins/sextante/modeler/ModelerDialog.py
M python/plugins/sextante/modeler/ModelerGraphicItem.py
M python/plugins/sextante/modeler/ModelerOnlyAlgorithmProvider.py
M python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py
M python/plugins/sextante/modeler/ModelerParametersDialog.py
M python/plugins/sextante/modeler/ModelerScene.py
M python/plugins/sextante/modeler/ModelerUtils.py
M python/plugins/sextante/modeler/Providers.py
M python/plugins/sextante/modeler/WrongModelException.py
M python/plugins/sextante/pymorph/AlgNames.py
M python/plugins/sextante/pymorph/PymorphAlgorithm.py
M python/plugins/sextante/pymorph/PymorphAlgorithmProvider.py
M python/plugins/sextante/pymorph/__init__.py
M python/plugins/sextante/pymorph/compat.py
M python/plugins/sextante/pymorph/mmorph.py
M python/plugins/sextante/pymorph/notimplemented.py
M python/plugins/sextante/pymorph/pymorph_version.py
M python/plugins/sextante/pymorph/scripts/add4dilate.py
M python/plugins/sextante/pymorph/scripts/addm.py
M python/plugins/sextante/pymorph/scripts/areaclose.py
M python/plugins/sextante/pymorph/scripts/areaopen.py
M python/plugins/sextante/pymorph/scripts/asf.py
M python/plugins/sextante/pymorph/scripts/asfrec.py
M python/plugins/sextante/pymorph/scripts/binary.py
M python/plugins/sextante/pymorph/scripts/cbisector.py
M python/plugins/sextante/pymorph/scripts/cdilate.py
M python/plugins/sextante/pymorph/scripts/center.py
M python/plugins/sextante/pymorph/scripts/cerode.py
M python/plugins/sextante/pymorph/scripts/close.py
M python/plugins/sextante/pymorph/scripts/closeholes.py
M python/plugins/sextante/pymorph/scripts/closerec.py
M python/plugins/sextante/pymorph/scripts/closerecth.py
M python/plugins/sextante/pymorph/scripts/closeth.py
M python/plugins/sextante/pymorph/scripts/cthick.py
M python/plugins/sextante/pymorph/scripts/cthin.py
M python/plugins/sextante/pymorph/scripts/cwatershed.py
M python/plugins/sextante/pymorph/scripts/dilate.py
M python/plugins/sextante/pymorph/scripts/dist.py
M python/plugins/sextante/pymorph/scripts/erode.py
M python/plugins/sextante/pymorph/scripts/gdist.py
M python/plugins/sextante/pymorph/scripts/gradm.py
M python/plugins/sextante/pymorph/scripts/hmax.py
M python/plugins/sextante/pymorph/scripts/hmin.py
M python/plugins/sextante/pymorph/scripts/inpos.py
M python/plugins/sextante/pymorph/scripts/isolines.py
M python/plugins/sextante/pymorph/scripts/label.py
M python/plugins/sextante/pymorph/scripts/labelflat.py
M python/plugins/sextante/pymorph/scripts/lastero.py
M python/plugins/sextante/pymorph/scripts/neg.py
M python/plugins/sextante/pymorph/scripts/openrec.py
M python/plugins/sextante/pymorph/scripts/openrecth.py
M python/plugins/sextante/pymorph/scripts/openth.py
M python/plugins/sextante/pymorph/scripts/opentransf.py
M python/plugins/sextante/pymorph/scripts/patspec.py
M python/plugins/sextante/pymorph/scripts/randomcolor.py
M python/plugins/sextante/pymorph/scripts/regmax.py
M python/plugins/sextante/pymorph/scripts/regmin.py
M python/plugins/sextante/pymorph/scripts/skelm.py
M python/plugins/sextante/pymorph/scripts/skelmrec.py
M python/plugins/sextante/pymorph/scripts/skiz.py
M python/plugins/sextante/pymorph/scripts/subm.py
M python/plugins/sextante/pymorph/scripts/suprec.py
M python/plugins/sextante/pymorph/scripts/symdiff.py
M python/plugins/sextante/pymorph/scripts/thick.py
M python/plugins/sextante/pymorph/scripts/thin.py
M python/plugins/sextante/pymorph/scripts/toggle.py
M python/plugins/sextante/pymorph/scripts/watershed.py
M python/plugins/sextante/pymorph/text.py
A python/plugins/sextante/resources.qrc
M python/plugins/sextante/script/CreateNewScriptAction.py
M python/plugins/sextante/script/DeleteScriptAction.py
M python/plugins/sextante/script/EditScriptAction.py
M python/plugins/sextante/script/EditScriptDialog.py
M python/plugins/sextante/script/ScriptAlgorithm.py
M python/plugins/sextante/script/ScriptAlgorithmProvider.py
M python/plugins/sextante/script/ScriptUtils.py
M python/plugins/sextante/script/WrongScriptException.py
M python/plugins/sextante/tests/runtests.sh
M python/plugins/sextante/tests/utilities_test.py
A python/qsci_apis/CMakeLists.txt
A python/qsci_apis/OSGeo_GDAL-OGR-1.9.1.api
A python/qsci_apis/PyQGIS-1.7.api
A python/qsci_apis/PyQGIS-1.8.api
A python/qsci_apis/PyQt4-4.7.4.api
A python/qsci_apis/Python-2.5.api
A python/qsci_apis/Python-2.6.api
A python/qsci_apis/Python-2.7.api
A python/qsci_apis/QScintilla2-2.4.5.api
A python/qsci_apis/pyqgis_master.pap
M python/utils.py
M scripts/addcopyright.sh
M scripts/build_debian_package.sh
M scripts/chkspelling.sh
M scripts/chstroke.sh
M scripts/make-tarball.sh
M scripts/prepare-commit.sh
M scripts/qgis_srs.sh
M scripts/remove_git_confict_files.sh
M scripts/tsstat.pl
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/app/composer/qgscomposerlegendwidget.cpp
M src/app/composer/qgscomposermapwidget.cpp
M src/app/legend/qgslegendlayer.cpp
M src/app/nodetool/qgsselectedfeature.cpp
M src/app/qgisapp.cpp
M src/app/qgisapp.h
M src/app/qgisappinterface.cpp
M src/app/qgisappinterface.h
M src/app/qgsdecorationgriddialog.cpp
M src/app/qgslabeldialog.cpp
M src/app/qgslabelinggui.cpp
M src/app/qgsoptions.cpp
M src/app/qgsoptions.h
M src/app/qgsprojectproperties.cpp
M src/app/qgsprojectproperties.h
M src/app/qgsrasterlayerproperties.cpp
M src/app/qgssnappingdialog.cpp
M src/core/composer/qgscomposerhtml.cpp
M src/core/qgis.h
M src/core/qgsnetworkaccessmanager.cpp
M src/core/qgsnetworkaccessmanager.h
M src/core/qgsprojectfiletransform.cpp
M src/core/raster/qgsbilinearrasterresampler.h
M src/core/raster/qgscubicrasterresampler.h
M src/core/raster/qgsmultibandcolorrenderer.cpp
M src/core/raster/qgsmultibandcolorrenderer.h
M src/core/raster/qgspalettedrasterrenderer.cpp
M src/core/raster/qgspalettedrasterrenderer.h
M src/core/raster/qgsrasterdrawer.h
M src/core/raster/qgsrasterfilewriter.cpp
M src/core/raster/qgsrasterfilewriter.h
M src/core/raster/qgsrasteriterator.h
M src/core/raster/qgsrasterlayer.cpp
M src/core/raster/qgsrasterlayer.h
M src/core/raster/qgsrasternuller.h
M src/core/raster/qgsrasterrenderer.h
M src/core/raster/qgsrasterrendererregistry.h
M src/core/raster/qgsrasterresamplefilter.h
M src/core/raster/qgsrasterresampler.h
M src/core/raster/qgssinglebandcolordatarenderer.cpp
M src/core/raster/qgssinglebandcolordatarenderer.h
M src/core/raster/qgssinglebandgrayrenderer.cpp
M src/core/raster/qgssinglebandgrayrenderer.h
M src/core/raster/qgssinglebandpseudocolorrenderer.cpp
M src/core/raster/qgssinglebandpseudocolorrenderer.h
M src/core/symbology-ng/qgsfillsymbollayerv2.cpp
M src/core/symbology-ng/qgssymbollayerv2utils.cpp
M src/gui/qgisinterface.h
M src/gui/qgsattributeeditor.cpp
M src/gui/qgsowssourceselect.cpp
M src/gui/qgsowssourceselect.h
M src/gui/qgssearchquerybuilder.cpp
M src/gui/raster/qgsrasterhistogramwidget.cpp
M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
M src/plugins/diagram_overlay/CMakeLists.txt
R src/plugins/diagram_overlay/qgsdiagramdialog.cpp
R src/plugins/diagram_overlay/qgsdiagramdialog.h
R src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
R src/plugins/diagram_overlay/qgsdiagramfactorywidget.cpp
R src/plugins/diagram_overlay/qgsdiagramfactorywidget.h
M src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp
M src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h
R src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp
R src/plugins/diagram_overlay/qgsdiagramrendererwidget.h
R src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp
R src/plugins/diagram_overlay/qgslinearlyscalingdialog.h
R src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
R src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
R src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h
R src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
R src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp
R src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h
R src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
M src/plugins/globe/CMakeLists.txt
M src/plugins/globe/CMakeModules/FindOSG.cmake
M src/plugins/globe/globe_plugin.cpp
M src/plugins/globe/globe_plugin_dialog.cpp
M src/plugins/globe/osgEarthQt/ViewerWidget.cpp
M src/plugins/globe/osgEarthUtil/Controls
M src/plugins/globe/osgEarthUtil/Controls.cpp
M src/plugins/grass/modules/v.centroids.qgm
M src/providers/postgres/qgspostgresconn.cpp
M src/providers/postgres/qgspostgresprovider.cpp
M src/providers/wcs/qgswcscapabilities.cpp
M src/providers/wcs/qgswcscapabilities.h
M src/providers/wcs/qgswcsprovider.cpp
M src/providers/wcs/qgswcssourceselect.cpp
M src/providers/wfs/qgswfsdata.cpp
M src/providers/wfs/qgswfsprovider.cpp
M src/providers/wfs/qgswfsprovider.h
M src/ui/qgsoptionsbase.ui
M src/ui/qgsowssourceselectbase.ui
M src/ui/qgsprojectpropertiesbase.ui
M tests/src/core/testqgscomposermap.cpp
M tests/src/python/CMakeLists.txt
R tests/src/python/test_qgisapp.py
A tests/src/python/test_qgsapplication.py
M tests/src/python/test_qgscomposerhtml.py
M tests/src/python/test_qgscomposermap.py
M tests/src/python/test_qgscomposition.py
M tests/src/python/test_qgscoordinatetransform.py
M tests/src/python/test_qgsgeometry.py
M tests/src/python/test_qgslogger.py
M tests/src/python/test_qgsmemoryprovider.py
M tests/src/python/test_qgsrasterfilewriter.py
M tests/src/python/test_qgsrasterlayer.py
M tests/src/python/test_qgsrectangle.py
M tests/src/python/test_qgsspatialindex.py
M tests/src/python/test_qgssymbollayerv2.py
M tests/src/python/test_qgsvectorlayer.py
M tests/src/python/utilities.py
A tests/testdata/control_images/expected_composermap/composermap_zebra_style.png
Log Message:
-----------
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
Commit: 7218bd3412febbb5903426e44bc144920deea8dd
https://github.com/qgis/Quantum-GIS/commit/7218bd3412febbb5903426e44bc144920deea8dd
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M src/core/composer/qgsatlascomposition.cpp
M src/core/composer/qgsatlascomposition.h
Log Message:
-----------
Get rid of the unneeded vector of QgsExpression in atlas generation
Commit: 7ee4a5ce632f3433cd6e1cf7f78b162044a49f99
https://github.com/qgis/Quantum-GIS/commit/7ee4a5ce632f3433cd6e1cf7f78b162044a49f99
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M src/core/composer/qgsatlascomposition.cpp
M src/core/composer/qgsatlascomposition.h
Log Message:
-----------
Get rid of the unneeded vector of QgsFeature in atlas generation
Commit: 46730445711967d4310649146bc346608f5abc3d
https://github.com/qgis/Quantum-GIS/commit/46730445711967d4310649146bc346608f5abc3d
Author: Hugo Mercier <hugo.mercier at oslandia.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Log Message:
-----------
Merge branch 'atlas_integration' of https://github.com/Oslandia/Quantum-GIS into atlas
Commit: e54e917431fe23ed220bda60ee8fda896b8e4ca7
https://github.com/qgis/Quantum-GIS/commit/e54e917431fe23ed220bda60ee8fda896b8e4ca7
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-10-06 (Sat, 06 Oct 2012)
Changed paths:
M src/core/composer/qgscomposermap.h
Log Message:
-----------
Remove signal which is not used anymore
Commit: 68494068dae0b03a692047b17159049198acba47
https://github.com/qgis/Quantum-GIS/commit/68494068dae0b03a692047b17159049198acba47
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-10-06 (Sat, 06 Oct 2012)
Changed paths:
A python/core/composer/qgsatlascomposition.sip
M python/core/composer/qgscomposerlabel.sip
M python/core/composer/qgscomposition.sip
M python/core/core.sip
M python/core/qgsexpression.sip
A resources/function_help/$feature-en_US
A resources/function_help/$numfeatures-en_US
A resources/function_help/$numpages-en_US
A resources/function_help/$page-en_US
M src/app/CMakeLists.txt
A src/app/composer/qgsatlascompositionwidget.cpp
A src/app/composer/qgsatlascompositionwidget.h
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/app/composer/qgscomposerlabelwidget.cpp
M src/app/composer/qgscomposerlabelwidget.h
M src/app/composer/qgscomposermapwidget.cpp
M src/app/composer/qgscomposermapwidget.h
M src/core/CMakeLists.txt
A src/core/composer/qgsatlascomposition.cpp
A src/core/composer/qgsatlascomposition.h
M src/core/composer/qgscomposeritem.h
M src/core/composer/qgscomposerlabel.cpp
M src/core/composer/qgscomposerlabel.h
M src/core/composer/qgscomposermap.cpp
M src/core/composer/qgscomposermap.h
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/core/qgsexpression.cpp
M src/core/qgsexpression.h
M src/core/qgsexpressionparser.yy
M src/gui/qgscomposerview.cpp
M src/gui/qgsexpressionbuilderwidget.cpp
A src/ui/qgsatlascompositionwidgetbase.ui
M src/ui/qgscomposerlabelwidgetbase.ui
M src/ui/qgscomposerlegendwidgetbase.ui
M src/ui/qgscomposermapwidgetbase.ui
M tests/src/core/CMakeLists.txt
A tests/src/core/testqgsatlascomposition.cpp
A tests/src/core/testqgscomposerlabel.cpp
M tests/src/core/testqgsexpression.cpp
M tests/src/python/CMakeLists.txt
A tests/src/python/test_qgsatlascomposition.py
A tests/src/python/test_qgscomposerlabel.py
A tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
A tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
A tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
A tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
A tests/testdata/control_images/expected_composermapatlas/hiding_0.png
A tests/testdata/control_images/expected_composermapatlas/hiding_1.png
A tests/testdata/france_parts.dbf
A tests/testdata/france_parts.prj
A tests/testdata/france_parts.qpj
A tests/testdata/france_parts.shp
A tests/testdata/france_parts.shx
Log Message:
-----------
Merge atlas branch
Compare: https://github.com/qgis/Quantum-GIS/compare/f1c99553e37a...68494068dae0
More information about the QGIS-commit
mailing list