[GRASS-SVN] r29485 - grass/trunk/gui/tcltk/gis.m

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2007-12-20 15:06:45 -0500 (Thu, 20 Dec 2007)
New Revision: 29485

Modified:
   grass/trunk/gui/tcltk/gis.m/mapprint.tcl
Log:
Made lpr printing the default, regardless of ghostprint access

Modified: grass/trunk/gui/tcltk/gis.m/mapprint.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/mapprint.tcl	2007-12-20 16:09:26 UTC (rev 29484)
+++ grass/trunk/gui/tcltk/gis.m/mapprint.tcl	2007-12-20 20:06:45 UTC (rev 29485)
@@ -84,8 +84,9 @@
 	set psprint::mtop 1
 	set psprint::mbottom 1
 	
-	# check for ghostscript
-	
+	set printmode "lpr"
+
+	# check for ghostscript	
 	# switch to native windows version of ghostscript if runing wingrass
 	if { $mingw == 1 } {
 		set cmd "gswin32c"
@@ -96,14 +97,13 @@
 	if {![catch {set input [exec $cmd -help]} error]} {
 		regexp ".*Available devices:(.*)Search path:" $input string gsdevices 
 		set gsstate "normal"
-		set printmode "lpr"
 		regsub -all {   } $gsdevices { } gsdevices
 		regsub -all { } $gsdevices \n gsdevices
 		regsub -all \n\n $gsdevices \n gsdevices
 	} else {
 		set gsdevices "none available"
 		set gsstate "disabled"
-		set printmode "eps"
+	#	set printmode "eps"
 		tk_messageBox -type ok -icon error -message [G_msg "Ghostscript not available"]
 	}
 }	
@@ -431,10 +431,10 @@
  		if {[catch {exec lpr -o position=center $tmppsfile } error]} {
 			Gm::errmsg $error
 		}
-    }
+	}
 
 	# postsript printing via ghostsript
-    if { $printmode == "psprint" && $printer != "" } {
+	if { $printmode == "psprint" && $printer != "" } {
 		if {[catch {exec $cmd  $format -sDEVICE#$printer -r$res -sNOPAUSE -dBATCH -- $tmppsfile} error]} {
 			Gm::errmsg $error
 		}