Archives
/
notcurses
mirror of https://github.com/dankamongmen/notcurses
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove progbar PoC, move it into unit tests

Browse Source
dankamongmen/windows-tester
nick black 3 years ago
parent 1a61214a44
commit b2ce3f00f8
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 128 additions and 163 deletions
Show Stats Download Patch File Download Diff File

162
src/poc/progbar.c
Unescape Escape View File

@ -1,162 +0,0 @@
#include <stdlib.h>
#include <notcurses/notcurses.h>
static uint64_t
ts_to_ns(const struct timespec* ts){
return ts->tv_sec * 1000000000 + ts->tv_nsec;
}
static const uint64_t delay = 500000000ull;
static int
pbar_fill(struct notcurses* nc, struct ncprogbar* pbar){
struct timespec cur;
clock_gettime(CLOCK_MONOTONIC, &cur);
const uint64_t startns = ts_to_ns(&cur);
const uint64_t deadline = startns + delay;
do{
clock_gettime(CLOCK_MONOTONIC, &cur);
uint64_t curns = ts_to_ns(&cur);
double p = (curns - startns) / (double)delay;
if(p > 1.0){
p = 1;
}
if(ncprogbar_set_progress(pbar, p)){
return -1;
}
notcurses_render(nc);
}while(ts_to_ns(&cur) < deadline);
return 0;
}
static struct ncprogbar*
hbar_make(struct notcurses* nc, uint64_t flags){
unsigned dimy, dimx;
struct ncplane* std = notcurses_stddim_yx(nc, &dimy, &dimx);
struct ncplane_options nopts = {
.y = 1,
.x = NCALIGN_CENTER,
.rows = dimy - 4,
.cols = 5,
.name = "pbar",
.flags = NCPLANE_OPTION_HORALIGNED,
};
struct ncplane* pbar = ncplane_create(std, &nopts);
if(pbar == NULL){
return NULL;
}
int posy, posx;
ncplane_yx(pbar, &posy, &posx);
unsigned pdimy, pdimx;
ncplane_dim_yx(pbar, &pdimy, &pdimx);
ncplane_cursor_move_yx(std, posy - 1, posx - 1);
uint64_t channels = 0;
ncchannels_set_fg_rgb8(&channels, 0, 0xde, 0xde);
if(ncplane_rounded_box(std, 0, channels, posy + pdimy, posx + pdimx, 0)){
ncplane_destroy(pbar);
return NULL;
}
struct ncprogbar_options popts = {
.flags = flags,
};
ncchannel_set_rgb8(&popts.ulchannel, 0x80, 0x22, 0x22);
ncchannel_set_rgb8(&popts.urchannel, 0x22, 0x22, 0x80);
ncchannel_set_rgb8(&popts.blchannel, 0x22, 0x80, 0x22);
ncchannel_set_rgb8(&popts.brchannel, 0x80, 0x22, 0x22);
struct ncprogbar* ncp = ncprogbar_create(pbar, &popts);
if(ncp == NULL){
return NULL;
}
return ncp;
}
static struct ncprogbar*
pbar_make(struct notcurses* nc, uint64_t flags){
unsigned dimy, dimx;
struct ncplane* std = notcurses_stddim_yx(nc, &dimy, &dimx);
struct ncplane_options nopts = {
.y = dimy / 2,
.x = NCALIGN_CENTER,
.rows = 3,
.cols = dimx - 20,
.name = "pbar",
.flags = NCPLANE_OPTION_HORALIGNED,
};
struct ncplane* pbar = ncplane_create(std, &nopts);
if(pbar == NULL){
return NULL;
}
int posy, posx;
ncplane_yx(pbar, &posy, &posx);
unsigned pdimy, pdimx;
ncplane_dim_yx(pbar, &pdimy, &pdimx);
ncplane_cursor_move_yx(std, posy - 1, posx - 1);
uint64_t channels = 0;
ncchannels_set_fg_rgb8(&channels, 0, 0xde, 0xde);
if(ncplane_rounded_box(std, 0, channels, posy + pdimy, posx + pdimx, 0)){
ncplane_destroy(pbar);
return NULL;
}
struct ncprogbar_options popts = {
.flags = flags,
};
ncchannel_set_rgb8(&popts.ulchannel, 0x80, 0xcc, 0xcc);
ncchannel_set_rgb8(&popts.urchannel, 0xcc, 0xcc, 0x80);
ncchannel_set_rgb8(&popts.blchannel, 0xcc, 0x80, 0xcc);
ncchannel_set_rgb8(&popts.brchannel, 0x80, 0xcc, 0xcc);
struct ncprogbar* ncp = ncprogbar_create(pbar, &popts);
if(ncp == NULL){
return NULL;
}
return ncp;
}
int main(void){
struct notcurses* nc = notcurses_core_init(NULL, NULL);
if(nc == NULL){
return EXIT_FAILURE;
}
struct ncprogbar* ncp = pbar_make(nc, NCPROGBAR_OPTION_RETROGRADE);
if(ncp == NULL){
notcurses_stop(nc);
return EXIT_FAILURE;
}
if(pbar_fill(nc, ncp)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
ncprogbar_destroy(ncp);
ncp = pbar_make(nc, 0);
if(ncp == NULL){
notcurses_stop(nc);
return EXIT_FAILURE;
}
if(pbar_fill(nc, ncp)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
ncprogbar_destroy(ncp);
ncplane_erase(notcurses_stdplane(nc));
ncp = hbar_make(nc, NCPROGBAR_OPTION_RETROGRADE);
if(ncp == NULL){
notcurses_stop(nc);
return EXIT_FAILURE;
}
if(pbar_fill(nc, ncp)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
ncprogbar_destroy(ncp);
ncp = hbar_make(nc, 0);
if(ncp == NULL){
notcurses_stop(nc);
return EXIT_FAILURE;
}
if(pbar_fill(nc, ncp)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
ncprogbar_destroy(ncp);
notcurses_stop(nc);
return EXIT_SUCCESS;
}

129
src/tests/progbar.cpp
Unescape Escape View File

@ -2,6 +2,105 @@
#include <cstring>
#include <iostream>
int pbar_fill(struct notcurses* nc, struct ncprogbar* pbar){
double p = 0;
do{
if(ncprogbar_set_progress(pbar, p)){
return -1;
}
CHECK(0 == notcurses_render(nc));
p += 0.1;
}while(p <= 1.0);
return 0;
}
struct ncprogbar* hbar_make(struct notcurses* nc, uint64_t flags){
unsigned dimy, dimx;
struct ncplane* std = notcurses_stddim_yx(nc, &dimy, &dimx);
struct ncplane_options nopts = {
.y = 1,
.x = NCALIGN_CENTER,
.rows = dimy - 4,
.cols = 5,
.userptr = nullptr,
.name = "pbar",
.resizecb = nullptr,
.flags = NCPLANE_OPTION_HORALIGNED,
.margin_b = 0,
.margin_r = 0,
};
struct ncplane* pbar = ncplane_create(std, &nopts);
if(pbar == NULL){
return NULL;
}
int posy, posx;
ncplane_yx(pbar, &posy, &posx);
unsigned pdimy, pdimx;
ncplane_dim_yx(pbar, &pdimy, &pdimx);
CHECK(0 == ncplane_cursor_move_yx(std, posy - 1, posx - 1));
uint64_t channels = 0;
ncchannels_set_fg_rgb8(&channels, 0, 0xde, 0xde);
if(ncplane_rounded_box(std, 0, channels, posy + pdimy, posx + pdimx, 0)){
ncplane_destroy(pbar);
return NULL;
}
struct ncprogbar_options popts{};
popts.flags = flags;
ncchannel_set_rgb8(&popts.ulchannel, 0x80, 0x22, 0x22);
ncchannel_set_rgb8(&popts.urchannel, 0x22, 0x22, 0x80);
ncchannel_set_rgb8(&popts.blchannel, 0x22, 0x80, 0x22);
ncchannel_set_rgb8(&popts.brchannel, 0x80, 0x22, 0x22);
struct ncprogbar* ncp = ncprogbar_create(pbar, &popts);
if(ncp == NULL){
return NULL;
}
return ncp;
}
static struct ncprogbar*
pbar_make(struct notcurses* nc, uint64_t flags){
unsigned dimy, dimx;
struct ncplane* std = notcurses_stddim_yx(nc, &dimy, &dimx);
struct ncplane_options nopts = {
.y = (int)dimy / 2,
.x = NCALIGN_CENTER,
.rows = 3,
.cols = dimx - 20,
.userptr = nullptr,
.name = "pbar",
.resizecb = nullptr,
.flags = NCPLANE_OPTION_HORALIGNED,
.margin_b = 0,
.margin_r = 0,
};
struct ncplane* pbar = ncplane_create(std, &nopts);
if(pbar == NULL){
return NULL;
}
int posy, posx;
ncplane_yx(pbar, &posy, &posx);
unsigned pdimy, pdimx;
ncplane_dim_yx(pbar, &pdimy, &pdimx);
ncplane_cursor_move_yx(std, posy - 1, posx - 1);
uint64_t channels = 0;
ncchannels_set_fg_rgb8(&channels, 0, 0xde, 0xde);
if(ncplane_rounded_box(std, 0, channels, posy + pdimy, posx + pdimx, 0)){
ncplane_destroy(pbar);
return NULL;
}
struct ncprogbar_options popts{};
popts.flags = flags;
ncchannel_set_rgb8(&popts.ulchannel, 0x80, 0xcc, 0xcc);
ncchannel_set_rgb8(&popts.urchannel, 0xcc, 0xcc, 0x80);
ncchannel_set_rgb8(&popts.blchannel, 0xcc, 0x80, 0xcc);
ncchannel_set_rgb8(&popts.brchannel, 0x80, 0xcc, 0xcc);
struct ncprogbar* ncp = ncprogbar_create(pbar, &popts);
if(ncp == NULL){
return NULL;
}
return ncp;
}
TEST_CASE("ProgressBar") {
auto nc_ = testing_notcurses();
if(!nc_){
@ -45,7 +144,7 @@ TEST_CASE("ProgressBar") {
}
ncprogbar_destroy(pbar);
}
SUBCASE("SingleCellDown") {
struct ncplane_options nopts = {
.y = 0,
@ -163,5 +262,33 @@ TEST_CASE("ProgressBar") {
ncprogbar_destroy(pbar);
}
SUBCASE("FullVert") {
struct ncprogbar* ncp = pbar_make(nc_, 0);
REQUIRE(nullptr != ncp);
CHECK(0 == pbar_fill(nc_, ncp));
ncprogbar_destroy(ncp);
}
SUBCASE("FullVertRetrograde") {
struct ncprogbar* ncp = pbar_make(nc_, NCPROGBAR_OPTION_RETROGRADE);
REQUIRE(nullptr != ncp);
CHECK(0 == pbar_fill(nc_, ncp));
ncprogbar_destroy(ncp);
}
SUBCASE("FullHoriz") {
struct ncprogbar* ncp = hbar_make(nc_, 0);
REQUIRE(nullptr != ncp);
CHECK(0 == pbar_fill(nc_, ncp));
ncprogbar_destroy(ncp);
}
SUBCASE("FullHorizRetrograde") {
struct ncprogbar* ncp = hbar_make(nc_, NCPROGBAR_OPTION_RETROGRADE);
REQUIRE(nullptr != ncp);
CHECK(0 == pbar_fill(nc_, ncp));
ncprogbar_destroy(ncp);
}
CHECK(0 == notcurses_stop(nc_));
}

Write Preview
Loading…
Cancel
Save