blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-12 10:39:04 -04:00
Code Issues Projects Releases Wiki Activity

plots: get width/height for pixel plots #1382

Browse Source
This commit is contained in:
nick black 2021-07-27 15:46:42 -04:00 committed by nick black
parent f3fafb42ee
commit e36497866f
2 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/input.cpp
View File

@ -227,7 +227,7 @@ int input_demo(ncpp::NotCurses* nc) {
popts.minchannels = popts.maxchannels = 0; popts.minchannels = popts.maxchannels = 0;
ncchannels_set_fg_rgb8(&popts.minchannels, 0x40, 0x50, 0xb0); ncchannels_set_fg_rgb8(&popts.minchannels, 0x40, 0x50, 0xb0);
ncchannels_set_fg_rgb8(&popts.maxchannels, 0x40, 0xff, 0xd0); ncchannels_set_fg_rgb8(&popts.maxchannels, 0x40, 0xff, 0xd0);
popts.gridtype = static_cast<ncblitter_e>(NCBLIT_8x1); popts.gridtype = static_cast<ncblitter_e>(NCBLIT_PIXEL);
plot = ncuplot_create(pplane, &popts, 0, 0); plot = ncuplot_create(pplane, &popts, 0, 0);
if(!plot){ if(!plot){
return EXIT_FAILURE; return EXIT_FAILURE;

8
src/lib/plot.c
View File

@ -45,12 +45,14 @@ typedef struct nc##X##plot { \
\ \
int redraw_plot_##T(nc##X##plot* ncp){ \ int redraw_plot_##T(nc##X##plot* ncp){ \
ncplane_erase(ncp->plot.ncp); \ ncplane_erase(ncp->plot.ncp); \
const int scale = ncp->plot.bset->width; \ const int scale = ncp->plot.bset->geom == NCBLIT_PIXEL ? \
ncplane_notcurses_const(ncp->plot.ncp)->tcache.cellpixx : ncp->plot.bset->width; \
int dimy, dimx; \ int dimy, dimx; \
ncplane_dim_yx(ncp->plot.ncp, &dimy, &dimx); \ ncplane_dim_yx(ncp->plot.ncp, &dimy, &dimx); \
const int scaleddim = dimx * scale; \ const int scaleddim = dimx * scale; \
/* each transition is worth this much change in value */ \ /* each transition is worth this much change in value */ \
const size_t states = ncp->plot.bset->height + 1; \ const size_t states = (ncp->plot.bset->geom == NCBLIT_PIXEL ? \
ncplane_notcurses_const(ncp->plot.ncp)->tcache.cellpixy : ncp->plot.bset->height) + 1; \
/* FIXME can we not rid ourselves of this meddlesome double? either way, the \ /* FIXME can we not rid ourselves of this meddlesome double? either way, the \
interval is one row's range (for linear plots), or the base (base^slots== \ interval is one row's range (for linear plots), or the base (base^slots== \
maxy-miny) of the range (for exponential plots). */ \ maxy-miny) of the range (for exponential plots). */ \
@ -138,6 +140,7 @@ int redraw_plot_##T(nc##X##plot* ncp){ \
calc_gradient_channels(&channels, ncp->plot.minchannels, ncp->plot.minchannels, \ calc_gradient_channels(&channels, ncp->plot.minchannels, ncp->plot.minchannels, \
ncp->plot.maxchannels, ncp->plot.maxchannels, y, x, dimy, dimx); \ ncp->plot.maxchannels, ncp->plot.maxchannels, y, x, dimy, dimx); \
ncplane_set_channels(ncp->plot.ncp, channels); \ ncplane_set_channels(ncp->plot.ncp, channels); \
if(egc){ \
size_t egcidx = 0, sumidx = 0; \ size_t egcidx = 0, sumidx = 0; \
/* if we've got at least one interval's worth on the number of positions \ /* if we've got at least one interval's worth on the number of positions \
times the number of intervals per position plus the starting offset, \ times the number of intervals per position plus the starting offset, \
@ -201,6 +204,7 @@ int redraw_plot_##T(nc##X##plot* ncp){ \
if(done){ \ if(done){ \
break; \ break; \
} \ } \
} \
if(ncp->plot.exponentiali){ \ if(ncp->plot.exponentiali){ \
intervalbase = ncp->miny + pow(interval, (y + 1) * states - 1); \ intervalbase = ncp->miny + pow(interval, (y + 1) * states - 1); \
}else{ \ }else{ \