@@ -62,11 +62,13 @@ (declare (uses commonmod)) (declare (uses rmtmod)) (declare (uses runsmod)) (declare (uses dbmod)) (declare (uses testsmod)) +(declare (uses tasksmod)) (declare (uses dcommonmod)) +(declare (uses tasksmod)) (import gutilsmod) (import servermod) (import megamod) @@ -73,26 +75,39 @@ (import commonmod) (import rmtmod) (import runsmod) (import dbmod) (import testsmod) +(import tasksmod) (import dcommonmod) + +;; invoke the imports - ORDER IS IMPORTANT! +(declare (uses commonmod.import)) +(declare (uses odsmod.import)) +(declare (uses pgdbmod.import)) +(declare (uses tasksmod.import)) +(declare (uses gutilsmod.import)) +(declare (uses keysmod.import)) +(declare (uses dbmod.import)) +(declare (uses itemsmod.import)) +(declare (uses dbmod.import)) +(declare (uses servermod.import)) +(declare (uses apimod.import)) +(declare (uses rmtmod.import)) +(declare (uses testsmod.import)) +(declare (uses subrunmod.import)) +(declare (uses mtmod.import)) +(declare (uses runsmod.import)) +(declare (uses megamod.import)) +(declare (uses dcommonmod.import)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") (include "vg_records.scm") -;; invoke the imports - ORDER IS IMPORTANT! -(declare (uses gutilsmod.import)) -(declare (uses commonmod.import)) -(declare (uses testsmod.import)) -(declare (uses rmtmod.import)) -(declare (uses runsmod.import)) -(declare (uses megamod.import)) -(declare (uses dcommonmod.import)) (mtconfigf#set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) (mtconfigf#add-eval-string "(import megamod commonmod (prefix mtargs args:))") @@ -1443,60 +1458,53 @@ "dashboard:sysmon-tab-updater"))) (key-listboxes #f) ;; (update-keyvals (lambda () (dboard:target-updater tabdat)))) (dboard:tabdat-drawing-set! tabdat drawing) - (dboard:commondat-add-updater commondat run-times-tab-updater tab-num: tab-num) - (iup:split - #:orientation "VERTICAL" ;; "HORIZONTAL" - #:value 150 - (iup:vbox - (iup:split - #:orientation "HORIZONTAL" - #:value 800 - (let* ((cnv-obj (iup:canvas - ;; #:size "250x250" ;; "500x400" - #:expand "YES" - #:scrollbar "YES" - #:posx "0.5" - #:posy "0.5" - #:action (make-canvas-action - (lambda (c xadj yadj) - (debug:catch-and-dump - (lambda () - (if (not (dboard:tabdat-cnv tabdat)) - (let ((cnv (dboard:tabdat-cnv tabdat))) - (dboard:tabdat-cnv-set! tabdat c) - (vg:drawing-cnv-set! (dboard:tabdat-drawing tabdat) - (dboard:tabdat-cnv tabdat)))) - (let ((drawing (dboard:tabdat-drawing tabdat)) - (old-xadj (dboard:tabdat-xadj tabdat)) - (old-yadj (dboard:tabdat-yadj tabdat))) - (if (not (and (eq? xadj old-xadj)(eq? yadj old-yadj))) - (begin - ;; (print "xadj: " xadj " yadj: " yadj "changed: "(eq? xadj old-xadj) " " (eq? yadj old-yadj)) - (dboard:tabdat-view-changed-set! tabdat #t) - (dboard:tabdat-xadj-set! tabdat (* -2000 (- xadj 0.5))) - (dboard:tabdat-yadj-set! tabdat (* 2000 (- yadj 0.5))) - )))) - "iup:canvas action"))) - #:wheel-cb (lambda (obj step x y dir) ;; dir is 4 for up and 5 for down. I think. - (debug:catch-and-dump - (lambda () - (let* ((drawing (dboard:tabdat-drawing tabdat)) - (scalex (vg:drawing-scalex drawing))) - (dboard:tabdat-view-changed-set! tabdat #t) - ;; (print "step: " step " x: " x " y: " y " dir: " dir " scalex: " scalex) - (vg:drawing-scalex-set! drawing - (+ scalex - (if (> step 0) - (* scalex 0.02) - (* scalex -0.02)))))) - "wheel-cb")) - ))) - cnv-obj) - ))))) + (dboard:commondat-add-updater commondat sysmon-tab-updater tab-num: tab-num) + (iup:vbox + (let* ((cnv-obj (iup:canvas + ;; #:size "250x250" ;; "500x400" + #:expand "YES" + #:scrollbar "YES" + #:posx "0.5" + #:posy "0.5" + #:action (make-canvas-action + (lambda (c xadj yadj) + (debug:catch-and-dump + (lambda () + (if (not (dboard:tabdat-cnv tabdat)) + (let ((cnv (dboard:tabdat-cnv tabdat))) + (dboard:tabdat-cnv-set! tabdat c) + (vg:drawing-cnv-set! (dboard:tabdat-drawing tabdat) + (dboard:tabdat-cnv tabdat)))) + (let ((drawing (dboard:tabdat-drawing tabdat)) + (old-xadj (dboard:tabdat-xadj tabdat)) + (old-yadj (dboard:tabdat-yadj tabdat))) + (if (not (and (eq? xadj old-xadj)(eq? yadj old-yadj))) + (begin + ;; (print "xadj: " xadj " yadj: " yadj "changed: "(eq? xadj old-xadj) " " (eq? yadj old-yadj)) + (dboard:tabdat-view-changed-set! tabdat #t) + (dboard:tabdat-xadj-set! tabdat (* -2000 (- xadj 0.5))) + (dboard:tabdat-yadj-set! tabdat (* 2000 (- yadj 0.5))) + )))) + "iup:canvas action"))) + #:wheel-cb (lambda (obj step x y dir) ;; dir is 4 for up and 5 for down. I think. + (debug:catch-and-dump + (lambda () + (let* ((drawing (dboard:tabdat-drawing tabdat)) + (scalex (vg:drawing-scalex drawing))) + (dboard:tabdat-view-changed-set! tabdat #t) + ;; (print "step: " step " x: " x " y: " y " dir: " dir " scalex: " scalex) + (vg:drawing-scalex-set! drawing + (+ scalex + (if (> step 0) + (* scalex 0.02) + (* scalex -0.02)))))) + "wheel-cb")) + ))) + cnv-obj)))) ;; run times canvas updater ;; (define (dashboard:sysmon-canvas-updater commondat tabdat tab-num) (let ((cnv (dboard:tabdat-cnv tabdat))