From 922b844819b77de3d90e68765878b5708efa3b8f Mon Sep 17 00:00:00 2001 From: Victor Olaya Date: Sat, 19 Apr 2014 17:36:14 +0200 Subject: [PATCH] [processing] prevent grass7 config parameters from shadowing grass6 parameters --- .../plugins/processing/algs/grass7/Grass7Utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py index f511e5e4908..205b88a3464 100644 --- a/python/plugins/processing/algs/grass7/Grass7Utils.py +++ b/python/plugins/processing/algs/grass7/Grass7Utils.py @@ -39,15 +39,15 @@ from processing.tests.TestData import points class Grass7Utils: - GRASS_REGION_XMIN = 'GRASS_REGION_XMIN' - GRASS_REGION_YMIN = 'GRASS_REGION_YMIN' - GRASS_REGION_XMAX = 'GRASS_REGION_XMAX' - GRASS_REGION_YMAX = 'GRASS_REGION_YMAX' - GRASS_REGION_CELLSIZE = 'GRASS_REGION_CELLSIZE' + GRASS_REGION_XMIN = 'GRASS7_REGION_XMIN' + GRASS_REGION_YMIN = 'GRASS7_REGION_YMIN' + GRASS_REGION_XMAX = 'GRASS7_REGION_XMAX' + GRASS_REGION_YMAX = 'GRASS7_REGION_YMAX' + GRASS_REGION_CELLSIZE = 'GRASS7_REGION_CELLSIZE' GRASS_FOLDER = 'GRASS7_FOLDER' GRASS_WIN_SHELL = 'GRASS7_WIN_SHELL' - GRASS_LOG_COMMANDS = 'GRASS_LOG_COMMANDS' - GRASS_LOG_CONSOLE = 'GRASS_LOG_CONSOLE' + GRASS_LOG_COMMANDS = 'GRASS7_LOG_COMMANDS' + GRASS_LOG_CONSOLE = 'GRASS7_LOG_CONSOLE' sessionRunning = False sessionLayers = {}