Skip to content

Commit

Permalink
[piechart|scatter] define gnc:not-all-zeros locally
Browse files Browse the repository at this point in the history
which ensures that html-piechart and html-scatter converted into
modules do not need to import this function from elsewhere.
  • Loading branch information
christopherlam committed Dec 4, 2020
1 parent da32fb0 commit 9e23e41
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions gnucash/report/html-piechart.scm
Expand Up @@ -151,6 +151,14 @@
(define gnc:html-piechart-set-button-3-legend-urls!
(record-modifier <html-piechart> '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))
Expand Down
8 changes: 8 additions & 0 deletions gnucash/report/html-scatter.scm
Expand Up @@ -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))
Expand Down

0 comments on commit 9e23e41

Please sign in to comment.