4 files changed, 85 insertions, 33 deletions

diff --git a/src/graph.c b/src/graph.c
index 80b2a97..89f02a1 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -45,66 +45,106 @@ int color_in[3]            = { 0,235,12 };
 int color_out[3]           = { 0,94,255 };
 int color_grid[3]          = { 0,0,0 };
 int color_in_max[3]        = { 0,166,33 };
 int color_out_max[3]       = { 255,0,255 };
 int color_percent[3]       = { 239,159,79 };
 
 int graph_xsize = 460;
 int graph_ysize = 100;
 
 int graph_h_margin[2] = { 100, 14 };
 int graph_v_margin[2] = { 14, 35 };
 
-/* FIXME: I18N?? */
-char *rate_unit = "Bytes per Second";
+struct monitor default_monitor = {
+  NULL,
+  NULL,
+  NULL,
+  "Bytes per Second", /* rate_unit, FIXME: I18N?? */
+  0,                  /* max_rate */
+  0,                  /* max_adjust */
+  1.0,                /* scale */
+  0.1,                /* ystep */
+  0,                  /* ystep_absolute */
+  0                   /* swap */
+};
 
 #define make_color_index(g, ar) \
   gdImageColorAllocate (g, (ar)[0], (ar)[1], (ar)[2])
 
 static void
 draw_vtext (gdImagePtr graph, int color, const char *text)
 {
   gdImageStringUp (graph, gdFontSmall,
                    8,
                    graph_ysize + graph_v_margin[0] -
                    (graph_ysize - gdFontSmall->w * strlen (text))/2,
                    (unsigned char *) text, color);
 }
 
+static double
+find_max (queue_t *dataq)
+{
+  int i, n = queue_count (dataq);
+  double mval = 0;
+  struct traffic_history *th;
+  
+  for (i = 0; i < n; i++)
+    {
+      th = queue_get_ptr (dataq, i);
+      if (mval < th->inrate)
+        mval = th->inrate;
+      if (mval < th->outrate)
+        mval = th->outrate;
+    }
+  return mval;
+}
+
 int
 draw_graph (FILE *fp,
             struct monitor *mon,
             queue_t *dataq, const struct avg_acc *avg, time_t start,
             int xstep, unsigned long xmax, 
             int growright,
             struct grid_class *xgrid, struct grid_class *ygrid)
 {
   int x, y;
   int i, n;
   gdImagePtr graph, brush_out, brush_outm, brush_outp;
   int i_background, i_light, i_dark;
   int i_major, i_in, i_out, i_grid, i_inm, i_outm;
   int i_outp, i_outpg;
   double xscale, yscale;
   int dotted_style[3];
   int full_xsize = graph_xsize + graph_h_margin[0] + graph_h_margin[1];
   int full_ysize = graph_ysize + graph_v_margin[0] + graph_v_margin[1];
   grid_t grid;
-  double ymax = mon->max_rate;
+  double ymax;
+
+  if (mon->max_adjust)
+    {
+      double amax = find_max (dataq);
+      if (amax > mon->max_rate)
+        {
+          unsigned long n = (amax - mon->max_rate + mon->max_adjust - 1) /
+                             mon->max_adjust;
+          mon->max_rate += n * mon->max_adjust;
+        }
+    }
+  ymax = mon->max_rate;
   
   yscale = (double) graph_ysize / ymax;
   xscale = (double) graph_xsize / xmax;
   
 #define ytr(y)                      \
-  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : ymax) * \
+  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : 0) * \
                     yscale + graph_h_margin[1])
 #define xtr(x)                      \
   (unsigned long) (growright ?      \
                    ((full_xsize - (x)*xscale)) : \
                     (graph_h_margin[0] + (x)*xscale))
 
   graph = gdImageCreate (full_xsize, full_ysize);
   brush_out = gdImageCreate (1, 2);
   brush_outm = gdImageCreate (1, 2);
   brush_outp = gdImageCreate (1, 2);
 
   i_background = make_color_index (graph, color_background);
@@ -204,26 +244,25 @@ draw_graph (FILE *fp,
 
   dotted_style[0] = i_grid;
   dotted_style[1] = gdTransparent;
   dotted_style[2] = gdTransparent;
   gdImageSetStyle (graph, dotted_style, 3);
 
   grid = grid_create (ygrid, dataq, 0, ymax, mon);
   if (grid)
     {
       double d;
       char *str = NULL;
       
-      draw_vtext (graph, i_grid,
-                  mon->rate_unit ? mon->rate_unit : rate_unit);
+      draw_vtext (graph, i_grid, mon->rate_unit);
 
       /* Draw vertical grid */
       while ((d = grid_next (grid, &str, NULL)) < ymax)
         {
           int y = ytr (d);
           
           /* Left tick */
           gdImageLine (graph,
                        xtr (0) - 2, y,
                        xtr (0) + 1, y,
                        i_grid);
           /* Right tick */
diff --git a/src/grid.c b/src/grid.c
index 08e1c08..4ecb576 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -86,25 +86,28 @@ char **number_suffix = short_suffix;
 size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
 
 struct ygrid_data
 {
   double step;
 };
 
 static void *
 ygrid_create (grid_t grid, void *cdata)
 {
   struct monitor *mon = cdata;
   struct ygrid_data *gr = xmalloc (sizeof (*gr));
-  gr->step = mon->ystep;
+  if (mon->ystep_absolute)
+    gr->step = mon->ystep;
+  else
+    gr->step = mon->ystep * mon->max_rate;
   return gr;
 }
     
 static double
 ygrid_next (grid_t grid, char **str, int *mark)
 {
   struct ygrid_data *gr = grid->data;
   if (mark)
     *mark = 0;
   grid->cur += gr->step;
   if (grid->cur < grid->vmax)
     {
diff --git a/src/readconfig.c b/src/readconfig.c
index 1c22cb1..a60f19d 100644
--- a/src/readconfig.c
+++ b/src/readconfig.c
@@ -89,47 +89,53 @@ cb_monitor (enum grecs_callback_command cmd,
   
   switch (cmd)
     {
     case grecs_callback_section_begin:
       if (!value
           || value->type != GCONF_TYPE_STRING
           || value->v.string == NULL)
         {
           grecs_error (locus, 0, _("tag must be a string"));
           return 1;
         }
       mon = xzalloc (sizeof (*mon));
+      *mon = default_monitor;
       mon->id = strdup (value->v.string);
-      mon->scale = 1.0;
-      mon->ystep = 100.;
+      mon->name = NULL;
+      mon->dir = NULL;