[GRASS-SVN] r30100 - grass/branches/releasebranch_6_3/visualization/nviz/scripts

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-02-12 08:28:45 -0500 (Tue, 12 Feb 2008)
New Revision: 30100

Modified:
   grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_site.tcl
   grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_vect.tcl
   grass/branches/releasebranch_6_3/visualization/nviz/scripts/site_attr.tcl
Log:
Maris Nartiss: fixed 'display flat' button from crashing UI: 'display thematic' crashing UI if no point maps is selected; linewrap fix in site_attr (merge from HEAD)

Modified: grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_site.tcl
===================================================================
--- grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_site.tcl	2008-02-12 13:28:16 UTC (rev 30099)
+++ grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_site.tcl	2008-02-12 13:28:45 UTC (rev 30100)
@@ -114,7 +114,7 @@
 		-command "Nv_closePanel $BASE" -anchor s -bd 1
     pack $bottom.close -side right
 
-    button $bottom.draw_current -text {DRAW CURRENT} -fg darkgreen -anchor s \
+    button $bottom.draw_current -text "DRAW CURRENT" -fg darkgreen -anchor s \
 		-command {Nsite_draw_one [Nget_current site]} -bd 1
 
     pack $bottom.draw_current -side left
@@ -178,7 +178,7 @@
 	set site_attr(FIELD_ATTR_PANEL) 0
     
 	checkbutton $row4.themechk -text "thematic mapping for vector points" \
-		-variable site_attr(FIELD_ATTR_PANEL) -command "site_attr_gui $row5 $bottom $curr" \
+		-variable site_attr(FIELD_ATTR_PANEL) -command "if {$curr!=0} {site_attr_gui $row5 $bottom $curr}" \
 		-offvalue 0 -onvalue 1
 	pack $row4.themechk -side left -anchor nw
     

Modified: grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_vect.tcl
===================================================================
--- grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_vect.tcl	2008-02-12 13:28:16 UTC (rev 30099)
+++ grass/branches/releasebranch_6_3/visualization/nviz/scripts/panel_vect.tcl	2008-02-12 13:28:45 UTC (rev 30100)
@@ -79,7 +79,7 @@
     set tmp [frame $BASE.f]
     button $tmp.close -text Close -command "Nv_closePanel $BASE" -anchor s -bd 1
     pack $tmp.close -side right
-    button $tmp.draw_current -text {DRAW CURRENT} -bd 1 -fg darkgreen \
+    button $tmp.draw_current -text "DRAW CURRENT" -bd 1 -fg darkgreen \
 		-command {Nvect_draw_one [Nget_current vect]}
     pack $tmp.draw_current -side left
     pack $tmp -side bottom -fill x -expand 1 -padx 3
@@ -89,6 +89,7 @@
     set row1 [frame $tmp.row1]
     set row2 [frame $tmp.row2]
     set row3 [frame $tmp.row3]
+    set row4 [frame $tmp.row4]
     set tmp1a [frame $row1.b]
     
     set wlabel [label $row1.wlabel -text "line width" \
@@ -106,14 +107,14 @@
 		-command "change_color vect $row1.color"]
     bind $row1.color <Expose> "$row1.color configure -bg \[get_curr_sv_color vect\]"
     
-    set rb1 [radiobutton $row1.label2 -text "display flat" \
-		-variable flat_state -value 1 -command "check_list $row2.list"]
+    set rb1 [radiobutton $row2.label2 -text "display flat" \
+		-variable flat_state -value 1 -command "check_list $row3.list"]
 
     set rb2 [radiobutton $row2.label1 -text "display on surface(s):" \
 		-variable flat_state -value 0 \
-        -command "check_list $row2.list"]
+        -command "check_list $row3.list"]
 
-    set htscale [Nv_mkScale $row3.scale h "vector height\nabove surface" 0 10000 $height set_ht 1]
+    set htscale [Nv_mkScale $row4.scale h "vector height\nabove surface" 0 10000 $height set_ht 1]
 
 
     pack $wlabel $vlinewidth -side left
@@ -122,21 +123,22 @@
     pack $row1 -expand 1 -fill none -pady 4
     pack $rb2 -side left 
     pack $row2 -side left
+    pack $row3 -side left
     pack $htscale -side top -anchor w
-    pack $row3 -side top -fill x -expand 1 -pady 4 
+    pack $row4 -side top -fill x -expand 1 -pady 4 
 
 	# Let radiobutton state handle building list
 	# of available surfaces
     if {$flat_state == 0} {
 		$row2.label1 select
-		check_list $row2.list
+		check_list $row3.list
     } else {
 		$row2.label2 select
-		check_list $row2.list
+		check_list $row3.list
     }
 
-    pack $row1 $row2 -side top -fill both -expand 1
-    pack $row3 -side right -fill both -expand 1
+    pack $row1 $row2 $row3 -side top -fill both -expand 1
+    pack $row4 -side right -fill both -expand 1
     pack $tmp -side top  -fill both -expand 1  -padx 3
 
     return $panel

Modified: grass/branches/releasebranch_6_3/visualization/nviz/scripts/site_attr.tcl
===================================================================
--- grass/branches/releasebranch_6_3/visualization/nviz/scripts/site_attr.tcl	2008-02-12 13:28:16 UTC (rev 30099)
+++ grass/branches/releasebranch_6_3/visualization/nviz/scripts/site_attr.tcl	2008-02-12 13:28:45 UTC (rev 30100)
@@ -426,8 +426,7 @@
 			generate a color table."
 		}
 		default {
-			puts "WARNING: No thematic mapping preferences set"
-			for $site_attr($_idx.ATTR)!"
+			puts "WARNING: No thematic mapping preferences set for $site_attr($_idx.ATTR)!"
 		}
 	}