Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -1170,22 +1170,18 @@ (prev-runname (if prev-run-id (rmt:get-run-name-from-id prev-run-id) "None")) ) - (print "BB> xor-ui-update HELLO" ) - (print "BB> curr-runname="curr-runname) - (print "BB> prev-runname="prev-runname) - (print "BB> current-mode="current-mode) (case current-mode ((view-one-run) (iup:attribute-set! xor-src-runid-label "TITLE" "") (iup:attribute-set! xor-dest-runid-label "TITLE" "")) ((xor-two-runs) - (iup:attribute-set! xor-src-runid-label "TITLE" (conc " SRC: "curr-runname" ")) - (iup:attribute-set! xor-dest-runid-label "TITLE" (conc "DEST: "prev-runname" "))) - (else (print "BB> WHA?")) + (iup:attribute-set! xor-src-runid-label "TITLE" (conc " SRC: "prev-runname" ")) + (iup:attribute-set! xor-dest-runid-label "TITLE" (conc "DEST: "curr-runname" "))) + (else (print "BB> should never arrive here")) ))) (define (dboard:runs-tree-browser commondat tabdat) (let* ((tb (iup:treebox #:value 0 @@ -1212,13 +1208,11 @@ (dboard:tabdat-curr-run-id tabdat)) (dboard:tabdat-curr-run-id-set! tabdat run-id) (dboard:tabdat-run-name-set! tabdat curr-runname) - (print "BB> before xor-ui-update") (dboard:xor-ui-update tabdat) - (print "BB> after xor-ui-update") (dboard:tabdat-view-changed-set! tabdat #t)) (debug:print-error 5 *default-log-port* "tree-path->run-id returned non-number " run-id)))) "treebox")) ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) ))) @@ -1688,27 +1682,21 @@ (iup:attribute-set! view-one-run-button "BGCOLOR" nonsel-color) (dboard:xor-ui-update tabdat)) "temp-button-2")) ))) (set! xor-two-runs-button temp-button) - temp-button) - + temp-button) (let ((temp-label (iup:label "" #:size "125x15" #:fontsize "10" ))) (dboard:tabdat-xor-src-runid-label-set! tabdat temp-label) temp-label ) (let ((temp-label (iup:label "" #:size "125x15" #:fontsize "10"))) (dboard:tabdat-xor-dest-runid-label-set! tabdat temp-label) - temp-label - ) - - - ) - ) - + temp-label))) + (run-matrix (iup:matrix #:expand "YES" #:click-cb (lambda (obj lin col status) (let* ((toolpath (car (argv))) @@ -1731,12 +1719,11 @@ (dboard:tabdat-runs-tree-set! tabdat tb) (iup:vbox (iup:split #:value 150 - (iup:vbox - tb) + tb run-matrix) mode-selector) )) Index: gutils.scm ================================================================== --- gutils.scm +++ gutils.scm @@ -34,11 +34,11 @@ ((ARCHIVED) (case (string->symbol status) ((PASS) (list "70 170 73" status)) ((WARN WAIVED) (list "200 130 13" status)) ((SKIP) (list "180 180 0" status)) - (else (list "180 33 49" status)))) + (else (list "253 33 49" state)))) ;; (if (equal? status "PASS") ;; '("70 249 73" "PASS") ;; (if (or (equal? status "WARN") ;; (equal? status "WAIVED")) ;; (list "255 172 13" status) @@ -45,15 +45,15 @@ ;; (list "223 33 49" status)))) ;; greenish orangeish redish ((CLEAN) (list "60 235 63" status)) ((DIRTY-BETTER) (list "160 255 153" status)) ((DIRTY-WORSE) (list "165 42 42" status)) - ((BOTH-BAD) (list "253 33 49" state)) + ((BOTH-BAD) (list "180 33 49" status)) ((LAUNCHED) (list "101 123 142" state)) ((CHECK) (list "255 100 50" state)) ((REMOTEHOSTSTART) (list "50 130 195" state)) ((RUNNING) (list "9 131 232" state)) ((KILLREQ) (list "39 82 206" state)) ((KILLED) (list "234 101 17" state)) ((NOT_STARTED) (list "240 240 240" state)) (else (list "192 192 192" state))))