[GRASS-SVN] r63825 - in grass/branches/releasebranch_7_0: . display/d.grid general/g.list general/g.region include/defs lib/gis ps/ps.map raster/r.region
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 08:50:03 PST 2014
Author: martinl
Date: 2014-12-29 08:50:03 -0800 (Mon, 29 Dec 2014)
New Revision: 63825
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.grid/main.c
grass/branches/releasebranch_7_0/general/g.list/main.c
grass/branches/releasebranch_7_0/general/g.region/main.c
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/gis/get_window.c
grass/branches/releasebranch_7_0/ps/ps.map/r_wind.c
grass/branches/releasebranch_7_0/raster/r.region/main.c
Log:
libgis: G__get_window() renamed to G_get_element_window()
update modules
(merge r63823-4 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824
Modified: grass/branches/releasebranch_7_0/display/d.grid/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.grid/main.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/display/d.grid/main.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -206,7 +206,7 @@
G_fatal_error("Invalid direction: %s", direction->answer);
if (align->answer || strcmp(opt2->answer, "0") == 0)
- G__get_window(&wind, "", "WIND", G_mapset());
+ G_get_element_window(&wind, "", "WIND", G_mapset());
if (strcmp(opt2->answer, "0") == 0) {
if (geogrid->answer)
Modified: grass/branches/releasebranch_7_0/general/g.list/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -263,9 +263,9 @@
char name[GNAME_MAX], mapset[GMAPSET_MAX];
if (G_name_is_fully_qualified(opt.region->answer, name, mapset))
- G__get_window(&window, "windows", name, mapset);
+ G_get_element_window(&window, "windows", name, mapset);
else
- G__get_window(&window, "windows", opt.region->answer, "");
+ G_get_element_window(&window, "windows", opt.region->answer, "");
}
}
else
Modified: grass/branches/releasebranch_7_0/general/g.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -401,7 +401,7 @@
mapset = G_find_file2("windows", name, "");
if (!mapset)
G_fatal_error(_("Region <%s> not found"), name);
- G__get_window(&window, "windows", name, mapset);
+ G_get_element_window(&window, "windows", name, mapset);
}
/* raster= */
Modified: grass/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 16:50:03 UTC (rev 63825)
@@ -305,8 +305,8 @@
/* get_window.c */
void G_get_window(struct Cell_head *);
void G_get_default_window(struct Cell_head *);
-void G__get_window(struct Cell_head *, const char *, const char *,
- const char *);
+void G_get_element_window(struct Cell_head *, const char *, const char *,
+ const char *);
/* getl.c */
int G_getl(char *, int, FILE *);
Modified: grass/branches/releasebranch_7_0/lib/gis/get_window.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/get_window.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/lib/gis/get_window.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -26,10 +26,10 @@
static struct state *st = &state;
/*!
- \brief Read the database region
+ \brief Get the current region
- Reads the database region as stored in the WIND file in the user's
- current mapset into region.
+ Reads the region as stored in the WIND file in the user's current
+ mapset into region.
3D values are set to defaults if not available in WIND file. An
error message is printed and exit() is called if there is a problem
@@ -63,9 +63,9 @@
else {
char *wind = getenv("WIND_OVERRIDE");
if (wind)
- G__get_window(&st->dbwindow, "windows", wind, G_mapset());
+ G_get_element_window(&st->dbwindow, "windows", wind, G_mapset());
else
- G__get_window(&st->dbwindow, "", "WIND", G_mapset());
+ G_get_element_window(&st->dbwindow, "", "WIND", G_mapset());
}
*window = st->dbwindow;
@@ -79,7 +79,7 @@
}
/*!
- \brief Read the default region
+ \brief Get the default region
Reads the default region for the location into <i>region.</i> 3D
values are set to defaults if not available in WIND file.
@@ -91,21 +91,21 @@
*/
void G_get_default_window(struct Cell_head *window)
{
- G__get_window(window, "", "DEFAULT_WIND", "PERMANENT");
+ G_get_element_window(window, "", "DEFAULT_WIND", "PERMANENT");
}
/*!
- \brief Get window (region) of selected map
+ \brief Get region for selected element (raster, vector, window, etc.)
G_fatal_error() is called on error
- \param window pointer to Cell_head
+ \param[out] window pointer to Cell_head
\param element element type
- \param name map name
+ \param name element name
\param mapset mapset name
*/
-void G__get_window(struct Cell_head *window,
- const char *element, const char *name, const char *mapset)
+void G_get_element_window(struct Cell_head *window,
+ const char *element, const char *name, const char *mapset)
{
FILE *fp;
@@ -122,7 +122,7 @@
}
/*!
- \brief Unset current window
+ \brief Unset current region
*/
void G_unset_window()
{
Modified: grass/branches/releasebranch_7_0/ps/ps.map/r_wind.c
===================================================================
--- grass/branches/releasebranch_7_0/ps/ps.map/r_wind.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/ps/ps.map/r_wind.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -28,7 +28,7 @@
sprintf(fullname, "%s in %s", name, mapset);
- G__get_window(&window, "windows", name, mapset);
+ G_get_element_window(&window, "windows", name, mapset);
width = 1.;
color_R = color_G = color_B = 0;
Modified: grass/branches/releasebranch_7_0/raster/r.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.region/main.c 2014-12-29 16:46:18 UTC (rev 63824)
+++ grass/branches/releasebranch_7_0/raster/r.region/main.c 2014-12-29 16:50:03 UTC (rev 63825)
@@ -155,7 +155,7 @@
G_get_window(&window);
if ((name = parm.region->answer)) /* region= */
- G__get_window(&window, "windows", name, "");
+ G_get_element_window(&window, "windows", name, "");
if ((name = parm.raster->answer)) { /* raster= */
Rast_get_cellhd(name, "", &window);
More information about the grass-commit
mailing list