Make r.out.gridatb honour current region

Fix bugs, simplify


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40774 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.out.gridatb/adjcellhd.c

@@ -1,17 +0,0 @@
-#include "local_proto.h"
-
-
-int adjcellhd(struct Cell_head *cellhd)
-{
-    int retval = 0;
-
-    G_set_window(cellhd);
-
-    if (cellhd->rows != Rast_window_rows())
-	retval = 2;
-
-    if (cellhd->cols != Rast_window_cols())
-	retval = 3;
-
-    return (retval);
-}

raster/r.out.gridatb/check_ready.c

@@ -1,20 +0,0 @@
-#include <unistd.h>
-#include "local_proto.h"
-#include <grass/glocale.h>
-
-
-void check_ready(void)
-{
-    FILE *fp;
-
-    fp = fopen(file, "r");
-    if (!fp)
-	return;
-
-    fclose(fp);
-
-    if (overwr)
-	unlink(file);
-    else
-	G_fatal_error("%s - file already exists", file);
-}

raster/r.out.gridatb/file_io.c

@@ -1,96 +0,0 @@
-#include <stdlib.h>
-#include <grass/raster.h>
-#include <grass/glocale.h>
-#include "local_proto.h"
-
-
-void rdwr_gridatb(void)
-{
-    FILE *fp;
-    int fd, row, col;
-    int adjcellhdval;
-    CELL *cell;
-    DCELL *dcell;
-    FCELL *fcell;
-    RASTER_MAP_TYPE data_type;
-
-    fd = Rast_open_old(iname, "");
-
-    data_type = Rast_get_map_type(fd);
-    switch (data_type) {
-    case CELL_TYPE:
-	cell = Rast_allocate_c_buf();
-	break;
-    case FCELL_TYPE:
-	fcell = Rast_allocate_f_buf();
-	break;
-    case DCELL_TYPE:
-	dcell = Rast_allocate_d_buf();
-	break;
-    }
-
-    Rast_get_cellhd(iname, "", &cellhd);
-
-    adjcellhdval = adjcellhd(&cellhd);
-    switch (adjcellhdval) {
-    case 1:
-	G_fatal_error(_("Setting window header"));
-	break;
-    case 2:
-	G_fatal_error(_("Rows changed"));
-	break;
-    case 3:
-	G_fatal_error(_("Cols changed"));
-	break;
-    }
-
-    fp = fopen(file, "w");
-
-    fprintf(fp, "%s\n", Rast_get_cell_title(iname, ""));
-    fprintf(fp, "%d %d %lf\n", cellhd.cols, cellhd.rows, cellhd.ns_res);
-
-    for (row = 0; row < cellhd.rows; row++) {
-	G_percent(row, cellhd.rows, 2);
-	switch (data_type) {
-	case CELL_TYPE:
-	    Rast_get_c_row(fd, cell, row);
-
-	    for (col = 0; col < cellhd.cols; col++) {
-		if (Rast_is_c_null_value(&cell[col]))
-		    fprintf(fp, "  9999.00 ");
-		else
-		    fprintf(fp, "%9.2f ", (float)cell[col]);
-		if (!((col + 1) % 8) || col == cellhd.cols - 1)
-		    fprintf(fp, "\n");
-	    }
-	    break;
-	case FCELL_TYPE:
-	    Rast_get_f_row(fd, fcell, row);
-
-	    for (col = 0; col < cellhd.cols; col++) {
-		if (Rast_is_f_null_value(&fcell[col]))
-		    fprintf(fp, "  9999.00 ");
-		else
-		    fprintf(fp, "%9.2f ", (float)fcell[col]);
-		if (!((col + 1) % 8) || col == cellhd.cols - 1)
-		    fprintf(fp, "\n");
-	    }
-	    break;
-	case DCELL_TYPE:
-	    Rast_get_d_row(fd, dcell, row);
-
-	    for (col = 0; col < cellhd.cols; col++) {
-		if (Rast_is_d_null_value(&dcell[col]))
-		    fprintf(fp, "  9999.00 ");
-		else
-		    fprintf(fp, "%9.2lf ", (double)dcell[col]);
-		if (!((col + 1) % 8) || col == cellhd.cols - 1)
-		    fprintf(fp, "\n");
-	    }
-	    break;
-	}
-    }
-    Rast_close(fd);
-
-    return;
-}

raster/r.out.gridatb/local_proto.h

@@ -1,14 +0,0 @@
-#include <stdio.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-
-void check_ready(void);
-int adjcellhd(struct Cell_head *cellhd);
-void rdwr_gridatb(void);
-
-
-extern struct Cell_head cellhd;
-extern FCELL *cell;
-extern const char *file;
-extern const char *iname;
-extern char overwr;

raster/r.out.gridatb/main.c

@@ -17,30 +17,49 @@
 #include <stdio.h>
 
 #include <grass/gis.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
-#include "local_proto.h"
+static void rdwr_gridatb(const char *iname, const char *file)
+{
+    int fd = Rast_open_old(iname, "");
+    FILE *fp = fopen(file, "w");
+    DCELL *dcell = Rast_allocate_d_buf();
+    struct Cell_head cellhd;
+    int row, col;
+
+    Rast_get_window(&cellhd);
+
+    fprintf(fp, "%s\n", Rast_get_cell_title(iname, ""));
+    fprintf(fp, "%d %d %lf\n", cellhd.cols, cellhd.rows, cellhd.ns_res);
+
+    for (row = 0; row < cellhd.rows; row++) {
+	G_percent(row, cellhd.rows, 2);
 
-struct Cell_head cellhd;
-FCELL *cell;
-const char *file;
-const char *iname;
-char overwr;
+	Rast_get_d_row(fd, dcell, row);
+
+	for (col = 0; col < cellhd.cols; col++) {
+	    if (Rast_is_d_null_value(&dcell[col]))
+		fprintf(fp, "  9999.00 ");
+	    else
+		fprintf(fp, "%9.2f", (double) dcell[col]);
+	    if (!((col + 1) % 8) || col == cellhd.cols - 1)
+		fprintf(fp, "\n");
+	}
+    }
+
+    Rast_close(fd);
+}
 
 int main(int argc, char **argv)
 {
+    struct GModule *module;
     struct
     {
 	struct Option *input;
 	struct Option *output;
     } params;
 
-    struct
-    {
-	struct Flag *overwr;
-    } flags;
-    struct GModule *module;
-
     G_gisinit(argv[0]);
 
     /* Set description */
@@ -49,32 +68,15 @@ int main(int argc, char **argv)
     module->description =
 	_("Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)");
 
-    params.input = G_define_option();
-    params.input->key = "input";
-    params.input->description = _("Input map");
-    params.input->type = TYPE_STRING;
-    params.input->required = YES;
-    params.input->gisprompt = "old,cell,raster";
+    params.input = G_define_standard_option(G_OPT_R_INPUT);
 
-    params.output = G_define_option();
-    params.output->key = "output";
-    params.output->description = _("GRIDATB i/o map file");
-    params.output->type = TYPE_STRING;
-    params.output->required = YES;
-
-    flags.overwr = G_define_flag();
-    flags.overwr->key = 'o';
-    flags.overwr->description = _("Overwrite output map file");
+    params.output = G_define_standard_option(G_OPT_F_OUTPUT);
 
     if (G_parser(argc, argv))
 	exit(1);
 
-    iname = params.input->answer;
-    file = params.output->answer;
-    overwr = flags.overwr->answer;
-
-    check_ready();
-    rdwr_gridatb();
+    rdwr_gridatb(params.input->answer, params.output->answer);
 
-    exit(0);
+    return EXIT_SUCCESS;
 }
+