From c81863e4dafbff89e124a6e8c189a3ae71ee62a1 Mon Sep 17 00:00:00 2001 From: Bassiouny Date: Thu, 21 Jan 2016 21:39:26 +0200 Subject: [PATCH 1/2] fix waitkey comparisons --- src/misc_utilities/classifychars.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/misc_utilities/classifychars.cpp b/src/misc_utilities/classifychars.cpp index 0f2d226..4836bc3 100644 --- a/src/misc_utilities/classifychars.cpp +++ b/src/misc_utilities/classifychars.cpp @@ -182,25 +182,25 @@ int main( int argc, const char** argv ) curDashboardSelection--; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if (waitkey == RIGHT_ARROW_KEY) // right arrow key + else if ((char)waitkey == RIGHT_ARROW_KEY) // right arrow key { if (curDashboardSelection < pipeline_data.thresholds.size() - 1) curDashboardSelection++; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if (waitkey == DOWN_ARROW_KEY) + else if ((char)waitkey == DOWN_ARROW_KEY) { if (curDashboardSelection + DASHBOARD_COLUMNS <= pipeline_data.thresholds.size() - 1) curDashboardSelection += DASHBOARD_COLUMNS; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if (waitkey == UP_ARROW_KEY) + else if ((char)waitkey == UP_ARROW_KEY) { if (curDashboardSelection - DASHBOARD_COLUMNS >= 0) curDashboardSelection -= DASHBOARD_COLUMNS; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if (waitkey == ENTER_KEY_ONE || waitkey == ENTER_KEY_TWO) + else if ((char)waitkey == ENTER_KEY_ONE || (char)waitkey == ENTER_KEY_TWO) { if (pipeline_data.charRegionsFlat.size() > 0) { From 08d418d3f0e0d6af9c416d0bc6f7561b8a7f06fe Mon Sep 17 00:00:00 2001 From: Ahmed Bassiouny Date: Sat, 23 Jan 2016 04:43:13 +0200 Subject: [PATCH 2/2] update int keys values for linux. To be verified Sunday. --- src/misc_utilities/classifychars.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/misc_utilities/classifychars.cpp b/src/misc_utilities/classifychars.cpp index 4836bc3..f9eb641 100644 --- a/src/misc_utilities/classifychars.cpp +++ b/src/misc_utilities/classifychars.cpp @@ -50,20 +50,24 @@ const int RIGHT_ARROW_KEY = 2555904; const int DOWN_ARROW_KEY = 2621440; const int UP_ARROW_KEY = 2490368; + +const int ENTER_KEY_ONE = 13; +const int ENTER_KEY_TWO = 10; #else -const int LEFT_ARROW_KEY = 81; -const int RIGHT_ARROW_KEY = 83; +const int LEFT_ARROW_KEY = 1113937; +const int RIGHT_ARROW_KEY = 1113939; -const int DOWN_ARROW_KEY = 84; -const int UP_ARROW_KEY= 82; +const int DOWN_ARROW_KEY = 1113940; +const int UP_ARROW_KEY= 1113938; +const int ENTER_KEY_ONE = 1048586; +const int ENTER_KEY_TWO = 1048586; #endif const string SPACE = " "; const int SPACE_KEY = 32; const int ESCAPE_KEY = 27; -const int ENTER_KEY_ONE = 13; -const int ENTER_KEY_TWO = 10; + const int DASHBOARD_COLUMNS = 3; void showDashboard(vector images, vector selectedImages, int selectedIndex); @@ -182,25 +186,25 @@ int main( int argc, const char** argv ) curDashboardSelection--; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if ((char)waitkey == RIGHT_ARROW_KEY) // right arrow key + else if (waitkey == RIGHT_ARROW_KEY) // right arrow key { if (curDashboardSelection < pipeline_data.thresholds.size() - 1) curDashboardSelection++; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if ((char)waitkey == DOWN_ARROW_KEY) + else if (waitkey == DOWN_ARROW_KEY) { if (curDashboardSelection + DASHBOARD_COLUMNS <= pipeline_data.thresholds.size() - 1) curDashboardSelection += DASHBOARD_COLUMNS; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if ((char)waitkey == UP_ARROW_KEY) + else if (waitkey == UP_ARROW_KEY) { if (curDashboardSelection - DASHBOARD_COLUMNS >= 0) curDashboardSelection -= DASHBOARD_COLUMNS; showDashboard(pipeline_data.thresholds, selectedBoxes, curDashboardSelection); } - else if ((char)waitkey == ENTER_KEY_ONE || (char)waitkey == ENTER_KEY_TWO) + else if (waitkey == ENTER_KEY_ONE || waitkey == ENTER_KEY_TWO) { if (pipeline_data.charRegionsFlat.size() > 0) {