[GRASS-SVN] r29624 - grass/trunk/gui/tcltk/gis.m
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jan 9 03:10:02 EST 2008
Author: neteler
Date: 2008-01-09 03:10:01 -0500 (Wed, 09 Jan 2008)
New Revision: 29624
Modified:
grass/trunk/gui/tcltk/gis.m/animate.tcl
grass/trunk/gui/tcltk/gis.m/barscale.tcl
grass/trunk/gui/tcltk/gis.m/chart.tcl
grass/trunk/gui/tcltk/gis.m/cmd.tcl
grass/trunk/gui/tcltk/gis.m/dtext.tcl
grass/trunk/gui/tcltk/gis.m/frames.tcl
grass/trunk/gui/tcltk/gis.m/georect.tcl
grass/trunk/gui/tcltk/gis.m/gm.tcl
grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
grass/trunk/gui/tcltk/gis.m/gmtree.tcl
grass/trunk/gui/tcltk/gis.m/gridline.tcl
grass/trunk/gui/tcltk/gis.m/group.tcl
grass/trunk/gui/tcltk/gis.m/histogram.tcl
grass/trunk/gui/tcltk/gis.m/labels.tcl
grass/trunk/gui/tcltk/gis.m/legend.tcl
grass/trunk/gui/tcltk/gis.m/mapcanvas.tcl
grass/trunk/gui/tcltk/gis.m/maplabels.tcl
grass/trunk/gui/tcltk/gis.m/mapprint.tcl
grass/trunk/gui/tcltk/gis.m/maptool.tcl
grass/trunk/gui/tcltk/gis.m/profile.tcl
grass/trunk/gui/tcltk/gis.m/rastarrows.tcl
grass/trunk/gui/tcltk/gis.m/raster.tcl
grass/trunk/gui/tcltk/gis.m/rastnums.tcl
grass/trunk/gui/tcltk/gis.m/rgbhis.tcl
grass/trunk/gui/tcltk/gis.m/rules.tcl
grass/trunk/gui/tcltk/gis.m/runandoutput.tcl
grass/trunk/gui/tcltk/gis.m/thematic.tcl
grass/trunk/gui/tcltk/gis.m/tksys.tcl
grass/trunk/gui/tcltk/gis.m/vector.tcl
Log:
Gm::errmsg -> GmLib::errmsg
Modified: grass/trunk/gui/tcltk/gis.m/animate.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/animate.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/animate.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -88,7 +88,7 @@
# create file for temporary image output
if {[catch {set tmpfile [exec g.tempfile pid=[pid]]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
}
@@ -856,7 +856,7 @@
# export the map to a PPM file
if {[catch {exec r.out.ppm input=$name output=$tmpfile --q} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
return -1
}
@@ -933,20 +933,20 @@
if { $switch == 1 } {
# set temp region file for changing resolution
if {[catch {set region [exec g.region -u save=$tmpregion --o --q]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set env(WIND_OVERRIDE) $tmpregion} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
# change resolution
if {[catch [exec g.region res=$pnmres] error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
} else {
# switch back to original region
if {[catch {unset env(WIND_OVERRIDE)} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[file exists $tmpregion]} {
catch [exec g.remove region=$tmpregion --q 2> $devnull]
@@ -975,7 +975,7 @@
# set initial canvas geometry to match region
if {[catch {set region [exec g.region -ugp]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set reglist [split $region "\n"]
Modified: grass/trunk/gui/tcltk/gis.m/barscale.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/barscale.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/barscale.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -88,7 +88,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -398,7 +398,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/chart.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/chart.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/chart.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -86,7 +86,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -134,7 +134,7 @@
if ![catch {open "|v.db.connect map=$mapname layer=$layer -g" r} vdb] {
set vectdb [read $vdb]
if {[catch {close $vdb} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set vdblist [split $vectdb " "]
set tbl [lindex $vdblist 1]
@@ -438,7 +438,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/cmd.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/cmd.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/cmd.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -72,7 +72,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -203,7 +203,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/dtext.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/dtext.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/dtext.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -89,7 +89,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -398,7 +398,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/frames.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/frames.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/frames.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -75,7 +75,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
@@ -272,7 +272,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/georect.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/georect.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/georect.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -354,7 +354,7 @@
GRMap::setxyenv $xymset $xyloc
set cmd "i.group"
if {[catch {exec -- $cmd --ui } error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
# Return to georectified mapset
@@ -403,7 +403,7 @@
set mappid [pid]
if {[catch {set grfile [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
append grfile ".ppm"
@@ -545,7 +545,7 @@
catch {set vlist [open $vgfile]}
set vectnames [read $vlist]
if {[catch {close $vlist} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set vlines [split $vectnames "\n"]
@@ -583,7 +583,7 @@
puts $output $vect
}
if {[catch {close $output} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -1164,7 +1164,7 @@
catch {set pfile [open $gcpfile]}
set points [read $pfile]
if {[catch {close $pfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
regsub -all {[ ]+} $points " " points
set plines [split $points "\n"]
@@ -1229,7 +1229,7 @@
}
if {[catch {close $output} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -1269,7 +1269,7 @@
catch {set input [open "|g.transform group=$xygroup order=$rectorder"]}
set errorlist [read $input]
if {[catch {close $input} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
# Return to georectified mapset
@@ -1321,7 +1321,7 @@
catch {set pfile [open $gcpfile]}
set points [read $pfile]
if {[catch {close $pfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
regsub -all {[ ]+} $points " " points
@@ -1573,7 +1573,7 @@
}
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "Error setting region"]
+ GmLib::errmsg $error [G_msg "Error setting region"]
}
# Finally put this into wind file format to use with GRASS_REGION
regexp -nocase {^.* (\(.*\))} $parts(projection) trash end
@@ -1640,7 +1640,7 @@
catch {set pfile [open $gcpfile]}
set points [read $pfile]
if {[catch {close $pfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
regsub -all {[ ]+} $points " " points
@@ -1950,7 +1950,7 @@
set parts($key) $value
}
if {[catch {close $input} error]} {
- Gm::errmsg $error ["Error setting region"]
+ GmLib::errmsg $error ["Error setting region"]
}
GRMap::zoom_new $parts(north) $parts(south) $parts(east) $parts(west) $parts(nsres) $parts(ewres)
Modified: grass/trunk/gui/tcltk/gis.m/gm.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gm.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/gm.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -29,23 +29,23 @@
package require -exact GisM 1.0
if {[catch {set env(GISDBASE) [exec g.gisenv get=GISDBASE]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set env(LOCATION_NAME) [exec g.gisenv get=LOCATION_NAME]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set env(MAPSET) [exec g.gisenv get=MAPSET]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set gisdbase [exec g.gisenv get=GISDBASE]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set location_name [exec g.gisenv get=LOCATION_NAME]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {[catch {set mapset [exec g.gisenv get=MAPSET]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
# path to GIS Manager files
@@ -100,7 +100,7 @@
set GRASSVERSION [read -nonewline $fp]
if {[catch {close $fp} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
@@ -452,7 +452,7 @@
wm title .dispfont [G_msg "Select GRASS display font"]
if {[catch {set fontlist [exec d.font --q -l]} error]} {
- Gm::errmsg $error "d.font error"
+ GmLib::errmsg $error "d.font error"
}
set fontlist [string trim $fontlist]
set fontlist [split $fontlist "\n"]
@@ -540,7 +540,7 @@
###############################################################################
-proc Gm::errmsg { error args } {
+proc GmLib::errmsg { error args } {
# send error report and optional message (args) to tk_messageBox
set message ""
Modified: grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gmmenu.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/gmmenu.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -70,7 +70,7 @@
}
}
if {[catch {close $menudef} error]} {
- Gm::errmsg $error ["Error reading xtnmenu.dat file"]
+ GmLib::errmsg $error ["Error reading xtnmenu.dat file"]
}
}
set XtnsMenu "True"
Modified: grass/trunk/gui/tcltk/gis.m/gmtree.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gmtree.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/gmtree.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -480,7 +480,7 @@
global mon
if { [array size GmTree::tree] < 1 } {
- Gm::errmsg $error [G_msg "No layer selected"]
+ GmLib::errmsg $error [G_msg "No layer selected"]
}
set sel [ lindex [$tree($mon) selection get] 0 ]
@@ -628,7 +628,7 @@
global new_root_node mon
if { [array size GmTree::tree] < 1 } {
- Gm::errmsg $error [G_msg "No layer selected"]
+ GmLib::errmsg $error [G_msg "No layer selected"]
}
if { [catch {match string {} $new_root_node}] } {
@@ -722,13 +722,13 @@
set fpath $spth
if {[catch {set rcfile [open $fpath w]} error]} {
- Gm::errmsg $error [G_msg [format "Could not open file for writing.\n%s" $fpath]]
+ GmLib::errmsg $error [G_msg [format "Could not open file for writing.\n%s" $fpath]]
return
}
GmGroup::save $tree($mon) 0 "root"
if {[catch {close $rcfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -974,7 +974,7 @@
}
default {
if {[catch {GmTree::node_type $current_node} error]} {
- Gm::errmsg $error [G_msg [format "Could not open %s - bad file format" $fpath]]
+ GmLib::errmsg $error [G_msg [format "Could not open %s - bad file format" $fpath]]
break
} else {
set type [GmTree::node_type $current_node]
@@ -1043,7 +1043,7 @@
set Gm::prgindic $prg
}
if {[catch {close $rcfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set Gm::prgindic $max_prgindic
Modified: grass/trunk/gui/tcltk/gis.m/gridline.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gridline.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/gridline.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -96,7 +96,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -403,7 +403,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/group.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/group.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/group.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -164,7 +164,7 @@
}
if {[catch {eval exec "$cmd 2> $devnull &"} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -204,13 +204,13 @@
if {![catch {set rinfo [eval exec "r.info map=$surf 2> $devnull"]} error]} {
if { $rinfo == "" } {set surf ""}
} else {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {![catch {set rinfo [eval exec "r.info map=$clr 2> $devnull"]} error]} {
if { $rinfo == "" } {set surf ""}
} else {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if { $surf == "" || $clr == "" } { return }
@@ -235,7 +235,7 @@
if {![catch {set vinfo [eval exec "v.info map=$vect 2> $devnull"]} error]} {
if { $vinfo == "" } {set vect ""}
} else {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if {$vect == ""} {return}
Modified: grass/trunk/gui/tcltk/gis.m/histogram.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/histogram.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/histogram.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -81,7 +81,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -260,7 +260,7 @@
catch {set rt [open "|r.info map=$opt($id,1,map) -t" r]}
set rasttype [read $rt]
if {[catch {close $rt} error]} {
- Gm::errmsg $error [G_msg "r.info error"]
+ GmLib::errmsg $error [G_msg "r.info error"]
}
if {[regexp -nocase ".=FCELL" $rasttype] || [regexp -nocase ".=DCELL" $rasttype]} {
append cmd " nsteps=$opt($id,1,nsteps)"
@@ -365,7 +365,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/labels.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/labels.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/labels.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -75,7 +75,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -276,7 +276,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/legend.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/legend.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/legend.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -92,7 +92,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -473,7 +473,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/mapcanvas.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/mapcanvas.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/mapcanvas.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -209,7 +209,7 @@
# set tempfile for ppm output
set mappid [pid]
if {[catch {set mapfile($mon) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set maskfile($mon) $mapfile($mon)
append mapfile($mon) ".ppm"
@@ -218,7 +218,7 @@
# set tempfile and tmp directory path for composite output
set mappid [pid]
if {[catch {set outfile($mon) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set tmpdir [file dirname $outfile($mon)]
@@ -430,7 +430,7 @@
set prj($key) $value
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "g.proj or projection error"]
+ GmLib::errmsg $error [G_msg "g.proj or projection error"]
}
}
# Length is calculated from the map canvas arrows
@@ -590,7 +590,7 @@
}
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "Error setting region"]
+ GmLib::errmsg $error [G_msg "Error setting region"]
}
# Finally put this into wind file format to use with GRASS_REGION
regexp -nocase {^([0-9]+)} $parts(projection) trash parts(projection)
@@ -1133,7 +1133,7 @@
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "Error setting region"]
+ GmLib::errmsg $error [G_msg "Error setting region"]
}
#set start point (sw corner)
@@ -1186,7 +1186,7 @@
}
if {[catch {eval [list exec -- $cmd] $args $options >& $devnull} error]} {
- Gm::errmsg $error [G_msg "Error setting region"]
+ GmLib::errmsg $error [G_msg "Error setting region"]
}
}
Modified: grass/trunk/gui/tcltk/gis.m/maplabels.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/maplabels.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/maplabels.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -542,7 +542,7 @@
}
# close labels file
if {[catch {close $labelfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
Modified: grass/trunk/gui/tcltk/gis.m/mapprint.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/mapprint.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/mapprint.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -191,14 +191,14 @@
# get temporary file for postscript printing
set pid [ pid ]
if {[catch {set tmppsfile [ exec g.tempfile pid=$pid ]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
append tmppsfile ".ps"
set pid [ pid ]
if {[catch {set tmppngfile [ exec g.tempfile pid=$pid ]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
append tmppngfile ".png"
}
@@ -431,14 +431,14 @@
# lpr printing
if { $printmode == "lpr" } {
if {[catch {exec lpr -o position=center $tmppsfile } error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
# postsript printing via ghostsript
if { $printmode == "psprint" && $printer != "" } {
if {[catch {exec $cmd $format -sDEVICE#$printer -r$res -sNOPAUSE -dBATCH -- $tmppsfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -446,7 +446,7 @@
# output to pdf file via ghostscript
if { $printmode == "pdf" && $pdffile != "" } {
if {[catch {exec $cmd $format -sDEVICE#pdfwrite -r$res -sNOPAUSE -sOutputFile#$pdffile -dBATCH -- $tmppsfile} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
Modified: grass/trunk/gui/tcltk/gis.m/maptool.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/maptool.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/maptool.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -391,19 +391,19 @@
switch $type {
"bmp" {
if { [catch {exec gdal_translate $path.ppm $path.bmp -of BMP} error ]} {
- Gm::errmsg $error [G_msg "Could not create BMP"]
+ GmLib::errmsg $error [G_msg "Could not create BMP"]
}
catch {file delete $path.ppm}
}
"jpg" {
if { $quality == 300 } {
if { [catch {exec gdal_translate $path.ppm $path.jpg -of JPEG -co QUALITY=95 -outsize 300% 300% } error ]} {
- Gm::errmsg $error [G_msg "Could not create JPG"]
+ GmLib::errmsg $error [G_msg "Could not create JPG"]
}
catch {file delete $path.ppm}
} else {
if { [catch {exec gdal_translate $path.ppm $path.jpg -of JPEG -co QUALITY=$quality } error ]} {
- Gm::errmsg $error [G_msg "Could not create JPG"]
+ GmLib::errmsg $error [G_msg "Could not create JPG"]
}
catch {file delete $path.ppm}
@@ -411,7 +411,7 @@
}
"png" {
if { [catch {exec gdal_translate $path.ppm $path.png -of PNG} error ]} {
- Gm::errmsg $error [G_msg "Could not create PNG"]
+ GmLib::errmsg $error [G_msg "Could not create PNG"]
}
catch {file delete $path.ppm}
@@ -421,7 +421,7 @@
}
"tif" {
if { [catch {exec gdal_translate $path.ppm $path.tif -of GTIFF} error ]} {
- Gm::errmsg $error [G_msg "Could not create TIF"]
+ GmLib::errmsg $error [G_msg "Could not create TIF"]
}
catch {file delete $path.ppm}
Modified: grass/trunk/gui/tcltk/gis.m/profile.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/profile.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/profile.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -174,7 +174,7 @@
set elev($key) $value
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "r.univar error"]
+ GmLib::errmsg $error [G_msg "r.univar error"]
}
set elevmax $elev(max)
@@ -412,7 +412,7 @@
set prj($key) $value
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "g.proj or projection error"]
+ GmLib::errmsg $error [G_msg "g.proj or projection error"]
}
}
@@ -531,7 +531,7 @@
}
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "r.profile error"]
+ GmLib::errmsg $error [G_msg "r.profile error"]
}
}
@@ -616,7 +616,7 @@
}
}
if {[catch {close $input} error]} {
- Gm::errmsg $error [G_msg "r.profile error"]
+ GmLib::errmsg $error [G_msg "r.profile error"]
}
}
Modified: grass/trunk/gui/tcltk/gis.m/rastarrows.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/rastarrows.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/rastarrows.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -80,7 +80,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -354,7 +354,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/raster.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/raster.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/raster.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -83,7 +83,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -348,7 +348,7 @@
if {![catch {open "|r.info map=$opt($id,1,map) -t" r} rt]} {
set rasttype [read $rt]
if {[catch {close $rt} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -460,7 +460,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/rastnums.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/rastnums.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/rastnums.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -76,7 +76,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
return
}
set lfilemask($count) $lfile($count)
@@ -246,7 +246,7 @@
catch {set rc [open "|g.region -ugp" r]}
set rowscolumns [read $rc]
if {[catch {close $rc} error]} {
- Gm::errmsg $error "Region settings error"
+ GmLib::errmsg $error "Region settings error"
}
regexp {rows=(\d*)} $rowscolumns string rows
regexp {cols=(\d*)} $rowscolumns string cols
@@ -357,7 +357,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/rgbhis.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/rgbhis.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/rgbhis.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -80,7 +80,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -359,7 +359,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
Modified: grass/trunk/gui/tcltk/gis.m/rules.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/rules.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/rules.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -204,7 +204,7 @@
set rulespid [pid]
if {[catch {set rulesfile [exec g.tempfile pid=$rulespid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
# get rules from text widget
@@ -218,7 +218,7 @@
catch {set output [open $rulesfile w ]}
puts $output $rules
if {[catch {close $output} error]} {
- Gm::errmsg $error [G_msg "Error creating rules file"]
+ GmLib::errmsg $error [G_msg "Error creating rules file"]
return
}
Modified: grass/trunk/gui/tcltk/gis.m/runandoutput.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/runandoutput.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/runandoutput.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -73,7 +73,7 @@
set code ""
if {[catch {set code [exec -- $program --tcltk 2> $devnull]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set path .dialog$dlg
@@ -94,7 +94,7 @@
proc run_disabled {gronsole button cmd} {
if {[catch {$button configure -state disabled} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
$gronsole run $cmd {running} "catch {$button configure -state active}"
@@ -166,7 +166,7 @@
proc spawn {cmd args} {
if {[catch {eval [list exec -- $cmd] $args &} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -196,7 +196,7 @@
# eval exec -- $cmd $args >@ stdout 2>@ stderr
if {[catch {eval [list exec -- $cmd] $args >& $devnull} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
@@ -228,12 +228,12 @@
if { $mingw == "1" } {
if {[catch {eval [list exec -- cmd.exe /c start $env(GISBASE)/etc/grass-run.bat $cmd] $args &} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
} else {
if {[catch {eval [list exec -- $env(GISBASE)/etc/grass-xterm-wrapper -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd] $args &} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
Modified: grass/trunk/gui/tcltk/gis.m/thematic.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/thematic.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/thematic.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -104,7 +104,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -175,7 +175,7 @@
if {![catch {open "|v.db.connect map=$mapname layer=$layer -g" r} vdb]} {
set vectdb [read $vdb]
if {[catch {close $vdb} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set vdblist [split $vectdb " "]
set tbl [lindex $vdblist 1]
@@ -604,7 +604,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -677,7 +677,7 @@
# get legend file created by d.vect.thematic in GRASS tmp diretory
set mappid [pid]
if {[catch {set tmpdir [file dirname [exec g.tempfile pid=$mappid]]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set legfile "$tmpdir/gismlegend.txt"
@@ -779,7 +779,7 @@
}
}
if {[catch {close $ltxt} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
return
Modified: grass/trunk/gui/tcltk/gis.m/tksys.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/tksys.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/tksys.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -78,7 +78,7 @@
if { [string compare "$sys(user)" "unknown"] == 0 && \
[string compare "$sys(platform)" "$tcl_platform_subst(unix)"] == 0 } {
if {[catch {set sys(user) [exec whoami]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
@@ -100,7 +100,7 @@
if { [string compare "$sys(platform)" "$tcl_platform_subst(unix)"] == 0 } {
if {[catch {set tmp [exec uname -srm]} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
regsub -all { } $tmp {-} tmp
set sys(uname) $tmp
@@ -212,11 +212,11 @@
return
}
if [catch {open $file w} error] {
- Gm::errmsg $error
+ GmLib::errmsg $error
} else {
sys_putinfo $out
if {[catch {close $out} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
}
Modified: grass/trunk/gui/tcltk/gis.m/vector.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/vector.tcl 2008-01-08 22:02:23 UTC (rev 29623)
+++ grass/trunk/gui/tcltk/gis.m/vector.tcl 2008-01-09 08:10:01 UTC (rev 29624)
@@ -191,7 +191,7 @@
# create files in tmp diretory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
@@ -252,7 +252,7 @@
if {![catch {open "|v.db.connect map=$mapname layer=$layernum -g" r} vdb]} {
set vectdb [read $vdb]
if {[catch {close $vdb} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
set vdblist [split $vectdb " "]
@@ -570,7 +570,7 @@
if {![catch {open "|v.info map=$vect 2> $devnull" r} rv]} {
set vinfo [read $rv]
if {[catch {close $rv} error]} {
- Gm::errmsg $error
+ GmLib::errmsg $error
}
if { $vinfo == "" } {return}
@@ -816,7 +816,7 @@
# create files in tmp directory for layer output
set mappid [pid]
if {[catch {set lfile($count) [exec g.tempfile pid=$mappid]} error]} {
- Gm::errmsg $error [G_msg "Error creating tempfile"]
+ GmLib::errmsg $error [G_msg "Error creating tempfile"]
}
set lfilemask($count) $lfile($count)
append lfile($count) ".ppm"
More information about the grass-commit
mailing list