[QGIS Commit] [qgis/Quantum-GIS] c58c9d: fixed ftools overlay algorithms

GitHub noreply at github.com
Mon Jan 21 14:11:17 PST 2013 

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: c58c9daea5b3154180a1d7c0983decaf800ae276
      https://github.com/qgis/Quantum-GIS/commit/c58c9daea5b3154180a1d7c0983decaf800ae276
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M python/plugins/sextante/algs/JoinAttributes.py
    M python/plugins/sextante/algs/SaveSelectedFeatures.py
    M python/plugins/sextante/algs/ftools/Clip.py
    M python/plugins/sextante/algs/ftools/Difference.py
    M python/plugins/sextante/algs/ftools/Intersection.py
    M python/plugins/sextante/algs/ftools/ReprojectLayer.py
    M python/plugins/sextante/algs/ftools/Union.py
    M python/plugins/sextante/algs/ftools/ftools_utils.py
    M python/plugins/sextante/saga/description/ClipGridwithPolygon.txt
    R python/plugins/sextante/saga/description/CroptoData.txt
    M python/plugins/sextante/saga/description/Merging.txt

  Log Message:
  -----------
  fixed ftools overlay algorithms
code cleaning and minor edits in other algorithms


  Commit: 995ede35262422223645b6262d58f3f5213e0c89
      https://github.com/qgis/Quantum-GIS/commit/995ede35262422223645b6262d58f3f5213e0c89
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M python/plugins/sextante/core/GeoAlgorithm.py
    M python/plugins/sextante/core/QGisLayers.py
    M python/plugins/sextante/core/Sextante.py
    M python/plugins/sextante/core/SextanteConfig.py
    M python/plugins/sextante/gdal/GdalOgrAlgorithmProvider.py
    M python/plugins/sextante/gdal/GdalUtils.py
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/gui/SextantePostprocessing.py
    M python/plugins/sextante/gui/UnthreadedAlgorithmExecutor.py
    M python/plugins/sextante/outputs/OutputRaster.py
    M python/plugins/sextante/outputs/OutputTable.py
    M python/plugins/sextante/outputs/OutputVector.py
    M python/plugins/sextante/saga/SagaAlgorithm.py

  Log Message:
  -----------
  added support for all gdal/ogr formats in all providers
added support for pre and post execution hooks


  Commit: 2231971ead00ea0fa5410d9805f20abd9142610f
      https://github.com/qgis/Quantum-GIS/commit/2231971ead00ea0fa5410d9805f20abd9142610f
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M doc/TRANSLATORS
    M doc/msvc.t2t
    M i18n/qgis_de.ts
    M i18n/qgis_pt_PT.ts
    M images/images.qrc
    A images/themes/default/mIconTimerContinue.png
    A images/themes/default/mIconTimerPause.png
    M python/analysis/network/qgsarcproperter.sip
    M python/analysis/network/qgsdistancearcproperter.sip
    M python/analysis/network/qgsgraphanalyzer.sip
    M python/analysis/network/qgsgraphbuilderintr.sip
    M python/analysis/network/qgsgraphdirector.sip
    M python/console/console.py
    M python/console/console_output.py
    M python/console/console_sci.py
    M python/core/composer/qgscomposition.sip
    M python/core/core.sip
    M python/core/qgscredentials.sip
    A python/core/qgsofflineediting.sip
    M python/core/qgspoint.sip
    M python/core/raster/qgsrasterblock.sip
    M python/core/raster/qgsrasterinterface.sip
    M python/core/symbology-ng/qgsvectorcolorrampv2.sip
    M python/gui/qgisinterface.sip
    M python/gui/qgsannotationitem.sip
    M python/gui/qgsmapcanvasitem.sip
    M python/gui/qgsmaptool.sip
    M python/gui/qgsmaptoolemitpoint.sip
    M python/gui/qgsmessagebar.sip
    M python/gui/qgsquickprint.sip
    M python/gui/qgsrasterformatsaveoptionswidget.sip
    M python/gui/qgsvertexmarker.sip
    M python/plugins/GdalTools/tools/dialogSRS.py
    M python/plugins/fTools/tools/ftools_utils.py
    M python/plugins/sextante/admintools/ImportIntoPostGIS.py
    M python/plugins/sextante/algs/AddTableField.py
    M python/plugins/sextante/algs/FieldPyculator.py
    M python/plugins/sextante/algs/FieldsCalculator.py
    M python/plugins/sextante/algs/JoinAttributes.py
    M python/plugins/sextante/algs/QGISAlgorithmProvider.py
    M python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py
    M python/plugins/sextante/algs/ftools/Buffer.py
    M python/plugins/sextante/algs/ftools/Centroids.py
    M python/plugins/sextante/algs/ftools/ConvexHull.py
    M python/plugins/sextante/algs/ftools/Delaunay.py
    M python/plugins/sextante/algs/ftools/DensifyGeometries.py
    M python/plugins/sextante/algs/ftools/DensifyGeometriesInterval.py
    M python/plugins/sextante/algs/ftools/Dissolve.py
    M python/plugins/sextante/algs/ftools/ExportGeometryInfo.py
    M python/plugins/sextante/algs/ftools/ExtentFromLayer.py
    M python/plugins/sextante/algs/ftools/ExtractNodes.py
    M python/plugins/sextante/algs/ftools/FToolsUtils.py
    M python/plugins/sextante/algs/ftools/LinesIntersection.py
    M python/plugins/sextante/algs/ftools/LinesToPolygons.py
    M python/plugins/sextante/algs/ftools/MultipartToSingleparts.py
    M python/plugins/sextante/algs/ftools/NearestNeighbourAnalysis.py
    M python/plugins/sextante/algs/ftools/PointsInPolygon.py
    M python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py
    M python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py
    M python/plugins/sextante/algs/ftools/PolygonsToLines.py
    M python/plugins/sextante/algs/ftools/RandomSelection.py
    M python/plugins/sextante/algs/ftools/ReprojectLayer.py
    M python/plugins/sextante/algs/ftools/SimplifyGeometries.py
    M python/plugins/sextante/algs/ftools/SumLines.py
    M python/plugins/sextante/algs/ftools/ftools_utils.py
    M python/plugins/sextante/algs/mmqgisx/MMQGISXAlgorithms.py
    M python/plugins/sextante/algs/mmqgisx/mmqgisx_library.py
    M python/plugins/sextante/core/QGisLayers.py
    M python/plugins/sextante/core/SextanteTableWriter.py
    M python/plugins/sextante/gdal/translate.py
    M python/plugins/sextante/grass/GrassAlgorithm.py
    M python/plugins/sextante/grass/ext/HtmlReportPostProcessor.py
    M python/plugins/sextante/grass/ext/r_coin.py
    M python/plugins/sextante/grass/ext/r_covar.py
    M python/plugins/sextante/grass/ext/r_describe.py
    M python/plugins/sextante/grass/ext/r_info.py
    M python/plugins/sextante/grass/ext/r_quantile.py
    M python/plugins/sextante/grass/ext/r_regression_line.py
    M python/plugins/sextante/grass/ext/v_class.py
    M python/plugins/sextante/grass/ext/v_info.py
    M python/plugins/sextante/grass/ext/v_normal.py
    M python/plugins/sextante/grass/ext/v_report.py
    M python/plugins/sextante/grass/ext/v_univar.py
    M python/plugins/sextante/grass/nviz.py
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/gui/FileSelectionPanel.py
    M python/plugins/sextante/gui/InputLayerSelectorPanel.py
    M python/plugins/sextante/modeler/ModelerAlgorithm.py
    M python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py
    M python/plugins/sextante/modeler/ModelerParametersDialog.py
    M python/plugins/sextante/outputs/OutputTable.py
    M python/plugins/sextante/parameters/ParameterFile.py
    M python/plugins/sextante/parameters/ParameterNumber.py
    M python/plugins/sextante/parameters/ParameterString.py
    M python/plugins/sextante/saga/SagaAlgorithm.py
    M scripts/context_help_id.py
    M scripts/prepare-commit.sh
    M src/app/CMakeLists.txt
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscompositionwidget.cpp
    M src/app/composer/qgscompositionwidget.h
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    A src/app/qgisappstylesheet.cpp
    A src/app/qgisappstylesheet.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsmaptooledit.cpp
    M src/app/qgsmaptoolselectutils.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/core/CMakeLists.txt
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgscomposeritem.cpp
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    A src/core/qgsofflineediting.cpp
    A src/core/qgsofflineediting.h
    M src/core/qgsprojectfiletransform.h
    M src/gui/qgisinterface.h
    M src/gui/qgsmessagebar.cpp
    M src/gui/qgsmessagebar.h
    M src/gui/qgsrasterformatsaveoptionswidget.cpp
    M src/mapserver/qgsconfigcache.cpp
    M src/plugins/grass/qgis_grass_test.py
    M src/plugins/offline_editing/CMakeLists.txt
    R src/plugins/offline_editing/offline_editing.cpp
    R src/plugins/offline_editing/offline_editing.h
    M src/plugins/offline_editing/offline_editing_plugin.cpp
    M src/plugins/offline_editing/offline_editing_plugin.h
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/grass/qgsgrassrasterprovider.cpp
    M src/providers/oracle/ocispatial/qsql_ocispatial.cpp
    M src/providers/oracle/qgsoraclecolumntypethread.cpp
    M src/providers/oracle/qgsoraclecolumntypethread.h
    M src/providers/oracle/qgsoracleconn.cpp
    M src/providers/oracle/qgsoracleconn.h
    M src/providers/oracle/qgsoracledataitems.cpp
    M src/providers/oracle/qgsoracledataitems.h
    M src/providers/oracle/qgsoracleprovider.cpp
    M src/providers/oracle/qgsoracleprovider.h
    M src/providers/oracle/qgsoraclesourceselect.cpp
    M src/providers/oracle/qgsoraclesourceselect.h
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/providers/spatialite/qgsspatialitedataitems.cpp
    M src/ui/qgsabout.ui
    M src/ui/qgscompositionwidgetbase.ui
    M src/ui/qgsoptionsbase.ui

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

Conflicts:
	python/plugins/sextante/algs/ftools/Difference.py
	python/plugins/sextante/algs/ftools/Intersection.py
	python/plugins/sextante/outputs/OutputTable.py


Compare: https://github.com/qgis/Quantum-GIS/compare/0757e4208ca3...2231971ead00

More information about the QGIS-commit mailing list