Skip to content

Commit

Permalink
3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@mapplus
mapplus committed May 13, 2019
1 parent 4d5054d commit 22702cf
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 38 deletions.
7 changes: 0 additions & 7 deletions scripts/CalculateNearestNeighborIndex.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,11 @@
from qgis.core import (QgsProcessing,
QgsFeature,
QgsFeatureSink,
QgsFields,
QgsField,
QgsGeometry,
QgsPoint,
QgsWkbTypes,
QgsFeatureRequest,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterField,
QgsProcessingParameterString,
QgsProcessingParameterBoolean,
QgsProcessingParameterFeatureSink)
import processing
import sys, math
Expand Down
4 changes: 0 additions & 4 deletions scripts/CreateRingMaps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,16 @@
from qgis.core import (QgsProcessing,
QgsFeature,
QgsFeatureSink,
QgsFields,
QgsField,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsRectangle,
QgsWkbTypes,
QgsSpatialIndex,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterField,
QgsProcessingParameterString,
QgsProcessingParameterBoolean,
QgsProcessingParameterNumber,
QgsProcessingParameterFeatureSink)
import processing
Expand Down
19 changes: 12 additions & 7 deletions scripts/CreateWindRoseMaps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@

from PyQt5.QtCore import (QCoreApplication,
QVariant)
from qgis.utils import iface
from qgis.utils import (iface)
from qgis.core import (QgsProcessing,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingUtils,
QgsFeatureRequest,
QgsFeatureSink,
QgsFeature,
Expand All @@ -35,15 +34,14 @@
QgsFields,
QgsField,
QgsWkbTypes,
QgsProject,
QgsCoordinateTransform,
QgsProcessingParameterBoolean,
QgsProcessingParameterField,
QgsProcessingParameterEnum,
QgsProcessingParameterNumber,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterFeatureSink,
QgsSpatialIndex,
QgsVectorFileWriter,
QgsProviderRegistry)
QgsSpatialIndex)

import processing
import math, sys
Expand Down Expand Up @@ -161,12 +159,19 @@ def processAlgorithm(self, parameters, context, feedback):
raise QgsProcessingException(self.invalidSinkError(parameters, self.OUTPUT_ANCHOR))

# Center : X, Center Y. if not provided, the center of point layer will be used
source_crs = iface.mapCanvas().mapSettings().destinationCrs()
target_crs = source.sourceCrs()
transform = QgsCoordinateTransform(source_crs, target_crs, QgsProject.instance())

extent = source.sourceExtent()
if center_type == 1:
extent = iface.mapCanvas().extent()
elif center_type == 2:
extent = iface.mapCanvas().fullExtent()


if center_type != 0 and source_crs != target_crs:
extent = transform.transformBoundingBox(extent);

center_point = extent.center(); # QgsPoint

minx = extent.xMinimum()
Expand Down
2 changes: 0 additions & 2 deletions scripts/MultipleRingBuffer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@
from qgis.core import (QgsProcessing,
QgsFeature,
QgsFeatureSink,
QgsFields,
QgsField,
QgsWkbTypes,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterField,
QgsProcessingParameterString,
QgsProcessingParameterBoolean,
QgsProcessingParameterFeatureSink)
Expand Down
6 changes: 0 additions & 6 deletions scripts/PolygonToPoint.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,10 @@
from qgis.core import (QgsProcessing,
QgsFeature,
QgsFeatureSink,
QgsFields,
QgsField,
QgsGeometry,
QgsPoint,
QgsWkbTypes,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterField,
QgsProcessingParameterString,
QgsProcessingParameterBoolean,
QgsProcessingParameterFeatureSink)
import processing
Expand Down
4 changes: 2 additions & 2 deletions scripts/RasterEuclideanDistanceAnalysis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterEnum(self.RASTER_TYPE, self.tr('Raster Type'),
self.RASTER_TYPES, 0, optional=True))

self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT, self.tr('Output raster')))
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT, self.tr('Distance raster')))

def processAlgorithm(self, parameters, context, feedback):
source = self.parameterAsVectorLayer(parameters, self.INPUT, context)
Expand All @@ -100,7 +100,7 @@ def processAlgorithm(self, parameters, context, feedback):
max_distance = self.parameterAsDouble(parameters, self.MAX_DISTANCE, context)
raster_type = self.RASTER_TYPES[self.parameterAsEnum(parameters, self.RASTER_TYPE, context)]

extent = self.parameterAsExtent(parameters, self.EXTENT, context)
extent = self.parameterAsExtent(parameters, self.EXTENT, context, source.sourceCrs())
if extent is None or extent.width() == 0 or extent.height() == 0:
extent = source.sourceExtent()

Expand Down
6 changes: 3 additions & 3 deletions scripts/RasterReclassification.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def processAlgorithm(self, parameters, context, feedback):
if inputBand is None:
raise QgsProcessingException('Cannot open raster band {}'.format(band))

nodata = inputBand.GetNoDataValue()
nodata = -9999
gdal_output_type = gdal.GetDataTypeByName(raster_type)

driver = gdal.GetDriverByName('GTiff')
Expand All @@ -135,7 +135,7 @@ def processAlgorithm(self, parameters, context, feedback):

output = ''.encode()
for value in values:
reclassValue = value
reclassValue = nodata
if value == nodata:
reclassValue = nodata
else:
Expand All @@ -144,7 +144,7 @@ def processAlgorithm(self, parameters, context, feedback):
reclassValue = reclass_values[index]
break

reclassValue = int(reclassValue) if raster_type == 0 else float(reclassValue)
reclassValue = int(reclassValue) if raster_type == 'Int32' else float(reclassValue)
output = output + struct.pack(output_data_type, reclassValue)

# write line
Expand Down
1 change: 0 additions & 1 deletion scripts/ThiessenPolygons.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from qgis.core import (QgsProcessing,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingUtils,
QgsFeatureRequest,
QgsFeatureSink,
QgsFeature,
Expand Down
3 changes: 2 additions & 1 deletion scripts/VectorToRasterConversion.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterVectorLayer(self.INPUT, self.tr('Input Vector Layer'),
[QgsProcessing.TypeVector]))
self.addParameter(QgsProcessingParameterField(self.FIELD, self.tr('Attribute Field'),
type=QgsProcessingParameterField.Numeric,
parentLayerParameterName=self.INPUT, optional=True))

self.addParameter(QgsProcessingParameterExtent(self.EXTENT, description=self.tr('Extent'), optional=True))
Expand All @@ -98,7 +99,7 @@ def processAlgorithm(self, parameters, context, feedback):
attribute_field = self.parameterAsString(parameters, self.FIELD, context)
raster_type = self.RASTER_TYPES[self.parameterAsEnum(parameters, self.RASTER_TYPE, context)]

extent = self.parameterAsExtent(parameters, self.EXTENT, context)
extent = self.parameterAsExtent(parameters, self.EXTENT, context, source.sourceCrs())
if extent is None or extent.width() == 0 or extent.height() == 0:
extent = source.sourceExtent()

Expand Down
5 changes: 0 additions & 5 deletions scripts/WKTToVectorLayer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@
QgsFields,
QgsField,
QgsGeometry,
QgsPoint,
QgsWkbTypes,
QgsProcessingException,
QgsProcessingAlgorithm,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterField,
QgsProcessingParameterString,
QgsProcessingParameterBoolean,
QgsProcessingParameterFeatureSink)
import processing

Expand Down

0 comments on commit 22702cf

Please sign in to comment.