Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r.carve: adding the option to read width, depth values from vector map table columns #803

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

tmszi
Copy link
Member

@tmszi tmszi commented Jul 18, 2020

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

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

@hellik hellik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

raster/r.carve/r.carve.html Outdated Show resolved Hide resolved
@tmszi tmszi force-pushed the improve_r_carve branch 2 times, most recently from 2793af8 to 1cb8d75 Compare July 19, 2020 06:06
@neteler neteler added the enhancement New feature or request label Jul 19, 2020
raster/r.carve/main.c Outdated Show resolved Hide resolved
raster/r.carve/main.c Outdated Show resolved Hide resolved
raster/r.carve/main.c Outdated Show resolved Hide resolved
raster/r.carve/main.c Outdated Show resolved Hide resolved
@tmszi tmszi force-pushed the improve_r_carve branch from 1cb8d75 to 29cfa94 Compare July 20, 2020 07:55
@wenzeslaus
Copy link
Member

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
Copy link
Member Author

tmszi commented Sep 8, 2022

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 nilason added the C Related code is in C label Feb 15, 2023
@nilason
Copy link
Contributor

nilason commented Feb 15, 2023

Merged this to main again.

@neteler
Copy link
Member

neteler commented Feb 18, 2023

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

Copy link
Contributor

@nilason nilason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

}

void set_value(dbColumn *col, unsigned short int *ctype, char *answer,
double *parm, double *def_value, dbTable *table,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

table not used

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++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs before function, see doxygen style, eg.

@wenzeslaus wenzeslaus modified the milestones: 8.3.0, 8.4.0 Mar 17, 2023
@neteler
Copy link
Member

neteler commented Nov 7, 2023

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

@github-actions github-actions bot added raster Related to raster data processing HTML Related code is in HTML module docs labels Mar 6, 2024
@petrasovaa petrasovaa modified the milestones: 8.4.0, 8.5.0 Apr 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C Related code is in C docs enhancement New feature or request HTML Related code is in HTML module raster Related to raster data processing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants