projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed nvidia fan values display.
[psensor.git]
/
src
/
graph.c
diff --git
a/src/graph.c
b/src/graph.c
index
f12a155
..
578ad73
100644
(file)
--- a/
src/graph.c
+++ b/
src/graph.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
3
jeanfi@gmail.com
+ * Copyright (C) 2010-201
4
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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-24,9
+24,9
@@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#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
/* horizontal padding */
#define GRAPH_H_PADDING 4
@@
-111,15
+111,15
@@
draw_graph_background(cairo_t *cr,
cairo_fill(cr);
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
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,
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_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
cairo_fill(cr);
@@
-144,7
+144,7
@@
static void draw_background_lines(cairo_t *cr,
cairo_set_line_width(cr, 1);
cairo_set_dash(cr, dashes, ndash, 0);
cairo_set_source_rgb(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++) {
/* vertical lines representing time steps */
for (i = 0; i <= 5; i++) {
@@
-184,9
+184,9
@@
static void draw_sensor_curve(struct psensor *s,
double v;
cairo_set_source_rgb(cr,
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;
dt = et - bt;
first = 1;
@@
-266,12
+266,12
@@
graph_update(struct psensor **sensors,
mint = get_min_temp(enabled_sensors);
strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
mint,
mint = get_min_temp(enabled_sensors);
strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
mint,
- config->temperature_unit == CEL
C
IUS);
+ config->temperature_unit == CEL
S
IUS);
maxt = get_max_temp(enabled_sensors);
strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
maxt,
maxt = get_max_temp(enabled_sensors);
strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
maxt,
- config->temperature_unit == CEL
C
IUS);
+ config->temperature_unit == CEL
S
IUS);
str_btime = time_to_str(get_graph_begin_time_s(config));
str_etime = time_to_str(get_graph_end_time_s());
str_btime = time_to_str(get_graph_begin_time_s(config));
str_etime = time_to_str(get_graph_end_time_s());
@@
-361,13
+361,13
@@
graph_update(struct psensor **sensors,
struct psensor *s = *sensor_cur;
no_graphs = 0;
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;
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,
min = 0;
max = get_max_value(enabled_sensors,
- SENSOR_TYPE_
CPU_USAGE
);
+ SENSOR_TYPE_
PERCENT
);
} else {
min = mint;
max = maxt;
} else {
min = mint;
max = maxt;
@@
-391,7
+391,6
@@
graph_update(struct psensor **sensors,
cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
if (cr_pixmap) {
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);
if (config->alpha_channel_enabled)
cairo_set_operator(cr_pixmap, CAIRO_OPERATOR_SOURCE);