[GRASS-SVN] r47643 - in grass/trunk: general/g.region
gui/wxpython/gui_modules include lib/gis lib/gpde lib/manage
lib/ogsf lib/raster3d raster/r.colors raster/r.mapcalc
raster/r.univar raster3d/r3.cross.rast raster3d/r3.info
raster3d/r3.mask raster3d/r3.mkdspf raster3d/r3.null
raster3d/r3.out.ascii raster3d/r3.out.v5d raster3d/r3.out.vtk
raster3d/r3.retile raster3d/r3.showdspf raster3d/r3.stats
raster3d/r3.timestamp raster3d/r3.to.rast vector/v.colors
visualization/nviz2/cmd
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 15 09:56:56 EDT 2011
Author: martinl
Date: 2011-08-15 06:56:55 -0700 (Mon, 15 Aug 2011)
New Revision: 47643
Added:
grass/trunk/lib/gis/find_rast.c
grass/trunk/lib/gis/find_rast3d.c
Removed:
grass/trunk/lib/gis/find_cell.c
grass/trunk/lib/raster3d/find_grid3.c
Modified:
grass/trunk/general/g.region/main.c
grass/trunk/gui/wxpython/gui_modules/wxnviz.py
grass/trunk/include/gisdefs.h
grass/trunk/include/raster3ddefs.h
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/manage/do_remove.c
grass/trunk/lib/manage/do_rename.c
grass/trunk/lib/ogsf/Gvl3.c
grass/trunk/lib/ogsf/gvl_file.c
grass/trunk/lib/raster3d/region.c
grass/trunk/raster/r.colors/edit_colors.c
grass/trunk/raster/r.mapcalc/map3.c
grass/trunk/raster/r.univar/r3.univar_main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.info/r3.info.main.c
grass/trunk/raster3d/r3.mask/main.c
grass/trunk/raster3d/r3.mkdspf/r3_find.c
grass/trunk/raster3d/r3.null/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/r3.out.v5d/main.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.retile/main.c
grass/trunk/raster3d/r3.showdspf/r3_find.c
grass/trunk/raster3d/r3.stats/main.c
grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/vector/v.colors/main.c
grass/trunk/visualization/nviz2/cmd/volume.c
Log:
G_find_grid3 moved from raster3d to gislib
gislib: find_cell.c renamed to find_rast.c
Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/general/g.region/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -485,7 +485,7 @@
if ((name = parm.raster3d->answer)) {
RASTER3D_Region win;
- if ((mapset = G_find_grid3(name, "")) == NULL)
+ if ((mapset = G_find_raster3d(name, "")) == NULL)
G_fatal_error(_("3D raster map <%s> not found"), name);
if (Rast3d_read_region_map(name, mapset, &win) < 0)
Modified: grass/trunk/gui/wxpython/gui_modules/wxnviz.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxnviz.py 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/gui/wxpython/gui_modules/wxnviz.py 2011-08-15 13:56:55 UTC (rev 47643)
@@ -421,7 +421,7 @@
@return object id
@return -1 on failure
"""
- mapset = G_find_grid3(name, "")
+ mapset = G_find_raster3d(name, "")
if mapset is None:
G_warning(_("3d raster map <%s> not found"),
name)
@@ -433,7 +433,7 @@
self.data)
if color_name: # check for color map
- mapset = G_find_grid3(color_name, "")
+ mapset = G_find_raster3d(color_name, "")
if mapset is None:
G_warning(_("3d raster map <%s> not found"),
color_name)
Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/include/gisdefs.h 2011-08-15 13:56:55 UTC (rev 47643)
@@ -221,10 +221,6 @@
char *G_file_name_misc(char *, const char *, const char *, const char *,
const char *);
-/* find_cell.c */
-const char *G_find_raster(char *, const char *);
-const char *G_find_raster2(const char *, const char *);
-
/* find_file.c */
const char *G_find_file(const char *, char *, const char *);
const char *G_find_file2(const char *, const char *, const char *);
@@ -235,6 +231,13 @@
/* find_etc.c */
char *G_find_etc(const char *);
+/* find_rast.c */
+const char *G_find_raster(char *, const char *);
+const char *G_find_raster2(const char *, const char *);
+
+/* find_rast3d.c */
+const char *G_find_raster3d(const char *, const char *);
+
/* find_vect.c */
const char *G_find_vector(char *, const char *);
const char *G_find_vector2(const char *, const char *);
Modified: grass/trunk/include/raster3ddefs.h
===================================================================
--- grass/trunk/include/raster3ddefs.h 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/include/raster3ddefs.h 2011-08-15 13:56:55 UTC (rev 47643)
@@ -45,9 +45,6 @@
/* filename.c */
void Rast3d_filename(char *, const char *, const char *, const char *);
-/* find_grid3.c */
-char *G_find_grid3(const char *, const char *);
-
/* fpcompress.c */
void Rast3d_fpcompress_print_binary(char *, int);
void Rast3d_fpcompress_dissect_xdr_double(unsigned char *);
Deleted: grass/trunk/lib/gis/find_cell.c
===================================================================
--- grass/trunk/lib/gis/find_cell.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/gis/find_cell.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -1,80 +0,0 @@
-/*!
- * \file strings.c
- *
- * \brief GIS Library - Find raster map
- *
- * (C) 1999-2009 by the GRASS Development Team
- *
- * This program is free software under the GNU General Public
- * License (>=v2). Read the file COPYING that comes with GRASS
- * for details.
- *
- * \author Original author CERL
- */
-
-#include <grass/gis.h>
-
-/*!
- * \brief Find a raster map
- *
- * Looks for the raster map <i>name</i> in the database. The
- * <i>mapset</i> parameter can either be the empty string "", which
- * means search all the mapsets in the user's current mapset search
- * path (see \ref Mapset_Search_Path for more details about the search
- * path) or it can be a specific mapset name, which means look for the
- * raster map only in this one mapset (for example, in the current
- * mapset). If found, the mapset where the raster map lives is
- * returned. If not found, the NULL pointer is returned.
- *
- * Note: If the user specifies a fully qualified raster map which
- * exists, then G_find_raster() modifies <i>name</i> by removing
- * the "@<i>mapset</i>".
- *
- * For example, to find a raster map anywhere in the database:
- \code
- char name[GNAME_MAX];
- char *mapset;
- if ((mapset = G_find_raster(name,"")) == NULL)
- // not found
- \endcode
- *
- * To check that the raster map exists in the current mapset:
- *
- \code
- char name[GNAME_MAX];
- if (G_find_raster(name, G_mapset()) == NULL)
- // not found
- \endcode
- *
- * \param[in,out] name map name
- * \param mapset mapset name or ""
- *
- * \return mapset where raster map was found
- * \return NULL if not found
- */
-const char *G_find_raster(char *name, const char *mapset)
-{
- G_debug(1, "G_find_raster(): name=%s mapset=%s", name, mapset);
- return G_find_file("cell", name, mapset);
-}
-
-/*!
- * \brief Find a raster map (look but don't touch)
- *
- * The same as G_find_raster() but doesn't remove the "@<i>mapset</i>"
- * qualification from <i>name</i>, if present.
- *
- * Returns NULL if the map wasn't found, or the mapset the raster was
- * found in if it was.
- *
- * \param name map name
- * \param mapset mapset name or ""
- *
- * \return mapset where raster map was found
- * \return NULL if not found
- */
-const char *G_find_raster2(const char *name, const char *mapset)
-{
- G_debug(1, "G_find_raster2(): name=%s mapset=%s", name, mapset);
- return G_find_file2("cell", name, mapset);
-}
Copied: grass/trunk/lib/gis/find_rast.c (from rev 47641, grass/trunk/lib/gis/find_cell.c)
===================================================================
--- grass/trunk/lib/gis/find_rast.c (rev 0)
+++ grass/trunk/lib/gis/find_rast.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -0,0 +1,80 @@
+/*!
+ * \file strings.c
+ *
+ * \brief GIS Library - Find raster map
+ *
+ * (C) 1999-2009 by the GRASS Development Team
+ *
+ * This program is free software under the GNU General Public
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ * \author Original author CERL
+ */
+
+#include <grass/gis.h>
+
+/*!
+ * \brief Find a raster map
+ *
+ * Looks for the raster map <i>name</i> in the database. The
+ * <i>mapset</i> parameter can either be the empty string "", which
+ * means search all the mapsets in the user's current mapset search
+ * path (see \ref Mapset_Search_Path for more details about the search
+ * path) or it can be a specific mapset name, which means look for the
+ * raster map only in this one mapset (for example, in the current
+ * mapset). If found, the mapset where the raster map lives is
+ * returned. If not found, the NULL pointer is returned.
+ *
+ * Note: If the user specifies a fully qualified raster map which
+ * exists, then G_find_raster() modifies <i>name</i> by removing
+ * the "@<i>mapset</i>".
+ *
+ * For example, to find a raster map anywhere in the database:
+ \code
+ char name[GNAME_MAX];
+ char *mapset;
+ if ((mapset = G_find_raster(name,"")) == NULL)
+ // not found
+ \endcode
+ *
+ * To check that the raster map exists in the current mapset:
+ *
+ \code
+ char name[GNAME_MAX];
+ if (G_find_raster(name, G_mapset()) == NULL)
+ // not found
+ \endcode
+ *
+ * \param[in,out] name map name
+ * \param mapset mapset name or ""
+ *
+ * \return mapset where raster map was found
+ * \return NULL if not found
+ */
+const char *G_find_raster(char *name, const char *mapset)
+{
+ G_debug(1, "G_find_raster(): name=%s mapset=%s", name, mapset);
+ return G_find_file("cell", name, mapset);
+}
+
+/*!
+ * \brief Find a raster map (look but don't touch)
+ *
+ * The same as G_find_raster() but doesn't remove the "@<i>mapset</i>"
+ * qualification from <i>name</i>, if present.
+ *
+ * Returns NULL if the map wasn't found, or the mapset the raster was
+ * found in if it was.
+ *
+ * \param name map name
+ * \param mapset mapset name or ""
+ *
+ * \return mapset where raster map was found
+ * \return NULL if not found
+ */
+const char *G_find_raster2(const char *name, const char *mapset)
+{
+ G_debug(1, "G_find_raster2(): name=%s mapset=%s", name, mapset);
+ return G_find_file2("cell", name, mapset);
+}
Copied: grass/trunk/lib/gis/find_rast3d.c (from rev 47641, grass/trunk/lib/raster3d/find_grid3.c)
===================================================================
--- grass/trunk/lib/gis/find_rast3d.c (rev 0)
+++ grass/trunk/lib/gis/find_rast3d.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -0,0 +1,31 @@
+/*!
+ \file lib/gis/find_rast3d.c
+
+ \brief GIS library - Find a 3D raster map
+
+ (C) 2001-2009, 2011 by the GRASS Development Team
+
+` This program is free software under the GNU General Public License
+ (>=v2). Read the file COPYING that comes with GRASS for details.
+
+ \author Original author CERL
+*/
+
+#include <grass/gis.h>
+
+/*!
+ \brief Search for a 3D raster map in current search path or
+ in a specified mapset.
+
+ Note: rejects all names that begin with '.'
+
+ \param name map name
+ \param mapset mapset to search. ("" for search path)
+
+ \return pointer to a string with name of mapset where the map was found
+ \return NULL if not found
+*/
+const char *G_find_raster3d(const char *name, const char *mapset)
+{
+ return G_find_file2_misc("grid3", "cell", name, mapset);
+}
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -269,12 +269,12 @@
depths = region.depths;
- if (NULL == G_find_grid3(name, ""))
+ if (NULL == G_find_raster3d(name, ""))
Rast3d_fatal_error(_("Requested g3d map <%s> not found"), name);
/*Open all maps with default region */
map =
- Rast3d_open_cell_old(name, G_find_grid3(name, ""), RASTER3D_DEFAULT_WINDOW,
+ Rast3d_open_cell_old(name, G_find_raster3d(name, ""), RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
Modified: grass/trunk/lib/manage/do_remove.c
===================================================================
--- grass/trunk/lib/manage/do_remove.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/manage/do_remove.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -74,7 +74,7 @@
}
if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
- if ((mapset = G_find_grid3(old, "")) == NULL)
+ if ((mapset = G_find_raster3d(old, "")) == NULL)
G_warning(_("3D raster map <%s> not found"), old);
}
Modified: grass/trunk/lib/manage/do_rename.c
===================================================================
--- grass/trunk/lib/manage/do_rename.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/manage/do_rename.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -72,7 +72,7 @@
}
if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
- if ((mapset = G_find_grid3(old, "")) == NULL)
+ if ((mapset = G_find_raster3d(old, "")) == NULL)
G_warning(_("3D raster map <%s> not found"), old);
}
Modified: grass/trunk/lib/ogsf/Gvl3.c
===================================================================
--- grass/trunk/lib/ogsf/Gvl3.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/ogsf/Gvl3.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -36,7 +36,7 @@
const char *mapset;
struct Colors *colors;
- if (NULL == (mapset = G_find_grid3(name, ""))) {
+ if (NULL == (mapset = G_find_raster3d(name, ""))) {
G_warning(_("3D raster map <%s> not found"), name);
return (-1);
}
Modified: grass/trunk/lib/ogsf/gvl_file.c
===================================================================
--- grass/trunk/lib/ogsf/gvl_file.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/ogsf/gvl_file.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -423,7 +423,7 @@
void *map;
/* search for g3d file a return his mapset */
- mapset = G_find_grid3(filename, "");
+ mapset = G_find_raster3d(filename, "");
if (!mapset) {
G_warning(_("3D raster map <%s> not found"), filename);
return (NULL);
Deleted: grass/trunk/lib/raster3d/find_grid3.c
===================================================================
--- grass/trunk/lib/raster3d/find_grid3.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/raster3d/find_grid3.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -1,24 +0,0 @@
-#include <grass/gis.h>
-
-/*
- * \brief
- * searches for a grid3 file from the mapset search list
- * or in a specified mapset.
- * returns the mapset name where the cell file was found.
- *
- * note:
- * rejects all names that begin with '.'
- * if name is of the form nnn in ppp then
- * name = nnn and mapset = ppp
- *
- * \param const char *name file name to look for
- * \param const char *mapset mapset to search. if mapset is ""
- * will search in mapset search list
- * \return char * pointer to a string with name of mapset
- * where cell file was found, or NULL if not found
- */
-
-const char *G_find_grid3(const char *name, const char *mapset)
-{
- return G_find_file2_misc("grid3", "cell", name, mapset);
-}
Modified: grass/trunk/lib/raster3d/region.c
===================================================================
--- grass/trunk/lib/raster3d/region.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/lib/raster3d/region.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -223,7 +223,7 @@
Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, xname, xmapset);
else {
if (!mapset || !*mapset)
- mapset = G_find_grid3(name, "");
+ mapset = G_find_raster3d(name, "");
Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, name, mapset);
}
return Rast3d_read_window(region, fullName);
Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster/r.colors/edit_colors.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -174,7 +174,7 @@
rules = NULL;
/* Switch between raster and volume */
if (type == RASTER3D_TYPE) {
- mapset = G_find_grid3(name, "");
+ mapset = G_find_raster3d(name, "");
} else {
mapset = G_find_raster2(name, "");
}
@@ -270,7 +270,7 @@
if (Rast_read_colors(cmap, cmapset, &colors) < 0)
G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
} else {
- cmapset = G_find_grid3(cmap, "");
+ cmapset = G_find_raster3d(cmap, "");
if (cmapset == NULL)
G_fatal_error(_("Raster3d map <%s> not found"), cmap);
Modified: grass/trunk/raster/r.mapcalc/map3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map3.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster/r.mapcalc/map3.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -392,7 +392,7 @@
switch (mod) {
case 'M':
tmpname = G_store((char *)name);
- mapset = G_find_grid3(tmpname, "");
+ mapset = G_find_raster3d(tmpname, "");
if (mapset) {
void *handle;
@@ -440,7 +440,7 @@
max_col = col;
tmpname = G_store((char *)name);
- mapset = G_find_grid3(tmpname, "");
+ mapset = G_find_raster3d(tmpname, "");
G_free(tmpname);
if (!mapset)
@@ -571,7 +571,7 @@
int check_output_map(const char *name)
{
- return !!G_find_grid3(name, G_mapset());
+ return !!G_find_raster3d(name, G_mapset());
}
int open_output_map(const char *name, int res_type)
Modified: grass/trunk/raster/r.univar/r3.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -143,11 +143,11 @@
/* open 3D zoning raster with default region */
if ((zonemap = param.zonefile->answer) != NULL) {
- if (NULL == (mapset = G_find_grid3(zonemap, "")))
+ if (NULL == (mapset = G_find_raster3d(zonemap, "")))
Rast3d_fatal_error(_("Requested g3d map <%s> not found"), zonemap);
zmap =
- Rast3d_open_cell_old(zonemap, G_find_grid3(zonemap, ""), ®ion,
+ Rast3d_open_cell_old(zonemap, G_find_raster3d(zonemap, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (zmap == NULL)
@@ -182,11 +182,11 @@
/* Open 3D input raster with default region */
infile = param.inputfile->answer;
- if (NULL == G_find_grid3(infile, ""))
+ if (NULL == G_find_raster3d(infile, ""))
Rast3d_fatal_error(_("Requested g3d map <%s> not found"), infile);
map =
- Rast3d_open_cell_old(infile, G_find_grid3(infile, ""), ®ion,
+ Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -240,7 +240,7 @@
G_debug(3, "Open 3D raster map %s", param.input->answer);
- if (NULL == G_find_grid3(param.input->answer, ""))
+ if (NULL == G_find_raster3d(param.input->answer, ""))
Rast3d_fatal_error(_("3d raster map <%s> not found"),
param.input->answer);
@@ -270,7 +270,7 @@
/*******************/
map = Rast3d_open_cell_old(param.input->answer,
- G_find_grid3(param.input->answer, ""),
+ G_find_raster3d(param.input->answer, ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
Modified: grass/trunk/raster3d/r3.info/r3.info.main.c
===================================================================
--- grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -123,7 +123,7 @@
name = G_store(opt1->answer);
- if ((mapset = G_find_grid3(name, "")) == NULL)
+ if ((mapset = G_find_raster3d(name, "")) == NULL)
G_fatal_error(_("3D Raster map <%s> not found"), name);
/*We need to open the map */
Modified: grass/trunk/raster3d/r3.mask/main.c
===================================================================
--- grass/trunk/raster3d/r3.mask/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.mask/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -53,7 +53,7 @@
cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1);
- if (NULL == G_find_grid3(name, ""))
+ if (NULL == G_find_raster3d(name, ""))
Rast3d_fatal_error(_("3D raster map <%s> not found"), name);
map = Rast3d_open_cell_old(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,
Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -30,7 +30,7 @@
/* return NULL on error: otherwise returns dspout */
const char *check_get_any_dspname(const char *dspf, const char *g3f, const char *mset)
{
- if (!G_find_grid3(g3f, ""))
+ if (!G_find_raster3d(g3f, ""))
G_fatal_error("[%s] 3D raster map not found", g3f);
if (mset) { /* otherwise must be reading only */
Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.null/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -98,7 +98,7 @@
cacheSize = Rast3d_cache_size_encode(RASTER3D_USE_CACHE_XY, 1);
- if (NULL == G_find_grid3(name, ""))
+ if (NULL == G_find_raster3d(name, ""))
Rast3d_fatal_error(_("3D raster map <%s> not found"), name);
fprintf(stderr, "name %s Mapset %s \n", name, G_mapset());
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -326,7 +326,7 @@
param.row->answer = 0;
}
- if (NULL == G_find_grid3(input, ""))
+ if (NULL == G_find_raster3d(input, ""))
Rast3d_fatal_error(_("Requested 3d raster map not found"));
/* Initiate the default settings */
@@ -336,7 +336,7 @@
Rast3d_get_window(®ion);
/* Open the map and use XY cache mode */
- map = Rast3d_open_cell_old(input, G_find_grid3(input, ""), ®ion,
+ map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -308,10 +308,10 @@
trueCoords = coords->answer;
- if (NULL == G_find_grid3(input, ""))
+ if (NULL == G_find_raster3d(input, ""))
Rast3d_fatal_error(_("Requested 3d raster map not found"));
- map = Rast3d_open_cell_old(input, G_find_grid3(input, ""), RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_open_cell_old(input, G_find_raster3d(input, ""), RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (map == NULL)
Rast3d_fatal_error(_("Error opening 3d raster map"));
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -138,7 +138,7 @@
/*If input maps are provided, check them */
if (param.input->answers != NULL) {
for (i = 0; param.input->answers[i] != NULL; i++) {
- if (NULL == G_find_grid3(param.input->answers[i], ""))
+ if (NULL == G_find_raster3d(param.input->answers[i], ""))
Rast3d_fatal_error(_("Requested 3d raster map <%s> not found"),
param.input->answers[i]);
}
@@ -148,7 +148,7 @@
if (param.rgbmaps->answers != NULL) {
for (i = 0; i < 3; i++) {
if (param.rgbmaps->answers[i] != NULL) {
- if (NULL == G_find_grid3(param.rgbmaps->answers[i], ""))
+ if (NULL == G_find_raster3d(param.rgbmaps->answers[i], ""))
Rast3d_fatal_error(_("Requested g3d RGB map <%s> not found"),
param.rgbmaps->answers[i]);
} else {
@@ -161,7 +161,7 @@
if (param.vectormaps->answers != NULL) {
for (i = 0; i < 3; i++) {
if (param.vectormaps->answers[i] != NULL) {
- if (NULL == G_find_grid3(param.vectormaps->answers[i], ""))
+ if (NULL == G_find_raster3d(param.vectormaps->answers[i], ""))
Rast3d_fatal_error(_("Requested g3d vector map <%s> not found"),
param.vectormaps->answers[i]);
} else {
@@ -200,7 +200,7 @@
/*Open the map */
maprgb =
Rast3d_open_cell_old(param.rgbmaps->answers[i],
- G_find_grid3(param.rgbmaps->answers[i], ""),
+ G_find_raster3d(param.rgbmaps->answers[i], ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (maprgb == NULL) {
@@ -285,7 +285,7 @@
/*Open the map */
mapvect =
Rast3d_open_cell_old(param.vectormaps->answers[i],
- G_find_grid3(param.vectormaps->answers[i],
+ G_find_raster3d(param.vectormaps->answers[i],
""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (mapvect == NULL) {
@@ -504,7 +504,7 @@
/*Open the map */
in->map =
Rast3d_open_cell_old(param.input->answers[i],
- G_find_grid3(param.input->answers[i], ""),
+ G_find_raster3d(param.input->answers[i], ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (in->map == NULL) {
Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.retile/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -112,7 +112,7 @@
G_debug(3, _("Open 3d raster map <%s>"), param.input->answer);
- mapset = G_find_grid3(param.input->answer, "");
+ mapset = G_find_raster3d(param.input->answer, "");
if (mapset == NULL)
Rast3d_fatal_error(_("3d raster map <%s> not found"),
Modified: grass/trunk/raster3d/r3.showdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_find.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.showdspf/r3_find.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -35,7 +35,7 @@
char element[200], question[200];
static char dspout[200];
- if (!G_find_grid3(g3f, "")) {
+ if (!G_find_raster3d(g3f, "")) {
fprintf(stderr, "[%s] 3D raster map not found\n", g3f);
return (NULL);
}
Modified: grass/trunk/raster3d/r3.stats/main.c
===================================================================
--- grass/trunk/raster3d/r3.stats/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.stats/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -608,11 +608,11 @@
infile = inputfile->answer;
- if (NULL == G_find_grid3(infile, ""))
+ if (NULL == G_find_raster3d(infile, ""))
Rast3d_fatal_error(_("3D raster map <%s> not found"), infile);
map =
- Rast3d_open_cell_old(infile, G_find_grid3(infile, ""), ®ion,
+ Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
Modified: grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
===================================================================
--- grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -67,9 +67,9 @@
modify = date->answer != NULL;
if (modify)
- mapset = G_find_grid3(name, G_mapset());
+ mapset = G_find_raster3d(name, G_mapset());
else
- mapset = G_find_grid3(name, "");
+ mapset = G_find_raster3d(name, "");
if (mapset == NULL) {
G_fatal_error(_("Grid3 <%s> not found %s"), name,
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -217,7 +217,7 @@
G_debug(3, _("Open 3D raster map <%s>"), param.input->answer);
- if (NULL == G_find_grid3(param.input->answer, ""))
+ if (NULL == G_find_raster3d(param.input->answer, ""))
Rast3d_fatal_error(_("3D raster map <%s> not found"),
param.input->answer);
@@ -229,7 +229,7 @@
/*Open the map with current region */
map = Rast3d_open_cell_old(param.input->answer,
- G_find_grid3(param.input->answer, ""),
+ G_find_raster3d(param.input->answer, ""),
RASTER3D_DEFAULT_WINDOW, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
@@ -252,7 +252,7 @@
/*Open the 3d raster map */
map = Rast3d_open_cell_old(param.input->answer,
- G_find_grid3(param.input->answer, ""),
+ G_find_raster3d(param.input->answer, ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
Modified: grass/trunk/vector/v.colors/main.c
===================================================================
--- grass/trunk/vector/v.colors/main.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/vector/v.colors/main.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -258,7 +258,7 @@
if (Rast_read_colors(cmap, cmapset, &colors) < 0)
G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
} else {
- cmapset = G_find_grid3(cmap, "");
+ cmapset = G_find_raster3d(cmap, "");
if (!cmapset)
G_fatal_error(_("3D raster map <%s> not found"), cmap);
Modified: grass/trunk/visualization/nviz2/cmd/volume.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/volume.c 2011-08-15 13:34:26 UTC (rev 47642)
+++ grass/trunk/visualization/nviz2/cmd/volume.c 2011-08-15 13:56:55 UTC (rev 47643)
@@ -37,7 +37,7 @@
nvol = opt_get_num_answers(params->volume);
for (i = 0; i < nvol; i++) {
- mapset = G_find_grid3(params->volume->answers[i], "");
+ mapset = G_find_raster3d(params->volume->answers[i], "");
if (mapset == NULL) {
G_fatal_error(_("3d raster map <%s> not found"),
params->volume->answers[i]);
@@ -119,7 +119,7 @@
ncolor_const = opt_get_num_answers(params->isosurf_color_const);
if (i < ncolor_map && strcmp(params->isosurf_color_map->answers[i], "")) {
- mapset = G_find_grid3(params->isosurf_color_map->answers[i], "");
+ mapset = G_find_raster3d(params->isosurf_color_map->answers[i], "");
if (mapset == NULL) {
G_fatal_error(_("3d raster map <%s> not found"),
More information about the grass-commit
mailing list