瀏覽代碼

wxGUI/menuform: track suppress_required flags

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@44807 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 年之前
父節點
當前提交
ed7502803f
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      gui/wxpython/gui_modules/menuform.py

+ 4 - 1
gui/wxpython/gui_modules/menuform.py

@@ -517,17 +517,20 @@ class grassTask:
         """
         """
         cmd = [self.name]
         cmd = [self.name]
         
         
+        suppress_required = False
         for flag in self.flags:
         for flag in self.flags:
             if flag['value']:
             if flag['value']:
                 if len(flag['name']) > 1: # e.g. overwrite
                 if len(flag['name']) > 1: # e.g. overwrite
                     cmd +=  [ '--' + flag['name'] ]
                     cmd +=  [ '--' + flag['name'] ]
                 else:
                 else:
                     cmd +=  [ '-' + flag['name'] ]
                     cmd +=  [ '-' + flag['name'] ]
+                if flag['suppress_required']:
+                    suppress_required = True
         for p in self.params:
         for p in self.params:
             if p.get('value','') ==  '' and p.get('required', False):
             if p.get('value','') ==  '' and p.get('required', False):
                 if p.get('default', '') !=  '':
                 if p.get('default', '') !=  '':
                     cmd +=  [ '%s=%s' % (p['name'], p['default']) ]
                     cmd +=  [ '%s=%s' % (p['name'], p['default']) ]
-                elif ignoreErrors is False:
+                elif ignoreErrors is True and not suppress_required:
                     cmd +=  [ '%s=%s' % (p['name'], _('<required>')) ]
                     cmd +=  [ '%s=%s' % (p['name'], _('<required>')) ]
             elif p.get('value','') !=  '' and p['value'] !=  p.get('default','') :
             elif p.get('value','') !=  '' and p['value'] !=  p.get('default','') :
                 # Output only values that have been set, and different from defaults
                 # Output only values that have been set, and different from defaults