[GRASS-SVN] r45305 - grass/trunk/ps/ps.map

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-02-04 00:38:55 -0800 (Fri, 04 Feb 2011)
New Revision: 45305

Modified:
   grass/trunk/ps/ps.map/main.c
   grass/trunk/ps/ps.map/ps.map.html
Log:
remove command line scale option (use map instruction instead)

Modified: grass/trunk/ps/ps.map/main.c
===================================================================
--- grass/trunk/ps/ps.map/main.c	2011-02-04 07:18:16 UTC (rev 45304)
+++ grass/trunk/ps/ps.map/main.c	2011-02-04 08:38:55 UTC (rev 45305)
@@ -95,7 +95,6 @@
     int iflag;
     int can_reset_scale;
     int copies_set;
-    struct Option *map_scale;
     struct Option *input_file;
     struct Option *output_file;
     struct Option *copies;
@@ -148,13 +147,6 @@
     output_file->description = _("PostScript output file");
     /*    output_file->required = YES;   Can omit for -p list page size & exit mode */
 
-    map_scale = G_define_option();
-    map_scale->key = "scale";
-    map_scale->key_desc = "mapscale";
-    map_scale->type = TYPE_STRING;
-    map_scale->description =
-	_("Scale of the output map, e.g. 1:25000 (default: Auto-sized to fit page)");
-
     copies = G_define_option();
     copies->key = "copies";
     copies->type = TYPE_INTEGER;
@@ -251,17 +243,6 @@
 	    G_fatal_error("%s - %s: %s", G_program_name(),
 			  input_file->answer, strerror(errno));
     }
-    if (map_scale->answer) {
-	G_warning(_("Using <%s> from the command line is depreciated. "
-		    "Please use the <%s> mapping instruction instead. "
-		    "The parameter <%s> will be removed in future versions of GRASS."),
-		  "scale", "scale", "scale");
-	can_reset_scale = isatty(0);
-	if (check_scale(map_scale->answer))
-	    strcpy(PS.scaletext, map_scale->answer);
-	else
-	    error(map_scale->answer, "", "illegal scale request");
-    }
 
     if (copies->answer) {
 	if (sscanf(copies->answer, "%d", &ps_copies) != 1) {

Modified: grass/trunk/ps/ps.map/ps.map.html
===================================================================
--- grass/trunk/ps/ps.map/ps.map.html	2011-02-04 07:18:16 UTC (rev 45304)
+++ grass/trunk/ps/ps.map/ps.map.html	2011-02-04 08:38:55 UTC (rev 45305)
@@ -1087,12 +1087,6 @@
 	<B>scale</B> 1:25000
 </PRE>
 <P>
-This instruction is identical to the <EM>scale</EM> command line parameter.
-<BR>
-<em>NOTE: Using "scale" from the command line is depreciated and while
-still provided for compatibility reasons it will be removed in the future.
-Please use the "scale" mapping instruction instead.</em>
-<P>
 
 
 <a name="scalebar"></a>