pythonlib: rename getCmd -> get_cmd (follow naming convetion)

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

gui/wxpython/gui_modules/gmodeler.py

@@ -404,7 +404,7 @@ class Model(object):
         errList = list()
         for action in self.GetItems(objType = ModelAction):
             task = menuform.GUI(show = None).ParseCommand(cmd = action.GetLog(string = False))
-            errList += task.getCmdError()
+            errList += task.get_cmdError()
         
         return errList
 
@@ -1791,7 +1791,7 @@ class ModelAction(ModelObject, ogl.RectangleShape):
     def SetId(self, id):
         """!Set id"""
         self.id = id
-        cmd = self.task.getCmd(ignoreErrors = True)
+        cmd = self.task.get_cmd(ignoreErrors = True)
         if cmd and len(cmd) > 0:
             self.ClearText()
             self.AddText('(%d) %s' % (self.id, cmd[0]))
@@ -1810,7 +1810,7 @@ class ModelAction(ModelObject, ogl.RectangleShape):
 
     def GetLog(self, string = True):
         """!Get logging info"""
-        cmd = self.task.getCmd(ignoreErrors = True, ignoreRequired = True)
+        cmd = self.task.get_cmd(ignoreErrors = True, ignoreRequired = True)
         
         # substitute variables
         variables = self.parent.GetVariables()
@@ -1850,7 +1850,7 @@ class ModelAction(ModelObject, ogl.RectangleShape):
     
     def GetName(self):
         """!Get name"""
-        cmd = self.task.getCmd(ignoreErrors = True)
+        cmd = self.task.get_cmd(ignoreErrors = True)
         if cmd and len(cmd) > 0:
             return cmd[0]
         
@@ -3731,7 +3731,7 @@ class ModelParamDialog(wx.Dialog):
         """!Check for errors, get list of messages"""
         errList = list()
         for task in self.tasks:
-            errList += task.getCmdError()
+            errList += task.get_cmd_error()
         
         return errList
     

gui/wxpython/gui_modules/layertree.py

@@ -806,7 +806,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
             self.SetItemText(layer, '%s %s' % (_('raster'), label))
         elif ltype == '3d-raster':
             self.SetItemImage(layer, self.rast3d_icon)
-            self.SetItemText(layer, '%s %s' % (_('3d raster'), label))
+            self.SetItemText(layer, '%s %s' % (_('3D raster'), label))
         elif ltype == 'rgb':
             self.SetItemImage(layer, self.rgb_icon)
             self.SetItemText(layer, '%s %s' % (_('RGB'), label))
@@ -815,7 +815,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
             self.SetItemText(layer, '%s %s' % (_('HIS'), label))
         elif ltype == 'shaded':
             self.SetItemImage(layer, self.shaded_icon)
-            self.SetItemText(layer, '%s %s' % (_('Shaded relief'), label))
+            self.SetItemText(layer, '%s %s' % (_('shaded relief'), label))
         elif ltype == 'rastnum':
             self.SetItemImage(layer, self.rnum_icon)
             self.SetItemText(layer, '%s %s' % (_('raster cell numbers'), label))
@@ -869,7 +869,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                 ctrlId = ctrl.GetId()
             else:
                 ctrlId = None
-                
+            
             # add a data object to hold the layer's command (does not apply to generic command layers)
             self.SetPyData(layer, ({'cmd'      : cmd,
                                     'type'     : ltype,
@@ -934,7 +934,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         # updated progress bar range (mapwindow statusbar)
         if checked:
             self.mapdisplay.GetProgressBar().SetRange(len(self.Map.GetListOfLayers(l_active = True)))
-            
+        
         return layer
 
     def PropertiesDialog (self, layer, show = True):

gui/wxpython/gui_modules/menuform.py

@@ -471,7 +471,7 @@ class mainFrame(wx.Frame):
         # status bar
         status_text = _("Enter parameters for '") + self.task.name + "'"
         try:
-            self.task.getCmd()
+            self.task.get_cmd()
             self.updateValuesHook()
         except ValueError:
             self.SetStatusText(status_text)
@@ -1814,7 +1814,7 @@ class cmdPanel(wx.Panel):
         for GRASS
         """
         try:
-            cmd = self.task.getCmd(ignoreErrors = ignoreErrors,
+            cmd = self.task.get_cmd(ignoreErrors = ignoreErrors,
                                    ignoreRequired = ignoreRequired)
         except ValueError, err:
             dlg = wx.MessageDialog(parent = self,
@@ -2138,7 +2138,7 @@ if __name__ ==  "__main__":
             task.get_flag('v')['value'] = True
             task.get_param('layer')['value'] = 1
             task.get_param('bcolor')['value'] = "red"
-            assert ' '.join(task.getCmd()) ==  "d.vect -v map = map_name layer = 1 bcolor = red"
+            assert ' '.join(task.get_cmd()) ==  "d.vect -v map = map_name layer = 1 bcolor = red"
         # Test interface building with handmade grassTask,
         # possibly outside of a GRASS session.
         task = gtask.grassTask()

lib/python/task.py

@@ -169,8 +169,8 @@ class grassTask:
                 return f
         raise ValueError, _("Flag not found: %s") % aFlag
 
-    def getCmdError(self):
-        """!Get error string produced by getCmd(ignoreErrors = False)
+    def get_cmd_error(self):
+        """!Get error string produced by get_cmd(ignoreErrors = False)
         
         @return list of errors
         """
@@ -191,7 +191,7 @@ class grassTask:
         
         return errorList
     
-    def getCmd(self, ignoreErrors = False, ignoreRequired = False):
+    def get_cmd(self, ignoreErrors = False, ignoreRequired = False):
         """!Produce an array of command name and arguments for feeding
         into some execve-like command processor.
 
@@ -221,7 +221,7 @@ class grassTask:
                 # Output only values that have been set, and different from defaults
                 cmd +=  [ '%s=%s' % (p['name'], p['value']) ]
         
-        errList = self.getCmdError()
+        errList = self.get_cmd_error()
         if ignoreErrors is False and errList:
             raise ValueError, '\n'.join(errList)