use automatic scaling

3 files changed, 35 insertions, 17 deletions

diff --git a/asy/sched.asy b/asy/sched.asy
index cf932b1..4dde796 100644
--- a/asy/sched.asy
+++ b/asy/sched.asy
@@ -3,6 +3,9 @@ import palette;
 
 real __from = 0.0;
 real __to   = 0.0;
+int  __no_tasks = 0;
+real __scale = 1.0;
+real __time_scale = 1.0;
 
 void start_time(real when)
 {
@@ -14,6 +17,28 @@ void end_time(real when)
   __to = when;
 }
 
+void number_of_tasks(int n)
+{
+        __no_tasks = n;
+}
+
+void prepare_schedule(picture pic=currentpicture,
+                      real t0, real t1, int no_tasks)
+{
+        real delta = t1 - t0;
+        start_time(t0);
+        end_time(t1);
+        number_of_tasks(no_tasks);
+        if (delta > 2000) {
+                __time_scale = 2000 / delta;
+        }
+        if (delta > 450) {
+                __scale = 450.0 / delta;
+                delta = 450;
+        }
+        size(pic, delta * cm, no_tasks * 1.5cm, false);
+}
+
 pen[] task_fill = {
       rgb(1.0,0,0),
       rgb(0,0,1.0),
@@ -99,7 +124,7 @@ void completed(picture pic=currentpicture, int idx=0, real when) {
 }
 
 void draw_grid(picture pic=currentpicture, real xstep=1.0, real f=__from,
-               real t=__to, int tasks=1, real xlabelstep=10.0)
+               real t=__to, int tasks=__no_tasks, real xlabelstep=10.0)
 {
         real pos = f;
         int idx = 0;
@@ -118,8 +143,10 @@ void draw_grid(picture pic=currentpicture, real xstep=1.0, real f=__from,
 
         pos = f;
         while (pos <= t) {
-                string l = format("%f", pos);
+                Label l = scale(__time_scale) * Label(format("%f", pos));
                 label(pic, l, task_y(0, (pos, -1.2)), grid_pen);
+                path g = task_y(0, (pos, -0.8))--task_y(0, (pos - 0.5, -1.0))--task_y(0, (pos + 0.5, -1.0))--cycle;
+                fill(pic, g, grid_pen);
                 pos = pos + xlabelstep;
         }
 
diff --git a/src/st2pl.c b/src/st2pl.c
index 881da66..6e86c62 100644
--- a/src/st2pl.c
+++ b/src/st2pl.c
@@ -89,7 +89,7 @@ int in_range(double from, double x, double to)
         return from <= x && x <= to;
 }
 
-static void write_asy(double from, double to, double scale)
+static void write_asy(double from, double to)
 {
         struct task *t;
         struct evlink *e, *e2;
@@ -97,11 +97,8 @@ static void write_asy(double from, double to, double scale)
         u32 n = count_tasks();
 
         printf("import sched;\n");
-
-        printf("size(%fcm, %fcm, false);\n", (to - from) * scale, n * 1.5);
-        printf("start_time(%f); end_time(%f);\n", from, to);
-
-        printf("draw_grid(xstep=1.0, tasks=%u);\n", n);
+        printf("prepare_schedule(%f, %f, %d);\n", from, to, n);
+        printf("draw_grid();\n");
 
         for_each_task(t) {
                 printf("task(%u, %u, %f, %f);\n",
@@ -197,7 +194,7 @@ static lang_t str2mode(const char* str)
 }
 
 
-#define OPTSTR "f:t:l:m:M:s:"
+#define OPTSTR "f:t:l:m:M:"
 
 int main(int argc, char** argv)
 {
@@ -206,7 +203,6 @@ int main(int argc, char** argv)
         int opt;
         double from = 0.0;
         double to   = DBL_MAX;
-        double scale = 1; /* cm per ms */
         lang_t mode = PROLOG;
         struct heap *h;
 
@@ -228,11 +224,6 @@ int main(int argc, char** argv)
                 case 't':
                         to = atof(optarg);
                         break;
-                case 's':
-                        scale = atof(optarg);
-                        if (scale <= 0.0)
-                                usage("Scale must be > 0 cm/ms.");
-                        break;
                 case 'm':
                         g_min_task = atoi(optarg);
                         if (g_min_task > g_max_task) {
@@ -273,7 +264,7 @@ int main(int argc, char** argv)
                 write_prolog_kb();
                 break;
         case ASYMPTOTE:
-                write_asy(from, to, scale);
+                write_asy(from, to);
                 break;
         default:
                 usage("WTF?");
diff --git a/st_draw b/st_draw
index 5dc2153..3f79812 100755
--- a/st_draw
+++ b/st_draw
@@ -139,7 +139,7 @@ else
 fi
 
 info "Drawing schedule..."
-$ST2PL -lasy -f $FROM -t $TO -s 0.4 $TRACES > $SCHED || die "$ST2PL failed."
+$ST2PL -lasy -f $FROM -t $TO $TRACES > $SCHED || die "$ST2PL failed."
 info "Generating PDF..."
 $ASY   -f pdf -o $PDF $SCHED || die "$ASY failed."