[GRASS-SVN] r54198 - in grass/trunk: display/d.vect lib/gis lib/temporal/lib lib/vector/Vlib raster3d/r3.in.ascii vector/v.lidar.growing vector/v.lrs/v.lrs.label vector/v.perturb
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 5 04:14:46 PST 2012
Author: martinl
Date: 2012-12-05 04:14:45 -0800 (Wed, 05 Dec 2012)
New Revision: 54198
Modified:
grass/trunk/display/d.vect/label.c
grass/trunk/lib/gis/token.c
grass/trunk/lib/temporal/lib/default_name.c
grass/trunk/lib/vector/Vlib/dgraph.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/vector/v.lidar.growing/ConvexHull.c
grass/trunk/vector/v.lrs/v.lrs.label/main.c
grass/trunk/vector/v.perturb/myrng.c
Log:
avoid debug level 0 -- G_debug(0, ...)
Modified: grass/trunk/display/d.vect/label.c
===================================================================
--- grass/trunk/display/d.vect/label.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/display/d.vect/label.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -61,7 +61,7 @@
list = Vect_new_boxlist(FALSE); /* bboxes not needed */
Vect_get_constraint_box(Map, &box);
nlines = Vect_select_lines_by_box(Map, &box, GV_CENTROID, list);
- G_debug(0, "ncentroids (ogr) = %d", nlines);
+ G_debug(3, "ncentroids (ogr) = %d", nlines);
for (line = 0; line < nlines; line++) {
ltype = Vect_read_line(Map, Points, Cats, list->id[line]);
Modified: grass/trunk/lib/gis/token.c
===================================================================
--- grass/trunk/lib/gis/token.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/lib/gis/token.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -34,7 +34,7 @@
tokens = G_tokenize(buf, " |:,");
ntok = G_number_of_tokens(tokens);
for (i=0; i < ntok; i++) {
- G_debug(0, "%d=[%s]", i, tokens[i]);
+ G_debug(1, "%d=[%s]", i, tokens[i]);
}
G_free_tokens(tokens);
\endcode
Modified: grass/trunk/lib/temporal/lib/default_name.c
===================================================================
--- grass/trunk/lib/temporal/lib/default_name.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/lib/temporal/lib/default_name.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -60,8 +60,7 @@
{
dbConnection connection;
- G_debug(0,
- "Creating new default TGIS DB params with tgis_set_default_connection()");
+ G_verbose_message(_("Creating new default TGIS DB params"));
if (strcmp(TGISDB_DEFAULT_DRIVER, "sqlite") == 0) {
@@ -71,7 +70,7 @@
tgis_set_connection(&connection);
}
else
- G_fatal_error(_("Programmer error"));
+ G_fatal_error(_("Programmer error - only SQLite driver is currently supported"));
return DB_OK;
}
Modified: grass/trunk/lib/vector/Vlib/dgraph.c
===================================================================
--- grass/trunk/lib/vector/Vlib/dgraph.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/lib/vector/Vlib/dgraph.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -254,7 +254,7 @@
&x2, &y2);
/* res2 = segment_intersection_2d_e(x[i], y[i], x[i+1], y[i+1], x[j], y[j], x[j+1], y[j+1], &x1_, &y1_, &x2_, &y2_);
if ((res != res2) || ((res != 0) && (x1!=x1_ || y1!=y1_)) ) {
- G_debug(0, "exact=%d orig=%d", res, res2);
+ G_debug(1, "exact=%d orig=%d", res, res2);
segment_intersection_2d_test(x[i], y[i], x[i+1], y[i+1], x[j], y[j], x[j+1], y[j+1], &x1, &y1, &x2, &y2);
}
*/
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -273,8 +273,8 @@
Rast3d_set_null_value(&value, 1, DCELL_TYPE);
} else {
if (sscanf(buff, "%lf", &value) != 1) {
- G_warning(_("Invalid value detected."));
- G_debug(0, "invalid value at col=%d row=%d depth=%d last_value=[%s]",
+ G_warning(_("Invalid value detected"));
+ G_debug(1, "invalid value at col=%d row=%d depth=%d last_value=[%s]",
x + 1, y + 1, z + 1, buff);
fatalError("asciiToG3d: read failed");
}
Modified: grass/trunk/vector/v.lidar.growing/ConvexHull.c
===================================================================
--- grass/trunk/vector/v.lidar.growing/ConvexHull.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/vector/v.lidar.growing/ConvexHull.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -264,8 +264,8 @@
void nrerror(char error_text[])
/* standard error handler */
{
- G_debug(0, "run-time error...");
- G_debug(0, "%s", error_text);
+ G_debug(1, "run-time error...");
+ G_debug(1, "%s", error_text);
G_fatal_error(_("...now exiting to system..."));
exit(EXIT_FAILURE);
}
Modified: grass/trunk/vector/v.lrs/v.lrs.label/main.c
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.label/main.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/vector/v.lrs/v.lrs.label/main.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -319,7 +319,7 @@
nlines = Vect_get_num_lines(&In);
/* for ( line = 19; line <= 19; line++ ) { */
for (line = 1; line <= nlines; line++) {
- G_debug(0, " line = %d / %d", line, nlines);
+ G_debug(3, " line = %d / %d", line, nlines);
type = Vect_read_line(&In, LPoints, LCats, line);
if (!(type & GV_LINE))
continue;
@@ -391,7 +391,7 @@
nrseg++;
}
- G_debug(0, " %d reference segments selected", nrseg);
+ G_debug(3, " %d reference segments selected", nrseg);
if (nrseg == 0)
continue;
Modified: grass/trunk/vector/v.perturb/myrng.c
===================================================================
--- grass/trunk/vector/v.perturb/myrng.c 2012-12-05 11:06:36 UTC (rev 54197)
+++ grass/trunk/vector/v.perturb/myrng.c 2012-12-05 12:14:45 UTC (rev 54198)
@@ -25,10 +25,6 @@
/* is this how to do transformation? */
for (i = 0; i < n; ++i)
numbers[i] *= p2, numbers[i] += p1;
-
- /*
- for(i=0;i<n;++i)
- G_debug(0,"%g",numbers[i]);
- */
+
return 0;
}
More information about the grass-commit
mailing list