[GRASS-SVN] r72385 - grass-addons/grass7/imagery/i.cutlines

[svn_grass at osgeo.org]

Author: mlennert
Date: 2018-03-18 13:18:00 -0700 (Sun, 18 Mar 2018)
New Revision: 72385

Modified:
   grass-addons/grass7/imagery/i.cutlines/i.cutlines.py
Log:
i.cutlines: use the new '_' suffix enabled pygrass library in trunk


Modified: grass-addons/grass7/imagery/i.cutlines/i.cutlines.py
===================================================================
--- grass-addons/grass7/imagery/i.cutlines/i.cutlines.py	2018-03-18 19:55:51 UTC (rev 72384)
+++ grass-addons/grass7/imagery/i.cutlines/i.cutlines.py	2018-03-18 20:18:00 UTC (rev 72385)
@@ -235,16 +235,18 @@
     if edge_detection_algorithm == 'zc':
         kwargs = {'input' : inputraster,
                   'output' : temp_edge_map,
-                  'width' : int(options['zc_width']),
+                  'width_' : int(options['zc_width']),
                   'threshold' : float(options['zc_threshold']),
                   'quiet' : True}
 
         if tiled:
-            message = "Currently there is a parameter name conflict between\n"
-            message += "i.zc and GridModule used for tiling.\n"
-            message += "Please use i.edge for edge detection if you want to\n"
-            message += "tile this part."
-            gscript.fatal(message)
+            if gscript.version()['version'] < '7.5':
+                message = "Currently there is a parameter name conflict between\n"
+                message += "i.zc and GridModule used for tiling.\n"
+                message += "This is solved in GRASS trunk.\n"
+                message += "Please use i.edge for edge detection or GRASS trunk\n"
+                message += "if you want to tile this part."
+                gscript.fatal(message)
             grd = GridModule('i.zc',
                              width=width,
                              height=height,