Overview
| Comment: | Resolved merge conflict |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | popup_menu |
| Files: | files | file ages | folders |
| SHA1: |
2d12c063792dbbd692cdee81c0b664bc |
| User & Date: | ritikaag on 2016-08-16 14:42:35 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-08-16
| ||
| 14:42 | Resolved merge conflict Closed-Leaf check-in: 2d12c06379 user: ritikaag tags: popup_menu | |
|
2016-08-02
| ||
| 15:43 | Merged with v1.61 check-in: a05a9a1fd3 user: ritikaag tags: popup_menu | |
Changes
Modified dashboard.scm from [190459f5ad] to [63f9425a9d].
| ︙ | ︙ | |||
2725 2726 2727 2728 2729 2730 2731 | (if (not (null? vals)) (let* ((maxval (apply max vals)) (minval (apply min vals)) (yoff (- minval lly)) ;; minval)) (deltaval (- maxval minval)) (yscale (/ delta-y (if (eq? deltaval 0) 1 deltaval))) (yfunc (lambda (y)(+ lly (* yscale (- y minval)))))) ;; (lambda (y)(* (+ y yoff) yscale)))) | | | | 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 |
(if (not (null? vals))
(let* ((maxval (apply max vals))
(minval (apply min vals))
(yoff (- minval lly)) ;; minval))
(deltaval (- maxval minval))
(yscale (/ delta-y (if (eq? deltaval 0) 1 deltaval)))
(yfunc (lambda (y)(+ lly (* yscale (- y minval)))))) ;; (lambda (y)(* (+ y yoff) yscale))))
(print (car cf) "; maxval: " maxval " minval: " minval " deltaval: " deltaval " yscale: " yscale)
;; (lambda (y)(* (+ y yoff) yscale))))
;; (print (car cf) "; maxval: " maxval " minval: " minval " deltaval: " deltaval " yscale: " yscale)
(vg:add-obj-to-comp
cmp
(vg:make-text-obj (- llx 10)(yfunc maxval) (conc maxval)))
(vg:add-obj-to-comp
cmp
(vg:make-text-obj (- llx 10)(yfunc minval) (conc minval)))
|
| ︙ | ︙ |