[GRASS-SVN] r62959 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core gui/wxpython/mapdisp gui/wxpython/vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 01:10:53 -0800 (Wed, 26 Nov 2014)
New Revision: 62959

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
   grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
   grass/branches/releasebranch_7_0/gui/wxpython/vdigit/mapwindow.py
Log:
wxGUI: d.vect's fcolor -> fill_color



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2014-11-26 09:04:57 UTC (rev 62958)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2014-11-26 09:10:53 UTC (rev 62959)
@@ -2502,9 +2502,9 @@
             task.get_param('map')['value'] = "map_name"
             task.get_flag('i')['value'] = True
             task.get_param('layer')['value'] = 1
-            task.get_param('bcolor')['value'] = "red"
+            task.get_param('label_bcolor')['value'] = "red"
             # the default parameter display is added automatically
-            assert ' '.join(task.get_cmd()) == "d.vect -i map=map_name layer=1 display=shape bcolor=red"
+            assert ' '.join(task.get_cmd()) == "d.vect -i map=map_name layer=1 display=shape label_bcolor=red"
             print "Creation of task successful"
         # Test interface building with handmade grassTask,
         # possibly outside of a GRASS session.

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2014-11-26 09:04:57 UTC (rev 62958)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2014-11-26 09:10:53 UTC (rev 62959)
@@ -985,7 +985,7 @@
         pattern = ["d.vect",
                    "map=%s" % name,
                    "color=%s" % colorStr,
-                   "fcolor=%s" % colorStr,
+                   "fill_color=%s" % colorStr,
                    "width=%d"  % UserSettings.Get(group = 'atm', key = 'highlight', subkey = 'width')]
         if icon != '':
             pattern.append('icon=%s' % icon)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/vdigit/mapwindow.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/vdigit/mapwindow.py	2014-11-26 09:04:57 UTC (rev 62958)
+++ grass/branches/releasebranch_7_0/gui/wxpython/vdigit/mapwindow.py	2014-11-26 09:10:53 UTC (rev 62959)
@@ -778,7 +778,7 @@
                             'cats=%s' % ListOfCatsToRange(self.copyIds),
                             '-i',
                             'color=%s' % colorStr,
-                            'fcolor=%s' % colorStr,
+                            'fill_color=%s' % colorStr,
                             'type=point,line,boundary,centroid',
                             'width=2']