plTools

@@ -46,14 +46,21 @@ class adaptels_Algorithm(plToolsBaseAlgorithm):

     OUTPUT    = 'OUTPUT'

     INPUTS    = 'INPUTS'

+    DISTANE   = 'DISTANCE'

+    MINKOWSKI = 'MINKOWSKI'

     THRESHOLD = 'THRESHOLD'

     NORMALIZE = 'NORMALIZE'

     QUEENTOPO = 'QUEENTOPO'

+

+

     def initAlgorithm(self, config):

         super().initAlgorithm(config)

+        self.DIST = ['minkowski','cosine','angular']

         self.addParameter(QgsProcessingParameterMultipleLayers(self.INPUTS,self.tr('Input raster layers'),QgsProcessing.TypeRaster))

         self.addParameter(QgsProcessingParameterBoolean(self.NORMALIZE,self.tr('Normalize input layers to [0, 1]'),defaultValue=False))

+        self.addParameter(QgsProcessingParameterEnum(self.DISTANCE,self.tr('Distance'),self.DIST,defaultValue=0, allowMultiple=False))

+        self.addParameter(QgsProcessingParameterNumber(self.MINKOWSKI,self.tr('Minkowski p'),type=QgsProcessingParameterNumber.Double,defaultValue=2.0, optional=True))

         self.addParameter(QgsProcessingParameterNumber(self.THRESHOLD,self.tr('Energy threshold'),type=QgsProcessingParameterNumber.Double,defaultValue=60.0, optional=True))

         self.addParameter(QgsProcessingParameterBoolean(self.QUEENTOPO,self.tr('Eight directional merging'),defaultValue=False))

         self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT,self.tr('GeoAdaptels layer')))

@@ -72,6 +79,14 @@ class adaptels_Algorithm(plToolsBaseAlgorithm):

         queen = self.parameterAsBoolean(parameters, self.QUEENTOPO, context)

         if queen:

             arguments.append('-8')

+        dist = self.parameterAsEnum(parameters, self.DISTANCE, context)

+        if dist:

+            arguments.append('-d')

+            arguments.append(self.DIST[dist])

+        minkowski = self.parameterAsDouble(parameters, self.MINKOWSKI, context)

+        if minkowski:

+            arguments.append('-p')

+            arguments.append(str(minkowski))

         thresh = self.parameterAsDouble(parameters, self.THRESHOLD, context)

         if thresh:

             arguments.append('-t')