#include <psensor.h>
/* horizontal padding */
-#define GRAPH_H_PADDING 4
+const int GRAPH_H_PADDING = 4;
/* vertical padding */
-#define GRAPH_V_PADDING 4
+const int GRAPH_V_PADDING = 4;
bool is_smooth_curves_enabled;
struct graph_info {
- /* Horizontal position of the central region (curves) */
+ /* Horizontal position of the central area (curves) */
int g_xoff;
- /* Vertical position of the central region (curves) */
+ /* Vertical position of the central area (curves) */
int g_yoff;
+ /* Width of the central area (curves) */
+ int g_width;
+ /* Height of the central area (curves) */
+ int g_height;
+
/* Height of the drawing canvas */
int height;
+ /* Width of the drawing canvas */
+ int width;
/* Background color of the current desktop theme */
GdkRGBA theme_bg_color;
GdkRGBA theme_fg_color;
};
-
/* Return the end time of the graph i.e. the more recent measure. If
* no measure are available, return 0.
*/
time_t ret, t;
struct psensor *s;
struct measure *measures;
- int i;
+ int i, n;
ret = 0;
while (*sensors) {
s = *sensors;
measures = s->measures;
+ if (is_smooth_curves_enabled)
+ n = 2;
+ else
+ n = 0;
+
for (i = s->values_max_length - 1; i >= 0; i--) {
if (measures[i].value != UNKNOWN_DBL_VALUE) {
- t = measures[i].time.tv_sec;
+ if (!n) {
+ t = measures[i].time.tv_sec;
- if (t > ret)
- ret = t;
+ if (t > ret)
+ ret = t;
+ } else {
+ n--;
+ }
}
i--;
}
cairo_fill(cr);
}
+static void draw_right_region(cairo_t *cr, struct graph_info *info)
+{
+ cairo_set_source_rgb(cr,
+ info->theme_bg_color.red,
+ info->theme_bg_color.green,
+ info->theme_bg_color.blue);
+
+
+ cairo_rectangle(cr,
+ info->g_xoff + info->g_width,
+ 0,
+ info->g_xoff + info->g_width + GRAPH_H_PADDING,
+ info->height);
+ cairo_fill(cr);
+}
+
static void
draw_graph_background(cairo_t *cr,
- int g_xoff, int g_yoff,
- int g_width, int g_height,
- int width, struct config *config,
+ struct config *config,
struct graph_info *info)
{
struct color *bgcolor;
info->theme_bg_color.green,
info->theme_bg_color.blue);
- cairo_rectangle(cr, g_xoff, 0, g_width, info->height);
+ cairo_rectangle(cr, info->g_xoff, 0, info->g_width, info->height);
cairo_fill(cr);
if (config->alpha_channel_enabled)
bgcolor->green,
bgcolor->blue);
- cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
+ cairo_rectangle(cr,
+ info->g_xoff,
+ info->g_yoff,
+ info->g_width,
+ info->g_height);
cairo_fill(cr);
}
static int ndash = sizeof(dashes) / sizeof(dashes[0]);
static void draw_background_lines(cairo_t *cr,
- struct color *color,
- int g_width, int g_height,
- int g_xoff, int g_yoff,
- int min, int max)
+ int min, int max,
+ struct config *config,
+ struct graph_info *info)
{
int i;
+ double x, y;
+ struct color *color;
+
+ color = config->graph_fgcolor;
/* draw background lines */
cairo_set_line_width(cr, 1);
cairo_set_dash(cr, dashes, ndash, 0);
- cairo_set_source_rgb(cr,
- color->red, color->green, color->blue);
+ cairo_set_source_rgb(cr, color->red, color->green, color->blue);
/* vertical lines representing time steps */
for (i = 0; i <= 5; i++) {
- int x = i * (g_width / 5) + g_xoff;
-
- cairo_move_to(cr, x, g_yoff);
- cairo_line_to(cr, x, g_yoff + g_height);
- cairo_stroke(cr);
+ x = i * ((double)info->g_width / 5) + info->g_xoff;
+ cairo_move_to(cr, x, info->g_yoff);
+ cairo_line_to(cr, x, info->g_yoff + info->g_height);
}
/* horizontal lines draws a line for each 10C step */
for (i = min; i < max; i++) {
if (i % 10 == 0) {
- int y = compute_y(i, min, max, g_height, g_yoff);
-
- cairo_move_to(cr, g_xoff, y);
- cairo_line_to(cr, g_xoff + g_width, y);
- cairo_stroke(cr);
+ y = compute_y(i,
+ min,
+ max,
+ info->g_height,
+ info->g_yoff);
+
+ cairo_move_to(cr, info->g_xoff, y);
+ cairo_line_to(cr, info->g_xoff + info->g_width, y);
}
}
+ cairo_stroke(cr);
+
/* back to normal line style */
cairo_set_dash(cr, 0, 0, 0);
}
double max,
int bt,
int et,
- int g_width,
- int g_height,
- int g_xoff,
- int g_yoff)
+ struct graph_info *info)
{
int i, dt, vdt, j, k, found;
double x[4], y[4], v;
vdt = t - bt;
- x[0 + j] = ((double)vdt * g_width) / dt + g_xoff;
- y[0 + j] = compute_y(v, min, max, g_height, g_yoff);
+ x[0 + j] = ((double)vdt * info->g_width)
+ / dt + info->g_xoff;
+ y[0 + j] = compute_y(v,
+ min,
+ max,
+ info->g_height,
+ info->g_yoff);
if (j == 0)
t0 = t;
double max,
int bt,
int et,
- int g_width,
- int g_height,
- int g_xoff,
- int g_yoff)
+ struct graph_info *info)
{
int first, i, t, dt, vdt;
double v, x, y;
vdt = t - bt;
- x = ((double)vdt * g_width) / dt + g_xoff;
+ x = ((double)vdt * info->g_width) / dt + info->g_xoff;
- y = compute_y(v, min, max, g_height, g_yoff);
+ y = compute_y(v, min, max, info->g_height, info->g_yoff);
if (first) {
cairo_move_to(cr, x, y);
struct config *config,
GtkWidget *window)
{
- struct color *fgcolor = config->graph_fgcolor;
int et, bt, width, height, g_width, g_height;
double min_rpm, max_rpm, mint, maxt, min, max;
char *strmin, *strmax;
gtk_widget_get_allocation(w_graph, &galloc);
width = galloc.width;
+ info.width = galloc.width;
height = galloc.height;
+ info.height = height;
+
cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
cr = cairo_create(cst);
cairo_text_extents(cr, strmin, &te_min);
g_yoff = GRAPH_V_PADDING;
+ info.g_yoff = g_yoff;
g_height = height - GRAPH_V_PADDING;
if (te_etime.height > te_btime.height)
else
g_height -= GRAPH_V_PADDING + te_btime.height + GRAPH_V_PADDING;
+ info.g_height = g_height;
+
if (te_min.width > te_max.width)
g_xoff = (2 * GRAPH_H_PADDING) + te_max.width;
else
g_xoff = (2 * GRAPH_H_PADDING) + te_min.width;
info.g_xoff = g_xoff;
- info.g_yoff = g_yoff;
- info.height = height;
style_ctx = gtk_widget_get_style_context(window);
gtk_style_context_get_background_color(style_ctx,
GTK_STATE_FLAG_NORMAL,
&info.theme_fg_color);
-
g_width = width - g_xoff - GRAPH_H_PADDING;
+ info.g_width = g_width;
- draw_graph_background(cr,
- g_xoff, g_yoff, g_width, g_height,
- width, config,
- &info);
+ draw_graph_background(cr, config, &info);
/* Set the color for text drawing */
cairo_set_source_rgb(cr,
cairo_show_text(cr, str_etime);
free(str_etime);
- draw_background_lines(cr, fgcolor,
- g_width, g_height,
- g_xoff, g_yoff,
- mint, maxt);
+ draw_background_lines(cr, mint, maxt, config, &info);
/* .. and finaly draws the temperature graphs */
if (bt && et) {
draw_sensor_smooth_curve(s, cr,
min, max,
bt, et,
- g_width, g_height,
- g_xoff, g_yoff);
+ &info);
else
draw_sensor_curve(s, cr,
min, max,
bt, et,
- g_width, g_height,
- g_xoff, g_yoff);
+ &info);
sensor_cur++;
}
}
draw_left_region(cr, &info);
+ draw_right_region(cr, &info);
/* draw min and max temp */
cairo_set_source_rgb(cr,
projects / psensor.git / blobdiff