/*
- * 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
#include <gtk/gtk.h>
#include "cfg.h"
-#include "log.h"
+#include <plog.h>
#include "psensor.h"
/* horizontal padding */
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++) {
double v;
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;
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);
+ mint = get_min_temp(enabled_sensors);
strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
mint,
- config->temperature_unit == CELCIUS);
+ config->temperature_unit == CELSIUS);
- maxt = get_max_temp(sensors);
+ maxt = get_max_temp(enabled_sensors);
strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
maxt,
- config->temperature_unit == CELCIUS);
+ 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);
while (*sensor_cur) {
struct psensor *s = *sensor_cur;
- if (s->enabled) {
- no_graphs = 0;
- 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;
- }
-
- draw_sensor_curve(s, cr,
- min, max,
- bt, et,
- g_width, g_height,
- g_xoff, g_yoff);
+ no_graphs = 0;
+ 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(enabled_sensors,
+ SENSOR_TYPE_CPU_USAGE);
+ } else {
+ min = mint;
+ max = maxt;
}
+ 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);
+ display_no_graphs_warning(cr,
+ g_xoff + 12,
+ g_height / 2);
}
cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
cairo_paint(cr_pixmap);
}
+ free(enabled_sensors);
+
cairo_destroy(cr_pixmap);
cairo_surface_destroy(cst);
cairo_destroy(cr);