sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase conflicts

Browse Source
This commit is contained in:
Alexander Bruy 2013-08-27 19:47:44 +03:00
parent f17e2c07ee
commit 91ea88f1af
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/plugins/sextante/algs/PointsDisplacement.py → python/plugins/processing/algs/PointsDisplacement.py
View File

@ -29,13 +29,13 @@ from PyQt4.QtCore import *
from qgis.core import * from qgis.core import *
from sextante.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers from processing.core.QGisLayers import QGisLayers
from sextante.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterVector import ParameterVector
from sextante.parameters.ParameterNumber import ParameterNumber from processing.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterBoolean import ParameterBoolean from processing.parameters.ParameterBoolean import ParameterBoolean
from sextante.outputs.OutputVector import OutputVector from processing.outputs.OutputVector import OutputVector
class PointsDisplacement(GeoAlgorithm): class PointsDisplacement(GeoAlgorithm):

12
python/plugins/sextante/algs/PointsFromLines.py → python/plugins/processing/algs/PointsFromLines.py
View File

@ -29,15 +29,15 @@ from osgeo import gdal
from qgis.core import * from qgis.core import *
from sextante.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers from processing.core.QGisLayers import QGisLayers
from sextante.parameters.ParameterRaster import ParameterRaster from processing.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterVector import ParameterVector
from sextante.outputs.OutputVector import OutputVector from processing.outputs.OutputVector import OutputVector
from sextante.algs import QGISUtils as utils from processing.algs import QGISUtils as utils
class PointsFromLines(GeoAlgorithm): class PointsFromLines(GeoAlgorithm):

12
python/plugins/sextante/algs/PointsFromPolygons.py → python/plugins/processing/algs/PointsFromPolygons.py
View File

@ -29,15 +29,15 @@ from osgeo import gdal
from qgis.core import * from qgis.core import *
from sextante.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers from processing.core.QGisLayers import QGisLayers
from sextante.parameters.ParameterRaster import ParameterRaster from processing.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterVector import ParameterVector
from sextante.outputs.OutputVector import OutputVector from processing.outputs.OutputVector import OutputVector
from sextante.algs import QGISUtils as utils from processing.algs import QGISUtils as utils
class PointsFromPolygons(GeoAlgorithm): class PointsFromPolygons(GeoAlgorithm):

6
python/plugins/processing/algs/QGISAlgorithmProvider.py
View File

@ -87,9 +87,9 @@ from processing.algs.CreateConstantRaster import CreateConstantRaster
from processing.algs.PointsLayerFromTable import PointsLayerFromTable from processing.algs.PointsLayerFromTable import PointsLayerFromTable
from processing.algs.PointsDisplacement import PointsDisplacement from processing.algs.PointsDisplacement import PointsDisplacement
from sextante.algs.ZonalStatistics import ZonalStatistics from processing.algs.ZonalStatistics import ZonalStatistics
from sextante.algs.PointsFromPolygons import PointsFromPolygons from processing.algs.PointsFromPolygons import PointsFromPolygons
from sextante.algs.PointsFromLines import PointsFromLines from processing.algs.PointsFromLines import PointsFromLines
#from processing.algs.VectorLayerHistogram import VectorLayerHistogram #from processing.algs.VectorLayerHistogram import VectorLayerHistogram
#from processing.algs.VectorLayerScatterplot import VectorLayerScatterplot #from processing.algs.VectorLayerScatterplot import VectorLayerScatterplot

0
python/plugins/sextante/algs/QGISUtils.py → python/plugins/processing/algs/QGISUtils.py
View File

20
python/plugins/sextante/algs/ZonalStatistics.py → python/plugins/processing/algs/ZonalStatistics.py
View File

@ -30,19 +30,19 @@ from osgeo import gdal, ogr, osr
from qgis.core import * from qgis.core import *
from sextante.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers from processing.core.QGisLayers import QGisLayers
from sextante.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterVector import ParameterVector
from sextante.parameters.ParameterRaster import ParameterRaster from processing.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterString import ParameterString from processing.parameters.ParameterString import ParameterString
from sextante.parameters.ParameterNumber import ParameterNumber from processing.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterBoolean import ParameterBoolean from processing.parameters.ParameterBoolean import ParameterBoolean
from sextante.outputs.OutputVector import OutputVector from processing.outputs.OutputVector import OutputVector
from sextante.algs.ftools import FToolsUtils as ftools_utils from processing.algs.ftools import FToolsUtils as ftools_utils
from sextante.algs import QGISUtils as utils from processing.algs import QGISUtils as utils
class ZonalStatistics(GeoAlgorithm): class ZonalStatistics(GeoAlgorithm):