From 53aebc081b15391eebd156da26c30f06f418c364 Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Tue, 17 Jul 2018 19:52:29 +0200 Subject: [PATCH] Emergency stop page removed Change-Id: I6345b0afbdaccf07cc99315af901693a130600cd Signed-off-by: Michal Skorupinski --- edje/images/stop.png | Bin 14472 -> 0 bytes edje/images/stop_button.png | Bin 0 -> 20700 bytes inc/controller/controller_emergency_stop.h | 28 ---------- inc/view/view_emergency_stop.h | 23 --------- inc/view_manager/view_factory.h | 1 - res/edje/emergency_stop.edc | 80 ----------------------------- res/edje/racing.edc | 77 ++++++++++++++++++++++++++- src/controller/controller_emergency_stop.c | 52 ------------------- src/controller/controller_racing.c | 2 +- src/view/view_emergency_stop.c | 73 -------------------------- src/view/view_racing.c | 23 +++++++-- src/view_manager/view_factory.c | 4 -- 12 files changed, 97 insertions(+), 266 deletions(-) delete mode 100644 edje/images/stop.png create mode 100644 edje/images/stop_button.png delete mode 100644 inc/controller/controller_emergency_stop.h delete mode 100644 inc/view/view_emergency_stop.h delete mode 100644 res/edje/emergency_stop.edc delete mode 100644 src/controller/controller_emergency_stop.c delete mode 100644 src/view/view_emergency_stop.c diff --git a/edje/images/stop.png b/edje/images/stop.png deleted file mode 100644 index 4a86084c8e17ee97694c7c5898debaa344905aa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14472 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 O04fR^@^x=4!u}7&wtO`J diff --git a/edje/images/stop_button.png b/edje/images/stop_button.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2718f9b8eada80c9cc778d1de37b57765ebc25 GIT binary patch literal 20700 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 B1kwNi literal 0 HcmV?d00001 diff --git a/inc/controller/controller_emergency_stop.h b/inc/controller/controller_emergency_stop.h deleted file mode 100644 index 69de7c4..0000000 --- a/inc/controller/controller_emergency_stop.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -* Copyright (c) 2018 Samsung Electronics Co., Ltd. -* -* Licensed under the Flora License, Version 1.1 (the License); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://floralicense.org/license/ -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an AS IS BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - - -#ifndef CONTROLLER_CONTROLLER_EMERGENCY_STOP_H_ -#define CONTROLLER_CONTROLLER_EMERGENCY_STOP_H_ - -#include "controller/controller_base.h" - -void controller_emergency_stop_init(t_view_update_cb view_update_cb); -void controller_emergency_stop_destroy(void); -void controller_emergency_stop_back(void); -void controller_emergency_stop_next(); - -#endif /* CONTROLLER_CONTROLLER_EMERGENCY_STOP_H_ */ diff --git a/inc/view/view_emergency_stop.h b/inc/view/view_emergency_stop.h deleted file mode 100644 index 015c45a..0000000 --- a/inc/view/view_emergency_stop.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2018 Samsung Electronics Co., Ltd. -* -* Licensed under the Flora License, Version 1.1 (the License); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://floralicense.org/license/ -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an AS IS BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - - -#ifndef VIEW_VIEW_EMERGENCY_STOP_H_ -#define VIEW_VIEW_EMERGENCY_STOP_H_ - -s_view_base *view_emergency_stop_init(Evas_Object *parent); - -#endif /* VIEW_VIEW_EMERGENCY_STOP_H_ */ diff --git a/inc/view_manager/view_factory.h b/inc/view_manager/view_factory.h index 06a3327..29e36a9 100644 --- a/inc/view_manager/view_factory.h +++ b/inc/view_manager/view_factory.h @@ -26,7 +26,6 @@ typedef enum _e_view_id { VIEW_NAME_INPUT, VIEW_HELP, VIEW_RACING, - VIEW_EMERGENCY_STOP, VIEW_RESET, VIEW_NETWORK_FAILURE, } view_id; diff --git a/res/edje/emergency_stop.edc b/res/edje/emergency_stop.edc deleted file mode 100644 index a9ff7aa..0000000 --- a/res/edje/emergency_stop.edc +++ /dev/null @@ -1,80 +0,0 @@ -collections { - base_scale: 1.0; - group { "main"; - images { - image: "racing_bg.png" COMP; - image: "stop.png" COMP; - - } - parts { - image { "bg"; - desc { "default"; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - image.normal: "racing_bg.png"; - aspect: 1 1; - aspect_preference: BOTH; - } - } - image { "stop"; - scale: 1; - desc { "default"; - rel1.relative: 0.2638 0.2638; - rel2.relative: 0.7361 0.7361; - image.normal: "stop.png"; - align: 0.5 0.5; - } - desc { "pressed"; - inherit: "default"; - rel1.relative: 0.0833 0.0833; - rel2.relative: 0.9166 0.9166; - } - } - text { "text"; - scale: 1; - effect: SOFT_OUTLINE; - repeat_events: 1; - desc { "default"; - color: 248 238 204 255; - color2: 248 238 204 128; - visible: 1; - text { - size: 36; - font: "SamsungOne"; - text: "STOP"; - align: 0.5 0.5; - min: 0 0; - } - align: 0.5 0.5; - rel1.relative: 0.00 0.00; - rel2.relative: 1.00 1.00; - } - } - } - programs { - program { - signal: "mouse,down,*"; - source: "stop"; - - sequence { - action: STATE_SET "pressed"; - target: "stop"; - transition: LINEAR 2.0; - - action: SIGNAL_EMIT "pressed" ""; - }; - } - program { - signal: "mouse,up,*"; - source: "stop"; - - sequence { - action: STATE_SET "default"; - target: "stop"; - - action: SIGNAL_EMIT "released" ""; - } - } - } - } -} diff --git a/res/edje/racing.edc b/res/edje/racing.edc index 08dd74c..efbc4fb 100644 --- a/res/edje/racing.edc +++ b/res/edje/racing.edc @@ -3,6 +3,7 @@ collections { group { "main"; images { image: "racing_bg.png" COMP; + image: "stop_button.png" COMP; } parts { image { "bg"; @@ -14,12 +15,86 @@ collections { aspect_preference: BOTH; } } + image { "stop"; + scale: 1; + desc { "default"; + visible: 0; + image.normal: "stop_button.png"; + rel1.relative: 0.2638 0.2638; + rel2.relative: 0.7361 0.7361; + align: 0.5 0.5; + } + desc { "released"; + inherit: "default"; + visible: 1; + } + desc { "pressed"; + inherit: "released"; + rel1.relative: 0.0833 0.0833; + rel2.relative: 0.9166 0.9166; + } + } + text { "stop_text"; + scale: 1; + effect: SOFT_OUTLINE; + repeat_events: 1; + desc { "default"; + color: 248 238 204 255; + color2: 248 238 204 128; + visible: 0; + text { + size: 36; + font: "SamsungOne"; + text: "STOP"; + align: 0.5 0.5; + min: 0 0; + } + align: 0.5 0.5; + rel1.relative: 0.00 0.00; + rel2.relative: 1.00 1.00; + } + desc { "released"; + inherit: "default"; + visible: 1; + } + } } programs { program { signal: "mouse,clicked,*"; source: "bg"; - action: SIGNAL_EMIT "clicked" ""; + sequence { + action: SIGNAL_EMIT "bg_clicked" ""; + + action: STATE_SET "released"; + target: "stop"; + target: "stop_text"; + } + + } + program { + signal: "mouse,down,*"; + source: "stop"; + + sequence { + action: STATE_SET "pressed"; + target: "stop"; + transition: LINEAR 2.0; + + action: SIGNAL_EMIT "stop_pressed" ""; + }; + } + program { + signal: "mouse,up,*"; + source: "stop"; + + sequence { + action: STATE_SET "default"; + target: "stop"; + target: "stop_text"; + + action: SIGNAL_EMIT "stop_released" ""; + } } } } diff --git a/src/controller/controller_emergency_stop.c b/src/controller/controller_emergency_stop.c deleted file mode 100644 index 4c30335..0000000 --- a/src/controller/controller_emergency_stop.c +++ /dev/null @@ -1,52 +0,0 @@ -/* -* Copyright (c) 2018 Samsung Electronics Co., Ltd. -* -* Licensed under the Flora License, Version 1.1 (the License); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://floralicense.org/license/ -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an AS IS BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - - - -#include "gear-racing-controller.h" -#include "model/model_cloud_connection.h" -#include "controller/controller_emergency_stop.h" -#include "view_manager/view_manager.h" - -static s_controller s_info = { 0, }; - -void controller_emergency_stop_destroy(void) -{ - model_cloud_connection_unsubscirbe_event(); -} - -static void _connected_cb(s_model_cloud_connection_cb_data *model_data) -{ - view_manager_set_view(VIEW_RESET); -} - -void controller_emergency_stop_init(t_view_update_cb view_update_cb) -{ - s_info.view_update_cb = view_update_cb; - model_cloud_connection_subscribe_event(_connected_cb); -} - -void controller_emergency_stop_back(void) -{ - controller_emergency_stop_destroy(); - view_manager_set_view(VIEW_RACING); -} - -void controller_emergency_stop_next() -{ - model_cloud_connection_connect(); -} - diff --git a/src/controller/controller_racing.c b/src/controller/controller_racing.c index 502fdab..ae6896d 100644 --- a/src/controller/controller_racing.c +++ b/src/controller/controller_racing.c @@ -35,7 +35,7 @@ void controller_racing_destroy(void) static void _model_connected_cb(s_model_cloud_connection_cb_data *model_data) { - view_manager_set_view(VIEW_EMERGENCY_STOP); + view_manager_set_view(VIEW_RESET); } static void _sensors_cb(s_model_sensors_cb_data *model_data) diff --git a/src/view/view_emergency_stop.c b/src/view/view_emergency_stop.c deleted file mode 100644 index 57256da..0000000 --- a/src/view/view_emergency_stop.c +++ /dev/null @@ -1,73 +0,0 @@ -/* -* Copyright (c) 2018 Samsung Electronics Co., Ltd. -* -* Licensed under the Flora License, Version 1.1 (the License); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://floralicense.org/license/ -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an AS IS BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - - -#include "view/view_base.h" -#include "view/view_emergency_stop.h" -#include "view_manager/view_manager.h" -#include "controller/controller_emergency_stop.h" - -typedef struct _s_view_emergency_stop { - s_view_base view_base; - - bool stop_pressed; -} s_view_emergency_stop; - -static s_view_emergency_stop s_info = { {0,}, }; - -void _longpress_ok(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - s_info.stop_pressed = true; - controller_emergency_stop_next(); -} - -void _logpress_up(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - if (!s_info.stop_pressed) { - } - - s_info.stop_pressed = false; -} - -static void _view_emergency_stop_create_gui(Evas_Object *parent) -{ - s_info.view_base.view = view_base_create_layout(parent, "edje/emergency_stop.edj", GRP_MAIN); - elm_layout_text_set(s_info.view_base.view, "txt_title", "Emergency Stop"); - - elm_layout_signal_callback_add(s_info.view_base.view, "pressed", "", _longpress_ok, NULL); - elm_layout_signal_callback_add(s_info.view_base.view, "released", "", _logpress_up, NULL); -} - -static void _show_cb(void) -{ - //TODO: on show stuff -} - -static void _hide_cb(void) -{ - controller_emergency_stop_destroy(); -} - -s_view_base *view_emergency_stop_init(Evas_Object *parent) -{ - s_info.view_base.show_cb = _show_cb; - s_info.view_base.hide_cb = _hide_cb; - - controller_emergency_stop_init(NULL); - _view_emergency_stop_create_gui(parent); - - return &s_info.view_base; -} diff --git a/src/view/view_racing.c b/src/view/view_racing.c index f116b91..e709cc8 100644 --- a/src/view/view_racing.c +++ b/src/view/view_racing.c @@ -30,6 +30,8 @@ typedef struct _s_view_racing { float dir_max_angle; float vel_min_angle; float vel_max_angle; + + bool stop_pressed; } s_view_racing; static s_view_racing s_info = { @@ -102,9 +104,21 @@ static void _controller_cb(void *data) void _racing_screen_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) { + evas_object_hide(s_info.velocity); + evas_object_hide(s_info.direction); +} + +void _stop_longpress_down(void *data, Evas_Object *obj, const char *emission, const char *source) +{ controller_racing_next(); } +void _stop_logpress_up(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + evas_object_show(s_info.velocity); + evas_object_show(s_info.direction); +} + static void _view_racing_create_gui(Evas_Object *parent) { s_info.view_base.view = view_base_create_layout(parent, "edje/racing.edj", GRP_MAIN); @@ -121,7 +135,10 @@ static void _view_racing_create_gui(Evas_Object *parent) "images/circle.png", HORIZONTAL_ALIGN_CENTER, VERTICAL_ALIGN_TOP); evas_object_event_callback_add(s_info.view_base.view, EVAS_CALLBACK_DEL, _view_destroyed_cb, NULL); - elm_layout_signal_callback_add(s_info.view_base.view, "clicked", "", _racing_screen_clicked_cb, NULL); + elm_layout_signal_callback_add(s_info.view_base.view, "bg_clicked", "", _racing_screen_clicked_cb, NULL); + + elm_layout_signal_callback_add(s_info.view_base.view, "stop_pressed", "", _stop_longpress_down, NULL); + elm_layout_signal_callback_add(s_info.view_base.view, "stop_released", "", _stop_logpress_up, NULL); } static void _show_cb(void) @@ -132,8 +149,8 @@ static void _show_cb(void) static void _hide_cb(void) { - evas_object_hide(s_info.velocity); - evas_object_hide(s_info.direction); + evas_object_del(s_info.velocity); + evas_object_del(s_info.direction); controller_racing_destroy(); } diff --git a/src/view_manager/view_factory.c b/src/view_manager/view_factory.c index d2f88cf..693aa09 100644 --- a/src/view_manager/view_factory.c +++ b/src/view_manager/view_factory.c @@ -18,7 +18,6 @@ #include "view/view_connect_to_car.h" #include "view/view_car_selection.h" #include "view/view_connection_successed.h" -#include "view/view_emergency_stop.h" #include "view/view_help.h" #include "view/view_name_input.h" #include "view/view_network_failure.h" @@ -49,9 +48,6 @@ s_view_base *view_factory_create_view(Evas_Object *parent, Eext_Circle_Surface * case VIEW_RACING: view = view_racing_init(parent); break; - case VIEW_EMERGENCY_STOP: - view = view_emergency_stop_init(parent); - break; case VIEW_RESET: view = view_reset_init(parent); break; -- 2.7.4