[GRASS-SVN] r40450 - grass/branches/develbranch_6/gui/tcltk/gis.m

[svn_grass at osgeo.org]

Author: marisn
Date: 2010-01-14 08:14:39 -0500 (Thu, 14 Jan 2010)
New Revision: 40450

Modified:
   grass/branches/develbranch_6/gui/tcltk/gis.m/legend.tcl
   grass/branches/develbranch_6/gui/tcltk/gis.m/maplabels.tcl
Log:
gis.m: Fix PS legend and label layer duplication. Fixes bug #870

Modified: grass/branches/develbranch_6/gui/tcltk/gis.m/legend.tcl
===================================================================
--- grass/branches/develbranch_6/gui/tcltk/gis.m/legend.tcl	2010-01-14 11:33:49 UTC (rev 40449)
+++ grass/branches/develbranch_6/gui/tcltk/gis.m/legend.tcl	2010-01-14 13:14:39 UTC (rev 40450)
@@ -490,9 +490,6 @@
 
 	set opt($count,1,opacity) $opt($id,1,opacity)
 
-	set optlist { _check map opacity color lines thin labelnum at height width \
-             mouseset use range nolbl noval skip smooth flip}
-             
     foreach key $optlist {
     	set opt($count,1,$key) $opt($id,1,$key)
 		set opt($count,0,$key) $opt($count,1,$key)

Modified: grass/branches/develbranch_6/gui/tcltk/gis.m/maplabels.tcl
===================================================================
--- grass/branches/develbranch_6/gui/tcltk/gis.m/maplabels.tcl	2010-01-14 11:33:49 UTC (rev 40449)
+++ grass/branches/develbranch_6/gui/tcltk/gis.m/maplabels.tcl	2010-01-14 13:14:39 UTC (rev 40450)
@@ -571,7 +571,7 @@
 	variable dup
 	global iconpath
 
-    set node "PS labels:$count"
+    set node "clabels:$count"
 	set dup($count) 1
 
     set frm [ frame .clabelsicon$count]
@@ -595,12 +595,12 @@
 
 	if { $opt($id,1,labels) == ""} {
 	    $tree insert $sellayer $parent $node \
-		-text      "clabels $count" \
+		-text      "PS labels $count" \
 		-window    $frm \
 		-drawcross auto
 	} else {
 	    $tree insert $sellayer $parent $node \
-		-text      "$opt($id,1,clabels)" \
+		-text      "$opt($id,1,labels)" \
 		-window    $frm \
 		-drawcross auto
 	}