[QGIS Commit] [qgis/Quantum-GIS] 0df9e4: Added python test for qgscoordinatetransform

Mon Sep 3 08:23:22 PDT 2012

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 0df9e449285394be77bd01bea41ba9d33cc1c8ba
      https://github.com/qgis/Quantum-GIS/commit/0df9e449285394be77bd01bea41ba9d33cc1c8ba
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M tests/src/python/CMakeLists.txt
    A tests/src/python/test_qgscoordinatetransform.py

  Log Message:
  -----------
  Added python test for qgscoordinatetransform


  Commit: 7cc62de08e7594bc9b19fdfad4a2c6790cfba13d
      https://github.com/qgis/Quantum-GIS/commit/7cc62de08e7594bc9b19fdfad4a2c6790cfba13d
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M tests/src/python/test_qgscoordinatetransform.py

  Log Message:
  -----------
  In progress implementation of coordinate transform test


  Commit: 2f6767fa1ec94da85a75141054ebe4dcb9f3b676
      https://github.com/qgis/Quantum-GIS/commit/2f6767fa1ec94da85a75141054ebe4dcb9f3b676
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M CMakeLists.txt
    M cmake/UsePythonTest.cmake
    M doc/TRANSLATORS
    M i18n/qgis_de.ts
    M i18n/qgis_gl_ES.ts
    M i18n/qgis_sv.ts
    M images/images.qrc
    A images/themes/default/mIconClose.png
    M images/themes/default/mIconWarn.png
    A images/themes/gis/mIconClose.png
    A images/themes/gis/mIconWarn.png
    M python/core/qgscomposition.sip
    M python/core/qgsdistancearea.sip
    M python/core/qgsexpression.sip
    M python/core/qgsrasterdataprovider.sip
    M python/core/qgsrasterlayer.sip
    M python/core/qgsvectorlayer.sip
    M python/plugins/db_manager/completer.py
    M python/plugins/db_manager/db_plugins/postgis/connector.py
    M python/plugins/db_manager/db_plugins/spatialite/connector.py
    M python/utils.py
    M resources/symbology-ng-style.db
    M scripts/symbol_xml2db.py
    M src/analysis/network/qgsgraphbuilderintr.h
    M src/app/CMakeLists.txt
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgsattributetypedialog.cpp
    M src/app/qgsattributetypedialog.h
    M src/app/qgsdecorationgrid.cpp
    M src/app/qgsdecorationnortharrow.cpp
    M src/app/qgsdecorationscalebar.cpp
    A src/app/qgshtmlannotationdialog.cpp
    A src/app/qgshtmlannotationdialog.h
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/app/qgsmaptoolannotation.cpp
    A src/app/qgsmaptoolhtmlannotation.cpp
    A src/app/qgsmaptoolhtmlannotation.h
    M src/app/qgsmaptoolidentify.cpp
    M src/app/qgsmaptoolmeasureangle.cpp
    M src/app/qgsmeasuredialog.cpp
    M src/app/qgsmeasuredialog.h
    M src/app/qgsmeasuretool.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/app/qgsrasterlayerproperties.cpp
    A src/app/qgsvectorlayerproperties.cpp
    R src/app/qgsvectorlayerproperties.cpp
    M src/core/composer/qgscomposerscalebar.cpp
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgsnumericscalebarstyle.cpp
    A src/core/pal/costcalculator.cpp
    R src/core/pal/costcalculator.cpp
    M src/core/qgis.cpp
    M src/core/qgis.h
    M src/core/qgsapplication.cpp
    M src/core/qgsattributeaction.cpp
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgsdataitem.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdistancearea.cpp
    M src/core/qgsdistancearea.h
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgslogger.cpp
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsmaprenderer.h
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/core/qgsrasterdataprovider.cpp
    M src/core/qgsrasterdataprovider.h
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/raster/qgsrasterfilewriter.cpp
    M src/core/raster/qgsrasterfilewriter.h
    M src/core/raster/qgsrasterinterface.cpp
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    M src/core/raster/qgsrasterpipe.cpp
    M src/core/symbology-ng/qgsfillsymbollayerv2.cpp
    M src/core/symbology-ng/qgsfillsymbollayerv2.h
    M src/core/symbology-ng/qgslinesymbollayerv2.cpp
    M src/core/symbology-ng/qgsstylev2.cpp
    M src/core/symbology-ng/qgsstylev2.h
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/gui/CMakeLists.txt
    M src/gui/qgsattributeeditor.cpp
    A src/gui/qgshtmlannotationitem.cpp
    A src/gui/qgshtmlannotationitem.h
    M src/gui/qgsmapcanvas.cpp
    M src/gui/qgsmapcanvas.h
    M src/gui/qgsmaptip.cpp
    M src/gui/qgsmaptool.cpp
    A src/gui/qgsmessagebar.cpp
    A src/gui/qgsmessagebar.h
    M src/gui/qgsquickprint.cpp
    M src/gui/qgsrasterlayersaveasdialog.cpp
    M src/gui/qgsrasterlayersaveasdialog.h
    M src/gui/qgsrasterpyramidsoptionswidget.cpp
    M src/gui/qgsrasterpyramidsoptionswidget.h
    M src/gui/raster/qgsrasterhistogramwidget.cpp
    M src/gui/symbology-ng/qgslayerpropertieswidget.cpp
    M src/gui/symbology-ng/qgsstylev2managerdialog.cpp
    M src/gui/symbology-ng/qgssymbolv2selectordialog.h
    M src/mapserver/qgsconfigparser.h
    M src/mapserver/qgshttprequesthandler.cpp
    M src/mapserver/qgswfsserver.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/grass/qgsgrassedit.cpp
    M src/plugins/heatmap/heatmap.cpp
    M src/plugins/heatmap/heatmapgui.cpp
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/gdal/qgsgdalprovider.h
    M src/providers/mssql/qgsmssqlnewconnection.cpp
    M src/providers/mssql/qgsmssqlprovider.cpp
    M src/providers/ogr/qgsogrdataitems.cpp
    M src/providers/wcs/qgswcscapabilities.cpp
    M src/providers/wcs/qgswcsprovider.cpp
    M src/python/qgspythonutilsimpl.cpp
    M src/ui/qgisapp.ui
    M src/ui/qgsattributetypeedit.ui
    M src/ui/qgslabelingguibase.ui
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsprojectpropertiesbase.ui
    M src/ui/qgsrasterformatsaveoptionswidgetbase.ui
    M src/ui/qgsrasterlayerpropertiesbase.ui
    M src/ui/qgsrasterlayersaveasdialogbase.ui
    M src/ui/qgsrasterpyramidsoptionswidgetbase.ui
    M src/ui/qgsvectorlayerpropertiesbase.ui
    M tests/CMakeLists.txt
    M tests/src/core/CMakeLists.txt
    M tests/src/core/testqgscomposerhtml.cpp
    M tests/src/core/testqgscomposermap.cpp
    A tests/src/core/testqgscomposerscalebar.cpp
    A tests/src/core/testqgsdistancearea.cpp
    M tests/src/core/testqgsexpression.cpp
    M tests/src/core/testqgsrasterlayer.cpp
    M tests/src/providers/testqgswcsprovider.cpp
    M tests/src/python/CMakeLists.txt
    M tests/src/python/qgscompositionchecker.py
    A tests/src/python/test_qgscomposerhtml.py
    M tests/src/python/test_qgscomposermap.py
    M tests/src/python/test_qgscoordinatetransform.py
    M tests/src/python/test_qgsgeometry.py
    M tests/src/python/utilities.py
    A tests/testdata/GeodTest-nano.dat
    A tests/testdata/GeodTest.README
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
    A tests/testdata/control_images/expected_composerscalebar/composerscalebar_doublebox.png
    A tests/testdata/control_images/expected_composerscalebar/composerscalebar_numeric.png
    A tests/testdata/control_images/expected_composerscalebar/composerscalebar_singlebox.png
    A tests/testdata/control_images/expected_composerscalebar/composerscalebar_tick.png
    M tests/testdata/points_uniquevalue_symbol.qml

  Log Message:
  -----------
  Resolved merge conflicts


  Commit: d9c9052b2786de561bbf0348e1793296bf95aba2
      https://github.com/qgis/Quantum-GIS/commit/d9c9052b2786de561bbf0348e1793296bf95aba2
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M python/core/qgsdatasourceuri.sip
    M src/core/qgsdatasourceuri.h

  Log Message:
  -----------
  Added comment about introduction of srid to version 1.9 for data source id


Compare: https://github.com/qgis/Quantum-GIS/compare/56c15dc6470a...d9c9052b2786