Overview
| Comment: | added colors on the graph |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.61 |
| Files: | files | file ages | folders |
| SHA1: |
bf22a32f91c0d4d68e8211dc4d6c8943 |
| User & Date: | ritikaag on 2016-09-02 17:46:57 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-09-07
| ||
| 17:57 | added check for DISPLAY settings prior to launching dashboard check-in: f158e57b14 user: bjbarcla tags: v1.61 | |
| 16:44 | needed cleanup; one-run-updater wip bugfix check-in: 062b578b1b user: bjbarcla tags: v1.61_onerun | |
| 16:29 | db updated check-in: 9a47c20038 user: ritikaag tags: db | |
| 15:56 | Updated makefile to have less scary output when it can't find postgres and mysql check-in: 9a36d96247 user: jmoon18 tags: v1.61 | |
|
2016-09-06
| ||
| 17:10 | Create new branch named "refactor-db-v1.61-shoeb" check-in: ce9c0bd882 user: srehman tags: refactor-db-v1.61-shoeb | |
| 17:08 | WIP: read-only area support. Better MT_ variable support. Not working properly yet. Closed-Leaf check-in: 3f19516a56 user: mrwellan tags: mrw_wip_fixes_ww37 | |
|
2016-09-02
| ||
| 17:46 | added colors on the graph check-in: bf22a32f91 user: ritikaag tags: v1.61 | |
|
2016-08-31
| ||
| 16:48 | Partial fixes for dashboard issues. WIP check-in: ee53267d1a user: mrwellan tags: v1.61, v1.6104 | |
Changes
Modified dashboard.scm from [85d5b279a2] to [77b498cbd6].
| ︙ | ︙ | |||
2426 2427 2428 2429 2430 2431 2432 | (vals (map (lambda (x)(vector-ref x 2)) dat))) (if (not (null? vals)) (let* ((maxval (apply max vals)) (minval (min 0 (apply min vals))) (yoff (- minval lly)) ;; minval)) (deltaval (- maxval minval)) (yscale (/ delta-y (if (zero? deltaval) 1 deltaval))) | | > | 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 |
(vals (map (lambda (x)(vector-ref x 2)) dat)))
(if (not (null? vals))
(let* ((maxval (apply max vals))
(minval (min 0 (apply min vals)))
(yoff (- minval lly)) ;; minval))
(deltaval (- maxval minval))
(yscale (/ delta-y (if (zero? deltaval) 1 deltaval)))
(yfunc (lambda (y)(+ lly (* yscale (- y minval))))) ;; (lambda (y)(* (+ y yoff) yscale))))
(graph-color (vg:generate-color)))
;; (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)))
|
| ︙ | ︙ | |||
2449 2450 2451 2452 2453 2454 2455 |
(curr-tval (tfn (vector-ref next 0))))
(if (>= curr-tval last-tval)
(begin
(vg:add-obj-to-comp
cmp
;;(vg:make-rect-obj last-tval lly curr-tval last-yval ;; (- stval 2) lly (+ stval 2)(+ lly (* yval yscale))
(vg:make-line-obj last-tval last-yval curr-tval last-yval
| | | | 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 |
(curr-tval (tfn (vector-ref next 0))))
(if (>= curr-tval last-tval)
(begin
(vg:add-obj-to-comp
cmp
;;(vg:make-rect-obj last-tval lly curr-tval last-yval ;; (- stval 2) lly (+ stval 2)(+ lly (* yval yscale))
(vg:make-line-obj last-tval last-yval curr-tval last-yval
line-color: graph-color))
(vg:add-obj-to-comp
cmp
;;(vg:make-rect-obj last-tval lly curr-tval last-yval ;; (- stval 2) lly (+ stval 2)(+ lly (* yval yscale))
(vg:make-line-obj curr-tval last-yval curr-tval next-yval
line-color: graph-color)))
(print "ERROR: curr-tval is not > last-tval; curr-tval " curr-tval ", last-tval " last-tval))))
next)
;; for init create vector tstart,0
#f ;; (vector tstart minval minval)
dat)
;; (for-each
|
| ︙ | ︙ |
Modified vg.scm from [4c32df4c61] to [4b3f71521e].
| ︙ | ︙ | |||
365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
(define (vg:rgb->number r g b #!key (a 0))
(bitwise-ior
(arithmetic-shift a 24)
(arithmetic-shift r 16)
(arithmetic-shift g 8)
b))
(define (vg:iup-color->number iup-color)
(apply vg:rgb->number (map string->number (string-split iup-color))))
;;======================================================================
;; graphing
;;======================================================================
| > > > > > > | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 |
(define (vg:rgb->number r g b #!key (a 0))
(bitwise-ior
(arithmetic-shift a 24)
(arithmetic-shift r 16)
(arithmetic-shift g 8)
b))
(define (vg:generate-color)
(vg:rgb->number (random 255)
(random 255)
(random 255)))
;;(vg:rgb->number 0 0 0))
(define (vg:iup-color->number iup-color)
(apply vg:rgb->number (map string->number (string-split iup-color))))
;;======================================================================
;; graphing
;;======================================================================
|
| ︙ | ︙ |