Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0

lv_conf_template.h

@@ -257,6 +257,7 @@ typedef void * lv_obj_user_data_t;          /*Declare the type of the user data
 
 /*Chart (dependencies: -)*/
 #define LV_USE_CHART    1
+#define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 16
 
 /*Table (dependencies: lv_label)*/
 #define LV_USE_TABLE    1

scripts/lv_conf_checker.py

@@ -5,7 +5,7 @@ Generates a chechker file for lv_conf.h from lv_conf_templ.h define all the not
 
 import re
 
-fin = open("../templates/lv_conf_templ.h", "r");
+fin = open("../lv_conf_template.h", "r");
 fout = open("../src/lv_conf_checker.h", "w");
 
 

src/lv_conf_checker.h

@@ -439,6 +439,9 @@
 #ifndef LV_USE_CHART
 #define LV_USE_CHART    1
 #endif
+#ifndef LV_CHART_AXIS_TICK_LABEL_MAX_LEN
+#define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 16
+#endif
 
 /*Table (dependencies: lv_label)*/
 #ifndef LV_USE_TABLE

src/lv_objx/lv_chart.c

@@ -20,6 +20,11 @@
 #define LV_CHART_HDIV_DEF   3
 #define LV_CHART_VDIV_DEF   5
 #define LV_CHART_PNUM_DEF   10
+#define LV_CHART_AXIS_TO_LABEL_DISTANCE 4
+#define LV_CHART_AXIS_MAJOR_TICK_LEN_COE 1/15
+#define LV_CHART_AXIS_MINOR_TICK_LEN_COE 2/3
+#define LV_CHART_AXIS_X_TICK_OFFSET_FIX 1
+#define LV_CHART_AXIS_Y_TICK_OFFSET_FIX 0
 
 /**********************
  *      TYPEDEFS
@@ -36,6 +41,7 @@ static void lv_chart_draw_points(lv_obj_t * chart, const lv_area_t * mask);
 static void lv_chart_draw_cols(lv_obj_t * chart, const lv_area_t * mask);
 static void lv_chart_draw_vertical_lines(lv_obj_t * chart, const lv_area_t * mask);
 static void lv_chart_draw_areas(lv_obj_t * chart, const lv_area_t * mask);
+static void lv_chart_draw_axes(lv_obj_t * chart, const lv_area_t * mask);
 
 /**********************
  *  STATIC VARIABLES
@@ -82,6 +88,9 @@ lv_obj_t * lv_chart_create(lv_obj_t * par, const lv_obj_t * copy)
     ext->series.opa = LV_OPA_COVER;
     ext->series.dark = LV_OPA_50;
     ext->series.width = 2;
+    ext->margin = 0;
+    memset(&ext->x_axis, 0, sizeof(ext->x_axis));
+    memset(&ext->y_axis, 0, sizeof(ext->y_axis));
 
     if(ancestor_design_f == NULL) ancestor_design_f = lv_obj_get_design_func(new_chart);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_chart);
@@ -110,6 +119,9 @@ lv_obj_t * lv_chart_create(lv_obj_t * par, const lv_obj_t * copy)
         ext->vdiv_cnt = ext_copy->vdiv_cnt;
         ext->point_cnt = ext_copy->point_cnt;
         ext->series.opa =  ext_copy->series.opa;
+        ext->margin = ext_copy->margin;
+        memcpy(&ext->x_axis, &ext_copy->x_axis, sizeof(lv_chart_axis_cfg_t));
+        memcpy(&ext->y_axis, &ext_copy->y_axis, sizeof(lv_chart_axis_cfg_t));
 
         /*Refresh the style with new signal function*/
         lv_obj_refresh_style(new_chart);
@@ -388,6 +400,57 @@ void lv_chart_set_next(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t y)
     lv_chart_refresh(chart);
 }
 
+/**
+ * Set the margin around the chart, used for axes value and labels
+ * @param margin	value of the margin
+ */
+void lv_chart_set_margin(lv_obj_t* chart, uint16_t margin)
+{
+	lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+	ext->margin = margin;
+	lv_obj_refresh_ext_size(chart);
+}
+
+/**
+ * Set the x/y-axis ticks of a chart
+ * @param chart 			pointer to a chart object
+ * @param list_of_values 	list of string values, terminated with \n, except the last
+ * @param num_tick_marks 	if list_of_values is NULL: total number of ticks per axis
+ * 							else step in ticks between two value labels
+ * @param major_tick_len	the length of the major tick, AUTO if 0
+ * @param minor_tick_len	the length of the minor tick, AUTO if 0
+ * @param options			extra options
+ */
+void lv_chart_set_x_ticks(	lv_obj_t* chart,
+							const char* list_of_values,
+							uint8_t num_tick_marks,
+							uint8_t major_tick_len,
+							uint8_t minor_tick_len,
+							lv_chart_axis_options_t options)
+{
+    lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+    ext->x_axis.num_tick_marks = num_tick_marks;
+    ext->x_axis.list_of_values = list_of_values;
+    ext->x_axis.major_tick_len = major_tick_len;
+    ext->x_axis.minor_tick_len = minor_tick_len;
+    ext->x_axis.options = options;
+}
+
+void lv_chart_set_y_ticks(	lv_obj_t* chart,
+							const char* list_of_values,
+							uint8_t num_tick_marks,
+							uint8_t major_tick_len,
+							uint8_t minor_tick_len,
+							lv_chart_axis_options_t options)
+{
+    lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+    ext->y_axis.num_tick_marks = num_tick_marks;
+    ext->y_axis.list_of_values = list_of_values;
+    ext->y_axis.major_tick_len = major_tick_len;
+    ext->y_axis.minor_tick_len = minor_tick_len;
+    ext->y_axis.options = options;
+}
+
 /*=====================
  * Getter functions
  *====================*/
@@ -460,6 +523,17 @@ void lv_chart_refresh(lv_obj_t * chart)
     lv_obj_invalidate(chart);
 }
 
+/**
+ * Get the margin around the chart, used for axes value and labels
+ * @param chart pointer to an chart object
+ * @param return value of the margin
+ */
+uint16_t lv_chart_get_margin(lv_obj_t* chart)
+{
+	lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+	return ext->margin;
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
@@ -493,6 +567,7 @@ static bool lv_chart_design(lv_obj_t * chart, const lv_area_t * mask, lv_design_
         if(ext->type & LV_CHART_TYPE_VERTICAL_LINE) lv_chart_draw_vertical_lines(chart, mask);
         if(ext->type & LV_CHART_TYPE_AREA) lv_chart_draw_areas(chart, mask);
 
+        lv_chart_draw_axes(chart, mask);
     }
     return true;
 }
@@ -506,6 +581,7 @@ static bool lv_chart_design(lv_obj_t * chart, const lv_area_t * mask, lv_design_
 static lv_res_t lv_chart_signal(lv_obj_t * chart, lv_signal_t sign, void * param)
 {
     lv_res_t res;
+    lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
 
     /* Include the ancient signal function */
     res = ancestor_signal(chart, sign, param);
@@ -513,7 +589,6 @@ static lv_res_t lv_chart_signal(lv_obj_t * chart, lv_signal_t sign, void * param
 
     if(sign == LV_SIGNAL_CLEANUP) {
         lv_coord_t ** datal;
-        lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
         LV_LL_READ(ext->series_ll, datal) {
             lv_mem_free(*datal);
         }
@@ -525,6 +600,9 @@ static lv_res_t lv_chart_signal(lv_obj_t * chart, lv_signal_t sign, void * param
             if(buf->type[i] == NULL) break;
         }
         buf->type[i] = "lv_chart";
+    } else if(sign == LV_SIGNAL_REFR_EXT_SIZE) {
+    	/*Provide extra px draw area around the chart*/
+    	chart->ext_size = ext->margin;
     }
 
     return res;
@@ -885,4 +963,236 @@ static void lv_chart_draw_areas(lv_obj_t * chart, const lv_area_t * mask)
     }
 }
 
+static void lv_chart_draw_y_ticks(lv_obj_t * chart, const lv_area_t * mask)
+{
+    lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+
+    if(ext->y_axis.list_of_values != NULL || ext->y_axis.num_tick_marks != 0) {
+
+        const lv_style_t * style = lv_obj_get_style(chart);
+        lv_opa_t opa_scale = lv_obj_get_opa_scale(chart);
+
+        uint8_t i,j;
+        uint8_t list_index;
+        uint8_t num_of_labels;
+        uint8_t num_scale_ticks;
+        uint8_t major_tick_len, minor_tick_len;
+        lv_point_t p1;
+        lv_point_t p2;
+        lv_coord_t x_ofs = chart->coords.x1;
+        lv_coord_t y_ofs = chart->coords.y1;
+        lv_coord_t h = lv_obj_get_height(chart);
+        lv_coord_t w = lv_obj_get_width(chart);
+        char buf[LV_CHART_AXIS_TICK_LABEL_MAX_LEN+1]; /* up to N symbols per label + null terminator */
+
+        /* calculate the size of tick marks */
+        if(ext->y_axis.major_tick_len == 0)
+        	major_tick_len = (int32_t)w * LV_CHART_AXIS_MAJOR_TICK_LEN_COE;
+        else
+        	major_tick_len = ext->y_axis.major_tick_len;
+
+        if(ext->y_axis.minor_tick_len == 0)
+        	minor_tick_len = major_tick_len * LV_CHART_AXIS_MINOR_TICK_LEN_COE;
+        else
+        	minor_tick_len = ext->y_axis.minor_tick_len;
+
+        /* count the '\n'-s to determine the number of options */
+        list_index = 0;
+        num_of_labels = 0;
+        if(ext->y_axis.list_of_values != NULL)
+        {
+			for(j = 0; ext->y_axis.list_of_values[j] != '\0'; j++) {
+				if(ext->y_axis.list_of_values[j] == '\n')
+					num_of_labels++;
+			}
+
+	        num_of_labels++; /* last option in the at row*/
+        }
+
+        /* we can't have string labels without ticks step, set to 1 if not specified */
+        if(ext->y_axis.num_tick_marks == 0)
+        	ext->y_axis.num_tick_marks = 1;
+
+        /* calculate total number of ticks */
+        if(num_of_labels < 2)
+        	num_scale_ticks = ext->y_axis.num_tick_marks;
+        else
+        	num_scale_ticks = (ext->y_axis.num_tick_marks * (num_of_labels - 1));
+
+        for(i = 0; i < (num_scale_ticks + 1); i++ ) { /* one extra loop - it may not exist in the list, empty label */
+        	/* first point of the tick */
+            p1.x = 0 + x_ofs;
+
+        	/* second point of the tick */
+        	if( (num_of_labels != 0) && (i == 0 || i % ext->y_axis.num_tick_marks == 0) )
+        		p2.x = p1.x - major_tick_len; /* major tick */
+        	else
+        		p2.x = p1.x - minor_tick_len; /* minor tick */
+
+            /* draw a line at moving y position */
+        	p2.y = p1.y = y_ofs + h - (int32_t)(((int32_t)h * i) / num_scale_ticks + 1) - LV_CHART_AXIS_Y_TICK_OFFSET_FIX;
+
+        	if( i != num_scale_ticks )
+        		lv_draw_line(&p1, &p2, mask, style, opa_scale);
+        	else
+        		if( (ext->y_axis.options & LV_CHART_AXIS_DRAW_LAST_TICK) != 0 )
+        			lv_draw_line(&p1, &p2, mask, style, opa_scale);
+
+            /* draw values if available */
+            if (num_of_labels != 0)
+            {
+            	/* add text only to major tick */
+            	if( i == 0 || i % ext->y_axis.num_tick_marks == 0 )
+            	{
+            		/* search for tick string */
+            		j = 0;
+            		while(	ext->y_axis.list_of_values[list_index] != '\n' &&
+            				ext->y_axis.list_of_values[list_index] != '\0')
+            		{
+            			/* do not overflow the buffer, but move to the end of the current label */
+            			if(j < LV_CHART_AXIS_TICK_LABEL_MAX_LEN)
+            				buf[j++] = ext->y_axis.list_of_values[list_index++];
+            			else
+            				list_index++;
+            		}
+
+            		/* this was a string, but not end of the list, so jump to the next string */
+            		if(ext->y_axis.list_of_values[list_index] == '\n')
+            			list_index++;
+
+            		/* terminate the string */
+            		buf[j] = '\0';
+
+            		/* reserve appropriate area */
+            		lv_point_t size;
+            		lv_txt_get_size(&size, buf, style->text.font, style->text.letter_space, style->text.line_space, LV_COORD_MAX, LV_TXT_FLAG_CENTER);
+
+            		/* set the area at some distance of the major tick len left of the tick */
+					lv_area_t a = {(p2.x - size.x - LV_CHART_AXIS_TO_LABEL_DISTANCE) , (p2.y - size.y/2), (p2.x - LV_CHART_AXIS_TO_LABEL_DISTANCE), (p2.y + size.y/2) };
+					lv_draw_label(&a, mask, style, opa_scale, buf, LV_TXT_FLAG_CENTER, NULL);
+            	}
+            }
+        }
+    }
+}
+
+static void lv_chart_draw_x_ticks(lv_obj_t * chart, const lv_area_t * mask)
+{
+
+    lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
+
+    if(ext->x_axis.list_of_values != NULL || ext->x_axis.num_tick_marks != 0) {
+
+        const lv_style_t * style = lv_obj_get_style(chart);
+        lv_opa_t opa_scale = lv_obj_get_opa_scale(chart);
+
+        uint8_t i,j;
+        uint8_t list_index;
+        uint8_t num_of_labels;
+        uint8_t num_scale_ticks;
+        uint8_t major_tick_len, minor_tick_len;
+        lv_point_t p1;
+        lv_point_t p2;
+        lv_coord_t x_ofs = chart->coords.x1;
+        lv_coord_t y_ofs = chart->coords.y1;
+        lv_coord_t h = lv_obj_get_height(chart);
+        lv_coord_t w = lv_obj_get_width(chart);
+        char buf[LV_CHART_AXIS_TICK_LABEL_MAX_LEN+1]; /* up to N symbols per label + null terminator */
+
+        /* calculate the size of tick marks */
+        if(ext->x_axis.major_tick_len == 0)
+        	major_tick_len = (int32_t)w * LV_CHART_AXIS_MAJOR_TICK_LEN_COE;
+        else
+        	major_tick_len = ext->x_axis.major_tick_len;
+
+        if(ext->x_axis.minor_tick_len == 0)
+        	minor_tick_len = major_tick_len * LV_CHART_AXIS_MINOR_TICK_LEN_COE;
+        else
+        	minor_tick_len = ext->x_axis.minor_tick_len;
+
+        /* count the '\n'-s to determine the number of options */
+        list_index = 0;
+        num_of_labels = 0;
+        if(ext->x_axis.list_of_values != NULL)
+        {
+			for(j = 0; ext->x_axis.list_of_values[j] != '\0'; j++) {
+				if(ext->x_axis.list_of_values[j] == '\n')
+					num_of_labels++;
+			}
+
+	        num_of_labels++; /* last option in the at row*/
+        }
+
+        /* we can't have string labels without ticks step, set to 1 if not specified */
+        if(ext->x_axis.num_tick_marks == 0)
+        	ext->x_axis.num_tick_marks = 1;
+
+        /* calculate total number of marks */
+        if(num_of_labels < 2)
+        	num_scale_ticks = ext->x_axis.num_tick_marks;
+        else
+        	num_scale_ticks = (ext->x_axis.num_tick_marks * (num_of_labels - 1));
+
+        for(i = 0; i < (num_scale_ticks + 1); i++ ) { /* one extra loop - it may not exist in the list, empty label */
+        	/* first point of the tick */
+            p1.y = h + y_ofs;
+
+        	/* second point of the tick */
+        	if( (num_of_labels != 0) && (i == 0 || i % ext->x_axis.num_tick_marks == 0) )
+        		p2.y = p1.y + major_tick_len; /* major tick */
+        	else
+        		p2.y = p1.y + minor_tick_len; /* minor tick */
+
+            /* draw a line at moving x position */
+        	p2.x = p1.x = x_ofs + (int32_t)(((int32_t)w * i) / num_scale_ticks + 1) - LV_CHART_AXIS_X_TICK_OFFSET_FIX;
+
+        	if( i != num_scale_ticks )
+        		lv_draw_line(&p1, &p2, mask, style, opa_scale);
+        	else
+        		if( (ext->x_axis.options & LV_CHART_AXIS_DRAW_LAST_TICK) != 0 )
+        			lv_draw_line(&p1, &p2, mask, style, opa_scale);
+
+            /* draw values if available */
+            if (num_of_labels != 0)
+            {
+            	/* add text only to major tick */
+            	if( i == 0 || i % ext->x_axis.num_tick_marks == 0 )
+            	{
+            		/* search for tick string */
+            		j = 0;
+            		while(	ext->x_axis.list_of_values[list_index] != '\n' &&
+            				ext->x_axis.list_of_values[list_index] != '\0')
+            		{
+            			/* do not overflow the buffer, but move to the end of the current label */
+            			if(j < LV_CHART_AXIS_TICK_LABEL_MAX_LEN)
+            				buf[j++] = ext->x_axis.list_of_values[list_index++];
+            			else
+            				list_index++;
+            		}
+
+            		/* this was a string, but not end of the list, so jump to the next string */
+            		if(ext->x_axis.list_of_values[list_index] == '\n')
+            			list_index++;
+
+            		/* terminate the string */
+            		buf[j] = '\0';
+
+            		/* reserve appropriate area */
+            		lv_point_t size;
+            		lv_txt_get_size(&size, buf, style->text.font, style->text.letter_space, style->text.line_space, LV_COORD_MAX, LV_TXT_FLAG_CENTER);
+
+            		/* set the area at some distance of the major tick len under of the tick */
+					lv_area_t a = { (p2.x - size.x/2) , (p2.y + LV_CHART_AXIS_TO_LABEL_DISTANCE), (p2.x + size.x/2), (p2.y + size.y + LV_CHART_AXIS_TO_LABEL_DISTANCE) };
+					lv_draw_label(&a, mask, style, opa_scale, buf, LV_TXT_FLAG_CENTER, NULL);
+            	}
+            }
+        }
+    }
+}
+
+static void lv_chart_draw_axes(lv_obj_t * chart, const lv_area_t * mask)
+{
+    lv_chart_draw_y_ticks(chart, mask);
+    lv_chart_draw_x_ticks(chart, mask);
+}
 #endif

src/lv_objx/lv_chart.h

@@ -51,6 +51,22 @@ typedef struct
     uint16_t start_point;
 } lv_chart_series_t;
 
+/*Data of axis */
+enum
+{
+    LV_CHART_AXIS_DRAW_LAST_TICK = 0x01   /* draw the last tick */
+};
+typedef uint8_t lv_chart_axis_options_t;
+
+typedef struct
+{
+	const char* list_of_values;
+	uint8_t num_tick_marks;
+	lv_chart_axis_options_t options;
+	uint8_t major_tick_len;
+	uint8_t minor_tick_len;
+} lv_chart_axis_cfg_t;
+
 /*Data of chart */
 typedef struct
 {
@@ -63,6 +79,9 @@ typedef struct
     uint8_t vdiv_cnt;       /*Number of vertical division lines*/
     uint16_t point_cnt;     /*Point number in a data line*/
     lv_chart_type_t type;   /*Line, column or point chart (from 'lv_chart_type_t')*/
+    lv_chart_axis_cfg_t y_axis;
+    lv_chart_axis_cfg_t x_axis;
+    uint16_t margin;
     struct {
         lv_coord_t width;  /*Line width or point radius*/
         uint8_t num;       /*Number of data lines in dl_ll*/
@@ -193,6 +212,37 @@ static inline void lv_chart_set_style(lv_obj_t *chart, lv_style_t *style)
     lv_obj_set_style(chart, style);
 }
 
+/**
+ * Set the margin around the chart, used for axes value and labels
+ * @param chart 	pointer to an chart object
+ * @param margin	value of the margin
+ */
+void lv_chart_set_margin(lv_obj_t* chart, uint16_t margin);
+
+/**
+ * Set the x/y-axis ticks of a chart
+ * @param chart 			pointer to a chart object
+ * @param list_of_values 	list of string values, terminated with \n, except the last
+ * @param num_tick_marks 	if list_of_values is NULL: total number of ticks per axis
+ * 							else step in ticks between two value labels
+ * @param major_tick_len	the length of the major tick, AUTO if 0
+ * @param minor_tick_len	the length of the minor tick, AUTO if 0
+ * @param options			extra options
+ */
+void lv_chart_set_x_ticks(	lv_obj_t* chart,
+							const char* list_of_values,
+							uint8_t num_tick_marks,
+							uint8_t major_tick_len,
+							uint8_t minor_tick_len,
+							lv_chart_axis_options_t options);
+
+void lv_chart_set_y_ticks(	lv_obj_t* chart,
+							const char* list_of_values,
+							uint8_t num_tick_marks,
+							uint8_t major_tick_len,
+							uint8_t minor_tick_len,
+							lv_chart_axis_options_t options);
+
 /*=====================
  * Getter functions
  *====================*/
@@ -242,6 +292,13 @@ static inline lv_style_t* lv_chart_get_style(const lv_obj_t *chart)
     return lv_obj_get_style(chart);
 }
 
+/**
+ * Get the margin around the chart, used for axes value and labels
+ * @param chart pointer to an chart object
+ * @param return value of the margin
+ */
+uint16_t lv_chart_get_margin(lv_obj_t* chart);
+
 /*=====================
  * Other functions
  *====================*/