From 9e23e41fe60835d9b86fe8f9591ec1d84a37839b Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Fri, 4 Dec 2020 20:52:08 +0800 Subject: [PATCH] [piechart|scatter] define gnc:not-all-zeros locally which ensures that html-piechart and html-scatter converted into modules do not need to import this function from elsewhere. --- gnucash/report/html-piechart.scm | 8 ++++++++ gnucash/report/html-scatter.scm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/gnucash/report/html-piechart.scm b/gnucash/report/html-piechart.scm index 2bc56d1dce..fb6f3a3e63 100644 --- a/gnucash/report/html-piechart.scm +++ b/gnucash/report/html-piechart.scm @@ -151,6 +151,14 @@ (define gnc:html-piechart-set-button-3-legend-urls! (record-modifier 'button-3-legend-urls)) +(define (gnc:not-all-zeros data) + (define (myor list) + (if (null? list) #f + (or (car list) (myor (cdr list))))) + (cond ((number? data) (not (= 0 data))) + ((list? data) (myor (map gnc:not-all-zeros data))) + (else #f))) + (define (gnc:html-piechart-render piechart doc) (let* ((chart (gnc:make-html-chart)) (title (gnc:html-piechart-title piechart)) diff --git a/gnucash/report/html-scatter.scm b/gnucash/report/html-scatter.scm index 77ebf5aa83..d16f925699 100644 --- a/gnucash/report/html-scatter.scm +++ b/gnucash/report/html-scatter.scm @@ -132,6 +132,14 @@ scatter (cons newpoint (gnc:html-scatter-data scatter))))) +(define (gnc:not-all-zeros data) + (define (myor list) + (if (null? list) #f + (or (car list) (myor (cdr list))))) + (cond ((number? data) (not (= 0 data))) + ((list? data) (myor (map gnc:not-all-zeros data))) + (else #f))) + ;; The Renderer (define (gnc:html-scatter-render scatter doc) (let* ((chart (gnc:make-html-chart))