removed useless parameters
[psensor.git] / src / graph.c
index be5d8b4..de423d9 100644 (file)
@@ -24,6 +24,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <math.h>
+
 #include <cfg.h>
 #include <plog.h>
 #include <psensor.h>
 
 bool is_smooth_curves_enabled;
 
-static time_t get_graph_end_time_s()
-{
-       struct timeval tv;
+struct graph_info {
+       /* Horizontal position of the central region (curves) */
+       int g_xoff;
+       /* Vertical position of the central region (curves) */
+       int g_yoff;
 
-       if (gettimeofday(&tv, NULL) == 0)
-               return tv.tv_sec;
-       else
-               return 0;
-}
+       /* Height of the drawing canvas */
+       int height;
 
-static time_t get_graph_begin_time_s(struct config *cfg)
+       /* Background color of the current desktop theme */
+       GdkRGBA theme_bg_color;
+       /* Foreground color of the current desktop theme */
+       GdkRGBA theme_fg_color;
+};
+
+
+/* Return the end time of the graph i.e. the more recent measure.  If
+ * no measure are available, return 0.
+ */
+static time_t get_graph_end_time_s(struct psensor **sensors)
 {
-       int ct;
+       time_t ret, t;
+       struct psensor *s;
+       struct measure *measures;
+       int i;
 
-       ct = get_graph_end_time_s();
+       ret = 0;
+       while (*sensors) {
+               s = *sensors;
+               measures = s->measures;
+
+               for (i = s->values_max_length - 1; i >= 0; i--) {
+                       if (measures[i].value != UNKNOWN_DBL_VALUE) {
+                               t = measures[i].time.tv_sec;
+
+                               if (t > ret)
+                                       ret = t;
+                       }
+                       i--;
+               }
+
+               sensors++;
+       }
+
+       return ret;
+}
 
-       if (!ct)
+static time_t get_graph_begin_time_s(struct config *cfg, time_t etime)
+{
+       if (!etime)
                return 0;
 
-       return ct - cfg->graph_monitoring_duration * 60;
+       return etime - cfg->graph_monitoring_duration * 60;
 }
 
 static double
 compute_y(double value, double min, double max, int height, int off)
 {
        double t = value - min;
+
        return height - ((double)height * (t / (max - min))) + off;
 }
 
@@ -79,39 +115,42 @@ static char *time_to_str(time_t s)
        return str;
 }
 
+static void draw_left_region(cairo_t *cr, struct graph_info *info)
+{
+       cairo_set_source_rgb(cr,
+                            info->theme_bg_color.red,
+                            info->theme_bg_color.green,
+                            info->theme_bg_color.blue);
+
+       cairo_rectangle(cr, 0, 0, info->g_xoff, info->height);
+       cairo_fill(cr);
+}
+
 static void
 draw_graph_background(cairo_t *cr,
-                     int g_xoff, int g_yoff,
                      int g_width, int g_height,
-                     int width, int height, struct config *config,
-                     GtkWidget *widget,
-                     GtkWidget *window)
+                     int width, struct config *config,
+                     struct graph_info *info)
 {
-       GtkStyleContext *style_ctx;
        struct color *bgcolor;
-       GdkRGBA rgba;
 
        bgcolor = config->graph_bgcolor;
 
-       style_ctx = gtk_widget_get_style_context(window);
-       gtk_style_context_get_background_color(style_ctx,
-                                              GTK_STATE_FLAG_NORMAL,
-                                              &rgba);
-
        if (config->alpha_channel_enabled)
                cairo_set_source_rgba(cr,
-                                     rgba.red,
-                                     rgba.green,
-                                     rgba.blue,
+                                     info->theme_bg_color.red,
+                                     info->theme_bg_color.green,
+                                     info->theme_bg_color.blue,
                                      config->graph_bg_alpha);
        else
                cairo_set_source_rgb(cr,
-                                    rgba.red,
-                                    rgba.green,
-                                    rgba.blue);
+                                    info->theme_bg_color.red,
+                                    info->theme_bg_color.green,
+                                    info->theme_bg_color.blue);
 
-       cairo_rectangle(cr, 0, 0, width, height);
+       cairo_rectangle(cr, info->g_xoff, 0, g_width, info->height);
        cairo_fill(cr);
+
        if (config->alpha_channel_enabled)
                cairo_set_source_rgba(cr,
                                      bgcolor->red,
@@ -124,7 +163,7 @@ draw_graph_background(cairo_t *cr,
                                     bgcolor->green,
                                     bgcolor->blue);
 
-       cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
+       cairo_rectangle(cr, info->g_xoff, info->g_yoff, g_width, g_height);
        cairo_fill(cr);
 }
 
@@ -152,6 +191,7 @@ static void draw_background_lines(cairo_t *cr,
        /* vertical lines representing time steps */
        for (i = 0; i <= 5; i++) {
                int x = i * (g_width / 5) + g_xoff;
+
                cairo_move_to(cr, x, g_yoff);
                cairo_line_to(cr, x, g_yoff + g_height);
                cairo_stroke(cr);
@@ -309,8 +349,6 @@ static void draw_sensor_curve(struct psensor *s,
                        continue;
 
                vdt = t - bt;
-               if (vdt < 0)
-                       continue;
 
                x = ((double)vdt * g_width) / dt + g_xoff;
 
@@ -364,10 +402,10 @@ graph_update(struct psensor **sensors,
        struct psensor **sensor_cur, **enabled_sensors;
        GtkAllocation galloc;
        GtkStyleContext *style_ctx;
-       GdkRGBA rgba;
+       struct graph_info info;
 
        if (!gtk_widget_is_drawable(w_graph))
-               return ;
+               return;
 
        enabled_sensors = psensor_list_filter_graph_enabled(sensors);
 
@@ -384,8 +422,11 @@ graph_update(struct psensor **sensors,
                                      maxt,
                                      config->temperature_unit == CELSIUS);
 
-       str_btime = time_to_str(get_graph_begin_time_s(config));
-       str_etime = time_to_str(get_graph_end_time_s());
+       et = get_graph_end_time_s(enabled_sensors);
+       bt = get_graph_begin_time_s(config, et);
+
+       str_btime = time_to_str(bt);
+       str_etime = time_to_str(et);
 
        gtk_widget_get_allocation(w_graph, &galloc);
        width = galloc.width;
@@ -418,18 +459,31 @@ graph_update(struct psensor **sensors,
        else
                g_xoff = (2 * GRAPH_H_PADDING) + te_min.width;
 
+       info.g_xoff = g_xoff;
+       info.g_yoff = g_yoff;
+       info.height = height;
+
+       style_ctx = gtk_widget_get_style_context(window);
+       gtk_style_context_get_background_color(style_ctx,
+                                              GTK_STATE_FLAG_NORMAL,
+                                              &info.theme_bg_color);
+       gtk_style_context_get_color(style_ctx,
+                                   GTK_STATE_FLAG_NORMAL,
+                                   &info.theme_fg_color);
+
+
        g_width = width - g_xoff - GRAPH_H_PADDING;
 
        draw_graph_background(cr,
-                             g_xoff, g_yoff, g_width, g_height,
-                             width, height, config,
-                             w_graph,
-                             window);
+                             g_width, g_height,
+                             width, config,
+                             &info);
 
-       /** Set the color for text drawing */
-       style_ctx = gtk_widget_get_style_context(window);
-       gtk_style_context_get_color(style_ctx, GTK_STATE_FLAG_NORMAL, &rgba);
-       cairo_set_source_rgb(cr, rgba.red, rgba.green, rgba.blue);
+       /* Set the color for text drawing */
+       cairo_set_source_rgb(cr,
+                            info.theme_fg_color.red,
+                            info.theme_fg_color.green,
+                            info.theme_fg_color.blue);
 
        /* draw graph begin time */
        cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING);
@@ -443,25 +497,12 @@ graph_update(struct psensor **sensors,
        cairo_show_text(cr, str_etime);
        free(str_etime);
 
-       /* draw min and max temp */
-       cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING);
-       cairo_show_text(cr, strmax);
-       free(strmax);
-
-       cairo_move_to(cr,
-                     GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff);
-       cairo_show_text(cr, strmin);
-       free(strmin);
-
        draw_background_lines(cr, fgcolor,
                              g_width, g_height,
                              g_xoff, g_yoff,
                              mint, maxt);
 
        /* .. and finaly draws the temperature graphs */
-       bt = get_graph_begin_time_s(config);
-       et = get_graph_end_time_s();
-
        if (bt && et) {
                sensor_cur = enabled_sensors;
 
@@ -506,6 +547,23 @@ graph_update(struct psensor **sensors,
                                                  g_height / 2);
        }
 
+       draw_left_region(cr, &info);
+
+       /* draw min and max temp */
+       cairo_set_source_rgb(cr,
+                            info.theme_fg_color.red,
+                            info.theme_fg_color.green,
+                            info.theme_fg_color.blue);
+
+       cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING);
+       cairo_show_text(cr, strmax);
+       free(strmax);
+
+       cairo_move_to(cr,
+                     GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff);
+       cairo_show_text(cr, strmin);
+       free(strmin);
+
        cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
 
        if (cr_pixmap) {
@@ -522,3 +580,15 @@ graph_update(struct psensor **sensors,
        cairo_surface_destroy(cst);
        cairo_destroy(cr);
 }
+
+int compute_values_max_length(struct config *c)
+{
+       int n, duration, interval;
+
+       duration = c->graph_monitoring_duration * 60;
+       interval = c->sensor_update_interval;
+
+       n = 3 + ceil((((double)duration) / interval) + 0.5) + 3;
+
+       return n;
+}