[GRASS-SVN] r65873 - in grass/trunk/vector: v.delaunay v.mkgrid
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 10 06:56:03 PDT 2015
Author: neteler
Date: 2015-08-10 06:56:03 -0700 (Mon, 10 Aug 2015)
New Revision: 65873
Modified:
grass/trunk/vector/v.delaunay/v.delaunay.html
grass/trunk/vector/v.mkgrid/main.c
Log:
revert unwanted part of r65872
Modified: grass/trunk/vector/v.delaunay/v.delaunay.html
===================================================================
--- grass/trunk/vector/v.delaunay/v.delaunay.html 2015-08-10 13:49:54 UTC (rev 65872)
+++ grass/trunk/vector/v.delaunay/v.delaunay.html 2015-08-10 13:56:03 UTC (rev 65873)
@@ -15,13 +15,6 @@
<div class="code"><pre>
g.region n=220750 s=219950 w=638300 e=639000 -p
v.delaunay input=elev_lid792_randpts output=elev_lid792_randpts_delaunay
-
-
- 696 v.delaunay input=elev_lid792_bepts output=elev_lid792_bepts_tin
- 697 v.colors elev_lid792_bepts_tin color=srtm_plus
- 698 d.erase
- 699 d.vect elev_lid792_bepts_tin
-
</pre></div>
Modified: grass/trunk/vector/v.mkgrid/main.c
===================================================================
--- grass/trunk/vector/v.mkgrid/main.c 2015-08-10 13:49:54 UTC (rev 65872)
+++ grass/trunk/vector/v.mkgrid/main.c 2015-08-10 13:56:03 UTC (rev 65873)
@@ -323,9 +323,7 @@
if (grid_info.north - grid_info.south < 3 * grid_info.rstep) {
G_fatal_error(_("Please use a higher resolution or a larger region"));
}
-G_debug(0,"grid_info.num_vect_rows %d", grid_info.num_vect_rows);
-G_debug(0,"grid_info.num_rows %d", grid_info.num_rows);
-G_debug(0,"grid_info.num_vect_rows / 2.0 + 0.5: %f (int) %d", (grid_info.num_vect_rows / 2.0 + 0.5), (int)(grid_info.num_vect_rows / 2.0 + 0.5));
+
if ((int)(grid_info.num_vect_rows / 2.0 + 0.5) != grid_info.num_rows)
G_message(_("The number of rows has been adjusted from %d to %d"),
grid_info.num_rows, (int)(grid_info.num_vect_rows / 2.0 + 0.5));
@@ -368,7 +366,7 @@
}
}
}
- else { /* squares and rectangles */
+ else {
if (grid_info.width != grid_info.height) {
G_important_message(_("The rectangles will be asymmetrical."));
}
More information about the grass-commit
mailing list