[GRASS-SVN] r69398 - in grass/branches/releasebranch_7_2: gui/wxpython/core gui/wxpython/lmgr gui/wxpython/xml scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-09-07 12:50:52 -0700 (Wed, 07 Sep 2016)
New Revision: 69398

Removed:
   grass/branches/releasebranch_7_2/scripts/v.krige/
Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/core/gconsole.py
   grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py
   grass/branches/releasebranch_7_2/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_2/gui/wxpython/xml/wxgui_items.xml
   grass/branches/releasebranch_7_2/scripts/Makefile
Log:
 v.krige removed from core distribution (see #3136 for details)

Modified: grass/branches/releasebranch_7_2/gui/wxpython/core/gconsole.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/core/gconsole.py	2016-09-07 19:43:51 UTC (rev 69397)
+++ grass/branches/releasebranch_7_2/gui/wxpython/core/gconsole.py	2016-09-07 19:50:52 UTC (rev 69398)
@@ -534,8 +534,7 @@
 
                     # no arguments given
                     if hasParams and \
-                       not isinstance(self._guiparent, FormNotebook) and \
-                       command[0] != 'v.krige':
+                       not isinstance(self._guiparent, FormNotebook):
                         # also parent must be checked, see #3135 for details
                         try:
                             GUI(parent=self._guiparent,

Modified: grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py	2016-09-07 19:43:51 UTC (rev 69397)
+++ grass/branches/releasebranch_7_2/gui/wxpython/lmgr/frame.py	2016-09-07 19:50:52 UTC (rev 69398)
@@ -861,7 +861,7 @@
 
         # check list of dummy commands for GUI modules that do not have GRASS
         # bin modules or scripts.
-        if cmd in ['vcolors', 'r.mapcalc', 'r3.mapcalc', 'v.krige']:
+        if cmd in ['vcolors', 'r.mapcalc', 'r3.mapcalc']:
             return cmdlist
 
         try:

Modified: grass/branches/releasebranch_7_2/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/xml/toolboxes.xml	2016-09-07 19:43:51 UTC (rev 69397)
+++ grass/branches/releasebranch_7_2/gui/wxpython/xml/toolboxes.xml	2016-09-07 19:50:52 UTC (rev 69398)
@@ -1039,8 +1039,6 @@
         <label>Raster series interpolation</label> 
       </module-item> 
       <separator/>
-      <wxgui-item name="OrdinaryOrBlockKriging"/>
-      <separator/>
       <module-item name="r.fillnulls">
         <label>Fill NULL cells</label>
       </module-item>

Modified: grass/branches/releasebranch_7_2/gui/wxpython/xml/wxgui_items.xml
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/xml/wxgui_items.xml	2016-09-07 19:43:51 UTC (rev 69397)
+++ grass/branches/releasebranch_7_2/gui/wxpython/xml/wxgui_items.xml	2016-09-07 19:50:52 UTC (rev 69398)
@@ -334,12 +334,6 @@
     <description>Configuration editor for r.li.'index'</description>
     <keywords>raster,landscape structure analysis</keywords>
   </wxgui-item>
-  <wxgui-item name="OrdinaryOrBlockKriging">
-    <label>Ordinary or block kriging</label>
-    <command>v.krige</command>
-    <description>Performs ordinary or block kriging.</description>
-    <keywords>vector,raster,interpolation,kriging</keywords>
-  </wxgui-item>
   <wxgui-item name="CreateNewVectorMap">
     <label>Create new vector map</label>
     <handler>OnNewVector</handler>

Modified: grass/branches/releasebranch_7_2/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_7_2/scripts/Makefile	2016-09-07 19:43:51 UTC (rev 69397)
+++ grass/branches/releasebranch_7_2/scripts/Makefile	2016-09-07 19:50:52 UTC (rev 69398)
@@ -75,8 +75,7 @@
 	v.unpack \
 	v.what.strds \
 	v.what.vect \
-	wxpyimgview \
-	v.krige
+	wxpyimgview
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make