/*
- * Copyright (C) 2010-2013 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 <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "cfg.h"
-#include "log.h"
-#include "psensor.h"
+#include <cfg.h>
+#include <plog.h>
+#include <psensor.h>
/* horizontal padding */
#define GRAPH_H_PADDING 4
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;
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(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());
struct psensor *s = *sensor_cur;
no_graphs = 0;
- if (is_fan_type(s->type)) {
+ if (s->type & SENSOR_TYPE_RPM) {
min = min_rpm;
max = max_rpm;
- } else if (s->type & SENSOR_TYPE_CPU_USAGE) {
+ } else if (s->type & SENSOR_TYPE_PERCENT) {
min = 0;
max = get_max_value(enabled_sensors,
- SENSOR_TYPE_CPU_USAGE);
+ SENSOR_TYPE_PERCENT);
} else {
min = mint;
max = maxt;
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);