This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository echart.
View the commit online.
commit 7522b690be1c256da6d75a22e0e5b84abe1cd331
Author: Vincent Torri <[email protected]>
AuthorDate: Fri May 15 09:14:30 2026 +0200
rename vbar API to bar
---
src/bin/echart_main.c | 6 ++--
src/lib/Echart.h | 2 +-
src/lib/echart_bar.c | 94 +++++++++++++++++++++++++--------------------------
src/lib/echart_bar.h | 20 +++++------
src/lib/meson.build | 4 +--
5 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/src/bin/echart_main.c b/src/bin/echart_main.c
index 84084c5..5cb2f86 100644
--- a/src/bin/echart_main.c
+++ b/src/bin/echart_main.c
@@ -103,16 +103,16 @@ elm_main(int argc, char **argv)
echart_grid_width_set(o, 3);
evas_object_show(o);
#else
- o = echart_vbar_add(evas_object_evas_get(win));
+ o = echart_bar_add(evas_object_evas_get(win));
evas_object_move(o, 0, 0);
evas_object_resize(o, w * elm_config_scale_get(), h * elm_config_scale_get());
int nd = 3;
double v[3] = { 3, 6, 4 };
- echart_vbar_data_append(o, v, nd);
+ echart_bar_data_append(o, v, nd);
v[0] = 6;
v[1] = 4;
v[2] = 3;
- echart_vbar_data_append(o, v, nd);
+ echart_bar_data_append(o, v, nd);
evas_object_show(o);
#endif
diff --git a/src/lib/Echart.h b/src/lib/Echart.h
index f0458c3..3e85b10 100644
--- a/src/lib/Echart.h
+++ b/src/lib/Echart.h
@@ -45,8 +45,8 @@
#include "echart_main.h"
#include "echart_grid.h"
#include "echart_grid_ord.h"
+#include "echart_bar.h"
#include "echart_line.h"
-#include "echart_vbar.h"
#include "echart_chart.h"
#endif
diff --git a/src/lib/echart_bar.c b/src/lib/echart_bar.c
index 9cf37a3..098b735 100644
--- a/src/lib/echart_bar.c
+++ b/src/lib/echart_bar.c
@@ -17,7 +17,7 @@
#define Y_VG(y) (h) * (sd->ymax - (y)) / (sd->ymax - sd->ymin)
typedef struct Data Data;
-typedef struct Chart_Vbar Chart_Vbar;
+typedef struct Chart_Bar Chart_Bar;
struct Data
{
@@ -26,7 +26,7 @@ struct Data
unsigned char r, g, b;
};
-struct Chart_Vbar
+struct Chart_Bar
{
Evas_Object_Smart_Clipped_Data __clipped_data;
@@ -45,19 +45,19 @@ struct Chart_Vbar
double ymax;
};
-static Evas_Smart *_vbar_smart = NULL;
+static Evas_Smart *_bar_smart = NULL;
static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
/* Evas_Object smart callbacks */
static void
-_vbar_smart_add(Evas_Object *obj)
+_bar_smart_add(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
INF(" * %s", __FUNCTION__);
- sd = calloc(1, sizeof(Chart_Vbar));
+ sd = calloc(1, sizeof(Chart_Bar));
EINA_SAFETY_ON_NULL_RETURN(sd);
sd->o_bg = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -77,9 +77,9 @@ _vbar_smart_add(Evas_Object *obj)
}
static void
-_vbar_smart_del(Evas_Object *obj)
+_bar_smart_del(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
INF(" * %s", __FUNCTION__);
@@ -98,9 +98,9 @@ _vbar_smart_del(Evas_Object *obj)
}
static void
-_vbar_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+_bar_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
Evas_Coord ox;
Evas_Coord oy;
@@ -120,9 +120,9 @@ _vbar_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
}
static void
-_vbar_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+_bar_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
Evas_Coord ow;
Evas_Coord oh;
@@ -142,9 +142,9 @@ _vbar_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
}
static void
-_vbar_smart_show(Evas_Object *obj)
+_bar_smart_show(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
INF(" * %s", __FUNCTION__);
@@ -156,9 +156,9 @@ _vbar_smart_show(Evas_Object *obj)
}
static void
-_vbar_smart_hide(Evas_Object *obj)
+_bar_smart_hide(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
INF(" * %s", __FUNCTION__);
@@ -170,12 +170,12 @@ _vbar_smart_hide(Evas_Object *obj)
}
static void
-_vbar_smart_calculate(Evas_Object *obj)
+_bar_smart_calculate(Evas_Object *obj)
{
- Chart_Vbar *sd;
- double gw; /* width of 1 group of vbars */
- double sw; /* space between 2 group of vbars */
- double bw; /* width of 1 vbar */
+ Chart_Bar *sd;
+ double gw; /* width of 1 group of bars */
+ double sw; /* space between 2 group of bars */
+ double bw; /* width of 1 bar */
int w, h;
INF(" * %s", __FUNCTION__);
@@ -198,7 +198,7 @@ _vbar_smart_calculate(Evas_Object *obj)
gw = (w * sd->group_width) / (100.0 * sd->nbr_values);
sw = (w - sd->nbr_values * gw) / (sd->nbr_values - 1);
- bw = (gw - sd->nbr_series + 1) / sd->nbr_series; /* vbars separated by 1 px */
+ bw = (gw - sd->nbr_series + 1) / sd->nbr_series; /* bars separated by 1 px */
for (int j = 0; j < sd->nbr_series; j++)
{
@@ -221,7 +221,7 @@ _vbar_smart_calculate(Evas_Object *obj)
}
static void
-_vbar_smart_init(void)
+_bar_smart_init(void)
{
static Evas_Smart_Class sc;
@@ -229,16 +229,16 @@ _vbar_smart_init(void)
evas_object_smart_clipped_smart_set(&_parent_sc);
sc = _parent_sc;
- sc.name = "vbar";
+ sc.name = "bar";
sc.version = EVAS_SMART_CLASS_VERSION;
- sc.add = _vbar_smart_add;
- sc.del = _vbar_smart_del;
- sc.move = _vbar_smart_move;
- sc.resize = _vbar_smart_resize;
- sc.show = _vbar_smart_show;
- sc.hide = _vbar_smart_hide;
- sc.calculate = _vbar_smart_calculate;
- _vbar_smart = evas_smart_class_new(&sc);
+ sc.add = _bar_smart_add;
+ sc.del = _bar_smart_del;
+ sc.move = _bar_smart_move;
+ sc.resize = _bar_smart_resize;
+ sc.show = _bar_smart_show;
+ sc.hide = _bar_smart_hide;
+ sc.calculate = _bar_smart_calculate;
+ _bar_smart = evas_smart_class_new(&sc);
}
/*============================================================================*
@@ -250,22 +250,22 @@ _vbar_smart_init(void)
*============================================================================*/
ECH_API Evas_Object *
-echart_vbar_add(Evas *evas)
+echart_bar_add(Evas *evas)
{
Evas_Object *obj;
INF(" * %s", __FUNCTION__);
- if (!_vbar_smart) _vbar_smart_init();
- obj = evas_object_smart_add(evas, _vbar_smart);
+ if (!_bar_smart) _bar_smart_init();
+ obj = evas_object_smart_add(evas, _bar_smart);
return obj;
}
ECH_API void
-echart_vbar_data_append(Evas_Object *obj, double *values, int nbr_values)
+echart_bar_data_append(Evas_Object *obj, double *values, int nbr_values)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
double ymin;
double ymax;
unsigned int c;
@@ -337,9 +337,9 @@ echart_vbar_data_append(Evas_Object *obj, double *values, int nbr_values)
}
ECH_API int
-echart_vbar_nbr_series_get(Evas_Object *obj)
+echart_bar_nbr_series_get(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0);
@@ -348,9 +348,9 @@ echart_vbar_nbr_series_get(Evas_Object *obj)
}
ECH_API int
-echart_vbar_nbr_values_get(Evas_Object *obj)
+echart_bar_nbr_values_get(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0);
@@ -359,9 +359,9 @@ echart_vbar_nbr_values_get(Evas_Object *obj)
}
ECH_API void
-echart_vbar_color_set(Evas_Object *obj, int serie_num, int r, int g, int b, int a)
+echart_bar_color_set(Evas_Object *obj, int serie_num, int r, int g, int b, int a)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN(sd);
@@ -374,9 +374,9 @@ echart_vbar_color_set(Evas_Object *obj, int serie_num, int r, int g, int b, int
}
ECH_API void
-echart_vbar_group_width_set(Evas_Object *obj, double group_width)
+echart_bar_group_width_set(Evas_Object *obj, double group_width)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN(sd);
@@ -390,9 +390,9 @@ echart_vbar_group_width_set(Evas_Object *obj, double group_width)
}
ECH_API double
-echart_vbar_group_width_get(Evas_Object *obj)
+echart_bar_group_width_get(Evas_Object *obj)
{
- Chart_Vbar *sd;
+ Chart_Bar *sd;
sd = evas_object_smart_data_get(obj);
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0.0);
diff --git a/src/lib/echart_bar.h b/src/lib/echart_bar.h
index a5bfd09..3da0a93 100644
--- a/src/lib/echart_bar.h
+++ b/src/lib/echart_bar.h
@@ -3,23 +3,23 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#ifndef ECHART_VBAR_H
-#define ECHART_VBAR_H
+#ifndef ECHART_BAR_H
+#define ECHART_BAR_H
#include <Evas.h>
-ECH_API Evas_Object *echart_vbar_add(Evas *evas);
+ECH_API Evas_Object *echart_bar_add(Evas *evas);
-ECH_API void echart_vbar_data_append(Evas_Object *obj, double *values, int nbr_vamues);
+ECH_API void echart_bar_data_append(Evas_Object *obj, double *values, int nbr_vamues);
-ECH_API int echart_vbar_nbr_series_get(Evas_Object *obj);
+ECH_API int echart_bar_nbr_series_get(Evas_Object *obj);
-ECH_API int echart_vbar_nbr_values_get(Evas_Object *obj);
+ECH_API int echart_bar_nbr_values_get(Evas_Object *obj);
-ECH_API void echart_vbar_color_set(Evas_Object *obj, int serie_num, int r, int g, int b, int a);
+ECH_API void echart_bar_color_set(Evas_Object *obj, int serie_num, int r, int g, int b, int a);
-ECH_API void echart_vbar_group_width_set(Evas_Object *obj, double group_width);
+ECH_API void echart_bar_group_width_set(Evas_Object *obj, double group_width);
-ECH_API double echart_vbar_group_width_get(Evas_Object *obj);
+ECH_API double echart_bar_group_width_get(Evas_Object *obj);
-#endif /* ECHART_VBAR_H */
+#endif /* ECHART_BAR_H */
diff --git a/src/lib/meson.build b/src/lib/meson.build
index 1341cfa..3fce511 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -9,7 +9,7 @@ echart_header = files([
'echart_grid_ord.h',
'echart_line.h',
'echart_main.h',
- 'echart_vbar.h',
+ 'echart_bar.h',
])
echart_lib_src = files([
@@ -19,7 +19,7 @@ echart_lib_src = files([
'echart_grid_ord.c',
'echart_line.c',
'echart_main.c',
- 'echart_vbar.c',
+ 'echart_bar.c',
])
config_dir += [ include_directories('.') ]
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
