From 993e6b18966af927563398e04c516a6fcafd8123 Mon Sep 17 00:00:00 2001 From: Wei Shuai Date: Wed, 7 Feb 2018 12:05:03 +0800 Subject: tracker/wii: enhance user friendly UI 1. add wii status wii_cam_wait_for_sync 2. add images show how user should do in preview window 3. reduce redundancy convertion about QImage by doing in WIIPreview Class --- tracker-wii/wii_frame.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tracker-wii/wii_frame.hpp') diff --git a/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp index 2bffa862..3ad23734 100644 --- a/tracker-wii/wii_frame.hpp +++ b/tracker-wii/wii_frame.hpp @@ -16,7 +16,7 @@ namespace pt_module { -enum wii_camera_status : unsigned { wii_cam_wait_for_connect, wii_cam_data_no_change, wii_cam_data_change }; +enum wii_camera_status : unsigned { wii_cam_wait_for_sync, wii_cam_wait_for_connect, wii_cam_data_no_change, wii_cam_data_change }; struct wii_info_points { unsigned ux; @@ -59,6 +59,7 @@ private: bool fresh = true; cv::Mat frame_copy, frame_color, frame_resize, frame_out; + wii_camera_status status; }; } // ns pt_module -- cgit v1.2.3 From b62f4a94932785203ad133565575bc5cf0f0f408 Mon Sep 17 00:00:00 2001 From: Wei Shuai Date: Thu, 8 Feb 2018 06:45:52 +0800 Subject: tracker/wii: enhance friendly UI 1. add new status wii_cam_wait_for_dongle 2. show "insert USB dongle" in preview window --- tracker-wii/wii_camera.cpp | 2 +- tracker-wii/wii_frame.cpp | 2 ++ tracker-wii/wii_frame.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tracker-wii/wii_frame.hpp') diff --git a/tracker-wii/wii_camera.cpp b/tracker-wii/wii_camera.cpp index 9b6da4e1..1186afc1 100644 --- a/tracker-wii/wii_camera.cpp +++ b/tracker-wii/wii_camera.cpp @@ -115,7 +115,7 @@ wii_camera_status WIICamera::_pair() bt_param.dwSize = sizeof(bt_param); hbt = BluetoothFindFirstRadio(&bt_param, hbtlist + ibtidx); - if (!hbt) { return ret; } + if (!hbt) { ret = wii_cam_wait_for_dongle; return ret; } do { ibtidx++; diff --git a/tracker-wii/wii_frame.cpp b/tracker-wii/wii_frame.cpp index 16bcfab2..9332a704 100644 --- a/tracker-wii/wii_frame.cpp +++ b/tracker-wii/wii_frame.cpp @@ -50,6 +50,8 @@ WIIPreview::WIIPreview(int w, int h) QImage WIIPreview::get_bitmap() { switch (status) { + case wii_cam_wait_for_dongle: + return QImage(":/Resources/usb.png"); case wii_cam_wait_for_sync: return QImage(":/Resources/sync.png"); case wii_cam_wait_for_connect: diff --git a/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp index 3ad23734..31967d10 100644 --- a/tracker-wii/wii_frame.hpp +++ b/tracker-wii/wii_frame.hpp @@ -16,7 +16,7 @@ namespace pt_module { -enum wii_camera_status : unsigned { wii_cam_wait_for_sync, wii_cam_wait_for_connect, wii_cam_data_no_change, wii_cam_data_change }; +enum wii_camera_status : unsigned { wii_cam_wait_for_dongle, wii_cam_wait_for_sync, wii_cam_wait_for_connect, wii_cam_data_no_change, wii_cam_data_change }; struct wii_info_points { unsigned ux; -- cgit v1.2.3