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

added zero size rectangles, ellipses, circles, and strings

Browse Source 
svn: r10610

original commit: 7be05fcf8b156766495df02b7c77d0ebcbd720d1
This commit is contained in:
Robby Findler 2008-07-05 01:58:36 +00:00
parent c90125942e
commit ebed61f4d6
2 changed files with 100 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
collects/mrlib/cache-image-snip.ss
View File

@ -9,8 +9,8 @@
cache-image-snip-class% cache-image-snip-class%
snip-class) snip-class)
;; type argb = (make-argb (vectorof rational[between 0 & 255]) int) ;; type argb = (make-argb (vectorof rational[between 0 & 255]) int int)
(define-struct argb (vector width)) (define-struct argb (vector width height))
#| #|
@ -64,7 +64,6 @@
;; argb : (union #f argb) ;; argb : (union #f argb)
(init-field [argb #f]) (init-field [argb #f])
;; bitmap : (union #f (is-a?/c bitmap%)) ;; bitmap : (union #f (is-a?/c bitmap%))
;; the way that this image is be drawn, on its own ;; the way that this image is be drawn, on its own
(define bitmap #f) (define bitmap #f)
@ -79,18 +78,22 @@
(px px) (px px)
(py py))) (py py)))
;; get-bitmap : -> bitmap ;; get-bitmap : -> bitmap or false
;; returns a bitmap showing what the image would look like, ;; returns a bitmap showing what the image would look like,
;; if it were drawn ;; if it were drawn
(define/public (get-bitmap) (define/public (get-bitmap)
(cond
[(or (zero? width) (zero? height))
#f]
[else
(unless bitmap (unless bitmap
(set! bitmap (argb->bitmap (get-argb)))) (set! bitmap (argb->bitmap (get-argb))))
bitmap) bitmap]))
;; get-argb : -> argb ;; get-argb : -> argb
(define/public (get-argb) (define/public (get-argb)
(unless argb (unless argb
(set! argb (make-argb (make-vector (* 4 width height) 255) width)) (set! argb (make-argb (make-vector (* 4 width height) 255) width height))
(argb-proc argb 0 0)) (argb-proc argb 0 0))
argb) argb)
@ -108,10 +111,12 @@
(define/override (draw dc x y left top right bottom dx dy draw-caret) (define/override (draw dc x y left top right bottom dx dy draw-caret)
(cond (cond
[argb (let ([bitmap (get-bitmap)]) [argb
(let ([bitmap (get-bitmap)])
(when bitmap
(send dc draw-bitmap bitmap x y 'solid (send dc draw-bitmap bitmap x y 'solid
(send the-color-database find-color "black") (send the-color-database find-color "black")
(send bitmap get-loaded-mask)))] (send bitmap get-loaded-mask))))]
[dc-proc [dc-proc
(let ([smoothing (send dc get-smoothing)]) (let ([smoothing (send dc get-smoothing)])
(send dc set-smoothing 'aligned) (send dc set-smoothing 'aligned)
@ -124,6 +129,7 @@
(format "~s" (format "~s"
(list (argb-vector (get-argb)) (list (argb-vector (get-argb))
width width
height
px px
py)))]) py)))])
(send f put str))) (send f put str)))
@ -146,11 +152,31 @@
(define/override (read f) (define/override (read f)
(data->snip (read-from-string (send f get-bytes) (lambda () #f)))) (data->snip (read-from-string (send f get-bytes) (lambda () #f))))
(define/public (data->snip data) (define/public (data->snip data)
(if data (cond
(argb->cache-image-snip (make-argb (first data) (second data)) [(not (list? data)) (make-null-cache-image-snip)]
(third data) [(= (length data 4))
(fourth data)) ;; this is the case for old save files
(make-null-cache-image-snip))) ;; if the width is zero, the height
;; will automatically also be zero
(let ([argb-vec (list-ref data 0)]
[width (list-ref data 1)]
[px (list-ref data 2)]
[py (list-ref data 3)])
(argb->cache-image-snip (make-argb argb-vec
width
(if (zero? width)
0
(/ (vector-length argb-vec) width 4)))
px
py))]
[(= (length data) 5)
;; this is the new saved data and it has the width and the height separately.
(let ([argb-vec (list-ref data 0)]
[width (list-ref data 1)]
[height (list-ref data 2)]
[px (list-ref data 3)]
[py (list-ref data 4)])
(argb->cache-image-snip (make-argb argb-vec width height) px py))]))
(super-new))) (super-new)))
(define snip-class (new cache-image-snip-class%)) (define snip-class (new cache-image-snip-class%))
@ -236,8 +262,8 @@
;; argb->cache-image-snip : argb number number -> cache-image-snip ;; argb->cache-image-snip : argb number number -> cache-image-snip
(define (argb->cache-image-snip argb px py) (define (argb->cache-image-snip argb px py)
(let* ([width (argb-width argb)] (let* ([width (argb-width argb)]
[height (argb-height argb)]
[argb-vector (argb-vector argb)] [argb-vector (argb-vector argb)]
[height (quotient (vector-length argb-vector) (* 4 width))]
[bitmap (argb->bitmap argb)] [bitmap (argb->bitmap argb)]
[mask (send bitmap get-loaded-mask)]) [mask (send bitmap get-loaded-mask)])
(new cache-image-snip% (new cache-image-snip%
@ -246,21 +272,26 @@
(argb argb) (argb argb)
(px px) (px px)
(py py) (py py)
(argb-proc (argb-proc (if (or (zero? width) (zero? height))
(lambda (argb dx dy) void
(overlay-bitmap argb dx dy bitmap mask))) (lambda (argb dx dy) (overlay-bitmap argb dx dy bitmap mask))))
(dc-proc (lambda (dc dx dy) (dc-proc (if (or (zero? width) (zero? height))
void
(lambda (dc dx dy)
(send dc draw-bitmap bitmap dx dy 'solid (send dc draw-bitmap bitmap dx dy 'solid
(send the-color-database find-color "black") (send the-color-database find-color "black")
mask)))))) mask)))))))
;; argb-vector->bitmap : argb -> bitmap ;; argb-vector->bitmap : argb -> bitmap or false
;; flattens the argb vector into a bitmap ;; flattens the argb vector into a bitmap
(define (argb->bitmap argb) (define (argb->bitmap argb)
(let* ([argb-vector (argb-vector argb)] (let* ([argb-vector (argb-vector argb)]
[w (argb-width argb)] [w (argb-width argb)]
[h (quotient (vector-length argb-vector) (* w 4))] [h (argb-height argb)])
[bm (make-object bitmap% w h)] (cond
[(or (zero? w) (zero? h)) #f]
[else
(let* ([bm (make-object bitmap% w h)]
[mask-bm (make-object bitmap% w h)] [mask-bm (make-object bitmap% w h)]
[bdc (new bitmap-dc% (bitmap bm))] [bdc (new bitmap-dc% (bitmap bm))]
[bytes (make-bytes (vector-length argb-vector) 255)] [bytes (make-bytes (vector-length argb-vector) 255)]
@ -281,7 +312,7 @@
(send bdc set-argb-pixels 0 0 w h mask-bytes) (send bdc set-argb-pixels 0 0 w h mask-bytes)
(send bdc set-bitmap #f) (send bdc set-bitmap #f)
(send bm set-loaded-mask mask-bm) (send bm set-loaded-mask mask-bm)
bm)) bm)])))
;; overlay-bitmap : argb int int bitmap bitmap -> void ;; overlay-bitmap : argb int int bitmap bitmap -> void
;; assumes that the mask bitmap only has greyscale in it ;; assumes that the mask bitmap only has greyscale in it
@ -656,9 +687,10 @@ for b3, we have:
[flatten-bitmap ((is-a?/c bitmap%) . -> . (is-a?/c bitmap%))] [flatten-bitmap ((is-a?/c bitmap%) . -> . (is-a?/c bitmap%))]
[argb->cache-image-snip (argb? number? number? . -> . (is-a?/c cache-image-snip%))] [argb->cache-image-snip (argb? number? number? . -> . (is-a?/c cache-image-snip%))]
[argb->bitmap (argb? . -> . (is-a?/c bitmap%))] [argb->bitmap (argb? . -> . (or/c false/c (is-a?/c bitmap%)))]
[argb? (any/c . -> . boolean?)] [argb? (any/c . -> . boolean?)]
[make-argb ((vectorof (integer-in 0 255)) integer? . -> . argb?)] [make-argb ((vectorof (integer-in 0 255)) exact-nonnegative-integer? exact-nonnegative-integer? . -> . argb?)]
[argb-vector (argb? . -> . (vectorof (integer-in 0 255)))] [argb-vector (argb? . -> . (vectorof (integer-in 0 255)))]
[argb-width (argb? . -> . integer?)])) [argb-width (argb? . -> . exact-nonnegative-integer?)]
[argb-height (argb? . -> . exact-nonnegative-integer?)]))

22
collects/mrlib/scribblings/cache-image-snip.scrbl
View File

@ -44,13 +44,13 @@ predicate.
} }
@defmethod[(get-bitmap) @defmethod[(get-bitmap) (or/c false/c (is-a?/c bitmap%))]{
(is-a?/c bitmap%)]{
Builds (if not yet built) a bitmap corresponding to Builds (if not yet built) a bitmap corresponding to
this snip and returns it. this snip and returns it.
If the width or the height of the snip is @scheme[0],
this method return @scheme[#f].
} }
@defmethod[(get-dc-proc) @defmethod[(get-dc-proc)
@ -83,7 +83,9 @@ predicate.
This snipclass is used for saved cache image snips.} This snipclass is used for saved cache image snips.}
@defproc[(make-argb [vectorof (integer-in 0 255)] [width exact-nonnegative-integer?]) @defproc[(make-argb [vectorof (integer-in 0 255)]
[width exact-nonnegative-integer?]
[height exact-nonnegative-integer?])
argb?]{ argb?]{
Constructs a new argb value. The vector has four entries Constructs a new argb value. The vector has four entries
@ -99,6 +101,10 @@ This snipclass is used for saved cache image snips.}
Extracts the width from @scheme[argb].} Extracts the width from @scheme[argb].}
@defproc[(argb-height [argb argb?]) exact-nonnegative-integer?]{
Extracts the height from @scheme[argb].}
@defproc[(argb? [v any/c]) boolean?]{ @defproc[(argb? [v any/c]) boolean?]{
@ -142,9 +148,13 @@ procedure @scheme[draw] to render the bitmap content into the given
@scheme[argb], using @scheme[dx] and @scheme[dy] as the pinhole.} @scheme[argb], using @scheme[dx] and @scheme[dy] as the pinhole.}
@defproc[(argb->bitmap [argb argb?]) (is-a?/c bitmap%)]{ @defproc[(argb->bitmap [argb argb?]) (or/c false/c (is-a?/c bitmap%))]{
Builds a bitmap that draws the same way as @scheme[argb]; the alpha Builds a bitmap that draws the same way as @scheme[argb]; the alpha
pixels are put into the bitmap's @method[bitmap% get-loaded-mask] pixels are put into the bitmap's @method[bitmap% get-loaded-mask]
bitmap.} bitmap.
If the width or height of @scheme[argb] is @scheme[0],
this returns @scheme[#f].
}