Megatest

Check-in [716dd0e5a5]
Login
Overview
Comment:Graph Colors
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | db
Files: files | file ages | folders
SHA1: 716dd0e5a5a2dfab3ee9fc89dbfffb1e748be37b
User & Date: ritikaag on 2016-09-30 19:49:01
Other Links: branch diff | manifest | tags
Context
2016-10-06
21:13
Updates to graph, still needs some work check-in: 8c7c83ca96 user: ritikaag tags: db
11:28
Merged partial implementation of graph controls and added remote support for load detection check-in: 18599e811e user: mrwellan tags: v1.62
2016-09-30
19:49
Graph Colors check-in: 716dd0e5a5 user: ritikaag tags: db
16:31
Matrix display check-in: be004c567e user: ritikaag tags: db
Changes

Modified dashboard.scm from [9ae36afbc2] to [abc1880d4e].

2902
2903
2904
2905
2906
2907
2908
2909

2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2902
2903
2904
2905
2906
2907
2908

2909
2910
2911
2912
2913
2914
2915

2916
2917
2918
2919
2920
2921
2922







-
+






-







	      (lambda (fieldn)
		(let* ((dat     (hash-table-ref alldat fieldn))
		       (vals    (map (lambda (x)(vector-ref x 2)) dat)))
                  (if (not (hash-table-exists? graph-matrix-table fieldn))
                      ;;(print fieldn "exists")
                      (begin
                        (let* ((graph-color-rgb (vg:generate-color-rgb))
                               (graph-color (apply vg:rgb->number graph-color-rgb))
                               (graph-color (vg:iup-color->number graph-color-rgb))
                               (graph-matrix-col (dboard:tabdat-graph-matrix-col tabdat))
                               (graph-matrix-row (dboard:tabdat-graph-matrix-row tabdat)))
                          (hash-table-set! graph-matrix-table fieldn graph-color)
                          (print "Graph data " graph-matrix-row " " graph-matrix-col " " fieldn " " graph-color " " graph-color-rgb)
                          (set! changed #t)
                          (iup:attribute-set! graph-matrix (conc graph-matrix-row ":"  graph-matrix-col) fieldn)
                          (iup:attribute-set! graph-matrix "FGCOLOR1:1" '(70 249 73))
                          (iup:attribute-set! graph-matrix (conc "BGCOLOR" (conc graph-matrix-row ":"  graph-matrix-col)) graph-color-rgb)
                          (if (> graph-matrix-col 10)
                              (begin
                                (dboard:tabdat-graph-matrix-col-set! tabdat 1)
                                (dboard:tabdat-graph-matrix-row-set! tabdat (+ graph-matrix-row 1)))
                              (dboard:tabdat-graph-matrix-col-set! tabdat (+ graph-matrix-col 1)))
                          )))

Modified vg.scm from [9ee0d0e29e] to [2067ad836c].

366
367
368
369
370
371
372


373
374
375
376
377


378
379
380
381



382
383
384
385
386
387
388
389
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382



383
384
385

386
387
388
389
390
391
392







+
+





+
+

-
-
-
+
+
+
-







(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))

;; Obsolete function
;;
(define (vg:generate-color)
  (vg:rgb->number (random 255)
                  (random 255)
                  (random 255)))

;; Need to return a string of random iup-color for graph
;;
(define (vg:generate-color-rgb)
  (list (random 255)
        (random 255)
        (random 255)))
  (conc (number->string (random 255)) " "
        (number->string (random 255)) " "
        (number->string (random 255))))


(define (vg:iup-color->number iup-color)
  (apply vg:rgb->number (map string->number (string-split iup-color))))

;;======================================================================
;; graphing
;;======================================================================