Bladeren bron

wxGUI: flag->label fix, trac https://trac.osgeo.org/grass/ticket/241

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32436 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 17 jaren geleden
bovenliggende
commit
9602ffe306
1 gewijzigde bestanden met toevoegingen van 8 en 2 verwijderingen
  1. 8 2
      gui/wxpython/gui_modules/menuform.py

+ 8 - 2
gui/wxpython/gui_modules/menuform.py

@@ -290,7 +290,8 @@ class processTask(HandlerBase):
             self.task.name = attrs.get('name', None)
 
         if name == 'parameter':
-            self.inParameter = True;
+            self.inParameter = True
+            self.label = '' # tmp variable
             self.param_label = ''
             self.param_description = ''
             self.param_default = ''
@@ -309,7 +310,9 @@ class processTask(HandlerBase):
             self.param_multiple = attrs.get('multiple', None)
 
         if name == 'flag':
-            self.inFlag = True;
+            self.inFlag = True
+            self.label = '' # tmp variable
+            self.flag_label = ''
             self.flag_description = ''
             self.flag_default = ''
             self.flag_guisection = ''
@@ -421,12 +424,15 @@ class processTask(HandlerBase):
             self.inFlag = False;
             self.task.flags.append({
                 "name" : self.flag_name,
+                "label" : self.flag_label,
                 "description" : self.flag_description,
                 "guisection" : self.flag_guisection } )
 
         if name == 'label':
             if self.inParameter:
                 self.param_label = normalize_whitespace(self.label)
+            elif self.inFlag:
+                self.flag_label = normalize_whitespace(self.label)
             else:
                 self.task.label = normalize_whitespace(self.label)