/*
- Copyright (C) 2010-2011 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 published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2012 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
#include <stdlib.h>
#include <sys/time.h>
#include <gtk/gtk.h>
static void
draw_graph_background(cairo_t *cr,
- int width, int height, struct config *config)
+ int g_xoff, int g_yoff,
+ int g_width, int g_height,
+ int width, int height, struct config *config,
+ GtkWidget *widget)
{
+ GtkStyle *style;
struct color *bgcolor = config->graph_bgcolor;
+ GdkColor *bg;
+
+ style = gtk_widget_get_style(widget);
+
+ bg = &style->bg[GTK_STATE_NORMAL];
+
+ if (config->alpha_channel_enabled)
+ cairo_set_source_rgba(cr,
+ ((double)bg->red) / 65535,
+ ((double)bg->green) / 65535,
+ ((double)bg->blue) / 65535,
+ config->graph_bg_alpha);
+ else
+ cairo_set_source_rgb(cr,
+ ((double)bg->red) / 65535,
+ ((double)bg->green) / 65535,
+ ((double)bg->blue) / 65535);
- /* draw background */
+ cairo_rectangle(cr, 0, 0, width, height);
+ cairo_fill(cr);
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
bgcolor->f_red,
bgcolor->f_red,
bgcolor->f_green, bgcolor->f_blue);
- cairo_rectangle(cr, 0, 0, width, height);
+
+
+ cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
cairo_fill(cr);
}
/* setup dash style */
static double dashes[] = {
1.0, /* ink */
- 1.0, /* skip */
- 1.0, /* ink */
- 1.0 /* skip */
+ 2.0, /* skip */
};
static int ndash = sizeof(dashes) / sizeof(dashes[0]);
int i;
/* draw background lines */
- cairo_set_dash(cr, dashes, ndash, 0);
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);
/* back to normal line style */
cairo_set_dash(cr, 0, 0, 0);
-
}
static void draw_sensor_curve(struct psensor *s,
int g_xoff,
int g_yoff)
{
- int first = 1;
- int i;
+ int first, i, x, y, t, dt, vdt;
+ double v;
cairo_set_source_rgb(cr,
s->color->f_red,
s->color->f_green,
s->color->f_blue);
- cairo_set_line_width(cr, 1);
+ dt = et - bt;
+ first = 1;
for (i = 0; i < s->values_max_length; i++) {
- int x, y, t;
- double v;
-
t = s->measures[i].time.tv_sec;
v = s->measures[i].value.d_num;
- if (v == UNKNOWN_DBL_VALUE || !t || (t - bt) < 0)
+ if (v == UNKNOWN_DBL_VALUE || !t)
+ continue;
+
+ vdt = t - bt;
+ if (vdt < 0)
continue;
- x = (t - bt) * g_width / (et - bt) + g_xoff;
+ x = vdt * g_width / dt + g_xoff;
y = compute_y(v, min, max, g_height, g_yoff);
void
graph_update(struct psensor **sensors,
- GtkWidget *w_graph, struct config *config)
+ GtkWidget *w_graph,
+ struct config *config)
{
struct color *fgcolor = config->graph_fgcolor;
- int et, bt;
- double min_rpm = get_min_rpm(sensors);
- double max_rpm = get_max_rpm(sensors);
-
- double mint = get_min_temp(sensors);
- char *strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint);
-
- double maxt = get_max_temp(sensors);
- char *strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt);
-
- int width, height, g_width, g_height;
-
+ int et, bt, width, height, g_width, g_height;
+ double min_rpm, max_rpm, mint, maxt;
+ char *strmin, *strmax;
/* horizontal and vertical offset of the graph */
int g_xoff, g_yoff;
-
cairo_surface_t *cst;
cairo_t *cr, *cr_pixmap;
-
- char *str_btime = time_to_str(get_graph_begin_time_s(config));
- char *str_etime = time_to_str(get_graph_end_time_s());
-
+ char *str_btime, *str_etime;
cairo_text_extents_t te_btime, te_etime, te_max, te_min;
-
struct psensor **sensor_cur;
GtkAllocation galloc;
if (!gtk_widget_is_drawable(w_graph))
return ;
+ min_rpm = get_min_rpm(sensors);
+ max_rpm = get_max_rpm(sensors);
+
+ mint = get_min_temp(sensors);
+ strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint);
+
+ maxt = get_max_temp(sensors);
+ strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt);
+
+ str_btime = time_to_str(get_graph_begin_time_s(config));
+ str_etime = time_to_str(get_graph_end_time_s());
+
gtk_widget_get_allocation(w_graph, &galloc);
width = galloc.width;
height = galloc.height;
cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
cr = cairo_create(cst);
- draw_graph_background(cr, width, height, config);
-
cairo_select_font_face(cr,
"sans-serif",
CAIRO_FONT_SLANT_NORMAL,
g_width = width - g_xoff - GRAPH_H_PADDING;
+ draw_graph_background(cr,
+ g_xoff, g_yoff, g_width, g_height,
+ width, height, config,
+ w_graph);
+
cairo_set_source_rgb(cr,
fgcolor->f_red, fgcolor->f_green, fgcolor->f_blue);
if (bt && et) {
sensor_cur = sensors;
+
+ cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+ cairo_set_line_width(cr, 1);
while (*sensor_cur) {
struct psensor *s = *sensor_cur;