Overview
| Comment: | Made the run summary and new view into distinct and independent views |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.61 |
| Files: | files | file ages | folders |
| SHA1: |
ea58099f7409c16c70e6fb04b0d7c3ae |
| User & Date: | matt on 2016-05-01 22:26:01 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-05-01
| ||
| 23:20 | merged v1.61 check-in: d5326c8ee2 user: bb tags: v1.61 | |
| 22:26 | Made the run summary and new view into distinct and independent views check-in: ea58099f74 user: matt tags: v1.61 | |
| 22:08 | fixed filtering, made filters visible to all views check-in: 5edb46dcb8 user: matt tags: v1.61 | |
Changes
Modified dashboard.scm from [c55c7113eb] to [2608c1f472].
| ︙ | ︙ | |||
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 |
(define (tree-path->run-id data path)
(if (not (null? path))
(hash-table-ref/default (d:data-path-run-ids data) path #f)
#f))
(define dashboard:update-run-summary-tab #f)
(define (dboard:get-tests-dat data run-id last-update)
(let ((tdat (if run-id
(if (d:alldat-useserver data)
(rmt:get-tests-for-run run-id
(hash-table-ref/default (d:alldat-searchpatts data) "test-name" "%/%")
(hash-table-keys (d:alldat-state-ignore-hash data)) ;; '()
| > | 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 |
(define (tree-path->run-id data path)
(if (not (null? path))
(hash-table-ref/default (d:data-path-run-ids data) path #f)
#f))
(define dashboard:update-run-summary-tab #f)
(define dashboard:update-new-view-tab #f)
(define (dboard:get-tests-dat data run-id last-update)
(let ((tdat (if run-id
(if (d:alldat-useserver data)
(rmt:get-tests-for-run run-id
(hash-table-ref/default (d:alldat-searchpatts data) "test-name" "%/%")
(hash-table-keys (d:alldat-state-ignore-hash data)) ;; '()
|
| ︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | (lambda (obj id state) ;; (print "obj: " obj ", id: " id ", state: " state) (let* ((run-path (tree:node->path obj id)) (run-id (tree-path->run-id ddata (cdr run-path)))) (if (number? run-id) (begin (d:data-curr-run-id-set! ddata run-id) | | | 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 | (lambda (obj id state) ;; (print "obj: " obj ", id: " id ", state: " state) (let* ((run-path (tree:node->path obj id)) (run-id (tree-path->run-id ddata (cdr run-path)))) (if (number? run-id) (begin (d:data-curr-run-id-set! ddata run-id) (dashboard:update-new-view-tab)) (debug:print 0 "ERROR: tree-path->run-id returned non-number " run-id))) ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) ))) (cell-lookup (make-hash-table)) (run-matrix (iup:matrix #:expand "YES" #:click-cb |
| ︙ | ︙ | |||
1537 1538 1539 1540 1541 1542 1543 |
(begin
(set! changed #t)
(iup:attribute-set! run-matrix key name)
(iup:attribute-set! run-matrix "FITTOTEXT" (conc "C" num))))))
col-indices)
(if changed (iup:attribute-set! run-matrix "REDRAW" "ALL"))))))
| | | 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 |
(begin
(set! changed #t)
(iup:attribute-set! run-matrix key name)
(iup:attribute-set! run-matrix "FITTOTEXT" (conc "C" num))))))
col-indices)
(if changed (iup:attribute-set! run-matrix "REDRAW" "ALL"))))))
(set! dashboard:update-new-view-tab updater)
(d:data-runs-tree-set! ddata tb)
(iup:split
tb
run-matrix)))
;;======================================================================
;; R U N S
|
| ︙ | ︙ | |||
1875 1876 1877 1878 1879 1880 1881 | (if val (set! res (cons (list key val) res)))))) (d:alldat-dbkeys *alldat*)) res)) (update-buttons uidat (d:alldat-numruns *alldat*) (d:alldat-num-tests *alldat*))) ((2) (dashboard:update-run-summary-tab)) ((3) | | | | 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 |
(if val (set! res (cons (list key val) res))))))
(d:alldat-dbkeys *alldat*))
res))
(update-buttons uidat (d:alldat-numruns *alldat*) (d:alldat-num-tests *alldat*)))
((2)
(dashboard:update-run-summary-tab))
((3)
(dashboard:update-new-view-tab))
(else
(let ((updater (hash-table-ref/default (d:alldat-updaters *alldat*)
(d:alldat-curr-tab-num *alldat*) #f)))
(if updater (updater)))))
(d:alldat-please-update-set! *alldat* #f)
(d:alldat-last-db-update-set! *alldat* modtime)
(set! *last-recalc-ended-time* (current-milliseconds))))))
;;======================================================================
;; The heavy lifting starts here
;;======================================================================
;; ease debugging by loading ~/.dashboardrc
(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
(if (file-exists? debugcontrolf)
(load debugcontrolf)))
(define (main)
(let* ((runs-sum-dat (d:data-init (make-d:data))) ;; data for run-summary tab
(new-view-dat (d:data-init (make-d:data)))
(data *alldat*))
(cond
((args:get-arg "-run")
(let ((runid (string->number (args:get-arg "-run"))))
(if runid
(begin
(lambda (x)
|
| ︙ | ︙ |