[GRASS-SVN] r63684 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core include lib/manage lib/python/pygrass/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 22 12:38:09 PST 2014
Author: martinl
Date: 2014-12-22 12:38:09 -0800 (Mon, 22 Dec 2014)
New Revision: 63684
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
grass/branches/releasebranch_7_0/include/gis.h
grass/branches/releasebranch_7_0/lib/manage/option.c
grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
Log:
gislib: remove G_ELEMENT_3DVIEW and G_ELEMENT_REGION3D
remove references to region3d and view3d
(merge r63639, r63642 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,63362,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,63616,63624,63626,63628,63630,63634,63644,63650,63652,63656,63679
+ /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,63362,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,63616,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-12-22 20:35:29 UTC (rev 63683)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-12-22 20:38:09 UTC (rev 63684)
@@ -459,10 +459,6 @@
'region':'region',
'region definition':'region',
'region definition files':'region',
- 'windows3d':'region3d',
- 'region3d':'region3d',
- 'region3D definition':'region3d',
- 'region3D definition files':'region3d',
'group':'group',
'imagery group':'group',
'imagery group files':'group',
Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h 2014-12-22 20:35:29 UTC (rev 63683)
+++ grass/branches/releasebranch_7_0/include/gis.h 2014-12-22 20:38:09 UTC (rev 63684)
@@ -357,8 +357,8 @@
*/
enum
{ /* Dir */
- G_ELEMENT_RASTER = 1, /*!< cell */
- G_ELEMENT_RASTER3D = 2, /*!< 3dcell */
+ G_ELEMENT_RASTER = 1, /*!< raster */
+ G_ELEMENT_RASTER3D = 2, /*!< 3d raster */
G_ELEMENT_VECTOR = 3, /*!< vector */
G_ELEMENT_OLDVECTOR = 4, /*!< GRASS < 5.7 vector */
G_ELEMENT_ASCIIVECTOR = 5, /*!< ASCII vector */
@@ -366,9 +366,7 @@
G_ELEMENT_LABEL = 7, /*!< labels */
G_ELEMENT_SITE = 8, /*!< sites */
G_ELEMENT_REGION = 9, /*!< region */
- G_ELEMENT_REGION3D = 10, /*!< 3dregion */
- G_ELEMENT_GROUP = 11, /*!< group */
- G_ELEMENT_3DVIEW = 12 /*!< 3dview */
+ G_ELEMENT_GROUP = 10, /*!< group */
};
/*=========================== Typedefs/Structures ==========================*/
Modified: grass/branches/releasebranch_7_0/lib/manage/option.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-22 20:35:29 UTC (rev 63683)
+++ grass/branches/releasebranch_7_0/lib/manage/option.c 2014-12-22 20:38:09 UTC (rev 63684)
@@ -53,7 +53,7 @@
strcmp(p->key, "old_vector") == 0 ||
strcmp(p->key, "ascii_vector") == 0)
p->guisection = _("Vector");
- else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
+ else if (strcmp(p->key, "region") == 0)
p->guisection = _("Region");
else if (strcmp(p->key, "group") == 0)
p->guisection = _("Group");
Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2014-12-22 20:35:29 UTC (rev 63683)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/gis/__init__.py 2014-12-22 20:38:09 UTC (rev 63684)
@@ -24,9 +24,7 @@
'labels': libgis.G_ELEMENT_LABEL,
'sites': libgis.G_ELEMENT_SITE,
'region': libgis.G_ELEMENT_REGION,
- 'region3d': libgis.G_ELEMENT_REGION3D,
- 'group': libgis.G_ELEMENT_GROUP,
- 'view3d': libgis.G_ELEMENT_3DVIEW}
+ 'group': libgis.G_ELEMENT_GROUP}
CHECK_IS = {"GISBASE": libgis.G_is_gisbase,
@@ -317,10 +315,8 @@
* 'raster',
* 'raster_3d',
* 'region',
- * 'region3d',
* 'sites',
* 'vector',
- * 'view3d'
:param type: the type of element to query
:type type: str
More information about the grass-commit
mailing list