use the new API

vtorri · Feb 9, 2021 · 27e1ebb · 27e1ebb
1 parent 8679383
commit 27e1ebb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/meson.build b/meson.build
@@ -40,7 +40,8 @@ libm = cc.find_library('m', required : true)
 dep_bin = shared_library('echart',
                          src_lib,
                          c_args : cflags_lib,
-                         dependencies : [dep_lib, libm])
+                         dependencies : [dep_lib, libm],
+                         install      : true)
 
 ### Binary
 
@@ -56,7 +57,8 @@ executable('echart',
            dependencies : [dep_bin,
                            dependency('ecore-evas'),
                            dependency('ecore'),
-                           dep_lib])
+                           dep_lib],
+           install      : true)
 
 ### config.h
 

diff --git a/src/bin/echart.c b/src/bin/echart.c
@@ -41,7 +41,7 @@ _echart_delete_cb(Ecore_Evas *ee EINA_UNUSED)
     ecore_main_loop_quit();
 }
 
-int main()
+int main(void)
 {
     Ecore_Evas *ee;
     Evas *evas;
@@ -101,10 +101,13 @@ int main()
     echart_chart_size_get(chart, &w, &h);
     echart_chart_background_color_set(chart, 0xffffffff);
 
-    /* o = echart_line_object_add(evas); */
-    /* echart_line_object_chart_set(o, chart); */
+#if 1
+    o = echart_line_object_add(evas);
+    echart_line_object_chart_set(o, chart);
+#else
     o = echart_vbar_object_add(evas);
     echart_vbar_object_chart_set(o, chart);
+#endif
     evas_object_show(o);
 
     ecore_evas_resize(ee, w, h);

diff --git a/src/lib/echart_line.c b/src/lib/echart_line.c
@@ -229,7 +229,8 @@ _echart_line_smart_add(Evas_Object *obj)
     sd->common.title = evas_object_text_add(evas_object_evas_get(obj));
     sd->common.ord = eina_inarray_new(sizeof(Evas_Object *), 0);
     sd->common.vg = evas_object_vg_add(evas_object_evas_get(obj));
-    sd->common.root = evas_object_vg_root_node_get(sd->common.vg);
+    sd->common.root = evas_vg_container_add(sd->common.vg);
+    evas_object_vg_root_node_set(sd->common.vg, sd->common.root);
 
     evas_object_event_callback_add(sd->common.vg, EVAS_CALLBACK_MOUSE_MOVE,
                                    _echart_line_mouse_move_cb, sd);

diff --git a/src/lib/echart_vbar.c b/src/lib/echart_vbar.c
@@ -221,7 +221,8 @@ _echart_vbar_smart_add(Evas_Object *obj)
     sd->common.bg = evas_object_rectangle_add(evas_object_evas_get(obj));
     sd->common.title = evas_object_text_add(evas_object_evas_get(obj));
     sd->common.vg = evas_object_vg_add(evas_object_evas_get(obj));
-    sd->common.root = evas_object_vg_root_node_get(sd->common.vg);
+    sd->common.root = evas_vg_container_add(sd->common.vg);
+    evas_object_vg_root_node_set(sd->common.vg, sd->common.root);
 
     sd->group_width = 0.6180339887; /* golden number^-1 */
 
@@ -364,7 +365,7 @@ _echart_vbar_add(const Echart_Smart_Data *sd,
                  double x,
                  double L)
 {
-    Evas_VG *r;
+    Efl_VG *r;
     const Eina_Inarray *y_values;
     const Echart_Serie *serie;
     double *yv;