Overview
Comment: | more incremental draw |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.61 |
Files: | files | file ages | folders |
SHA1: |
4d158f878fc0131cd44a0122fcf883e3 |
User & Date: | mrwellan on 2016-07-22 17:57:21 |
Other Links: | branch diff | manifest | tags |
Context
2016-07-23
| ||
00:46 | Converted to named loops so can exit before all tests drawn check-in: dde8e637fa user: matt tags: v1.61 | |
2016-07-22
| ||
17:57 | more incremental draw check-in: 4d158f878f user: mrwellan tags: v1.61 | |
16:34 | Fixed fallout from refactoring check-in: 66a0b5821b user: mrwellan tags: v1.61 | |
Changes
Modified dashboard.scm from [1d8470c8da] to [25798d6cb1].
︙ | ︙ | |||
159 160 161 162 163 164 165 | ;; data for each specific tab goes here ;; (defstruct dboard:tabdat ;; runs allruns ;; list of dboard:rundat records allruns-by-id ;; hash of run-id -> dboard:rundat records | | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | ;; data for each specific tab goes here ;; (defstruct dboard:tabdat ;; runs allruns ;; list of dboard:rundat records allruns-by-id ;; hash of run-id -> dboard:rundat records done-runs ;; list of runs already drawn not-done-runs ;; list of runs not yet drawn header ;; header for decoding the run records keys ;; keys for this run (i.e. target components) numruns tot-runs ;; Runs view buttondat |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 258 259 260 261 262 | filters-changed: #f header: #f hide-empty-runs: #f hide-not-hide-button: #f hide-not-hide: #t item-test-names: '() last-db-update: 0 num-tests: 15 numruns: 16 path-run-ids: (make-hash-table) run-ids: (make-hash-table) run-keys: (make-hash-table) searchpatts: (make-hash-table) start-run-offset: 0 | > > | 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | filters-changed: #f header: #f hide-empty-runs: #f hide-not-hide-button: #f hide-not-hide: #t item-test-names: '() last-db-update: 0 not-done-runs: '() done-runs: '() num-tests: 15 numruns: 16 path-run-ids: (make-hash-table) run-ids: (make-hash-table) run-keys: (make-hash-table) searchpatts: (make-hash-table) start-run-offset: 0 |
︙ | ︙ | |||
2477 2478 2479 2480 2481 2482 2483 | (let ((res '())) (for-each (lambda (key) (if (not (equal? key "runname")) (let ((val (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) key #f))) (if val (set! res (cons (list key val) res)))))) (dboard:tabdat-dbkeys tabdat)) res)) | > | > | | | | 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 | (let ((res '())) (for-each (lambda (key) (if (not (equal? key "runname")) (let ((val (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) key #f))) (if val (set! res (cons (list key val) res)))))) (dboard:tabdat-dbkeys tabdat)) res)) (let ((allruns (if (null? (dboard:tabdat-not-done-runs tabdat)) (dboard:tabdat-allruns tabdat) (dboard:tabdat-not-done-runs tabdat))) (rowhash (make-hash-table)) ;; store me in tabdat (cnv (dboard:tabdat-cnv tabdat))) (print "allruns: " allruns) (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv)) ((originx originy) (canvas-origin cnv))) ;; (print "allruns: " allruns) (let runloop ((rundat (car allruns)) (runtal (cdr allruns)) (doneruns '())) (let* ((run (dboard:rundat-run rundat)) (hierdat (dboard:tests-sort-by-time-group-by-item (dboard:rundat-tests rundat))) ;; hierarchial list of ids (tests-ht (dboard:rundat-tests rundat)) (all-tids (hash-table-keys tests-ht)) ;; (apply append hierdat)) ;; was testsdat (testsdat (hash-table-values tests-ht)) (key-val-dat (dboard:rundat-key-vals rundat)) (run-id (db:get-value-by-header run (dboard:tabdat-header tabdat) "id")) |
︙ | ︙ | |||
2605 2606 2607 2608 2609 2610 2611 | (llx (list-ref new-xtnts 0)) (lly (list-ref new-xtnts 1)) (ulx (list-ref new-xtnts 2)) (uly (list-ref new-xtnts 3)) ) ;; (vg:components-get-extents d1 c1))) (vg:add-obj-to-comp runcomp (vg:make-rect-obj llx lly ulx uly text: run-full-name)) (vg:instantiate drawing "runslib" run-full-name run-full-name 0 0)) | | > > > > > > > > > > > > | | 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 | (llx (list-ref new-xtnts 0)) (lly (list-ref new-xtnts 1)) (ulx (list-ref new-xtnts 2)) (uly (list-ref new-xtnts 3)) ) ;; (vg:components-get-extents d1 c1))) (vg:add-obj-to-comp runcomp (vg:make-rect-obj llx lly ulx uly text: run-full-name)) (vg:instantiate drawing "runslib" run-full-name run-full-name 0 0)) (set! max-row (+ max-row 1))) ;; end of the run handling loop (let ((newdoneruns (cons rundat doneruns))) (if (null? runtal) (begin (dboard:tabdat-not-done-runs-set! tabdat '()) (dboard:tabdat-done-runs-set! tabdat allruns)) (if (> (- (current-seconds) update-start-time) 5) (begin (print "drawing runs taking too long.... have " (length runtal) " remaining") (dboard:tabdat-done-runs-set! tabdat newdoneruns) ;; taking too long? stop here! (dboard:tabdat-non-done-runs-set! tabdat tal)) (runloop (car runtal)(cdr runtal) newdoneruns))))) (vg:drawing-cnv-set! (dboard:tabdat-drawing tabdat)(dboard:tabdat-cnv tabdat)) ;; cnv-obj) (canvas-clear! (dboard:tabdat-cnv tabdat)) ;; -obj) (print "Number of objs: " (length (vg:draw (dboard:tabdat-drawing tabdat) #t))) (dboard:tabdat-view-changed-set! tabdat #f) ))) (debug:print 2 *default-log-port* "no tabdat for run-times-tab-updater")))) |
︙ | ︙ |