Overview
Comment: | Mock up of run control mostly done |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
ae38e1ab419a5bea58118fb72a604127 |
User & Date: | matt on 2013-07-07 00:51:55 |
Other Links: | branch diff | manifest | tags |
Context
2013-07-07
| ||
01:00 | Moved log panel to span entire bottom width. check-in: f4535b4813 user: matt tags: dev | |
00:51 | Mock up of run control mostly done check-in: ae38e1ab41 user: matt tags: dev | |
2013-07-06
| ||
18:10 | Merged kind-db-access back to development check-in: 11aea778da user: matt tags: dev | |
Changes
Modified dashboard.scm from [ee415124e5] to [747b25ec6e].
︙ | ︙ | |||
154 155 156 157 158 159 160 | (define (message-window msg) (iup:show (iup:dialog (iup:vbox (iup:label msg #:margin "40x40"))))) (define (iuplistbox-fill-list lb items . default) | | < > | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | (define (message-window msg) (iup:show (iup:dialog (iup:vbox (iup:label msg #:margin "40x40"))))) (define (iuplistbox-fill-list lb items . default) (let ((i 1) (selected-item (if (null? default) #f (car default)))) (for-each (lambda (item) (iup:attribute-set! lb (number->string i) item) (if selected-item (if (equal? selected-item item) (iup:attribute-set! lb "VALUE" item))) ;; (number->string i)))) (set! i (+ i 1))) items) (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) i)) (define (pad-list l n)(append l (make-list (- n (length l))))) (define (colors-similar? color1 color2) (let* ((c1 (map string->number (string-split color1))) (c2 (map string->number (string-split color2))) |
︙ | ︙ | |||
460 461 462 463 464 465 466 | (refvals '()) (indx 0) (lbs '())) (let* ((lb (let ((lb (list-ref key-listboxes indx))) (if lb lb (iup:listbox | | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | (refvals '()) (indx 0) (lbs '())) (let* ((lb (let ((lb (list-ref key-listboxes indx))) (if lb lb (iup:listbox ;; #:size "x10" #:fontsize "10" #:expand "YES" ;; "VERTICAL" ;; #:dropdown "YES" #:editbox "YES" #:action action-proc )))) ;; loop though all the targets and build the list for this dropdown (selected-value (dashboard:populate-target-dropdown lb refvals db-targets))) (if (null? remkeys) |
︙ | ︙ | |||
484 485 486 487 488 489 490 491 492 493 494 495 496 497 | header listboxes))) (loop (car remkeys) (cdr remkeys) (append refvals (list selected-value)) (+ indx 1) (append lbs (list lb)))))))) (define (dashboard:draw-tests cnv xadj yadj test-draw-state sorted-testnames) (canvas-clear! cnv) (canvas-font-set! cnv "Courier New, -10") (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv)) ((originx originy) (canvas-origin cnv))) (if (hash-table-ref/default test-draw-state 'first-time #t) | > > > > > > > > > > > > > > > > > > > > > > > | 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 | header listboxes))) (loop (car remkeys) (cdr remkeys) (append refvals (list selected-value)) (+ indx 1) (append lbs (list lb)))))))) ;; Make a vertical list of toggles using items, when toggled call proc with the conc'd string ;; interspersed with commas ;; (define (dashboard:text-list-toggle-box items proc) (let ((alltgls (make-hash-table))) (apply iup:vbox (map (lambda (item) (iup:toggle item #:expand "YES" #:action (lambda (obj tstate) (if (eq? tstate 0) (hash-table-delete! alltgls item) (hash-table-set! alltgls item #t)) (let ((all (hash-table-keys alltgls))) (proc all))))) items)))) ;; Extract the various bits of data from *data* and create the command line equivalent that will be displayed ;; (define (dashboard:update-run-command) (print "Updated!!")) (define (dashboard:draw-tests cnv xadj yadj test-draw-state sorted-testnames) (canvas-clear! cnv) (canvas-font-set! cnv "Courier New, -10") (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv)) ((originx originy) (canvas-origin cnv))) (if (hash-table-ref/default test-draw-state 'first-time #t) |
︙ | ︙ | |||
557 558 559 560 561 562 563 564 | (hash-table-set! tests-draw-state 'first-time #t) (hash-table-set! tests-draw-state 'scalef 8) (tests:get-full-data test-names test-records '()) (set! sorted-testnames (tests:sort-by-priority-and-waiton test-records)) ;; refer to *keys*, *dbkeys* for keys (iup:vbox (iup:hbox | > > > > > > > > > > > | > > | | > > > > > > > > | > > > > > > > > > > > > > | | | | | | | > > | | > > > > > > | > > > > > > > > > > | > > > > > > > | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 | (hash-table-set! tests-draw-state 'first-time #t) (hash-table-set! tests-draw-state 'scalef 8) (tests:get-full-data test-names test-records '()) (set! sorted-testnames (tests:sort-by-priority-and-waiton test-records)) ;; refer to *keys*, *dbkeys* for keys (iup:vbox ;; The command line display/exectution control (iup:hbox (iup:label "Run on" #:size "40x") (iup:radio (iup:hbox (iup:toggle "Local" #:size "40x") (iup:toggle "Server" #:size "40x"))) (iup:textbox #:value "megatest -xyz" #:expand "HORIZONTAL") (iup:button "Execute" #:size "50x")) (iup:split ;; Target, testpatt, state and status input boxes (iup:vbox ;; Command to run (iup:frame #:title "Set the action to take" (iup:hbox (iup:label "Command to run" #:expand "HORIZONTAL" #:size "70x") (let ((lb (iup:listbox #:expand "HORIZONTAL" #:dropdown "YES"))) (iuplistbox-fill-list lb '("-runtests" "-remove-runs" "-set-state-status") "-runtests") lb))) (iup:frame #:title "Selectors that determine which tests will be operated on" (iup:vbox ;; Text box for test patterns (iup:frame #:title "Test patterns (one per line)" (iup:textbox #:action (lambda (val a b) (dboard:data-set-test-patts! *data* (dboard:lines->test-patt b))) #:value (dboard:test-patt->lines (dboard:data-get-test-patts *data*)) #:expand "YES" #:multiline "YES")) (iup:frame #:title "Target" ;; Target selectors (apply iup:hbox (let* ((dat (dashboard:update-target-selector key-listboxes action-proc: update-keyvals)) (key-lb (car dat)) (combos (cadr dat))) (set! key-listboxes key-lb) combos))) (iup:hbox ;; Text box for STATES (iup:frame #:title "States" (dashboard:text-list-toggle-box '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED") (lambda (all) (dboard:data-set-states! *data* (string-intersperse all ",")) (dashboard:update-run-command)))) ;; Text box for STATES (iup:frame #:title "States" (dashboard:text-list-toggle-box '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD") (lambda (all) (dboard:data-set-statuses! *data* (string-intersperse all ",")) (dashboard:update-run-command)))))))) (iup:split #:orientation "HORIZONTAL" (iup:frame #:title "Tests and Tasks" (iup:canvas #:action (make-canvas-action (lambda (cnv xadj yadj) ;; (print "cnv: " cnv " x: " x " y: " y) (dashboard:draw-tests cnv xadj yadj tests-draw-state sorted-testnames))) #:size "150x150" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5")) (iup:frame #:title "Logs" ;; To be replaced with tabs (let ((logs-tb (iup:textbox #:expand "YES" #:multiline "YES"))) (dboard:data-set-logs-textbox! *data* logs-tb) logs-tb)) ))))) ;; (trace dashboard:populate-target-dropdown ;; common:list-is-sublist) ;; ;; ;; key1 key2 key3 ... ;; ;; target entry (wild cards allowed) ;; |
︙ | ︙ |
Modified dcommon.scm from [9ceb7ccb63] to [36076daa84].
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ;; PURPOSE. ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (declare (unit dcommon)) (declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) (declare (uses synchash)) | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;; PURPOSE. ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (use regex) (declare (unit dcommon)) (declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) (declare (uses synchash)) |
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | (define (dboard:data-get-curr-test-ids vec) (vector-ref vec 5)) ;; (define (dboard:data-get-test-details vec) (vector-ref vec 6)) (define (dboard:data-get-path-test-ids vec) (vector-ref vec 7)) (define (dboard:data-get-updaters vec) (vector-ref vec 8)) (define (dboard:data-get-path-run-ids vec) (vector-ref vec 9)) (define (dboard:data-get-curr-run-id vec) (vector-ref vec 10)) (define (dboard:data-get-runs-tree vec) (vector-ref vec 11)) (define (dboard:data-set-runs! vec val)(vector-set! vec 0 val)) (define (dboard:data-set-tests! vec val)(vector-set! vec 1 val)) (define (dboard:data-set-runs-matrix! vec val)(vector-set! vec 2 val)) (define (dboard:data-set-tests-tree! vec val)(vector-set! vec 3 val)) (define (dboard:data-set-run-keys! vec val)(vector-set! vec 4 val)) (define (dboard:data-set-curr-test-ids! vec val)(vector-set! vec 5 val)) ;; (define (dboard:data-set-test-details! vec val)(vector-set! vec 6 val)) (define (dboard:data-set-path-test-ids! vec val)(vector-set! vec 7 val)) (define (dboard:data-set-updaters! vec val)(vector-set! vec 8 val)) (define (dboard:data-set-path-run-ids! vec val)(vector-set! vec 9 val)) (define (dboard:data-set-curr-run-id! vec val)(vector-set! vec 10 val)) | > > > > > | > > > > > > > > > > > > > > > > > > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | (define (dboard:data-get-curr-test-ids vec) (vector-ref vec 5)) ;; (define (dboard:data-get-test-details vec) (vector-ref vec 6)) (define (dboard:data-get-path-test-ids vec) (vector-ref vec 7)) (define (dboard:data-get-updaters vec) (vector-ref vec 8)) (define (dboard:data-get-path-run-ids vec) (vector-ref vec 9)) (define (dboard:data-get-curr-run-id vec) (vector-ref vec 10)) (define (dboard:data-get-runs-tree vec) (vector-ref vec 11)) ;; For test-patts convert #f to "" (define (dboard:data-get-test-patts vec) (let ((val (vector-ref vec 12)))(if val val ""))) (define (dboard:data-get-states vec) (vector-ref vec 12)) (define (dboard:data-get-statuses vec) (vector-ref vec 13)) (define (dboard:data-set-runs! vec val)(vector-set! vec 0 val)) (define (dboard:data-set-tests! vec val)(vector-set! vec 1 val)) (define (dboard:data-set-runs-matrix! vec val)(vector-set! vec 2 val)) (define (dboard:data-set-tests-tree! vec val)(vector-set! vec 3 val)) (define (dboard:data-set-run-keys! vec val)(vector-set! vec 4 val)) (define (dboard:data-set-curr-test-ids! vec val)(vector-set! vec 5 val)) ;; (define (dboard:data-set-test-details! vec val)(vector-set! vec 6 val)) (define (dboard:data-set-path-test-ids! vec val)(vector-set! vec 7 val)) (define (dboard:data-set-updaters! vec val)(vector-set! vec 8 val)) (define (dboard:data-set-path-run-ids! vec val)(vector-set! vec 9 val)) (define (dboard:data-set-curr-run-id! vec val)(vector-set! vec 10 val)) (define (dboard:data-set-runs-tree! vec val)(vector-set! vec 11 val)) ;; For test-patts convert "" to #f (define (dboard:data-set-test-patts! vec val) (vector-set! vec 12 (if (equal? val "") #f val))) (define (dboard:data-set-states! vec val)(vector-set! vec 12 val)) (define (dboard:data-set-statuses! vec val)(vector-set! vec 13 val)) (define (dboard:data-set-logs-textbox! vec val)(vector-set! vec 14 val)) (dboard:data-set-run-keys! *data* (make-hash-table)) ;; List of test ids being viewed in various panels (dboard:data-set-curr-test-ids! *data* (make-hash-table)) ;; Look up test-ids by (key1 key2 ... testname [itempath]) (dboard:data-set-path-test-ids! *data* (make-hash-table)) ;; Look up run-ids by ?? (dboard:data-set-path-run-ids! *data* (make-hash-table)) ;;====================================================================== ;; TARGET AND PATTERN MANIPULATIONS ;;====================================================================== ;; Convert to and from list of lines (for a text box) ;; "," => "\n" (define (dboard:test-patt->lines test-patt) (string-substitute (regexp ",") "\n" test-patt)) (define (dboard:lines->test-patt lines) (string-substitute (regexp "\n") "," lines)) ;;====================================================================== ;; P R O C E S S R U N S ;;====================================================================== ;; MOVE THIS INTO *data* (define *cachedata* (make-hash-table)) |
︙ | ︙ |