Skip to content

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

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.

Sign up for GitHub

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

Open
tmszi wants to merge 10 commits into
base: main
Choose a base branch
from
+689 −59
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a9c7b35
r.carve: adding the option to read width, depth values from vector ma…
tmszi Jul 20, 2020
079415b
Indent conflicting files with the indent script
wenzeslaus Sep 7, 2022
140befa
Merge current main with global indent into improve_r_carve with selec…
wenzeslaus Sep 7, 2022
d46d2d5
apply clang-format
nilason Feb 15, 2023
b935a12
Merge branch 'main' into improve_r_carve
nilason Feb 15, 2023
1b838df
Merge branch 'main' into improve_r_carve
nilason Feb 15, 2023
7cd820b
Merge remote-tracking branch 'upstream/main' into improve_r_carve
neteler Nov 7, 2023
82f497b
Merge branch 'main' into improve_r_carve
echoix Mar 6, 2024
1ac8b03
Merge branch 'main' into improve_r_carve
echoix Nov 9, 2024
01c4bee
Merge branch 'main' into improve_r_carve
echoix Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion raster/r.carve/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..

PGM = r.carve

LIBES = $(VECTORLIB) $(BITMAPLIB) $(DIG2LIB) $(RASTERLIB) $(GISLIB)
LIBES = $(VECTORLIB) $(BITMAPLIB) $(DIG2LIB) $(RASTERLIB) $(GISLIB) $(DBMILIB)
Copy link
Member

@echoix echoix Jul 23, 2025

Choose a reason for hiding this comment

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

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?

DEPENDENCIES = $(VECTORDEP) $(BITMAPDEP) $(DIG2DEP) $(RASTERDEP) $(GISDEP)

EXTRA_INC = $(VECT_INC)
Expand Down
51 changes: 46 additions & 5 deletions raster/r.carve/enforce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
*
* AUTHOR(S): Original author Bill Brown, UIUC GIS Laboratory
* Brad Douglas <rez touchofmadness com>
* Tomas Zigo <tomas zigo slovanet sk> (adding the option
* to read width, depth values from vector map table columns)
*
* PURPOSE: Takes vector stream data, converts it to 3D raster and
* subtracts a specified depth
Expand Down Expand Up @@ -43,17 +45,55 @@ typedef struct {
} PointGrp;

struct parms {
struct Option *inrast, *invect, *outrast, *outvect;
struct Option *inrast, *invect, *outrast, *outvect, *width_col, *depth_col,
*field;
RASTER_MAP_TYPE raster_type;
double swidth, sdepth;
int wrap, noflat;
};

struct sql_statement {
dbString *sql;
int ncats;
struct vect_id_cat_map *id_cat_map;
};

struct vect_id_cat_map {
int id;
int cat;
};

struct ptr {
enum Type {
P_INT,
P_DOUBLE,
P_CHAR,
P_DBSTRING,
P_VECT_ID_CAT_MAP,
} type;
union {
int *p_int;
double *p_double;
char *p_char;
dbString *p_dbString;
struct vect_id_cat_map *p_vect_id_cat_map;
};
};

typedef enum {
WIDTH,
DEPTH,
} value_type;

/* enforce_ds.c */
extern int enforce_downstream(int /*infd */, int /*outfd */,
struct Map_info * /*Map */,
struct Map_info * /*outMap */,
struct parms * /* parm */);
extern void
enforce_downstream(int /*infd */, int /*outfd */, struct Map_info * /*Map */,
struct Map_info * /*outMap */, struct parms * /* parm */,
struct field_info * /* Fi */, int * /* width_col_posw */,
int * /* depth_col_pos */, char *[2] /* columns[2] */,
dbDriver * /* driver */);
extern void adjust_swidth(struct Cell_head *win, double *value);
extern void adjust_sdepth(double *value);

/* lobf.c */
extern Point2 *pg_getpoints(PointGrp *);
Expand All @@ -68,6 +108,7 @@ void *write_raster(void *, const int, const RASTER_MAP_TYPE);

/* support.c */
extern void update_rast_history(struct parms *);
extern void check_mem_alloc(struct ptr *pointer);

/* vect.c */
extern int open_new_vect(struct Map_info *, char *);
Expand Down
Loading
Loading