@@ -673,11 +673,11 @@ )) (define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records) (let* ((dot-data ;; (map cdr (filter ;; (lambda (x)(equal? "node" (car x))) - (map string-split (tests:easy-dot test-records "plain"))) + (map string-split (tests:lazy-dot test-records "plain"))) ;; (tests:easy-dot test-records "plain"))) (scalef (hash-table-ref tests-draw-state 'scalef)) (dotscale (hash-table-ref tests-draw-state 'dotscale)) (test-browse-xoffset (hash-table-ref tests-draw-state 'test-browse-xoffset)) (test-browse-yoffset (hash-table-ref tests-draw-state 'test-browse-yoffset)) (xtorig (+ test-browse-xoffset (* (/ sizex 2) 1 (- 0.5 xadj)))) ;; (- xadj 1)))) @@ -693,17 +693,23 @@ (if (> x-max boxw)(set! boxw (+ 10 x-max))))) ;; (print "sizex: " sizex " sizey: " sizey " font: " (canvas-font cnv) " originx: " originx " originy: " originy " xtorig: " xtorig " ytorig: " ytorig " xadj: " xadj " yadj: " yadj) (if (not (null? sorted-testnames)) (let loop ((hed (car (reverse sorted-testnames))) (tal (cdr (reverse sorted-testnames)))) - (let* ((nodedat (car (filter (lambda (x) - (if (equal? (car x) "node") - (equal? hed (cadr x)) - #f)) - dot-data))) + (let* ((nodedat (let ((tmpres (filter (lambda (x) + (if (and (not (null? x)) + (equal? (car x) "node")) + (equal? hed (cadr x)) + #f)) + dot-data))) + (if (null? tmpres) + ;; llx lly boxw boxh + (list "0" "1" "1" (conc (length tal)) "2" "0.5") ;; return some junk + (car tmpres)))) (edgedat (let ((edges (filter (lambda (x) ;; filter for edge - (if (equal? (car x) "edge") + (if (and (not (null? x)) + (equal? (car x) "edge")) (equal? hed (cadr x)) #f)) dot-data))) (map (lambda (inlst) (dcommon:process-polyline