From c751c11a87019f933d8596b7342ba37ce94a977f Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Wed, 7 Jul 2021 18:04:46 +0300 Subject: [PATCH] fix(examples) remove cast in MP scripts (#2354) After https://github.com/lvgl/lv_binding_micropython/pull/161 merged, it is no longer needed to cast the result of 'e.get_target()' Also, additional small fixes to allow CI improvements --- examples/event/lv_example_event_1.py | 2 +- examples/get_started/lv_example_get_started_1.py | 2 +- examples/widgets/bar/lv_example_bar_6.py | 2 +- examples/widgets/bar/test.py | 2 +- examples/widgets/btnmatrix/lv_example_btnmatrix_3.py | 2 +- examples/widgets/calendar/lv_example_calendar_1.py | 2 +- examples/widgets/chart/lv_example_chart_2.py | 2 +- examples/widgets/chart/lv_example_chart_5.py | 4 ++-- examples/widgets/chart/lv_example_chart_6.py | 2 +- examples/widgets/checkbox/lv_example_checkbox_1.py | 2 +- examples/widgets/dropdown/lv_example_dropdown_1.py | 2 +- examples/widgets/dropdown/lv_example_dropdown_3.py | 2 +- examples/widgets/list/lv_example_list_1.py | 2 +- examples/widgets/list/test.py | 2 +- examples/widgets/msgbox/lv_example_msgbox_1.py | 4 ++-- examples/widgets/roller/lv_example_roller_1.py | 2 +- examples/widgets/roller/lv_example_roller_2.py | 2 +- examples/widgets/slider/lv_example_slider_1.py | 2 +- examples/widgets/slider/lv_example_slider_3.py | 2 +- examples/widgets/switch/lv_example_switch_1.py | 2 +- examples/widgets/table/lv_example_table_1.py | 2 +- examples/widgets/table/lv_example_table_2.py | 4 ++-- examples/widgets/textarea/lv_example_textarea_1.py | 4 ++-- examples/widgets/textarea/lv_example_textarea_2.py | 2 +- examples/widgets/textarea/lv_example_textarea_3.py | 2 +- examples/widgets/win/lv_example_win_1.py | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/event/lv_example_event_1.py b/examples/event/lv_example_event_1.py index b1947610a..624eaf058 100644 --- a/examples/event/lv_example_event_1.py +++ b/examples/event/lv_example_event_1.py @@ -17,7 +17,7 @@ class Event_1(): def event_cb(self,e): print("Clicked"); - btn = lv.btn.__cast__(e.get_target()) + btn = e.get_target() label = btn.get_child(0) label.set_text(str(self.cnt)) self.cnt += 1 diff --git a/examples/get_started/lv_example_get_started_1.py b/examples/get_started/lv_example_get_started_1.py index 639048644..8adfbdd0d 100644 --- a/examples/get_started/lv_example_get_started_1.py +++ b/examples/get_started/lv_example_get_started_1.py @@ -21,7 +21,7 @@ class CounterBtn(): self.cnt += 1 # Get the first child of the button which is the label and change its text - label = lv.label.__cast__(btn.get_child(0)) + label = btn.get_child(0) label.set_text("Button: " + str(self.cnt)) diff --git a/examples/widgets/bar/lv_example_bar_6.py b/examples/widgets/bar/lv_example_bar_6.py index 6c7793afe..3251df86f 100644 --- a/examples/widgets/bar/lv_example_bar_6.py +++ b/examples/widgets/bar/lv_example_bar_6.py @@ -6,7 +6,7 @@ def event_cb(e): if dsc.part != lv.PART.INDICATOR: return - obj= lv.bar.__cast__(e.get_target()) + obj= e.get_target() label_dsc = lv.draw_label_dsc_t() label_dsc.init() diff --git a/examples/widgets/bar/test.py b/examples/widgets/bar/test.py index 4ff17fb44..502036f0d 100644 --- a/examples/widgets/bar/test.py +++ b/examples/widgets/bar/test.py @@ -9,7 +9,7 @@ def event_cb(e): if dsc.part != lv.PART.INDICATOR: return - obj= lv.bar.__cast__(e.get_target()) + obj= e.get_target() label_dsc = lv.draw_label_dsc_t() label_dsc.init() diff --git a/examples/widgets/btnmatrix/lv_example_btnmatrix_3.py b/examples/widgets/btnmatrix/lv_example_btnmatrix_3.py index 12becddf6..2a4f4b2c1 100644 --- a/examples/widgets/btnmatrix/lv_example_btnmatrix_3.py +++ b/examples/widgets/btnmatrix/lv_example_btnmatrix_3.py @@ -1,5 +1,5 @@ def event_cb(e): - obj = lv.btnmatrix.__cast__(e.get_target()) + obj = e.get_target() id = obj.get_selected_btn() if id == 0: prev = True diff --git a/examples/widgets/calendar/lv_example_calendar_1.py b/examples/widgets/calendar/lv_example_calendar_1.py index 119c0db64..112451ba2 100644 --- a/examples/widgets/calendar/lv_example_calendar_1.py +++ b/examples/widgets/calendar/lv_example_calendar_1.py @@ -2,7 +2,7 @@ def event_handler(evt): code = evt.get_code() if code == lv.EVENT.VALUE_CHANGED: - source = lv.calendar.__cast__(evt.get_target()) + source = evt.get_target() date = lv.calendar_date_t() lv.calendar.get_pressed_date(source,date) if date: diff --git a/examples/widgets/chart/lv_example_chart_2.py b/examples/widgets/chart/lv_example_chart_2.py index e769d14e5..1050bf61b 100644 --- a/examples/widgets/chart/lv_example_chart_2.py +++ b/examples/widgets/chart/lv_example_chart_2.py @@ -1,6 +1,6 @@ def draw_event_cb(e): - obj = lv.obj.__cast__(e.get_target()) + obj = e.get_target() # Add the faded area before the lines are drawn dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) diff --git a/examples/widgets/chart/lv_example_chart_5.py b/examples/widgets/chart/lv_example_chart_5.py index 1999d3003..198cae146 100644 --- a/examples/widgets/chart/lv_example_chart_5.py +++ b/examples/widgets/chart/lv_example_chart_5.py @@ -44,13 +44,13 @@ ecg_sample = [ def slider_x_event_cb(e): - slider = lv.slider.__cast__(e.get_target()) + slider = e.get_target() v = slider.get_value() chart.set_zoom_x(v) def slider_y_event_cb(e): - slider = lv.slider.__cast__(e.get_target()) + slider = e.get_target() v = slider.get_value() chart.set_zoom_y(v) diff --git a/examples/widgets/chart/lv_example_chart_6.py b/examples/widgets/chart/lv_example_chart_6.py index 6eb89dc52..80f28386b 100644 --- a/examples/widgets/chart/lv_example_chart_6.py +++ b/examples/widgets/chart/lv_example_chart_6.py @@ -37,7 +37,7 @@ class ExampleChart_6(): def event_cb(self,e): code = e.get_code() - chart = lv.chart.__cast__(e.get_target()) + chart = e.get_target() if code == lv.EVENT.VALUE_CHANGED: # print("last_id: ",self.last_id) diff --git a/examples/widgets/checkbox/lv_example_checkbox_1.py b/examples/widgets/checkbox/lv_example_checkbox_1.py index 9eae6435f..10669afeb 100644 --- a/examples/widgets/checkbox/lv_example_checkbox_1.py +++ b/examples/widgets/checkbox/lv_example_checkbox_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.checkbox.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.VALUE_CHANGED: txt = obj.get_text() if obj.get_state() & lv.STATE.CHECKED: diff --git a/examples/widgets/dropdown/lv_example_dropdown_1.py b/examples/widgets/dropdown/lv_example_dropdown_1.py index 4cfc15521..e30735e67 100644 --- a/examples/widgets/dropdown/lv_example_dropdown_1.py +++ b/examples/widgets/dropdown/lv_example_dropdown_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.dropdown.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.VALUE_CHANGED: option = " "*10 # should be large enough to store the option obj.get_selected_str(option, len(option)) diff --git a/examples/widgets/dropdown/lv_example_dropdown_3.py b/examples/widgets/dropdown/lv_example_dropdown_3.py index 099b2a7f7..c7b9f603a 100644 --- a/examples/widgets/dropdown/lv_example_dropdown_3.py +++ b/examples/widgets/dropdown/lv_example_dropdown_3.py @@ -19,7 +19,7 @@ img_caret_down_argb = lv.img_dsc_t({ }) def event_cb(e): - dropdown = lv.dropdown.__cast__(e.get_target()) + dropdown = e.get_target() option = " "*64 # should be large enough to store the option dropdown.get_selected_str(option, len(option)) print(option.strip() +" is selected") diff --git a/examples/widgets/list/lv_example_list_1.py b/examples/widgets/list/lv_example_list_1.py index d0ae048a5..2bb83cc68 100644 --- a/examples/widgets/list/lv_example_list_1.py +++ b/examples/widgets/list/lv_example_list_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.btn.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.CLICKED: print("Clicked: list1." + list1.get_btn_text(obj)) diff --git a/examples/widgets/list/test.py b/examples/widgets/list/test.py index 36ac6f8ea..1d2a9f110 100755 --- a/examples/widgets/list/test.py +++ b/examples/widgets/list/test.py @@ -3,7 +3,7 @@ import lvgl as lv import display_driver def event_handler(e): code = e.get_code() - obj = lv.btn.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.CLICKED: print("Clicked: list1." + list1.get_btn_text(obj)) diff --git a/examples/widgets/msgbox/lv_example_msgbox_1.py b/examples/widgets/msgbox/lv_example_msgbox_1.py index e37452a50..9d3e7f783 100644 --- a/examples/widgets/msgbox/lv_example_msgbox_1.py +++ b/examples/widgets/msgbox/lv_example_msgbox_1.py @@ -1,6 +1,6 @@ def event_cb(e): - mbox = lv.msgbox.__cast__(e.get_current_target()) - print("Button " + mbox.get_active_btn_text() + " clicked") + mbox = e.get_current_target() + print("Button %s clicked" % mbox.get_active_btn_text()) btns = ["Apply", "Close", ""] diff --git a/examples/widgets/roller/lv_example_roller_1.py b/examples/widgets/roller/lv_example_roller_1.py index 4d1f191a4..a638321bb 100644 --- a/examples/widgets/roller/lv_example_roller_1.py +++ b/examples/widgets/roller/lv_example_roller_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.roller.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.VALUE_CHANGED: option = " "*10 obj.get_selected_str(option, len(option)) diff --git a/examples/widgets/roller/lv_example_roller_2.py b/examples/widgets/roller/lv_example_roller_2.py index 03e39f61a..704dc7ddb 100644 --- a/examples/widgets/roller/lv_example_roller_2.py +++ b/examples/widgets/roller/lv_example_roller_2.py @@ -2,7 +2,7 @@ import fs_driver def event_handler(e): code = e.get_code() - obj = lv.roller.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.VALUE_CHANGED: option = " "*10 obj.get_selected_str(option, len(option)) diff --git a/examples/widgets/slider/lv_example_slider_1.py b/examples/widgets/slider/lv_example_slider_1.py index 21a9925aa..30af17bab 100644 --- a/examples/widgets/slider/lv_example_slider_1.py +++ b/examples/widgets/slider/lv_example_slider_1.py @@ -3,7 +3,7 @@ # def slider_event_cb(e): - slider = lv.slider.__cast__(e.get_target()) + slider = e.get_target() slider_label.set_text("{:d}%".format(slider.get_value())) slider_label.align_to(slider, lv.ALIGN.OUT_BOTTOM_MID, 0, 10) diff --git a/examples/widgets/slider/lv_example_slider_3.py b/examples/widgets/slider/lv_example_slider_3.py index 550714ddc..15b690b14 100644 --- a/examples/widgets/slider/lv_example_slider_3.py +++ b/examples/widgets/slider/lv_example_slider_3.py @@ -1,6 +1,6 @@ def slider_event_cb(e): code = e.get_code() - obj = lv.slider.__cast__(e.get_target()) + obj = e.get_target() # Provide some extra space for the value if code == lv.EVENT.REFR_EXT_DRAW_SIZE: diff --git a/examples/widgets/switch/lv_example_switch_1.py b/examples/widgets/switch/lv_example_switch_1.py index ec53cbcaf..e62a35388 100644 --- a/examples/widgets/switch/lv_example_switch_1.py +++ b/examples/widgets/switch/lv_example_switch_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.switch.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.VALUE_CHANGED: if obj.has_state(lv.STATE.CHECKED): print("State: on") diff --git a/examples/widgets/table/lv_example_table_1.py b/examples/widgets/table/lv_example_table_1.py index 888dfc0fa..f88fffd07 100644 --- a/examples/widgets/table/lv_example_table_1.py +++ b/examples/widgets/table/lv_example_table_1.py @@ -1,5 +1,5 @@ def draw_part_event_cb(e): - obj = lv.table.__cast__(e.get_target()) + obj = e.get_target() dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) # If the cells are drawn../ if dsc.part == lv.PART.ITEMS: diff --git a/examples/widgets/table/lv_example_table_2.py b/examples/widgets/table/lv_example_table_2.py index 5b60befe0..3cb745e00 100644 --- a/examples/widgets/table/lv_example_table_2.py +++ b/examples/widgets/table/lv_example_table_2.py @@ -4,7 +4,7 @@ import gc ITEM_CNT = 200 def draw_event_cb(e): - obj = lv.table.__cast__(e.get_target()) + obj = e.get_target() dsc = lv.obj_draw_part_dsc_t.__cast__(e.get_param()) # If the cells are drawn... if dsc.part == lv.PART.ITEMS: @@ -40,7 +40,7 @@ def draw_event_cb(e): lv.draw_rect(sw_area, dsc.clip_area, rect_dsc) def change_event_cb(e): - obj = lv.table.__cast__(e.get_target()) + obj = e.get_target() row = lv.C_Pointer() col = lv.C_Pointer() table.get_selected_cell(row, col) diff --git a/examples/widgets/textarea/lv_example_textarea_1.py b/examples/widgets/textarea/lv_example_textarea_1.py index f06435e4e..d828fd681 100644 --- a/examples/widgets/textarea/lv_example_textarea_1.py +++ b/examples/widgets/textarea/lv_example_textarea_1.py @@ -3,13 +3,13 @@ def textarea_event_handler(e,ta): def btnm_event_handler(e,ta): - obj = lv.btnmatrix.__cast__(e.get_target()) + obj = e.get_target() txt = obj.get_btn_text(obj.get_selected_btn()) if txt == lv.SYMBOL.BACKSPACE: ta.del_char() elif txt == lv.SYMBOL.NEW_LINE: lv.event_send(ta,lv.EVENT.READY,None) - else: + elif txt: ta.add_text(txt) ta = lv.textarea(lv.scr_act()) diff --git a/examples/widgets/textarea/lv_example_textarea_2.py b/examples/widgets/textarea/lv_example_textarea_2.py index 44bfee59d..b418861d7 100644 --- a/examples/widgets/textarea/lv_example_textarea_2.py +++ b/examples/widgets/textarea/lv_example_textarea_2.py @@ -1,6 +1,6 @@ def ta_event_cb(e): code = e.get_code() - ta = lv.textarea.__cast__(e.get_target()) + ta = e.get_target() if code == lv.EVENT.CLICKED or code == lv.EVENT.FOCUSED: # Focus on the clicked text area if kb != None: diff --git a/examples/widgets/textarea/lv_example_textarea_3.py b/examples/widgets/textarea/lv_example_textarea_3.py index 13cfa169f..400596bc7 100644 --- a/examples/widgets/textarea/lv_example_textarea_3.py +++ b/examples/widgets/textarea/lv_example_textarea_3.py @@ -1,5 +1,5 @@ def ta_event_cb(e): - ta = lv.textarea.__cast__(e.get_target()) + ta = e.get_target() txt = ta.get_text() # print(txt) pos = ta.get_cursor_pos() diff --git a/examples/widgets/win/lv_example_win_1.py b/examples/widgets/win/lv_example_win_1.py index aac716b9e..e5f6e6760 100644 --- a/examples/widgets/win/lv_example_win_1.py +++ b/examples/widgets/win/lv_example_win_1.py @@ -1,6 +1,6 @@ def event_handler(e): code = e.get_code() - obj = lv.obj.__cast__(e.get_target()) + obj = e.get_target() if code == lv.EVENT.CLICKED: print("Button {:d} clicked".format(obj.get_child_id()))