[GRASS-SVN] r62530 - in grass/branches/releasebranch_7_0: . general/g.region gui/wxpython/gui_core lib/manage raster/r.region
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 1 15:40:30 PDT 2014
Author: annakrat
Date: 2014-11-01 15:40:30 -0700 (Sat, 01 Nov 2014)
New Revision: 62530
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.region/main.c
grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
grass/branches/releasebranch_7_0/lib/manage/element_list
grass/branches/releasebranch_7_0/raster/r.region/main.c
Log:
remove unused 3dview element, keep library (merge from trunk, r62182)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62179-62180,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526
+ /grass/trunk:62179-62180,62182,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526
Modified: grass/branches/releasebranch_7_0/general/g.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.region/main.c 2014-11-01 22:38:25 UTC (rev 62529)
+++ grass/branches/releasebranch_7_0/general/g.region/main.c 2014-11-01 22:40:30 UTC (rev 62530)
@@ -53,7 +53,7 @@
struct Option
*north, *south, *east, *west, *top, *bottom,
*res, *nsres, *ewres, *res3, *tbres, *rows, *cols,
- *save, *region, *view, *raster, *raster3d, *align,
+ *save, *region, *raster, *raster3d, *align,
*zoom, *vect;
} parm;
@@ -184,16 +184,6 @@
parm.vect->description = NULL;
parm.vect->guisection = _("Existing");
- parm.view = G_define_option();
- parm.view->key = "3dview";
- parm.view->key_desc = "name";
- parm.view->required = NO;
- parm.view->multiple = NO;
- parm.view->type = TYPE_STRING;
- parm.view->description = _("Set region to match this 3dview file");
- parm.view->gisprompt = "old,3d.view,3d view";
- parm.view->guisection = _("Existing");
-
parm.north = G_define_option();
parm.north->key = "n";
parm.north->key_desc = "value";
@@ -414,46 +404,6 @@
G__get_window(&window, "windows", name, mapset);
}
- /* 3dview= */
- if ((name = parm.view->answer)) {
- struct G_3dview v;
- FILE *fp;
- int ret;
-
- mapset = G_find_file2("3d.view", name, "");
- if (!mapset)
- G_fatal_error(_("3dview file <%s> not found"), name);
-
- G_3dview_warning(0); /* suppress boundary mismatch warning */
-
- if (NULL == (fp = G_fopen_old("3d.view", name, mapset)))
- G_fatal_error(_("Unable to open 3dview file <%s> in <%s>"), name,
- mapset);
-
- temp_window = window;
-
- if (0 > (ret = G_get_3dview(name, mapset, &v)))
- G_fatal_error(_("Unable to read 3dview file <%s> in <%s>"), name,
- mapset);
- if (ret == 0)
- G_fatal_error(_("Old 3dview file. Region <%s> not found in <%s>"),
- name, mapset);
-
-
- window.north = v.vwin.north;
- window.south = v.vwin.south;
- window.west = v.vwin.west;
- window.east = v.vwin.east;
-
- window.rows = v.vwin.rows;
- window.cols = v.vwin.cols;
- window.ns_res = v.vwin.ns_res;
- window.ew_res = v.vwin.ew_res;
-
- fclose(fp);
-
- }
-
/* raster= */
if (parm.raster->answer) {
int first = 0;
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-11-01 22:38:25 UTC (rev 62529)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py 2014-11-01 22:40:30 UTC (rev 62530)
@@ -440,10 +440,6 @@
'group':'group',
'imagery group':'group',
'imagery group files':'group',
- '3d.view':'3dview',
- '3dview':'3dview',
- '3D viewing parameters':'3dview',
- '3D view parameters':'3dview',
'stds':'stds',
'strds':'strds',
'str3ds':'str3ds',
Modified: grass/branches/releasebranch_7_0/lib/manage/element_list
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/element_list 2014-11-01 22:38:25 UTC (rev 62529)
+++ grass/branches/releasebranch_7_0/lib/manage/element_list 2014-11-01 22:40:30 UTC (rev 62530)
@@ -27,4 +27,3 @@
windows:region:region definition:region definition(s)
windows3d:region3d:region3D definition:3D region definition(s)
group:group:imagery group:imagery group(s)
-3d.view:view3d:3D viewing parameters:3D view parameter(s)
Modified: grass/branches/releasebranch_7_0/raster/r.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.region/main.c 2014-11-01 22:38:25 UTC (rev 62529)
+++ grass/branches/releasebranch_7_0/raster/r.region/main.c 2014-11-01 22:40:30 UTC (rev 62530)
@@ -42,7 +42,7 @@
struct Option
*map,
*north, *south, *east, *west,
- *raster, *vect, *region, *view, *align;
+ *raster, *vect, *region, *align;
} parm;
G_gisinit(argv[0]);
@@ -94,16 +94,6 @@
parm.vect->description = _("Set region to match this vector map");
parm.vect->guisection = _("Existing");
- parm.view = G_define_option();
- parm.view->key = "3dview";
- parm.view->key_desc = "name";
- parm.view->required = NO;
- parm.view->multiple = NO;
- parm.view->type = TYPE_STRING;
- parm.view->description = _("Set region to match this 3dview file");
- parm.view->gisprompt = "old,3d.view,3d view";
- parm.view->guisection = _("Existing");
-
parm.north = G_define_option();
parm.north->key = "n";
parm.north->key_desc = "value";
@@ -167,33 +157,6 @@
if ((name = parm.region->answer)) /* region= */
G__get_window(&window, "windows", name, "");
- if ((name = parm.view->answer)) { /* 3dview= */
- struct G_3dview v;
- FILE *fp;
- int ret;
-
- G_3dview_warning(0); /* suppress boundary mismatch warning */
-
- fp = G_fopen_old("3d.view", name, "");
- if (!fp)
- G_fatal_error(_("Unable to open 3dview file <%s>"), name);
-
- ret = G_get_3dview(name, "", &v);
- if (ret < 0)
- G_fatal_error(_("Unable to read 3dview file <%s>"), name);
- if (ret == 0)
- G_fatal_error(_("Old 3dview file. Region <%s> not found"), name);
-
-
- window.north = v.vwin.north;
- window.south = v.vwin.south;
- window.west = v.vwin.west;
- window.east = v.vwin.east;
-
- fclose(fp);
-
- }
-
if ((name = parm.raster->answer)) { /* raster= */
Rast_get_cellhd(name, "", &window);
}
More information about the grass-commit
mailing list