[QGIS Commit] [qgis/Quantum-GIS] a2997b: fixed #6227

GitHub noreply at github.com
Wed Dec 12 13:41:38 PST 2012 

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: a2997be05c6292521ab2765a7a1f4f70c96e82f4
      https://github.com/qgis/Quantum-GIS/commit/a2997be05c6292521ab2765a7a1f4f70c96e82f4
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/parameters/ParameterNumber.py

  Log Message:
  -----------
  fixed #6227


  Commit: 7197a3121c5db0575ab86fc821249aa8867798db
      https://github.com/qgis/Quantum-GIS/commit/7197a3121c5db0575ab86fc821249aa8867798db
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M python/plugins/sextante/grass/CMakeLists.txt
    M python/plugins/sextante/grass/GrassAlgorithm.py
    M python/plugins/sextante/grass/GrassUtils.py
    M python/plugins/sextante/grass/description/r.average.txt
    M python/plugins/sextante/grass/description/r.basins.fill.txt
    M python/plugins/sextante/grass/description/r.bilinear.txt
    M python/plugins/sextante/grass/description/r.bitpattern.txt
    M python/plugins/sextante/grass/description/r.buffer.txt
    M python/plugins/sextante/grass/description/r.carve.txt
    M python/plugins/sextante/grass/description/r.clump.txt
    M python/plugins/sextante/grass/description/r.coin.txt
    M python/plugins/sextante/grass/description/r.composite.txt
    M python/plugins/sextante/grass/description/r.contour.level.txt
    M python/plugins/sextante/grass/description/r.contour.step.txt
    R python/plugins/sextante/grass/description/r.contour.txt
    M python/plugins/sextante/grass/description/r.cost.txt
    M python/plugins/sextante/grass/description/r.covar.txt
    M python/plugins/sextante/grass/description/v.buffer.column.txt
    M python/plugins/sextante/grass/description/v.buffer.distance.txt
    M python/plugins/sextante/grass/description/v.class.txt
    M python/plugins/sextante/grass/description/v.clean.txt
    M python/plugins/sextante/grass/description/v.db.select.txt
    M python/plugins/sextante/grass/description/v.delaunay.txt
    M python/plugins/sextante/grass/description/v.dissolve.txt
    M python/plugins/sextante/grass/description/v.distance.toattr.txt
    M python/plugins/sextante/grass/description/v.distance.txt
    M python/plugins/sextante/grass/description/v.drape.txt
    M python/plugins/sextante/grass/description/v.extract.txt
    R python/plugins/sextante/grass/description/v.extrude.txt
    M python/plugins/sextante/grass/description/v.generalize.txt
    M python/plugins/sextante/grass/description/v.hull.txt
    M python/plugins/sextante/grass/description/v.info.txt
    M python/plugins/sextante/grass/description/v.kcv.txt
    M python/plugins/sextante/grass/description/v.lidar.correction.txt
    M python/plugins/sextante/grass/description/v.lidar.edgedetection.txt
    M python/plugins/sextante/grass/description/v.lidar.growing.txt
    M python/plugins/sextante/grass/description/v.mkgrid.txt
    M python/plugins/sextante/grass/description/v.neighbors.txt
    M python/plugins/sextante/grass/description/v.normal.txt
    M python/plugins/sextante/grass/description/v.outlier.txt
    M python/plugins/sextante/grass/description/v.overlay.txt
    M python/plugins/sextante/grass/description/v.parallel.txt
    M python/plugins/sextante/grass/description/v.patch.txt
    M python/plugins/sextante/grass/description/v.perturb.txt
    M python/plugins/sextante/grass/description/v.qcount.txt
    M python/plugins/sextante/grass/description/v.random.txt
    R python/plugins/sextante/grass/description/v.rast.stats.txt
    M python/plugins/sextante/grass/description/v.reclass.txt
    M python/plugins/sextante/grass/description/v.report.txt
    M python/plugins/sextante/grass/description/v.sample.txt
    M python/plugins/sextante/grass/description/v.segment.txt
    R python/plugins/sextante/grass/description/v.select.txt
    M python/plugins/sextante/grass/description/v.split.txt
    M python/plugins/sextante/grass/description/v.surf.bspline.txt
    M python/plugins/sextante/grass/description/v.surf.idw.txt
    M python/plugins/sextante/grass/description/v.surf.rst.cvdev.txt
    M python/plugins/sextante/grass/description/v.surf.rst.txt
    R python/plugins/sextante/grass/description/v.to.3d.txt
    M python/plugins/sextante/grass/description/v.to.points.txt
    M python/plugins/sextante/grass/description/v.to.rast.attribute.txt
    M python/plugins/sextante/grass/description/v.to.rast.value.txt
    M python/plugins/sextante/grass/description/v.transform.txt
    M python/plugins/sextante/grass/description/v.univar.txt
    M python/plugins/sextante/grass/description/v.voronoi.txt
    A python/plugins/sextante/grass/postproc/__init__.py
    A python/plugins/sextante/grass/postproc/r_coin.py
    A python/plugins/sextante/grass/postproc/r_covar.py
    A python/plugins/sextante/grass/postproc/v_class.py
    A python/plugins/sextante/grass/postproc/v_info.py
    A python/plugins/sextante/grass/postproc/v_normal.py
    A python/plugins/sextante/grass/postproc/v_report.py
    A python/plugins/sextante/grass/postproc/v_univar.py
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/gui/ParametersPanel.py

  Log Message:
  -----------
  Improving GRASS bindings and editing GASS descriptions


  Commit: a4186dfee2199de587f95e5ed7c1d0804b68fd43
      https://github.com/qgis/Quantum-GIS/commit/a4186dfee2199de587f95e5ed7c1d0804b68fd43
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M python/plugins/sextante/ftools/DensifyGeometries.py
    A python/plugins/sextante/ftools/DensifyGeometriesInterval.py

  Log Message:
  -----------
  Added DensifyGeometriesInterval.py by @underdark, and fixed existent DensifyGeometries.py


  Commit: d401a6ef6e314f260032bbffaa1c52c4a1f664c8
      https://github.com/qgis/Quantum-GIS/commit/d401a6ef6e314f260032bbffaa1c52c4a1f664c8
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M mac/xcode/src/x_qgsspatialitesourceselect.cpp
    M mac/xcode/src/x_spatialite.c
    M mac/xcode/src/x_sqlite3.c
    M python/console/console.py
    M python/console/console_help.py
    M python/console/console_output.py
    M python/console/console_sci.py
    M python/console/console_settings.py
    M python/core/qgscredentials.sip
    M python/gui/qgscredentialdialog.sip
    M python/plugins/GdalTools/tools/GdalTools_utils.py
    M python/plugins/GdalTools/tools/doBuildVRT.py
    M python/plugins/GdalTools/tools/doClipper.py
    M python/plugins/GdalTools/tools/doDEM.py
    M python/plugins/GdalTools/tools/doGrid.py
    M python/plugins/GdalTools/tools/doMerge.py
    M python/plugins/GdalTools/tools/doPolygonize.py
    M python/plugins/GdalTools/tools/doRasterize.py
    M python/plugins/GdalTools/tools/doSettings.py
    M python/plugins/GdalTools/tools/doWarp.py
    M python/plugins/GdalTools/tools/inOutSelector.py
    M python/plugins/GdalTools/tools/widgetPluginBase.py
    M python/plugins/db_manager/db_manager.py
    M python/plugins/db_manager/db_manager_plugin.py
    M python/plugins/db_manager/db_model.py
    M python/plugins/db_manager/db_plugins/connector.py
    M python/plugins/db_manager/db_plugins/data_model.py
    M python/plugins/db_manager/db_plugins/info_model.py
    M python/plugins/db_manager/db_plugins/plugin.py
    M python/plugins/db_manager/db_plugins/postgis/connector.py
    M python/plugins/db_manager/db_plugins/postgis/info_model.py
    M python/plugins/db_manager/db_plugins/postgis/plugin.py
    M python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
    M python/plugins/db_manager/db_plugins/postgis/plugins/versioning/__init__.py
    M python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py
    M python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
    M python/plugins/db_manager/db_plugins/spatialite/connector.py
    M python/plugins/db_manager/db_plugins/spatialite/data_model.py
    M python/plugins/db_manager/db_plugins/spatialite/info_model.py
    M python/plugins/db_manager/db_plugins/spatialite/plugin.py
    M python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
    M python/plugins/db_manager/db_tree.py
    M python/plugins/db_manager/dlg_add_geometry_column.py
    M python/plugins/db_manager/dlg_create_constraint.py
    M python/plugins/db_manager/dlg_create_index.py
    M python/plugins/db_manager/dlg_create_table.py
    M python/plugins/db_manager/dlg_db_error.py
    M python/plugins/db_manager/dlg_export_vector.py
    M python/plugins/db_manager/dlg_field_properties.py
    M python/plugins/db_manager/dlg_import_vector.py
    M python/plugins/db_manager/dlg_sql_window.py
    M python/plugins/db_manager/dlg_table_properties.py
    M python/plugins/db_manager/highlighter.py
    M python/plugins/db_manager/info_viewer.py
    M python/plugins/db_manager/layer_preview.py
    M python/plugins/db_manager/sql_dictionary.py
    M python/plugins/db_manager/table_viewer.py
    M python/plugins/db_manager/ui/DlgAddGeometryColumn.ui
    M python/plugins/db_manager/ui/DlgCreateConstraint.ui
    M python/plugins/db_manager/ui/DlgCreateIndex.ui
    M python/plugins/db_manager/ui/DlgCreateTable.ui
    M python/plugins/db_manager/ui/DlgDbError.ui
    M python/plugins/db_manager/ui/DlgExportVector.ui
    M python/plugins/db_manager/ui/DlgFieldProperties.ui
    M python/plugins/db_manager/ui/DlgImportVector.ui
    M python/plugins/db_manager/ui/DlgSqlWindow.ui
    M python/plugins/db_manager/ui/DlgTableProperties.ui
    M python/plugins/fTools/tools/doGeometry.py
    M python/plugins/fTools/tools/voronoi.py
    M python/plugins/mapserver_export/mapserverexport.py
    M python/plugins/mapserver_export/ms_export.py
    M python/plugins/osm/OsmDatabaseManager.py
    M python/plugins/plugin_installer/installer_plugin.py
    M python/plugins/sextante/admintools/AdminToolsAlgorithmProvider.py
    M python/plugins/sextante/admintools/CreateMosaicDatastore.py
    M python/plugins/sextante/admintools/CreateStyleGeoServer.py
    M python/plugins/sextante/admintools/CreateWorkspace.py
    M python/plugins/sextante/admintools/DeleteDatastore.py
    M python/plugins/sextante/admintools/DeleteWorkspace.py
    M python/plugins/sextante/admintools/GeoServerToolsAlgorithm.py
    M python/plugins/sextante/admintools/ImportIntoPostGIS.py
    M python/plugins/sextante/admintools/ImportRasterIntoGeoServer.py
    M python/plugins/sextante/admintools/ImportVectorIntoGeoServer.py
    M python/plugins/sextante/admintools/PostGISExecuteSQL.py
    M python/plugins/sextante/admintools/geoserver/catalog.py
    M python/plugins/sextante/admintools/geoserver/layer.py
    M python/plugins/sextante/admintools/geoserver/layergroup.py
    M python/plugins/sextante/admintools/geoserver/resource.py
    M python/plugins/sextante/admintools/geoserver/store.py
    M python/plugins/sextante/admintools/geoserver/support.py
    M python/plugins/sextante/admintools/geoserver/workspace.py
    M python/plugins/sextante/admintools/httplib2/iri2uri.py
    M python/plugins/sextante/admintools/postgis_utils.py
    M python/plugins/sextante/algs/EquivalentNumField.py
    M python/plugins/sextante/algs/FieldPyculator.py
    M python/plugins/sextante/core/AlgorithmClassification.py
    M python/plugins/sextante/core/GeoAlgorithm.py
    M python/plugins/sextante/core/Sextante.py
    M python/plugins/sextante/core/SextanteUtils.py
    M python/plugins/sextante/ftools/PointsInPolygonUnique.py
    M python/plugins/sextante/ftools/voronoi.py
    M python/plugins/sextante/gdal/GdalOgrAlgorithmProvider.py
    M python/plugins/sextante/gdal/gdaladdo.py
    M python/plugins/sextante/gdal/merge.py
    M python/plugins/sextante/gdal/ogr2ogr.py
    M python/plugins/sextante/gdal/ogrinfo.py
    M python/plugins/sextante/gdal/polygonize.py
    M python/plugins/sextante/gdal/pyogr/ogr2ogr.py
    M python/plugins/sextante/gdal/translate.py
    M python/plugins/sextante/grass/GrassAlgorithm.py
    M python/plugins/sextante/grass/GrassAlgorithmProvider.py
    M python/plugins/sextante/grass/GrassUtils.py
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/gui/BatchProcessingDialog.py
    M python/plugins/sextante/gui/ConfigDialog.py
    M python/plugins/sextante/gui/ExtentSelectionPanel.py
    M python/plugins/sextante/gui/MultipleInputPanel.py
    M python/plugins/sextante/gui/OutputSelectionPanel.py
    M python/plugins/sextante/gui/ResultsDialog.py
    M python/plugins/sextante/gui/SextanteToolbox.py
    M python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py
    M python/plugins/sextante/mmqgisx/mmqgisx_library.py
    M python/plugins/sextante/modeler/ModelerAlgorithm.py
    M python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
    M python/plugins/sextante/modeler/ModelerArrowItem.py
    M python/plugins/sextante/modeler/ModelerDialog.py
    M python/plugins/sextante/modeler/ModelerParametersDialog.py
    M python/plugins/sextante/modeler/ModelerScene.py
    M python/plugins/sextante/otb/OTBAlgorithm.py
    M python/plugins/sextante/otb/OTBUtils.py
    M python/plugins/sextante/otb/helper/generate_application_descriptors.py
    M python/plugins/sextante/parameters/ParameterFile.py
    M python/plugins/sextante/parameters/ParameterFixedTable.py
    M python/plugins/sextante/r/EditRScriptDialog.py
    M python/plugins/sextante/r/RAlgorithmProvider.py
    M python/plugins/sextante/saga/SagaAlgorithm.py
    M python/plugins/sextante/saga/SagaAlgorithmProvider.py
    M python/plugins/sextante/saga/SagaHelpGenerator.py
    M python/plugins/sextante/saga/SplitRGBBands.py
    M python/plugins/sextante/script/ScriptAlgorithm.py
    M python/plugins/sextante/tests/test.py
    M python/utils.py
    M python/widgets_tree.py
    M qgis.dtd
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposermanager.cpp
    M src/app/qgsattributedialog.cpp
    M src/app/qgsmaptooloffsetcurve.cpp
    M src/app/qgssvgannotationitemdialog.h
    M src/core/pal/rtree.hpp
    M src/core/qgspallabeling.cpp
    M src/core/spatialite/headers/spatialite/sqlite3.h
    M src/core/spatialite/headers/spatialite/sqlite3ext.h
    M src/core/spatialite/sqlite3.c
    M src/gui/symbology-ng/characterwidget.cpp
    M src/gui/symbology-ng/characterwidget.h
    M src/plugins/dxf2shp_converter/dxflib/confdefs.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp
    M src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
    M src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp
    M src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
    M src/plugins/grass/qgsgrassmodule.cpp
    M src/plugins/grass/qgsgrassmodule.h
    M src/plugins/grass/qgsgrasstoolsbase.ui
    M src/plugins/grass/scripts/db.connect-login.pg.py
    M src/plugins/grass/scripts/qgis.v.kernel.rast.py
    M src/plugins/grass/scripts/r.external.all.py
    M src/plugins/grass/scripts/v.out.ogr.pg.py
    M src/providers/grass/CMakeLists.txt
    M src/providers/grass/qgsgrassgislib.cpp
    M src/providers/grass/qgsgrassgislib.h
    M tests/src/python/test_qgsatlascomposition.py
    M tests/src/python/test_qgscomposerlabel.py
    M tests/src/python/test_qgsexpression.py
    M tests/src/python/test_qgsfeature.py

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

Conflicts:
	python/plugins/sextante/grass/GrassAlgorithm.py


  Commit: 260b4a19d2dd124f17fb66a1fed746bd5e96712a
      https://github.com/qgis/Quantum-GIS/commit/260b4a19d2dd124f17fb66a1fed746bd5e96712a
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    A images/svg/north_arrows/north-arrow_0_qgis_decoration.svg
    M python/core/qgsdistancearea.sip
    M scripts/addcopyright.sh
    M src/app/qgsidentifyresults.cpp
    M src/app/qgsidentifyresults.h
    M src/app/qgsmaptoolidentify.cpp
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgscoordinatetransform.cpp
    M src/core/raster/qgspalettedrasterrenderer.cpp
    M src/core/raster/qgspalettedrasterrenderer.h
    M src/core/raster/qgsrasterblock.cpp
    M src/core/raster/qgsrasterblock.h
    M src/mapserver/qgis_map_serv.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/grass/qtermwidget/ColorTables.h
    M src/plugins/grass/qtermwidget/DefaultTranslatorText.h
    M src/plugins/grass/qtermwidget/ExtendedDefaultTranslator.h
    M src/plugins/grass/qtermwidget/konsole_wcwidth.cpp
    M src/plugins/grass/qtermwidget/konsole_wcwidth.h
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/grass/CMakeLists.txt
    M src/providers/grass/qgsgrassgislib.cpp
    M tests/qt_modeltest/dynamictreemodel.cpp
    M tests/qt_modeltest/dynamictreemodel.h
    M tests/qt_modeltest/modeltest.cpp
    M tests/qt_modeltest/modeltest.h
    M tests/qt_modeltest/tst_modeltest.cpp

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


  Commit: 663726877239a4883ee53d55b08168d72f2fa594
      https://github.com/qgis/Quantum-GIS/commit/663726877239a4883ee53d55b08168d72f2fa594
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M python/plugins/sextante/grass/GrassUtils.py

  Log Message:
  -----------
  added fix by Salvatore Larosa that fixes #6862


Compare: https://github.com/qgis/Quantum-GIS/compare/f218a394f47b...663726877239

More information about the QGIS-commit mailing list