Skip to content
Permalink
Browse files

fix rebase conflicts

  • Loading branch information
alexbruy committed Sep 13, 2013
1 parent f17e2c0 commit 91ea88f1af92a35cfaf62cde5cfecfec172a80dc
@@ -29,13 +29,13 @@

from qgis.core import *

from sextante.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.QGisLayers import QGisLayers

from sextante.parameters.ParameterVector import ParameterVector
from sextante.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterBoolean import ParameterBoolean
from sextante.outputs.OutputVector import OutputVector
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterNumber import ParameterNumber
from processing.parameters.ParameterBoolean import ParameterBoolean
from processing.outputs.OutputVector import OutputVector

class PointsDisplacement(GeoAlgorithm):

@@ -29,15 +29,15 @@

from qgis.core import *

from sextante.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.QGisLayers import QGisLayers

from sextante.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterRaster import ParameterRaster
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):

@@ -29,15 +29,15 @@

from qgis.core import *

from sextante.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.QGisLayers import QGisLayers

from sextante.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterRaster import ParameterRaster
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):

@@ -87,9 +87,9 @@
from processing.algs.PointsLayerFromTable import PointsLayerFromTable

from processing.algs.PointsDisplacement import PointsDisplacement
from sextante.algs.ZonalStatistics import ZonalStatistics
from sextante.algs.PointsFromPolygons import PointsFromPolygons
from sextante.algs.PointsFromLines import PointsFromLines
from processing.algs.ZonalStatistics import ZonalStatistics
from processing.algs.PointsFromPolygons import PointsFromPolygons
from processing.algs.PointsFromLines import PointsFromLines

#from processing.algs.VectorLayerHistogram import VectorLayerHistogram
#from processing.algs.VectorLayerScatterplot import VectorLayerScatterplot
File renamed without changes.
@@ -30,19 +30,19 @@

from qgis.core import *

from sextante.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.QGisLayers import QGisLayers
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.QGisLayers import QGisLayers

from sextante.parameters.ParameterVector import ParameterVector
from sextante.parameters.ParameterRaster import ParameterRaster
from sextante.parameters.ParameterString import ParameterString
from sextante.parameters.ParameterNumber import ParameterNumber
from sextante.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterVector import ParameterVector
from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterString import ParameterString
from processing.parameters.ParameterNumber import ParameterNumber
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 sextante.algs import QGISUtils as utils
from processing.algs.ftools import FToolsUtils as ftools_utils
from processing.algs import QGISUtils as utils

class ZonalStatistics(GeoAlgorithm):

0 comments on commit 91ea88f

Please sign in to comment.
You can’t perform that action at this time.