From 117f071500f55f451806101ef5c3975cccde07fa Mon Sep 17 00:00:00 2001 From: stefan schippers Date: Fri, 10 Nov 2023 23:23:13 +0100 Subject: [PATCH] fix del() function in wave processor (did not plot the right %n dataset if specified) --- src/save.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/save.c b/src/save.c index d3e7aa2a..0efa37fc 100644 --- a/src/save.c +++ b/src/save.c @@ -1301,8 +1301,15 @@ int plot_raw_custom_data(int sweep_idx, int first, int last, const char *expr) else if(!strcmp(n, "avg()")) stack1[stackptr1++].i = AVG; else if(!strcmp(n, "ravg()")) stack1[stackptr1++].i = RAVG; else if(!strcmp(n, "del()")) { + int d, t = 0, p = 0; + /* set 'first' to beginning of dataset containing 'first' */ + for(d = 0; d < xctx->raw->datasets; d++) { + t += xctx->raw->npoints[d]; + if(t > first) break; + p = t; + } + first = p; stack1[stackptr1++].i = DEL; - first = 0; } else if(!strcmp(n, "db20()")) stack1[stackptr1++].i = DB20; else if(!strcmp(n, "deriv()")) {