From af166852511e73337374fbc8d46b18077640c3fc Mon Sep 17 00:00:00 2001 From: Jihoon Lee Date: Fri, 25 Sep 2020 11:59:50 +0900 Subject: [PATCH] [CS] Enlarge fonts and s/test/eval **Changes proposed in this PR:** - Enlarge font size, and change test to eval **Self evaluation:** 1. Build test: [X]Passed [ ]Failed [ ]Skipped 2. Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: Jihoon Lee --- .../Tizen_native/CustomShortcut/res/edje/main.edc | 16 ++++++++-------- Applications/Tizen_native/CustomShortcut/src/data.c | 2 -- Applications/Tizen_native/CustomShortcut/src/main.c | 6 +++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Applications/Tizen_native/CustomShortcut/res/edje/main.edc b/Applications/Tizen_native/CustomShortcut/res/edje/main.edc index 97e5ddd..3f441c7 100644 --- a/Applications/Tizen_native/CustomShortcut/res/edje/main.edc +++ b/Applications/Tizen_native/CustomShortcut/res/edje/main.edc @@ -34,16 +34,16 @@ state: "default" 0.0; \ color: 0 0 0 255; \ rel1 { \ - relative: 0.2 0.2; \ + relative: 0.1 0.1; \ to: button_name"/bg"; \ } \ rel2 { \ - relative: 0.8 0.8; \ + relative: 0.9 0.9; \ to: button_name"/bg"; \ } \ text { \ text: label ; \ - size: 26; \ + size: 28; \ align: 0.5 0.5; \ } \ } \ @@ -99,11 +99,11 @@ collections { parts { PART_TITLE("home/title", "Select actions...") PART_BUTTON("home/to_train", "train", 0.55, 0.3, 0.9, 0.7) - PART_BUTTON("home/to_test", "test", 0.1, 0.3, 0.45, 0.7) + PART_BUTTON("home/to_eval", "eval", 0.1, 0.3, 0.45, 0.7) } programs { PROGRAM_BUTTON("home/to_train", "routes/to", "draw:train") - PROGRAM_BUTTON("home/to_test", "routes/to", "draw:inference") + PROGRAM_BUTTON("home/to_eval", "routes/to", "draw:inference") } } group { @@ -119,7 +119,7 @@ collections { rel2.relative: 1.0 0.8; text { text: "😊"; - size: 58; + size: 100; align: 0.5 0.5; } } @@ -207,8 +207,8 @@ collections { group { name: "test_result"; parts { - PART_TITLE("test_result/title", "test is successfully done") - PART_BUTTON("test_result/go_back", "test result: 😊", 0.1, 0.3, 0.9, 0.7) + PART_TITLE("test_result/title", "eval successfully done") + PART_BUTTON("test_result/go_back", "😊", 0.1, 0.3, 0.9, 0.7) // reserve a text area to show the guess from the model } } diff --git a/Applications/Tizen_native/CustomShortcut/src/data.c b/Applications/Tizen_native/CustomShortcut/src/data.c index ff69729..c78e576 100644 --- a/Applications/Tizen_native/CustomShortcut/src/data.c +++ b/Applications/Tizen_native/CustomShortcut/src/data.c @@ -312,8 +312,6 @@ void *data_run_model(void *data) { return NULL; } - printf("test"); - LOG_D("start running model"); util_get_resource_path("model.ini", model_conf_path, false); util_get_data_path("label.dat", label_path); diff --git a/Applications/Tizen_native/CustomShortcut/src/main.c b/Applications/Tizen_native/CustomShortcut/src/main.c index 356f26e..92c2cbe 100644 --- a/Applications/Tizen_native/CustomShortcut/src/main.c +++ b/Applications/Tizen_native/CustomShortcut/src/main.c @@ -173,8 +173,12 @@ void presenter_on_go_main_request(void *data, Evas_Object *obj EINA_UNUSED, void presenter_on_canvas_submit_inference(void *data, Evas_Object *obj, const char *emission, const char *source) { + appdata_s *ad = (appdata_s *)data; /** appdata handling NYI */ - if (routes_to_((appdata_s *)data, "test_result") != 0) + + ad->tries = 0; + elm_naviframe_item_pop(ad->naviframe); + if (routes_to_(ad, "test_result") != 0) return; } -- 2.7.4