ソースを参照

wxGUI: fix broken workspace
(merge from devbr6, https://trac.osgeo.org/grass/changeset/35762)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35763 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 16 年 前
コミット
c07073ff49

+ 2 - 2
gui/wxpython/gui_modules/utils.py

@@ -208,7 +208,7 @@ def ListOfMapsets(all=False):
                               flags = 'l')
     
         if ret:
-            mapsets = ret.rstrip('\n').split(' ')
+            mapsets = ret.rstrip('\n').strip().split(' ')
         else:
             raise gcmd.CmdError(cmd = 'g.mapsets',
                                 message = _('Unable to get list of available mapsets.'))
@@ -217,7 +217,7 @@ def ListOfMapsets(all=False):
                               read = True,
                               flags = 'p')
         if ret:
-            mapsets = ret.rstrip('\n').split(' ')
+            mapsets = ret.rstrip('\n').strip().split(' ')
         else:
             raise gcmd.CmdError(cmd = 'g.mapsets',
                                 message = _('Unable to get list of accessible mapsets.'))

+ 6 - 6
gui/wxpython/gui_modules/workspace.py

@@ -439,17 +439,17 @@ class WriteWorkspaceFile(object):
                 # layer properties
                 self.file.write('%s<task name="%s">\n' % (' ' * self.indent, cmd[0]))
                 self.indent += 4
-                for option in cmd[1:]:
-                    if option[0] == '-': # flag
-                        self.file.write('%s<flag name="%s" />\n' %
-                                   (' ' * self.indent, option[1]))
+                for key, val in cmd[1].iteritems():
+                    if key == 'flags':
+                        for f in opt['flags']:
+                            self.file.write('%s<flag name="%s" />\n' %
+                                            (' ' * self.indent, f))
                     else: # parameter
-                        key, value = option.split('=', 1)
                         self.file.write('%s<parameter name="%s">\n' %
                                    (' ' * self.indent, key))
                         self.indent += 4
                         self.file.write('%s<value>%s</value>\n' %
-                                   (' ' * self.indent, value))
+                                   (' ' * self.indent, val))
                         self.indent -= 4
                         self.file.write('%s</parameter>\n' % (' ' * self.indent));
                 self.indent -= 4