@@ -54,11 +54,12 @@ -h : this help -test run-id,test-id : control test identified by testid -skip-version-check : skip the version check Misc - -rows N : set number of rows + -rows R : set number of rows + -cols C : set number of columns ")) ;; -server host:port : connect to host:port instead of db access ;; -xterm run-id,test-id : Start a new xterm with specified run-id and test-id ;; -guimonitor : control panel for runs @@ -65,10 +66,11 @@ ;; process args (define remargs (args:get-args (argv) (list "-rows" + "-cols" "-run" "-test" "-xterm" "-debug" "-host" @@ -166,11 +168,11 @@ ((allruns-by-id (make-hash-table)) : hash-table) ;; hash of run-id -> dboard:rundat records ((done-runs '()) : list) ;; list of runs already drawn ((not-done-runs '()) : list) ;; list of runs not yet drawn (header #f) ;; header for decoding the run records (keys #f) ;; keys for this run (i.e. target components) - ((numruns 16) : number) ;; + ((numruns (string->number (or (args:get-arg "-cols") "8"))) : number) ;; ((tot-runs 0) : number) ((last-data-update 0) : number) ;; last time the data in allruns was updated (runs-mutex (make-mutex)) ;; use to prevent parallel access to draw objects ;; Runs view @@ -178,10 +180,12 @@ ((item-test-names '()) : list) ((run-keys (make-hash-table)) : hash-table) (runs-matrix #f) ;; used in newdashboard ((start-run-offset 0) : number) ;; left-right slider value ((start-test-offset 0) : number) ;; up-down slider value + ((runs-btn-height (or (configf:lookup *configdat* "dashboard" "btn-height") "x12")) : string) + ((runs-btn-fontsz (or (configf:lookup *configdat* "dashboard" "btn-fontsz") "8")) : string) ;; Canvas and drawing data (cnv #f) (cnv-obj #f) (drawing #f) @@ -1953,13 +1957,13 @@ (let ((labl (iup:button "" #:flat "YES" #:alignment "ALEFT" ; #:image img1 ; #:impress img2 - #:size "x15" + #:size (dboard:tabdat-runs-btn-height runs-dat) ;; "x15" #:expand "HORIZONTAL" - #:fontsize "10" + #:fontsize (dboard:tabdat-runs-btn-fontsz runs-dat) ;; "10" #:action (lambda (obj) (mark-for-update tabdat) (toggle-hide testnum uidat))))) ;; (iup:attribute obj "TITLE")))) (vector-set! lftcol testnum labl) (loop (+ testnum 1)(cons labl res)))))) @@ -1991,13 +1995,13 @@ (loop (+ runnum 1) 0 (make-vector ntests) '())) (else (let* ((button-key (mkstr runnum testnum)) (butn (iup:button "" ;; button-key - #:size "60x15" + #:size (dboard:tabdat-runs-btn-height runs-dat) ;; "60x15" #:expand "HORIZONTAL" - #:fontsize "10" + #:fontsize (dboard:tabdat-runs-btn-fontsz runs-dat) ;; "10" #:button-cb (lambda (obj a pressed x y btn . rem) ;; (print "pressed= " pressed " x= " x " y= " y " rem=" rem " btn=" btn " string? " (string? btn)) (if (substring-index "3" btn) (if (eq? pressed 1)