#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;
+ /* Height of the drawing canvas */
+ int height;
- return 0;
-}
+ /* Background color of the current desktop theme */
+ GdkRGBA theme_bg_color;
+
+ /* Foreground color of the current desktop theme */
+ GdkRGBA theme_fg_color;
+};
-static time_t get_graph_begin_time_s(struct config *cfg)
+
+/* 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;
+
+ ret = 0;
+ while (*sensors) {
+ s = *sensors;
+ measures = s->measures;
- ct = get_graph_end_time_s();
+ 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
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,
rgba.green,
rgba.blue);
- cairo_rectangle(cr, 0, 0, width, height);
+ cairo_rectangle(cr, g_xoff, 0, g_width, height);
cairo_fill(cr);
+
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
bgcolor->red,
continue;
vdt = t - bt;
- if (vdt < 0)
- continue;
x = ((double)vdt * g_width) / dt + g_xoff;
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;
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;
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,
w_graph,
window);
- /** 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);
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;
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) {
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;
+}