suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better save/restore of parameters in plot-pict and plot3d-pict

Browse Source
This commit is contained in:
Neil Toronto 2011-10-18 15:48:18 -06:00
parent 4ca0729a2f
commit 27538e1214
4 changed files with 22 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/plot/common/utils.rkt
View File

@ -57,3 +57,11 @@
(cond
[(andmap (λ (e2) (equiv? e e2)) (first res)) (cons (cons e (first res)) (rest res))]
[else (list* (list e) res)]))]))))
(define (parameterize-procedure t)
(define parameterization (current-parameterization))
(make-keyword-procedure
(lambda (kws kw-args . rest)
(call-with-parameterization
parameterization
(λ () (keyword-apply t kws kw-args rest))))))

43
collects/plot/plot2d/plot.rkt
View File

@ -18,6 +18,7 @@
"../common/parameters.rkt"
"../common/deprecation-warning.rkt"
"../common/renderer.rkt"
"../common/utils.rkt"
"area.rkt")
;; Require lazily: without this, Racket complains while generating documentation:
@ -115,43 +116,11 @@
[#:y-label y-label (or/c string? #f) (plot-y-label)]
[#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
) pict?
(define foreground (plot-foreground))
(define background (plot-background))
(define foreground-alpha (plot-foreground-alpha))
(define background-alpha (plot-background-alpha))
(define font-size (plot-font-size))
(define font-family (plot-font-family))
(define line-width (plot-line-width))
(define legend-box-alpha (plot-legend-box-alpha))
(define tick-size (plot-tick-size))
(define x-transform (plot-x-transform))
(define y-transform (plot-y-transform))
(define z-transform (plot-z-transform))
(define x-ticks (plot-x-ticks))
(define y-ticks (plot-y-ticks))
(define z-ticks (plot-z-ticks))
(define animating? (plot-animating?))
(dc (λ (dc x y)
(parameterize ([plot-foreground foreground]
[plot-background background]
[plot-foreground-alpha foreground-alpha]
[plot-background-alpha background-alpha]
[plot-font-size font-size]
[plot-font-family font-family]
[plot-line-width line-width]
[plot-legend-box-alpha legend-box-alpha]
[plot-tick-size tick-size]
[plot-x-transform x-transform]
[plot-y-transform y-transform]
[plot-z-transform z-transform]
[plot-x-ticks x-ticks]
[plot-y-ticks y-ticks]
[plot-z-ticks z-ticks]
[plot-animating? animating?])
(plot/dc renderer-tree dc x y width height
#:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
#:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor)))
(dc (parameterize-procedure
(λ (dc x y)
(plot/dc renderer-tree dc x y width height
#:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
#:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor)))
width height))
;; Plot to a snip

54
collects/plot/plot3d/plot.rkt
View File

@ -12,6 +12,7 @@
"../common/parameters.rkt"
"../common/deprecation-warning.rkt"
"../common/renderer.rkt"
"../common/utils.rkt"
"area.rkt")
;; Require lazily: without this, Racket complains while generating documentation:
@ -130,53 +131,12 @@
[#:z-label z-label (or/c string? #f) (plot-z-label)]
[#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
) pict?
(define foreground (plot-foreground))
(define background (plot-background))
(define foreground-alpha (plot-foreground-alpha))
(define background-alpha (plot-background-alpha))
(define font-size (plot-font-size))
(define font-family (plot-font-family))
(define line-width (plot-line-width))
(define legend-box-alpha (plot-legend-box-alpha))
(define tick-size (plot-tick-size))
(define x-transform (plot-x-transform))
(define y-transform (plot-y-transform))
(define z-transform (plot-z-transform))
(define x-ticks (plot-x-ticks))
(define y-ticks (plot-y-ticks))
(define z-ticks (plot-z-ticks))
(define animating? (plot-animating?))
(define samples (plot3d-samples))
(define ambient-light (plot3d-ambient-light))
(define diffuse-light? (plot3d-diffuse-light?))
(define specular-light? (plot3d-specular-light?))
(dc (λ (dc x y)
(parameterize ([plot-foreground foreground]
[plot-background background]
[plot-foreground-alpha foreground-alpha]
[plot-background-alpha background-alpha]
[plot-font-size font-size]
[plot-font-family font-family]
[plot-line-width line-width]
[plot-legend-box-alpha legend-box-alpha]
[plot-tick-size tick-size]
[plot-x-transform x-transform]
[plot-y-transform y-transform]
[plot-z-transform z-transform]
[plot-x-ticks x-ticks]
[plot-y-ticks y-ticks]
[plot-z-ticks z-ticks]
[plot-animating? animating?]
[plot3d-samples samples]
[plot3d-ambient-light ambient-light]
[plot3d-diffuse-light? diffuse-light?]
[plot3d-specular-light? specular-light?])
(plot3d/dc
renderer-tree dc x y width height
#:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
#:angle angle #:altitude altitude #:title title #:x-label x-label #:y-label y-label
#:z-label z-label #:legend-anchor legend-anchor)))
(dc (parameterize-procedure
(λ (dc x y)
(plot3d/dc renderer-tree dc x y width height
#:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min
#:z-max z-max #:angle angle #:altitude altitude #:title title #:x-label x-label
#:y-label y-label #:z-label z-label #:legend-anchor legend-anchor)))
width height))
;; Plot to a snip

1
collects/plot/tests/slideshow-test.rkt
View File

@ -22,6 +22,7 @@
(parameterize ([plot-background 1]
[plot-background-alpha 1/2]
[plot-foreground 1])
;; This parabola should be pink:
(plot-pict (function sqr -1 1 #:label "y = x^2")
#:legend-anchor 'center)))