From c5a7690163895a3978347e9877499afb404bf751 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Tue, 10 Dec 2019 10:56:16 +0200 Subject: [PATCH 01/14] Update image_detect.py --- YOLOv3-custom-training/image_detect.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/YOLOv3-custom-training/image_detect.py b/YOLOv3-custom-training/image_detect.py index 621932c..b520df2 100644 --- a/YOLOv3-custom-training/image_detect.py +++ b/YOLOv3-custom-training/image_detect.py @@ -14,8 +14,7 @@ class YOLO(object): _defaults = { - #"model_path": 'logs/trained_weights_final.h5', - "model_path": 'logs/000/trained_weights_final.h5', + "model_path": 'logs/trained_weights_final.h5', "anchors_path": 'model_data/yolo_anchors.txt', "classes_path": '4_CLASS_test_classes.txt', "score" : 0.3, From 676c9e18d239f21e713d6343c1f3026858935485 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 10 Jan 2020 10:11:27 +0200 Subject: [PATCH 02/14] Update image_detect.py --- YOLOv3-custom-training/image_detect.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/YOLOv3-custom-training/image_detect.py b/YOLOv3-custom-training/image_detect.py index b520df2..1e7c27b 100644 --- a/YOLOv3-custom-training/image_detect.py +++ b/YOLOv3-custom-training/image_detect.py @@ -164,5 +164,7 @@ def detect_img(self, image): r_image, ObjectsList = yolo.detect_img(image) #print(ObjectsList) cv2.imshow(image, r_image) - + if cv2.waitKey(25) & 0xFF == ord("q"): + cv2.destroyAllWindows() + return yolo.close_session() From ee875643cf971d6c67eca1be98c1121ad6c3bb79 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 10 Jan 2020 10:12:11 +0200 Subject: [PATCH 03/14] Update realtime_detect.py --- YOLOv3-custom-training/realtime_detect.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/YOLOv3-custom-training/realtime_detect.py b/YOLOv3-custom-training/realtime_detect.py index 38df5f9..7d036fc 100644 --- a/YOLOv3-custom-training/realtime_detect.py +++ b/YOLOv3-custom-training/realtime_detect.py @@ -197,6 +197,9 @@ def SHOWMSS_screen(p_output): r_image, ObjectsList = yolo.detect_image(img) cv2.imshow("YOLO v3", r_image) + if cv2.waitKey(25) & 0xFF == ord("q"): + cv2.destroyAllWindows() + return fps+=1 TIME = time.time() - start_time if (TIME) >= display_time : From 3f8bf9e33e60ba65d4629a5a241c1a6b76a09106 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 10 Jan 2020 10:13:05 +0200 Subject: [PATCH 04/14] Update image_detect.py --- YOLOv3-CSGO-detection/image_detect.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/YOLOv3-CSGO-detection/image_detect.py b/YOLOv3-CSGO-detection/image_detect.py index a809082..b5d0b73 100644 --- a/YOLOv3-CSGO-detection/image_detect.py +++ b/YOLOv3-CSGO-detection/image_detect.py @@ -277,6 +277,9 @@ def CreateXMLfile(image, ObjectsList): if len(ObjectsList) > 0: CreateXMLfile(cv2.imread(image), ObjectsList) cv2.imshow(image, r_image) + if cv2.waitKey(25) & 0xFF == ord("q"): + cv2.destroyAllWindows() + return cv2.imwrite('home_detection.jpg', r_image) yolo.close_session() From b7dd9e84868a32e3076be2386be65d164a340d1f Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Sun, 12 Jan 2020 16:49:48 +0200 Subject: [PATCH 05/14] Update image_detect.py --- YOLOv3-custom-training/image_detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YOLOv3-custom-training/image_detect.py b/YOLOv3-custom-training/image_detect.py index 1e7c27b..ec38ca4 100644 --- a/YOLOv3-custom-training/image_detect.py +++ b/YOLOv3-custom-training/image_detect.py @@ -166,5 +166,5 @@ def detect_img(self, image): cv2.imshow(image, r_image) if cv2.waitKey(25) & 0xFF == ord("q"): cv2.destroyAllWindows() - return + break yolo.close_session() From c7b0aa66c8b9304c2e4def788887f665e1ef12ed Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Sun, 12 Jan 2020 16:50:45 +0200 Subject: [PATCH 06/14] Update image_detect.py --- YOLOv3-CSGO-detection/image_detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YOLOv3-CSGO-detection/image_detect.py b/YOLOv3-CSGO-detection/image_detect.py index b5d0b73..968696e 100644 --- a/YOLOv3-CSGO-detection/image_detect.py +++ b/YOLOv3-CSGO-detection/image_detect.py @@ -279,7 +279,7 @@ def CreateXMLfile(image, ObjectsList): cv2.imshow(image, r_image) if cv2.waitKey(25) & 0xFF == ord("q"): cv2.destroyAllWindows() - return + break cv2.imwrite('home_detection.jpg', r_image) yolo.close_session() From ada73906c74a83af764144beafb17edc1f701679 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 24 Jan 2020 12:18:03 +0200 Subject: [PATCH 07/14] Update image_detect.py --- YOLOv3-custom-training/image_detect.py | 1 - 1 file changed, 1 deletion(-) diff --git a/YOLOv3-custom-training/image_detect.py b/YOLOv3-custom-training/image_detect.py index ec38ca4..b0dfd16 100644 --- a/YOLOv3-custom-training/image_detect.py +++ b/YOLOv3-custom-training/image_detect.py @@ -166,5 +166,4 @@ def detect_img(self, image): cv2.imshow(image, r_image) if cv2.waitKey(25) & 0xFF == ord("q"): cv2.destroyAllWindows() - break yolo.close_session() From e08dee590f7b1d36a6caf9f9af2cff39476dc77e Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 24 Jan 2020 12:19:01 +0200 Subject: [PATCH 08/14] Update image_detect.py --- YOLOv3-CSGO-detection/image_detect.py | 1 - 1 file changed, 1 deletion(-) diff --git a/YOLOv3-CSGO-detection/image_detect.py b/YOLOv3-CSGO-detection/image_detect.py index 968696e..f3f9db9 100644 --- a/YOLOv3-CSGO-detection/image_detect.py +++ b/YOLOv3-CSGO-detection/image_detect.py @@ -279,7 +279,6 @@ def CreateXMLfile(image, ObjectsList): cv2.imshow(image, r_image) if cv2.waitKey(25) & 0xFF == ord("q"): cv2.destroyAllWindows() - break cv2.imwrite('home_detection.jpg', r_image) yolo.close_session() From c3ef8b8f3189ac0d1ad5fe53ffab321160c1da09 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Wed, 26 Feb 2020 12:09:40 +0200 Subject: [PATCH 09/14] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index f931a88..45dcc17 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,9 @@ How to use YOLO v3 with webcam:
https://pylessons.com/YOLOv3-WebCam/

In future will update readme file + +Requirements: +TensorFlow 1.15 +Keras 2.2.4 +Numpy (all versions should work) +opencv-python (all versions should work) From f965e2f822e45b86b443e702ba8ed34545e546c2 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Wed, 26 Feb 2020 17:08:21 +0200 Subject: [PATCH 10/14] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 45dcc17..e7ee804 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ https://pylessons.com/YOLOv3-WebCam/

In future will update readme file -Requirements: -TensorFlow 1.15 -Keras 2.2.4 -Numpy (all versions should work) -opencv-python (all versions should work) +Requirements:
+TensorFlow 1.15
+Keras 2.2.4
+Numpy (all versions should work)
+opencv-python (all versions should work)
From 1f6cd6c17f9899b4a3b820b00f9287139bf809a2 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 3 Apr 2020 13:47:56 +0300 Subject: [PATCH 11/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7ee804..5e99b65 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ https://pylessons.com/YOLOv3-WebCam/

In future will update readme file -Requirements:
+Requirements:
TensorFlow 1.15
Keras 2.2.4
Numpy (all versions should work)
From 11231295dc29232edaa1304726815134d3fbd2ca Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 15 May 2020 10:43:43 +0300 Subject: [PATCH 12/14] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5e99b65..925082f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# Right now writing detailed YOLO v3 tutorials for TensorFlow 2.x +Detection and custom training process works better and is more accurate: +https://github.com/pythonlessons/TensorFlow-2.x-YOLOv3 + # YOLOv3-object-detection-tutorial More information:
From 9a7d3d25db95c09cebd88499f7047434f5a81924 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Fri, 15 May 2020 10:44:09 +0300 Subject: [PATCH 13/14] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 925082f..6ac7d7e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Right now writing detailed YOLO v3 tutorials for TensorFlow 2.x -Detection and custom training process works better and is more accurate: +# Right now writing detailed YOLO v3 tutorials for TensorFlow 2.x
+Detection and custom training process works better and is more accurate:
https://github.com/pythonlessons/TensorFlow-2.x-YOLOv3 # YOLOv3-object-detection-tutorial From bdc8233d77fa3c08470557bd4c5d209f87f0bdc4 Mon Sep 17 00:00:00 2001 From: pythonlessons <43852392+pythonlessons@users.noreply.github.com> Date: Wed, 15 Jul 2020 16:11:56 +0300 Subject: [PATCH 14/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ac7d7e..35eb090 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Right now writing detailed YOLO v3 tutorials for TensorFlow 2.x
-Detection and custom training process works better and is more accurate:
+Detection and custom training process works better, is more accurate and has more planned features to do:
https://github.com/pythonlessons/TensorFlow-2.x-YOLOv3 # YOLOv3-object-detection-tutorial