fixed col > 80

[psensor.git] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 790e26a..0348d1a 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -27,13 +27,14 @@
 #include <math.h>
 
 #include <cfg.h>
+#include <graph.h>
 #include <plog.h>
 #include <psensor.h>
 
 /* horizontal padding */
-const int GRAPH_H_PADDING = 4;
+static const int GRAPH_H_PADDING = 4;
 /* vertical padding */
-const int GRAPH_V_PADDING = 4;
+static const int GRAPH_V_PADDING = 4;
 
 bool is_smooth_curves_enabled;
 
@@ -59,9 +60,10 @@ struct graph_info {
        GdkRGBA theme_fg_color;
 };
 
-
 /* Return the end time of the graph i.e. the more recent measure.  If
  * no measure are available, return 0.
+ * If Bezier curves are used return the measure n-3 to avoid to
+ * display a part of the curve outside the graph area.
  */
 static time_t get_graph_end_time_s(struct psensor **sensors)
 {
@@ -85,8 +87,10 @@ static time_t get_graph_end_time_s(struct psensor **sensors)
                                if (!n) {
                                        t = measures[i].time.tv_sec;
 
-                                       if (t > ret)
+                                       if (t > ret) {
                                                ret = t;
+                                               break;
+                                       }
                                } else {
                                        n--;
                                }
@@ -249,7 +253,7 @@ static void draw_background_lines(cairo_t *cr,
        cairo_stroke(cr);
 
        /* back to normal line style */
-       cairo_set_dash(cr, 0, 0, 0);
+       cairo_set_dash(cr, NULL, 0, 0);
 }
 
 /* Keys: sensor identifier.