Selaa lähdekoodia

rename d.thematic.area to d.vect.thematic (part 4)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63980 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 vuotta sitten
vanhempi
commit
866a6cb82f

+ 1 - 1
gui/wxpython/core/utils.py

@@ -1006,7 +1006,7 @@ command2ltype = {'d.rast'         : 'raster',
                  'd.rast.num'     : 'rastnum',
                  'd.rast.num'     : 'rastnum',
                  'd.rast.leg'     : 'maplegend',
                  'd.rast.leg'     : 'maplegend',
                  'd.vect'         : 'vector',
                  'd.vect'         : 'vector',
-                 'd.thematic.area': 'thememap',
+                 'd.vect.thematic': 'thememap',
                  'd.vect.chart'   : 'themechart',
                  'd.vect.chart'   : 'themechart',
                  'd.grid'         : 'grid',
                  'd.grid'         : 'grid',
                  'd.geodesic'     : 'geodesic',
                  'd.geodesic'     : 'geodesic',

+ 0 - 4
gui/wxpython/lmgr/layertree.py

@@ -1251,10 +1251,6 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
             elif ltype == 'vector':
             elif ltype == 'vector':
                 cmd += GetDisplayVectSettings()
                 cmd += GetDisplayVectSettings()
             
             
-            # ltype == 'thememap':
-            # -s flag requested, otherwise only first thematic category is displayed
-            # should be fixed by C-based d.thematic.* modules
-        
         if cmd:
         if cmd:
             GUI(parent = self, centreOnParent = False).ParseCommand(cmd,
             GUI(parent = self, centreOnParent = False).ParseCommand(cmd,
                                                                     completed = (self.GetOptData,layer,params))
                                                                     completed = (self.GetOptData,layer,params))

+ 3 - 8
lib/gis/renamed_options

@@ -66,18 +66,13 @@ d.vect|lcolor:label_color
 d.vect|bgcolor:label_bgcolor
 d.vect|bgcolor:label_bgcolor
 d.vect|bcolor:label_boundary_color
 d.vect|bcolor:label_boundary_color
 d.vect|lsize:label_size
 d.vect|lsize:label_size
-# d.thematic.area
-d.thematic.area|bcolor:boundary_color
-d.thematic.area|bwidth:boundary_width
+# d.vect.thematic
+d.vect.thematic|bcolor:boundary_color
+d.vect.thematic|bwidth:boundary_width
 # d.vect.chart
 # d.vect.chart
 d.vect.chart|ctype:chart_type
 d.vect.chart|ctype:chart_type
 d.vect.chart|ocolor:outline_color
 d.vect.chart|ocolor:outline_color
 d.vect.chart|sizecol:size_column
 d.vect.chart|sizecol:size_column
-# d.vect.thematic
-d.vect.thematic|pointcolor:point_color
-d.vect.thematic|linecolor:line_color
-d.vect.thematic|startcolor:start_color
-d.vect.thematic|endcolor:end_color
 ######################################
 ######################################
 ### Database management module changes
 ### Database management module changes
 ######################################
 ######################################

+ 4 - 4
vector/v.class/v.class.html

@@ -12,7 +12,7 @@ algorithm developed by Jean-Pierre Grimmeau at the Free University of
 Brussels (ULB).
 Brussels (ULB).
 
 
 It can be used to pipe class breaks into thematic mapping modules such
 It can be used to pipe class breaks into thematic mapping modules such
-as <em>d.thematic.area</em> (see example below);
+as <em>d.vect.thematic</em> (see example below);
 
 
 <h2>NOTES</h2>
 <h2>NOTES</h2>
 
 
@@ -71,9 +71,9 @@ v.class map=communes column=pop/area algo=std nbclasses=5
 
 
 
 
 The following example uses the output of d.class and feeds it directly
 The following example uses the output of d.class and feeds it directly
-into <em>d.thematic.area</em>:
+into <em>d.vect.thematic</em>:
 <div class="code"><pre>
 <div class="code"><pre>
-d.thematic.area -l map=communes2 column=pop/area \
+d.vect.thematic -l map=communes2 column=pop/area \
     breaks=`v.class -g map=communes2 column=pop/area algo=std nbcla=5` \
     breaks=`v.class -g map=communes2 column=pop/area algo=std nbcla=5` \
     colors=0:0:255,50:100:255,255:100:50,255:0:0,156:0:0
     colors=0:0:255,50:100:255,255:100:50,255:0:0,156:0:0
 </pre></div>
 </pre></div>
@@ -82,7 +82,7 @@ d.thematic.area -l map=communes2 column=pop/area \
 
 
 <em>
 <em>
 <a href="v.univar.html">v.univar</a>,
 <a href="v.univar.html">v.univar</a>,
-<a href="d.thematic.area.html">d.thematic.area</a>
+<a href="d.vect.thematic.html">d.vect.thematic</a>
 </em>
 </em>