Megatest

Diff
Login

Differences From Artifact [0391d85ac4]:

To Artifact [28cbba327c]:


2715
2716
2717
2718
2719
2720
2721




















2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
							fill-color: stdcolor
							line-color: stdcolor))
				     (print "ERROR: curr-tval is not > last-tval; curr-tval " curr-tval ", last-tval " last-tval))))
			   next)
			 ;; for init create vector tstart,0
			 #f ;; (vector tstart minval minval)
			 dat)




















			;; (for-each
			;;  (lambda (dpt)
			;;    (let* ((tval  (vector-ref dpt 0))
			;; 	  (yval  (vector-ref dpt 2))
			;; 	  (stval (tfn tval))
			;; 	  (syval (yfunc yval)))
			;;      (vg:add-obj-to-comp
			;;       cmp 
			;;       (vg:make-rect-obj (- stval 2) lly (+ stval 2)(+ lly (* yval yscale))
			;; 			fill-color: stdcolor))))
			;;  dat)







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|


|







2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
							fill-color: stdcolor
							line-color: stdcolor))
				     (print "ERROR: curr-tval is not > last-tval; curr-tval " curr-tval ", last-tval " last-tval))))
			   next)
			 ;; for init create vector tstart,0
			 #f ;; (vector tstart minval minval)
			 dat)
			 (vg:add-obj-to-comp
			  cmp
			  (vg:make-text-obj (- (tfn tstart) 10)(- lly 10)(seconds->year-week/day-time tstart)))
			 (let*-values (((span timeunit time-blk first timesym) (common:find-start-mark-and-mark-delta tstart tend)))
			   (let loop ((mark  first)
				      (count 0))
			     (let* ((smark (tfn mark))           ;; scale the mark
				    (mark-delta (quotient (- mark tstart) time-blk)) ;; how far from first mark
				    (label      (conc mark-delta timesym)))
			       (if (> count 2)
				   (begin
				     (vg:add-obj-to-comp
				      cmp
				      (vg:make-rect-obj (- smark 1)(- lly 2)(+ smark 1) lly))
				     (vg:add-obj-to-comp
				      cmp
				      (vg:make-text-obj (- smark 1)(- lly 10) label))))
			       (if (< mark (- tend time-blk))
				   (loop (+ mark time-blk)(+ count 1))))))
			   
			 ;; (for-each
			;;  (lambda (dpt)
			;;    (let* ((tval  (vector-ref dpt 0))
			 ;; 	  (yval  (vector-ref dpt 2))
			;; 	  (stval (tfn tval))
			;; 	  (syval (yfunc yval)))
			;;      (vg:add-obj-to-comp
			;;       cmp 
			;;       (vg:make-rect-obj (- stval 2) lly (+ stval 2)(+ lly (* yval yscale))
			;; 			fill-color: stdcolor))))
			;;  dat)