Forráskód Böngészése

wxGUI/datacatalog: simplify g.remove caller

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72371 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 7 éve
szülő
commit
a61b1487a5
1 módosított fájl, 3 hozzáadás és 9 törlés
  1. 3 9
      gui/wxpython/datacatalog/tree.py

+ 3 - 9
gui/wxpython/datacatalog/tree.py

@@ -792,15 +792,9 @@ class DataCatalogTree(LocationMapTree):
                 title=_('Delete map')) == wx.ID_YES:
                 title=_('Delete map')) == wx.ID_YES:
             label = _("Deleting {name}...").format(name=name)
             label = _("Deleting {name}...").format(name=name)
             self.showNotification.emit(message=label)
             self.showNotification.emit(message=label)
-            if self.selected_type.label == 'vector':
-                removed, cmd = self._runCommand(
-                    'g.remove', flags='f', type='vector', name=name, env=env)
-            elif self.selected_type.label == 'raster':
-                removed, cmd = self._runCommand(
-                    'g.remove', flags='f', type='raster', name=name, env=env)
-            else:
-                removed, cmd = self._runCommand(
-                    'g.remove', flags='f', type='raster_3d', name=name, env=env)
+
+            removed, cmd = self._runCommand(
+                'g.remove', flags='f', type=self.selected_type.label, name=name, env=env)
             if removed == 0:
             if removed == 0:
                 self._model.RemoveNode(self.selected_layer)
                 self._model.RemoveNode(self.selected_layer)
                 self.RefreshNode(self.selected_type, recursive=True)
                 self.RefreshNode(self.selected_type, recursive=True)