r.carve: adding the option to read width, depth values from vector map table columns by tmszi · Pull Request #803 · OSGeo/grass

tmszi · 2020-07-18T20:12:41Z

Adding the option to read width, depth values from vector map table columns issue #686.

hellik

typo

raster/r.carve/r.carve.html

raster/r.carve/enforce_ds.c

raster/r.carve/main.c

raster/r.carve/r.carve.html

…p table columns

…tive indent

wenzeslaus · 2022-09-07T08:24:28Z

I have merged current main into this which refreshes the code base in the PR overall. The PR had some indentation changes included, so the new indented code from main should actually make this PR cleaner. Anyway, no conflicts with the main branch now.

tmszi · 2022-09-08T19:33:15Z

I have merged current main into this which refreshes the code base in the PR overall. The PR had some indentation changes included, so the new indented code from main should actually make this PR cleaner. Anyway, no conflicts with the main branch now.

Thanks!

nilason · 2023-02-15T12:43:17Z

Merged this to main again.

neteler · 2023-02-18T10:30:00Z

There is a mac CI failure:

x86_64-apple-darwin13.4.0-clang -D_FORTIFY_SOURCE=2 -isystem /Users/runner/miniconda3/envs/grass-env/include  -I/Users/runner/miniconda3/envs/grass-env/include -O2 -pipe -arch x86_64 -DGL_SILENCE_DEPRECATION -Wall -Wextra -Werror -I/Users/runner/miniconda3/envs/grass-env/include -I/Users/runner/work/grass/grass/dist.x86_64-apple-darwin13.4.0/include -I/Users/runner/work/grass/grass/dist.x86_64-apple-darwin13.4.0/include    -DPACKAGE=\""grassmods"\"   -I/Users/runner/work/grass/grass/dist.x86_64-apple-darwin13.4.0/include -I/Users/runner/work/grass/grass/dist.x86_64-apple-darwin13.4.0/include -DRELDIR=\"raster/r.buffer\" -o OBJ.x86_64-apple-darwin13.4.0/process_row.o -c process_row.c
enforce_ds.c:176:27: error: comparison of integers of different signs: 'unsigned int' and 'int' [-Werror,-Wsign-compare]
            for (c = 0; c < sql.ncats; c++) {
                        ~ ^ ~~~~~~~~~
enforce_ds.c:637:58: error: unused parameter 'table' [-Werror,-Wunused-parameter]
               double *parm, double *def_value, dbTable *table,
                                                         ^
2 errors generated.
make[4]: *** [OBJ.x86_64-apple-darwin13.4.0/enforce_ds.o] Error 1

nilason

Docs in general need to be corrected, for a start, if not urgent fix perhaps milestone bump to 8.4 perhaps preferable.

nilason · 2023-02-18T19:08:31Z

raster/r.carve/enforce_ds.c

+}
+
+void set_value(dbColumn *col, unsigned short int *ctype, char *answer,
+               double *parm, double *def_value, dbTable *table,


table not used

nilason · 2023-02-18T19:11:49Z

raster/r.carve/enforce_ds.c

+            set_value(depth_col, &depth_col_type, parm->depth_col->answer,
+                      &parm->sdepth, def_depth, table, &wind, DEPTH);
+
+            for (c = 0; c < sql.ncats; c++) {


”comparison of integers of different signs: 'unsigned int' and 'int' `[-Werror,-Wsign-compare]” compiler warning

nilason · 2023-02-18T19:17:21Z

raster/r.carve/enforce_ds.c

+                        struct field_info *Fi, int *width_col_pos,
+                        int *depth_col_pos, char *columns[2], dbDriver *driver)
+/*
+ * Function: enforce_downstream


Docs before function, see doxygen style, eg.

grass/lib/display/raster.c

Line 30 in 001bf57

/*!

neteler · 2023-11-07T14:57:28Z

The CI gcc tests show this error:

make[4]: Entering directory '/home/runner/work/grass/grass/raster/r.carve'
test -d OBJ.x86_64-pc-linux-gnu || mkdir -p OBJ.x86_64-pc-linux-gnu
gcc  -std=gnu11 -fPIC -Wall -Wextra -Werror  -I/home/runner/work/grass/grass/dist.x86_64-pc-linux-gnu/include -I/home/runner/work/grass/grass/dist.x86_64-pc-linux-gnu/include   -I/usr/include/gdal -I/usr/include -DPACKAGE=\""grassmods"\"   -I/home/runner/work/grass/grass/dist.x86_64-pc-linux-gnu/include -I/home/runner/work/grass/grass/dist.x86_64-pc-linux-gnu/include -DRELDIR=\"raster/r.carve\" -o OBJ.x86_64-pc-linux-gnu/enforce_ds.o -c enforce_ds.c
enforce_ds.c: In function ‘enforce_downstream’:
enforce_ds.c:176:27: error: comparison of integer expressions of different signedness: ‘unsigned int’ and ‘int’ [-Werror=sign-compare]
  176 |             for (c = 0; c < sql.ncats; c++) {
      |                           ^
enforce_ds.c: In function ‘set_value’:
enforce_ds.c:637:58: error: unused parameter ‘table’ [-Werror=unused-parameter]
  637 |                double *parm, double *def_value, dbTable *table,
      |                                                 ~~~~~~~~~^~~~~
cc1: all warnings being treated as errors

echoix · 2025-02-26T17:30:37Z

raster/r.carve/r.carve.html

Remember to apply the changes in the markdown docs when updating the PR.

echoix · 2025-07-23T16:28:37Z

raster/r.carve/Makefile

 PGM = r.carve

-LIBES = $(VECTORLIB) $(BITMAPLIB) $(DIG2LIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(VECTORLIB) $(BITMAPLIB) $(DIG2LIB) $(RASTERLIB) $(GISLIB) $(DBMILIB)


What is the equivalent target in CMake for the DBMILIB?

It needs to be added in
https://github.com/tmszi/grass/blob/01c4bee8e121e35ba5fa38d38d371a0722d2e29d/raster/CMakeLists.txt#L159-L167

There are like three targets in that CMakeLists.txt that contain dbmi. Are they more precise now?

tmszi force-pushed the improve_r_carve branch from 046b150 to 310c0b1 Compare July 18, 2020 20:37

hellik reviewed Jul 18, 2020

View reviewed changes

raster/r.carve/r.carve.html Outdated Show resolved Hide resolved

tmszi force-pushed the improve_r_carve branch 2 times, most recently from 2793af8 to 1cb8d75 Compare July 19, 2020 06:06

neteler added the enhancement New feature or request label Jul 19, 2020