Skip to content

Commit

Permalink
Christian Stimming's report patch.
Browse files Browse the repository at this point in the history 
	* src/scm/options.scm (gnc:options-copy-values): New function.

	* src/scm/report/account-piecharts.scm: Added anchors to yet other
	reports on the slices of the pie. Simplified creation of other
	report's options.

	* src/scm/report/category-barchart.scm: Simplified creation of
	other report's options.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3933 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
@jdavisp3
jdavisp3 committed Apr 11, 2001
1 parent bf05efd commit a4a83ec
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 68 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
View file
Expand Up @@ -5,6 +5,15 @@

2001-04-11 Christian Stimming <stimming@tuhh.de>

* src/scm/options.scm (gnc:options-copy-values): New function.

* src/scm/report/account-piecharts.scm: Added anchors to yet other
reports on the slices of the pie. Simplified creation of other
report's options.

* src/scm/report/category-barchart.scm: Simplified creation of
other report's options.

* src/scm/report/report-list.scm: Renamed file.

* src/scm/report/account-piecharts.scm: Renamed to this filename
Expand Down
14 changes: 14 additions & 0 deletions src/scm/options.scm
View file
Expand Up @@ -925,6 +925,20 @@
(define (gnc:options-get-default-section options)
((options 'get-default-section)))

;; Copies all values from src-options to dest-options, that is, it
;; copies the values of all options from src which exist in dest to
;; there.
(define (gnc:options-copy-values src-options dest-options)
(gnc:options-for-each
(lambda (src-option)
(let ((dest-option (gnc:lookup-option dest-options
(gnc:option-section src-option)
(gnc:option-name src-option))))
(if dest-option
(gnc:option-set-value dest-option
(gnc:option-value src-option)))))
src-options))

(define (gnc:send-options db_handle options)
(gnc:options-for-each
(lambda (option)
Expand Down
94 changes: 51 additions & 43 deletions src/scm/report/account-piecharts.scm
View file
Expand Up @@ -255,43 +255,63 @@
(set! combined
(append start
(list (list sum (_ "Other")))))
(let* ((name reportname)
(options (gnc:make-report-options name))
(account-op
(gnc:lookup-option options pagename-accounts
optname-accounts)))
(let ((options (gnc:make-report-options reportname)))
;; now copy all the options
(define (set-option! pagename optname value)
(gnc:option-set-value
(gnc:lookup-option options pagename optname)
value))
(for-each
(lambda (l) (set-option! (car l) (cadr l) (caddr l)))
(append
(if do-intervals?
(list (list pagename-general optname-from-date
(cons 'absolute from-date-tp)))
'())
(list
(list pagename-general optname-to-date
(cons 'absolute to-date-tp))
(list pagename-general optname-report-currency
report-currency)
(list pagename-accounts optname-levels account-levels)
(list pagename-display optname-fullname show-fullname?)
(list pagename-display optname-show-total show-total?)
(list pagename-display optname-slices max-slices)
(list pagename-display optname-plot-height height)
(list pagename-display optname-plot-width width))))
(call-with-values (lambda () (unzip2 finish))
(lambda (ds as)
(gnc:option-set-value account-op as)))
(gnc:options-copy-values (gnc:report-options report-obj)
options)
;; and set the destination accounts
(gnc:option-set-value
(gnc:lookup-option options pagename-accounts
optname-accounts)
(map car finish))
;; set the URL.
(set! other-anchor
(gnc:report-anchor-text
(gnc:make-report name options))))))
(gnc:make-report reportname options))))))

;; set the URLs
(let ((urls
(map
(lambda (pair)
(if (string? (cadr pair))
other-anchor
(let* ((acct (cadr pair))
(subaccts
(gnc:account-get-immediate-subaccounts
acct)))
(if (null? subaccts)
;; if leaf-account, make this an anchor
;; to the register.
(gnc:account-anchor-text (cadr pair))
;; if non-leaf account, make this a link
;; to another report which is run on the
;; immediate subaccounts of this account
;; (and including this account).
(let ((options (gnc:make-report-options
reportname)))
(gnc:options-copy-values
(gnc:report-options report-obj) options)
(gnc:option-set-value
(gnc:lookup-option options pagename-accounts
optname-accounts)
(cons acct subaccts))
(gnc:option-set-value
(gnc:lookup-option options pagename-accounts
optname-levels)
(+ 1 tree-depth))
(gnc:report-anchor-text
(gnc:make-report reportname options)))))))
combined)))
(gnc:html-piechart-set-button-1-slice-urls! chart urls)
(gnc:html-piechart-set-button-1-legend-urls! chart urls))

(gnc:html-piechart-set-title!
chart report-title)
(gnc:html-piechart-set-width! chart width)
(gnc:html-piechart-set-height! chart height)
(gnc:html-piechart-set-data! chart (unzip1 combined))
(gnc:html-piechart-set-colors! chart
(gnc:assign-colors (length combined)))

(gnc:html-piechart-set-subtitle!
chart (string-append
Expand All @@ -310,9 +330,6 @@

"")))

(gnc:html-piechart-set-width! chart width)
(gnc:html-piechart-set-height! chart height)
(gnc:html-piechart-set-data! chart (unzip1 combined))
(gnc:html-piechart-set-labels!
chart
(map (lambda (pair)
Expand All @@ -328,15 +345,6 @@
(gnc:amount->string (car pair) print-info))
"")))
combined))
(gnc:html-piechart-set-colors! chart
(gnc:assign-colors (length combined)))
(let ((urls (map (lambda (pair)
(if (string? (cadr pair))
other-anchor
(gnc:account-anchor-text (cadr pair))))
combined)))
(gnc:html-piechart-set-button-1-slice-urls! chart urls)
(gnc:html-piechart-set-button-1-legend-urls! chart urls))

(gnc:html-document-add-object! document chart)

Expand Down
35 changes: 10 additions & 25 deletions src/scm/report/category-barchart.scm
View file
Expand Up @@ -330,34 +330,19 @@
(set! all-data
(append start
(list (list (_ "Other") other-sum))))
(let* ((name reportname)
(options (gnc:make-report-options name)))
(let* ((options (gnc:make-report-options reportname)))
;; now copy all the options
(define (set-option! pagename optname value)
(gnc:option-set-value
(gnc:lookup-option options pagename optname)
value))
(for-each
(lambda (l) (set-option! (car l) (cadr l) (caddr l)))
(list
(list pagename-general optname-from-date
(cons 'absolute from-date-tp))
(list pagename-general optname-to-date
(cons 'absolute to-date-tp))
(list pagename-general optname-stepsize interval)
(list pagename-general optname-report-currency
report-currency)
(list pagename-accounts optname-accounts
(map car finish))
(list pagename-accounts optname-levels account-levels)
(list pagename-display optname-fullname show-fullname?)
(list pagename-display optname-stacked stacked?)
(list pagename-display optname-slices max-slices)
(list pagename-display optname-plot-height height)
(list pagename-display optname-plot-width width)))
(gnc:options-copy-values
(gnc:report-options report-obj) options)
;; and set the destination accounts
(gnc:option-set-value
(gnc:lookup-option options pagename-accounts
optname-accounts)
(map car finish))
;; Set the URL to point to this report.
(set! other-anchor
(gnc:report-anchor-text
(gnc:make-report name options))))))
(gnc:make-report reportname options))))))

;; This adds the data. Note the apply-zip stuff: This
;; transposes the data, i.e. swaps rows and columns. Pretty
Expand Down

0 comments on commit a4a83ec

Please sign in to comment.