/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* 02110-1301 USA
*/
#include <stdlib.h>
+#include <string.h>
+
#include <sys/time.h>
+
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "cfg.h"
-#include "psensor.h"
+#include <cfg.h>
+#include <plog.h>
+#include <psensor.h>
/* horizontal padding */
#define GRAPH_H_PADDING 4
return ct - cfg->graph_monitoring_duration * 60;
}
-static int compute_y(double value, double min, double max, int height, int off)
+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;
cairo_fill(cr);
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
- bgcolor->f_red,
- bgcolor->f_green,
- bgcolor->f_blue,
+ bgcolor->red,
+ bgcolor->green,
+ bgcolor->blue,
config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
- bgcolor->f_red,
- bgcolor->f_green,
- bgcolor->f_blue);
+ bgcolor->red,
+ bgcolor->green,
+ bgcolor->blue);
cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
cairo_fill(cr);
cairo_set_line_width(cr, 1);
cairo_set_dash(cr, dashes, ndash, 0);
cairo_set_source_rgb(cr,
- color->f_red, color->f_green, color->f_blue);
+ color->red, color->green, color->blue);
/* vertical lines representing time steps */
for (i = 0; i <= 5; i++) {
cairo_set_dash(cr, 0, 0, 0);
}
+/* contains the time_t of the measures which have been draw ie not the
+ * bezier control points for each sensor. */
+static GHashTable *times;
+
+static void draw_sensor_smooth_curve(struct psensor *s,
+ cairo_t *cr,
+ double min,
+ double max,
+ int bt,
+ int et,
+ int g_width,
+ int g_height,
+ int g_xoff,
+ int g_yoff)
+{
+ int i, dt, vdt, j, k, found;
+ double x[4], y[4], v;
+ time_t t, t0, *stimes;
+
+ if (!times)
+ times = g_hash_table_new_full(g_str_hash,
+ g_str_equal,
+ free,
+ free);
+
+ stimes = g_hash_table_lookup(times, s->id);
+
+ cairo_set_source_rgb(cr,
+ s->color->red,
+ s->color->green,
+ s->color->blue);
+
+ i = 0;
+ if (stimes) {
+ while (i < s->values_max_length) {
+ t = s->measures[i].time.tv_sec;
+ v = s->measures[i].value;
+
+ found = 0;
+ if (v != UNKNOWN_DBL_VALUE && t) {
+ k = 0;
+ while (stimes[k]) {
+ if (t == stimes[k]) {
+ found = 1;
+ break;
+ }
+ k++;
+ }
+ }
+
+ if (found)
+ break;
+
+ i++;
+ }
+ }
+
+ stimes = malloc((s->values_max_length + 1) * sizeof(time_t));
+ memset(stimes, 0, (s->values_max_length + 1) * sizeof(time_t));
+ g_hash_table_insert(times, strdup(s->id), stimes);
+
+ if (i == s->values_max_length)
+ i = 0;
+
+ k = 0;
+ dt = et - bt;
+ while (i < s->values_max_length) {
+ j = 0;
+ t = 0;
+ while (i < s->values_max_length && j < 4) {
+ t = s->measures[i].time.tv_sec;
+ v = s->measures[i].value;
+
+ if (v == UNKNOWN_DBL_VALUE || !t) {
+ i++;
+ continue;
+ }
+
+ vdt = t - bt;
+
+ x[0 + j] = ((double)vdt * g_width) / dt + g_xoff;
+ y[0 + j] = compute_y(v, min, max, g_height, g_yoff);
+
+
+ if (j == 0)
+ t0 = t;
+
+ i++;
+ j++;
+ }
+
+ if (j == 4) {
+ cairo_move_to(cr, x[0], y[0]);
+ cairo_curve_to(cr, x[1], y[1], x[2], y[3], x[3], y[3]);
+ stimes[k++] = t0;
+ i--;
+ }
+ }
+
+ cairo_stroke(cr);
+}
+
static void draw_sensor_curve(struct psensor *s,
cairo_t *cr,
double min,
int g_xoff,
int g_yoff)
{
- int first, i, x, y, t, dt, vdt;
- double v;
+ int first, i, t, dt, vdt;
+ double v, x, y;
cairo_set_source_rgb(cr,
- s->color->f_red,
- s->color->f_green,
- s->color->f_blue);
+ s->color->red,
+ s->color->green,
+ s->color->blue);
dt = et - bt;
first = 1;
for (i = 0; i < s->values_max_length; i++) {
t = s->measures[i].time.tv_sec;
- v = s->measures[i].value.d_num;
+ v = s->measures[i].value;
if (v == UNKNOWN_DBL_VALUE || !t)
continue;
if (vdt < 0)
continue;
- x = vdt * g_width / dt + g_xoff;
+ x = ((double)vdt * g_width) / dt + g_xoff;
y = compute_y(v, min, max, g_height, g_yoff);
cairo_stroke(cr);
}
+static void display_no_graphs_warning(cairo_t *cr, int x, int y)
+{
+ char *msg;
+
+ msg = strdup(_("No graphs enabled"));
+
+ cairo_select_font_face(cr,
+ "sans-serif",
+ CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_NORMAL);
+ cairo_set_font_size(cr, 18.0);
+
+ cairo_move_to(cr, x, y);
+ cairo_show_text(cr, msg);
+
+ free(msg);
+}
void
graph_update(struct psensor **sensors,
double min_rpm, max_rpm, mint, maxt;
char *strmin, *strmax;
/* horizontal and vertical offset of the graph */
- int g_xoff, g_yoff;
+ int g_xoff, g_yoff, no_graphs, min, max;
cairo_surface_t *cst;
cairo_t *cr, *cr_pixmap;
char *str_btime, *str_etime;
cairo_text_extents_t te_btime, te_etime, te_max, te_min;
- struct psensor **sensor_cur;
+ struct psensor **sensor_cur, **enabled_sensors;
GtkAllocation galloc;
GtkStyleContext *style_ctx;
GdkRGBA rgba;
if (!gtk_widget_is_drawable(w_graph))
return ;
- min_rpm = get_min_rpm(sensors);
- max_rpm = get_max_rpm(sensors);
+ enabled_sensors = psensor_list_filter_graph_enabled(sensors);
- mint = get_min_temp(sensors);
+ min_rpm = get_min_rpm(enabled_sensors);
+ max_rpm = get_max_rpm(enabled_sensors);
- strmin = psensor_value_to_string(SENSOR_TYPE_TEMP,
- mint,
- config->temperature_unit == CELCIUS);
+ mint = get_min_temp(enabled_sensors);
+ strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
+ mint,
+ config->temperature_unit == CELSIUS);
- maxt = get_max_temp(sensors);
- strmax = psensor_value_to_string(SENSOR_TYPE_TEMP,
- maxt,
- config->temperature_unit == CELCIUS);
+ maxt = get_max_temp(enabled_sensors);
+ strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
+ 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();
if (bt && et) {
- sensor_cur = sensors;
+ sensor_cur = enabled_sensors;
cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
cairo_set_line_width(cr, 1);
+ no_graphs = 1;
while (*sensor_cur) {
struct psensor *s = *sensor_cur;
- if (s->enabled) {
- double min, max;
-
- if (is_fan_type(s->type)) {
- min = min_rpm;
- max = max_rpm;
- } else if (s->type & SENSOR_TYPE_CPU_USAGE) {
- min = 0;
- max = get_max_value
- (sensors,
- SENSOR_TYPE_CPU_USAGE);
- } else {
- min = mint;
- max = maxt;
- }
+ no_graphs = 0;
+ if (s->type & SENSOR_TYPE_RPM) {
+ min = min_rpm;
+ max = max_rpm;
+ } else if (s->type & SENSOR_TYPE_PERCENT) {
+ min = 0;
+ max = get_max_value(enabled_sensors,
+ SENSOR_TYPE_PERCENT);
+ } else {
+ min = mint;
+ max = maxt;
+ }
+ if (1)
+ draw_sensor_smooth_curve(s, cr,
+ min, max,
+ bt, et,
+ g_width, g_height,
+ g_xoff, g_yoff);
+ else
draw_sensor_curve(s, cr,
min, max,
bt, et,
g_width, g_height,
g_xoff, g_yoff);
- }
sensor_cur++;
}
+
+ if (no_graphs)
+ display_no_graphs_warning(cr,
+ g_xoff + 12,
+ g_height / 2);
}
cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
if (cr_pixmap) {
-
if (config->alpha_channel_enabled)
cairo_set_operator(cr_pixmap, CAIRO_OPERATOR_SOURCE);
cairo_paint(cr_pixmap);
}
+ free(enabled_sensors);
+
cairo_destroy(cr_pixmap);
cairo_surface_destroy(cst);
cairo_destroy(cr);
projects / psensor.git / blobdiff