From 2dfebb38e16d1c4ba6cd58461a4efc61d1d9814e Mon Sep 17 00:00:00 2001 From: RM Date: Thu, 19 Jul 2018 19:19:49 +0200 Subject: [PATCH] Undo functionality added --- .gitignore | 6 ++++++ main.cpp | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2244ce63 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# Build files +/CMakeCache.txt +/CMakeFiles/ +/Makefile +/cmake_install.cmake +/yolo_mark \ No newline at end of file diff --git a/main.cpp b/main.cpp index 5a67087a..df12428f 100644 --- a/main.cpp +++ b/main.cpp @@ -41,7 +41,7 @@ std::atomic clear_marks; std::atomic x_start, y_start; std::atomic x_end, y_end; std::atomic x_size, y_size; -std::atomic draw_select, selected; +std::atomic draw_select, selected, undo; std::atomic add_id_img; Rect prev_img_rect(0, 0, 50, 100); @@ -472,6 +472,11 @@ int main(int argc, char *argv[]) rectangle(frame, rect_dst, color, 2); } + if (undo) { + undo = false; + full_image.copyTo(full_image_roi); + current_coord_vec.pop_back(); + } if (selected) { @@ -656,6 +661,10 @@ int main(int argc, char *argv[]) switch (pressed_key) { + case 122: // z + undo = true; + break; + case 32: // SPACE case 1048608: // SPACE ++trackbar_value;