[CS] Enlarge fonts and s/test/eval
authorJihoon Lee <jhoon.it.lee@samsung.com>
Fri, 25 Sep 2020 02:59:50 +0000 (11:59 +0900)
committerJijoong Moon <jijoong.moon@samsung.com>
Sun, 4 Oct 2020 23:28:13 +0000 (08:28 +0900)
**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 <jhoon.it.lee@samsung.com>
Applications/Tizen_native/CustomShortcut/res/edje/main.edc
Applications/Tizen_native/CustomShortcut/src/data.c
Applications/Tizen_native/CustomShortcut/src/main.c

index 97e5ddd..3f441c7 100644 (file)
       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
     }
   }
index ff69729..c78e576 100644 (file)
@@ -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);
index 356f26e..92c2cbe 100644 (file)
@@ -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;
 }