Overview
| Comment: | Selecting by run and test now working |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.61 |
| Files: | files | file ages | folders |
| SHA1: |
7e8984fe9841fc9c1b59c51a28b34e64 |
| User & Date: | matt on 2016-07-25 20:02:07 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-07-25
| ||
| 20:31 | Added compact view check-in: 3cd616b626 user: matt tags: v1.61 | |
| 20:02 | Selecting by run and test now working check-in: 7e8984fe98 user: matt tags: v1.61 | |
| 18:18 | Almost have per run selection working check-in: 7ae9c97a29 user: mrwellan tags: v1.61 | |
Changes
Modified dashboard.scm from [93364af37a] to [3fe78aa26b].
| ︙ | ︙ | |||
203 204 205 206 207 208 209 210 211 212 213 214 215 216 | states ;; states for -state s1,s2 ... statuses ;; statuses for -status s1,s2 ... ;; Selector variables curr-run-id ;; current row to display in Run summary view curr-test-ids ;; used only in dcommon:run-update which is used in newdashboard filters-changed ;; to to indicate that the user changed filters for this tab hide-empty-runs hide-not-hide ;; toggle for hide/not hide empty runs hide-not-hide-button searchpatts state-ignore-hash ;; hash of STATE => #t/#f for display control status-ignore-hash ;; hash of STATUS => #t/#f target | > | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | states ;; states for -state s1,s2 ... statuses ;; statuses for -status s1,s2 ... ;; Selector variables curr-run-id ;; current row to display in Run summary view curr-test-ids ;; used only in dcommon:run-update which is used in newdashboard filters-changed ;; to to indicate that the user changed filters for this tab last-filter-str ;; conc the target runname and testpatt for a signature of changed filters hide-empty-runs hide-not-hide ;; toggle for hide/not hide empty runs hide-not-hide-button searchpatts state-ignore-hash ;; hash of STATE => #t/#f for display control status-ignore-hash ;; hash of STATUS => #t/#f target |
| ︙ | ︙ | |||
2536 2537 2538 2539 2540 2541 2542 |
(take (append (or (dboard:tabdat-target tabdat);; (string-split (dboard: "/")
'("%" "%"))
(make-list num-keys "%"))
num-keys)
))
(runpatt (if (dboard:tabdat-target tabdat)
(last (dboard:tabdat-target tabdat))
| | > > | | > > | > | | | 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 |
(take (append (or (dboard:tabdat-target tabdat);; (string-split (dboard: "/")
'("%" "%"))
(make-list num-keys "%"))
num-keys)
))
(runpatt (if (dboard:tabdat-target tabdat)
(last (dboard:tabdat-target tabdat))
"%"))
(testpatt (or (dboard:tabdat-test-patts tabdat) "%"))
(filtrstr (conc targpatt "/" runpatt "/" testpatt)))
(print "targpatt: " targpatt " runpatt: " runpatt " testpatt: " testpatt)
(if (not (equal? (dboard:tabdat-last-filter-str tabdat) filtrstr))
(let ((dwg (dboard:tabdat-drawing tabdat)))
(print "reseting drawing")
(dboard:tabdat-layout-update-ok-set! tabdat #f)
(vg:drawing-libs-set! dwg (make-hash-table))
(vg:drawing-insts-set! dwg (make-hash-table))
(vg:drawing-cache-set! dwg '())
(dboard:tabdat-allruns-by-id-set! tabdat (make-hash-table))
;; (dboard:tabdat-allruns-set! tabdat '())
(dboard:tabdat-max-row-set! tabdat 0)
(dboard:tabdat-last-filter-str-set! tabdat filtrstr)))
(update-rundat tabdat
runpatt
;; (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "runname" "%")
10 ;; (dboard:tabdat-numruns tabdat)
testpatt ;; (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%")
;; (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "item-name" "%")
targpatt
;; old method
;; (let ((res '()))
;; (for-each (lambda (key)
|
| ︙ | ︙ | |||
2639 2640 2641 2642 2643 2644 2645 | ;; (print "run: " run-full-name " curr-run-start-row: " curr-run-start-row) (if (not (vg:lib-get-component runslib run-full-name)) (let* ((hierdat (if (or (dboard:rundat-data-changed rundat) ;; attempt to not sort when possible. (not (dboard:rundat-hierdat rundat))) (let ((hd (dboard:tests-sort-by-time-group-by-item (dboard:rundat-tests rundat)))) ;; hierarchial list of ids (dboard:rundat-hierdat-set! rundat hd) hd) | | | 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 | ;; (print "run: " run-full-name " curr-run-start-row: " curr-run-start-row) (if (not (vg:lib-get-component runslib run-full-name)) (let* ((hierdat (if (or (dboard:rundat-data-changed rundat) ;; attempt to not sort when possible. (not (dboard:rundat-hierdat rundat))) (let ((hd (dboard:tests-sort-by-time-group-by-item (dboard:rundat-tests rundat)))) ;; hierarchial list of ids (dboard:rundat-hierdat-set! rundat hd) hd) (dboard:rundat-hierdat rundat))) (tests-ht (dboard:rundat-tests rundat)) (all-tids (hash-table-keys tests-ht)) ;; (apply append hierdat)) ;; was testsdat (testsdat (hash-table-values tests-ht)) (runcomp (vg:comp-new));; new component for this run (rows-used (make-hash-table)) ;; keep track of what parts of the rows are used here row1 = (obj1 obj2 ...) ;; (row-height 4) (run-start (dboard:min-max < (map db:test-get-event_time testsdat))) |
| ︙ | ︙ |
Modified dcommon.scm from [a31b0b33bd] to [afcab61b40].
| ︙ | ︙ | |||
975 976 977 978 979 980 981 |
#:value (dboard:test-patt->lines
(dboard:tabdat-test-patts-use tabdat))
#:expand "YES"
#:size "x30"
#:multiline "YES")))
(set! test-patterns-textbox tb)
tb))
| | | | | | | | | | 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 |
#:value (dboard:test-patt->lines
(dboard:tabdat-test-patts-use tabdat))
#:expand "YES"
#:size "x30"
#:multiline "YES")))
(set! test-patterns-textbox tb)
tb))
;; (iup:frame
;; #:title "Target"
;; ;; Target selectors
;; (apply iup:hbox
;; (let* ((dat (dashboard:update-target-selector tabdat action-proc: update-keyvals))
;; (key-lb (car dat))
;; (combos (cadr dat)))
;; combos)))
(iup:hbox
;; Text box for STATES
(iup:frame
#:title "States"
(dashboard:text-list-toggle-box
;; Move these definitions to common and find the other useages and replace!
(map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED")
|
| ︙ | ︙ |