Skip to content

Commit

Permalink
[processing] add missed fTools algorithms: Define current projection
Browse files Browse the repository at this point in the history
and Create spatial index.

Also add missed Assign projection from GDALTools
  • Loading branch information
alexbruy committed Mar 1, 2016
1 parent 11a9a66 commit 7823a5a
Show file tree
Hide file tree
Showing 9 changed files with 267 additions and 3 deletions.
81 changes: 81 additions & 0 deletions python/plugins/processing/algs/gdal/AssignProjection.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
self.py
---------------------
Date : January 2016
Copyright : (C) 2016 by Alexander Bruy
Email : alexander dot bruy at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Alexander Bruy'
__date__ = 'January 2016'
__copyright__ = '(C) 2016, Alexander Bruy'

# This will get replaced with a git SHA1 when you do a git archive

__revision__ = '$Format:%H$'

import os

from PyQt4.QtGui import QIcon

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterCrs
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

from processing.tools.system import isWindows

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]


class AssignProjection(GdalAlgorithm):

INPUT = 'INPUT'
CRS = 'CRS'
OUTPUT = 'OUTPUT'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'projection-add.png'))

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Assign projection')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Projections')

self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterCrs(self.CRS,
self.tr('Desired CRS'), ''))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Layer with projection'), True))

def getConsoleCommands(self):
fileName = self.getParameterValue(self.INPUT)
crs = self.getParameterValue(self.CRS)
output = self.getOutputValue(self.OUTPUT)

arguments = []
arguments.append('-a_srs')
arguments.append(crs)

arguments.append(fileName)

commands = []
if isWindows():
commands = ['cmd.exe', '/C ', 'gdal_edit.bat',
GdalUtils.escapeAndJoin(arguments)]
else:
commands = ['gdal_edit.py', GdalUtils.escapeAndJoin(arguments)]

self.setOutputValue(self.OUTPUT, fileName)
return commands
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
from rasterize_over import rasterize_over
from retile import retile
from gdal2tiles import gdal2tiles
from AssignProjection import AssignProjection

from ogr2ogr import Ogr2Ogr
from ogr2ogrclip import Ogr2OgrClip
Expand Down Expand Up @@ -124,7 +125,7 @@ def createAlgsList(self):
hillshade(), slope(), aspect(), tri(), tpi(), roughness(),
ColorRelief(), GridInvDist(), GridAverage(), GridNearest(),
GridDataMetrics(), gdaltindex(), gdalcalc(), rasterize_over(),
retile(), gdal2tiles(),
retile(), gdal2tiles(), AssignProjection(),
# ----- OGR tools -----
OgrInfo(), Ogr2Ogr(), Ogr2OgrClip(), Ogr2OgrClipExtent(),
Ogr2OgrToPostGis(), Ogr2OgrToPostGisList(), Ogr2OgrPointsOnLines(),
Expand Down
92 changes: 92 additions & 0 deletions python/plugins/processing/algs/qgis/DefineProjection.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
SpatialIndex.py
---------------------
Date : January 2016
Copyright : (C) 2016 by Alexander Bruy
Email : alexander dot bruy at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Alexander Bruy'
__date__ = 'January 2016'
__copyright__ = '(C) 2016, Alexander Bruy'

# This will get replaced with a git SHA1 when you do a git archive

__revision__ = '$Format:%H$'

import os
import re

from PyQt4.QtGui import QIcon

from qgis.core import QgsCoordinateReferenceSystem
from qgis.utils import iface

from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterCrs
from processing.core.outputs import OutputVector

from processing.tools import dataobjects, vector

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]


class DefineProjection(GeoAlgorithm):

INPUT = 'INPUT'
CRS = 'CRS'
OUTPUT = 'OUTPUT'

#def getIcon(self):
# return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'basic_statistics.png'))

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Define current projection')
self.group, self.i18n_group = self.trAlgorithm('Vector general tools')

self.addParameter(ParameterVector(self.INPUT,
self.tr('Input Layer'),
[ParameterVector.VECTOR_TYPE_ANY]))
self.addParameter(ParameterCrs(self.CRS, 'Output CRS'))
self.addOutput(OutputVector(self.OUTPUT,
self.tr('Layer with projection'), True))


def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName)
crs = QgsCoordinateReferenceSystem(self.getParameterValue(self.CRS))

provider = layer.dataProvider()
ds = provider.dataSourceUri()
p = re.compile('\|.*')
dsPath = p.sub('', ds)

if dsPath.lower().endswith('.shp'):
dsPath = dsPath[:-4]

wkt = crs.toWkt()
with open(dsPath + '.prj', 'w') as f:
f.write(wkt)

qpjFile = dsPath + '.qpj'
if os.path.exists(qpjFile):
with open(qpjFile, 'w') as f:
f.write(wkt)

layer.setCrs(crs)
iface.mapCanvas().refresh()

self.setOutputValue(self.OUTPUT, fileName)
7 changes: 7 additions & 0 deletions python/plugins/processing/algs/qgis/Grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@

__revision__ = '$Format:%H$'

import os
import math

from PyQt4.QtGui import QIcon
from PyQt4.QtCore import QVariant
from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, QGis, QgsField, QgsFeature, QgsGeometry, QgsPoint
from processing.core.GeoAlgorithm import GeoAlgorithm
Expand All @@ -37,6 +39,8 @@
from processing.core.parameters import ParameterCrs
from processing.core.outputs import OutputVector

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]


class Grid(GeoAlgorithm):
TYPE = 'TYPE'
Expand All @@ -46,6 +50,9 @@ class Grid(GeoAlgorithm):
CRS = 'CRS'
OUTPUT = 'OUTPUT'

#def getIcon(self):
# return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'vector_grid.png'))

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Create grid')
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
Expand Down
7 changes: 7 additions & 0 deletions python/plugins/processing/algs/qgis/Merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

__revision__ = '$Format:%H$'

import os

from PyQt4.QtGui import QIcon
from PyQt4.QtCore import QVariant
from qgis.core import QgsFields, QgsVectorLayer

Expand All @@ -36,11 +38,16 @@

from processing.tools import dataobjects, vector

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]


class Merge(GeoAlgorithm):
LAYERS = 'LAYERS'
OUTPUT = 'OUTPUT'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'merge_shapes.png'))

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Merge vector layers')
self.group, self.i18n_group = self.trAlgorithm('Vector general tools')
Expand Down
4 changes: 3 additions & 1 deletion python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@
from OrientedMinimumBoundingBox import OrientedMinimumBoundingBox
from Smooth import Smooth
from ReverseLineDirection import ReverseLineDirection
from SpatialIndex import SpatialIndex
from DefineProjection import DefineProjection

pluginPath = os.path.normpath(os.path.join(
os.path.split(os.path.dirname(__file__))[0], os.pardir))
Expand Down Expand Up @@ -189,7 +191,7 @@ def __init__(self):
SplitLinesWithLines(), CreateConstantRaster(),
FieldsMapper(), SelectByAttributeSum(), Datasources2Vrt(),
CheckValidity(), OrientedMinimumBoundingBox(), Smooth(),
ReverseLineDirection()
ReverseLineDirection(), SpatialIndex(), DefineProjection()
]

if hasMatplotlib:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import os
import random

from PyQt4.QtCore import QIcon
from PyQt4.QtGui import QIcon
from PyQt4.QtCore import QVariant
from qgis.core import (QGis, QgsFields, QgsField, QgsFeature, QgsPoint,
QgsGeometry, QgsSpatialIndex, QgsDistanceArea)
Expand Down
74 changes: 74 additions & 0 deletions python/plugins/processing/algs/qgis/SpatialIndex.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
SpatialIndex.py
---------------------
Date : January 2016
Copyright : (C) 2016 by Alexander Bruy
Email : alexander dot bruy at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Alexander Bruy'
__date__ = 'January 2016'
__copyright__ = '(C) 2016, Alexander Bruy'

# This will get replaced with a git SHA1 when you do a git archive

__revision__ = '$Format:%H$'

import os

from PyQt4.QtGui import QIcon

from qgis.core import QgsVectorDataProvider

from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.parameters import ParameterVector
from processing.core.outputs import OutputVector

from processing.tools import dataobjects, vector

pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]


class SpatialIndex(GeoAlgorithm):

INPUT = 'INPUT'
OUTPUT = 'OUTPUT'

#def getIcon(self):
# return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'basic_statistics.png'))

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Create spatial index')
self.group, self.i18n_group = self.trAlgorithm('Vector general tools')

self.addParameter(ParameterVector(self.INPUT,
self.tr('Input Layer'),
[ParameterVector.VECTOR_TYPE_ANY]))
self.addOutput(OutputVector(self.OUTPUT,
self.tr('Indexed layer'), True))


def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName)
provider = layer.dataProvider()

if provider.capabilities() & QgsVectorDataProvider.CreateSpatialIndex:
if not provider.createSpatialIndex():
progress.setInfo(self.tr('Can not create spatial index'))
else:
progress.setInfo(self.tr("Layer's data provider does not support "
"spatial indexes"))

self.setOutputValue(self.OUTPUT, fileName)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7823a5a

Please sign in to comment.