@@ -181,10 +181,13 @@ ;; Canvas and drawing data cnv cnv-obj drawing draw-cache ;; + start-row + run-start-row + max-row ;; Controls used to launch runs etc. command command-tb run-name ;; from run name setting widget @@ -266,10 +269,12 @@ state-ignore-hash: (make-hash-table) status-ignore-hash: (make-hash-table) xadj: 0 yadj: 0 view-changed: #t + run-start-row: 0 + max-row: 0 ))) (dboard:setup-tabdat dat) (dboard:setup-num-rows dat) dat)) @@ -2416,13 +2421,13 @@ (define (dashboard:run-times-tab-updater commondat tabdat tab-num) ;; each test is an object in the run component ;; each run is a component ;; all runs stored in runslib library (let* ((canvas-margin 10) - (start-row 0) ;; each run starts in this row - (run-start-row 0) - (max-row 0) ;; the max row seen for this run + ;; (start-row 0) ;; each run starts in this row + ;; (run-start-row 0) + ;; (max-row 0) ;; the max row seen for this run (row-height 10) (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs-hash (let ((ht (make-hash-table))) (for-each (lambda (run) @@ -2436,11 +2441,10 @@ (time-a (db:get-value-by-header record-a runs-header "event_time")) (time-b (db:get-value-by-header record-b runs-header "event_time"))) (< time-a time-b))))) (tb (dboard:tabdat-runs-tree tabdat)) (num-runs (length (hash-table-keys runs-hash))) - (run-num 0) (update-start-time (current-seconds))) ;; fill in the tree (if tb (for-each (lambda (run-id) (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) (key-vals (map (lambda (key)(db:get-value-by-header run-record runs-header key)) @@ -2492,11 +2496,13 @@ (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 '())) + (run-num 1) + (doneruns '()) + (run-start-row 0)) (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)) @@ -2518,72 +2524,64 @@ (if (> run-duration 0) run-duration (current-seconds)))) ;; a least lously guess (maptime (lambda (tsecs)(* timescale (+ tsecs timeoffset)))) (num-tests (length hierdat)) - (test-num 0) - (tot-tests (length testsdat))) - (set! run-num (+ run-num 1)) + (tot-tests (length testsdat)) + (new-run-start-row (+ (dboard:tabdat-max-row tabdat) 2))) ;; (print "timescale: " timescale " timeoffset: " timeoffset " sizex: " sizex " originx: " originx) (vg:add-comp-to-lib runslib run-full-name runcomp) - (set! run-start-row (+ max-row 2)) - (set! start-row run-start-row) - ;; this is the run title. move this into the box - ;; (let ((x 10) - ;; (y (- sizey (* start-row row-height)))) - ;; (vg:add-objs-to-comp runcomp (vg:make-text x y run-full-name font: "Helvetica -10")) - ;; (dashboard:add-bar rowhash start-row x (+ x 100))) - (set! start-row (+ start-row 1)) + ;; (set! run-start-row (+ max-row 2)) + ;; (dboard:tabdat-start-row-set! tabdat (+ new-run-start-row 1)) ;; get tests in list sorted by event time ascending - (for-each - (lambda (test-ids) + (let testsloop ((test-ids (car hierdat)) ;; loop on tests (NOTE: not items!) + (tests-tal (cdr hierdat)) + (test-num 1)) (let ((test-objs '()) (iterated (> (length test-ids) 1)) (first-rownum #f) - (num-items (length test-ids)) - (item-num 0)) - (set! test-num (+ test-num 1)) - (for-each - (lambda (test-id) - (let* ((testdat (hash-table-ref tests-ht test-id)) - (event-time (maptime (db:test-get-event_time testdat))) - (run-duration (* timescale (db:test-get-run_duration testdat))) - (end-time (+ event-time run-duration)) - (test-name (db:test-get-testname testdat)) - (item-path (db:test-get-item-path testdat)) - (state (db:test-get-state testdat)) - (status (db:test-get-status testdat)) - (test-fullname (conc test-name "/" item-path)) - (name-color (gutils:get-color-for-state-status state status))) - (set! item-num (+ item-num 1)) - ;; (print "event_time: " (db:test-get-event_time testdat) " mapped event_time: " event-time) - ;; (print "run-duration: " (db:test-get-run_duration testdat) " mapped run_duration: " run-duration) - (if (> item-num 50) - (if (eq? 0 (modulo item-num 50)) - (print "processing " run-num " of " num-runs " runs " item-num " of " num-items " of test " test-name ", " test-num " of " num-tests " tests"))) - (let loop ((rownum run-start-row)) ;; (+ start-row 1))) - (set! max-row (max rownum max-row)) ;; track the max row used - (if (dashboard:row-collision rowhash rownum event-time end-time) - (loop (+ rownum 1)) - (let* ((lly (- sizey (* rownum row-height))) - (uly (+ lly row-height)) - (obj (vg:make-rect-obj event-time lly end-time uly - fill-color: (vg:iup-color->number (car name-color)) - text: (if iterated item-path test-name) - font: "Helvetica -10"))) - ;; (if iterated - ;; (dashboard:add-bar rowhash (- rownum 1) event-time end-time num-rows: (+ 1 num-items)) - (if (not first-rownum) - (begin - (dashboard:row-collision rowhash (- rownum 1) event-time end-time num-rows: num-items) - (set! first-rownum rownum))) - (dashboard:add-bar rowhash rownum event-time end-time) - (vg:add-obj-to-comp runcomp obj) - (set! test-objs (cons obj test-objs))))) - ;; (print "test-name: " test-name " event-time: " event-time " run-duration: " run-duration) - )) - test-ids) + (num-items (length test-ids))) + (let testitemloop ((test-id (car test-ids)) ;; loop on test or test items + (tidstal (cdr test-ids)) + (item-num 1)) + (let* ((testdat (hash-table-ref tests-ht test-id)) + (event-time (maptime (db:test-get-event_time testdat))) + (run-duration (* timescale (db:test-get-run_duration testdat))) + (end-time (+ event-time run-duration)) + (test-name (db:test-get-testname testdat)) + (item-path (db:test-get-item-path testdat)) + (state (db:test-get-state testdat)) + (status (db:test-get-status testdat)) + (test-fullname (conc test-name "/" item-path)) + (name-color (gutils:get-color-for-state-status state status))) + ;; (print "event_time: " (db:test-get-event_time testdat) " mapped event_time: " event-time) + ;; (print "run-duration: " (db:test-get-run_duration testdat) " mapped run_duration: " run-duration) + (if (> item-num 50) + (if (eq? 0 (modulo item-num 50)) + (print "processing " run-num " of " num-runs " runs " item-num " of " num-items " of test " test-name ", " test-num " of " num-tests " tests"))) + (let loop ((rownum new-run-start-row)) ;; (+ start-row 1))) + (dboard:tabdat-max-row-set! tabdat (max rownum (dboard:tabdat-max-row tabdat))) ;; track the max row used + (if (dashboard:row-collision rowhash rownum event-time end-time) + (loop (+ rownum 1)) + (let* ((lly (- sizey (* rownum row-height))) + (uly (+ lly row-height)) + (obj (vg:make-rect-obj event-time lly end-time uly + fill-color: (vg:iup-color->number (car name-color)) + text: (if iterated item-path test-name) + font: "Helvetica -10"))) + ;; (if iterated + ;; (dashboard:add-bar rowhash (- rownum 1) event-time end-time num-rows: (+ 1 num-items)) + (if (not first-rownum) + (begin + (dashboard:row-collision rowhash (- rownum 1) event-time end-time num-rows: num-items) + (set! first-rownum rownum))) + (dashboard:add-bar rowhash rownum event-time end-time) + (vg:add-obj-to-comp runcomp obj) + (set! test-objs (cons obj test-objs))))) + ;; (print "test-name: " test-name " event-time: " event-time " run-duration: " run-duration) + (if (not (null? tidstal)) + (testitemloop (car tidstal)(cdr tidstal)(+ item-num 1))))) ;; If it is an iterated test put box around it now. (if iterated (let* ((xtents (vg:get-extents-for-objs drawing test-objs)) (llx (- (car xtents) 5)) (lly (- (cadr xtents) 10)) @@ -2590,32 +2588,33 @@ (ulx (+ 5 (caddr xtents))) (uly (+ 0 (cadddr xtents)))) (dashboard:add-bar rowhash first-rownum llx ulx num-rows: num-items) (vg:add-obj-to-comp runcomp (vg:make-rect-obj llx lly ulx uly text: (db:test-get-testname (hash-table-ref tests-ht (car test-ids))) - font: "Helvetica -10")))))) - hierdat) - ;; placeholder box - (set! max-row (+ max-row 1)) - (let ((y (- sizey (* max-row row-height)))) - (vg:add-obj-to-comp runcomp (vg:make-rect-obj 0 y 0 y))) - ;; instantiate the component - (let* ((extents (vg:components-get-extents drawing runcomp)) - ;; move the following into mapping functions in vg.scm - ;; (deltax (- llx ulx)) - ;; (scalex (if (> deltax 0)(/ sizex deltax) 1)) - ;; (sllx (* scalex llx)) - ;; (offx (- sllx originx)) - (new-xtnts (apply vg:grow-rect 5 5 extents)) - (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))) + font: "Helvetica -10")))) + (if (not (null? tests-tal)) + (testsloop (car tests-tal)(cdr tests-tal)(+ test-num 1))))) + ;; placeholder box + (dboard:tabdat-max-row-set! tabdat (+ (dboard:tabdat-max-row tabdat) 1)) + (let ((y (- sizey (* (dboard:tabdat-max-row tabdat) row-height)))) + (vg:add-obj-to-comp runcomp (vg:make-rect-obj 0 y 0 y))) + ;; instantiate the component + (let* ((extents (vg:components-get-extents drawing runcomp)) + ;; move the following into mapping functions in vg.scm + ;; (deltax (- llx ulx)) + ;; (scalex (if (> deltax 0)(/ sizex deltax) 1)) + ;; (sllx (* scalex llx)) + ;; (offx (- sllx originx)) + (new-xtnts (apply vg:grow-rect 5 5 extents)) + (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)) + (dboard:tabdat-max-row-set! tabdat (+ (dboard:tabdat-max-row tabdat) 1))) ;; end of the run handling loop (let ((newdoneruns (cons rundat doneruns))) (if (null? runtal) (begin (dboard:tabdat-not-done-runs-set! tabdat '()) @@ -2622,13 +2621,12 @@ (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))))) - + (dboard:tabdat-not-done-runs-set! tabdat runtal)) + (runloop (car runtal)(cdr runtal) (+ run-num 1) newdoneruns new-run-start-row))))) (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) )))