Browse Source

wxGUI/g.extension: fix extension loading and installing after adding new temporal modules (merge from trunk, https://trac.osgeo.org/grass/changeset/69455, https://trac.osgeo.org/grass/changeset/69459)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@69461 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 8 years ago
parent
commit
36f3ffd0e9
2 changed files with 4 additions and 2 deletions
  1. 2 1
      gui/wxpython/modules/extensions.py
  2. 2 1
      scripts/g.extension/g.extension.py

+ 2 - 1
gui/wxpython/modules/extensions.py

@@ -267,7 +267,7 @@ class ExtensionTreeModelBuilder:
         for prefix in ('display', 'database',
                        'general', 'imagery',
                        'misc', 'postscript', 'paint',
-                       'raster', 'raster3D', 'sites', 'vector', 'wxGUI', 'other'):
+                       'raster', 'raster3D', 'sites', 'temporal', 'vector', 'wxGUI', 'other'):
             node = self.model.AppendNode(parent=self.model.root, label=prefix)
             self.mainNodes[prefix] = node
         
@@ -291,6 +291,7 @@ class ExtensionTreeModelBuilder:
                  'r'  : 'raster',
                  'r3' : 'raster3D',
                  's'  : 'sites',
+                 't'  : 'temporal',
                  'v'  : 'vector',
                  'wx' : 'wxGUI',
                  ''   : 'other' }

+ 2 - 1
scripts/g.extension/g.extension.py

@@ -164,6 +164,7 @@ def expand_module_class_name(c):
              'r'   : 'raster',
              'r3'  : 'raster3d',
              's'   : 'sites',
+             't'   : 'temporal',
              'v'   : 'vector',
              'wx'  : 'gui/wxpython'
              }
@@ -348,7 +349,7 @@ def list_available_extensions_svn():
         grass.warning(_("Flag 'g' ignored, addons metadata file not available"))
 
     prefix = ['d', 'db', 'g', 'i', 'm', 'ps',
-              'p', 'r', 'r3', 's', 'v']
+              'p', 'r', 'r3', 's', 't', 'v']
     for d in prefix:
         modclass = expand_module_class_name(d)
         grass.verbose(_("Checking for '%s' modules...") % modclass)