GdkRGBA theme_fg_color;
};
+static struct psensor **list_filter_graph_enabled(struct psensor **sensors)
+{
+ int n, i;
+ struct psensor **result, **cur, *s;
+
+ if (!sensors)
+ return NULL;
+
+ n = psensor_list_size(sensors);
+ result = malloc((n+1) * sizeof(struct psensor *));
+
+ for (cur = sensors, i = 0; *cur; cur++) {
+ s = *cur;
+
+ if (config_is_sensor_graph_enabled(s->id))
+ result[i++] = s;
+ }
+
+ result[i] = NULL;
+
+ return result;
+}
+
/* Return the end time of the graph i.e. the more recent measure. If
* no measure are available, return 0.
* If Bezier curves are used return the measure n-3 to avoid to
int i, dt, vdt, j, k, found;
double x[4], y[4], v;
time_t t, t0, *stimes;
+ GdkRGBA *color;
if (!times)
times = g_hash_table_new_full(g_str_hash,
stimes = g_hash_table_lookup(times, s->id);
+ color = config_get_sensor_color(s->id);
+
cairo_set_source_rgb(cr,
- s->color->red,
- s->color->green,
- s->color->blue);
+ color->red,
+ color->green,
+ color->blue);
+ gdk_rgba_free(color);
/* search the index of the first measure used as a start point
* of a Bezier curve. The start and end points of the Bezier
{
int first, i, t, dt, vdt;
double v, x, y;
+ GdkRGBA *color;
+ color = config_get_sensor_color(s->id);
cairo_set_source_rgb(cr,
- s->color->red,
- s->color->green,
- s->color->blue);
+ color->red,
+ color->green,
+ color->blue);
+ gdk_rgba_free(color);
dt = et - bt;
first = 1;
double min_rpm, max_rpm, mint, maxt, min, max;
char *strmin, *strmax;
/* horizontal and vertical offset of the graph */
- int g_xoff, g_yoff, no_graphs;
+ int g_xoff, g_yoff, no_graphs, use_celsius;
cairo_surface_t *cst;
cairo_t *cr, *cr_pixmap;
char *str_btime, *str_etime;
if (!gtk_widget_is_drawable(w_graph))
return;
- enabled_sensors = psensor_list_filter_graph_enabled(sensors);
+ enabled_sensors = list_filter_graph_enabled(sensors);
min_rpm = get_min_rpm(enabled_sensors);
max_rpm = get_max_rpm(enabled_sensors);
+ if (config_get_temperature_unit() == CELSIUS)
+ use_celsius = 1;
+ else
+ use_celsius = 0;
+
mint = get_min_temp(enabled_sensors);
- strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
- mint,
- config->temperature_unit == CELSIUS);
+ strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, use_celsius);
maxt = get_max_temp(enabled_sensors);
- strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
- maxt,
- config->temperature_unit == CELSIUS);
+ strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, use_celsius);
et = get_graph_end_time_s(enabled_sensors);
bt = get_graph_begin_time_s(config, et);