Add check_imshow() (#2231)
* Add check_imshow() * Update general.py * Update general.py
This commit is contained in:
1 parent
f8464b4f66
commit
26c2e54c8f
2 files changed
+17
-4
No files matched your search
@@ -9,8 +9,8 @@ from numpy import random
|
|||||||
|
|
||||||
from models.experimental import attempt_load
|
from models.experimental import attempt_load
|
||||||
from utils.datasets import LoadStreams, LoadImages
|
from utils.datasets import LoadStreams, LoadImages
|
||||||
from utils.general import check_img_size, check_requirements, non_max_suppression, apply_classifier, scale_coords, \
|
from utils.general import check_img_size, check_requirements, check_imshow, non_max_suppression, apply_classifier, \
|
||||||
xyxy2xywh, strip_optimizer, set_logging, increment_path
|
scale_coords, xyxy2xywh, strip_optimizer, set_logging, increment_path
|
||||||
from utils.plots import plot_one_box
|
from utils.plots import plot_one_box
|
||||||
from utils.torch_utils import select_device, load_classifier, time_synchronized
|
from utils.torch_utils import select_device, load_classifier, time_synchronized
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ def detect(save_img=False):
|
|||||||
# Set Dataloader
|
# Set Dataloader
|
||||||
vid_path, vid_writer = None, None
|
vid_path, vid_writer = None, None
|
||||||
if webcam:
|
if webcam:
|
||||||
view_img = True
|
view_img = check_imshow()
|
||||||
cudnn.benchmark = True # set True to speed up constant image size inference
|
cudnn.benchmark = True # set True to speed up constant image size inference
|
||||||
dataset = LoadStreams(source, img_size=imgsz, stride=stride)
|
dataset = LoadStreams(source, img_size=imgsz, stride=stride)
|
||||||
else:
|
else:
|
||||||
@@ -118,7 +118,7 @@ def detect(save_img=False):
|
|||||||
# Stream results
|
# Stream results
|
||||||
if view_img:
|
if view_img:
|
||||||
cv2.imshow(str(p), im0)
|
cv2.imshow(str(p), im0)
|
||||||
cv2.waitKey(1) # 1 millisecond
|
cv2.waitKey(1) # 1 millisecond
|
||||||
|
|
||||||
# Save results (image with detections)
|
# Save results (image with detections)
|
||||||
if save_img:
|
if save_img:
|
||||||
|
|||||||
@@ -95,6 +95,19 @@ def check_img_size(img_size, s=32):
|
|||||||
return new_size
|
return new_size
|
||||||
|
|
||||||
|
|
||||||
|
def check_imshow():
|
||||||
|
# Check if environment supports image displays
|
||||||
|
try:
|
||||||
|
cv2.imshow('test', np.zeros((1, 1, 3)))
|
||||||
|
cv2.waitKey(1)
|
||||||
|
cv2.destroyAllWindows()
|
||||||
|
cv2.waitKey(1)
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
print(f'WARNING: Environment does not support cv2.imshow() or PIL Image.show() image previews\n{e}')
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def check_file(file):
|
def check_file(file):
|
||||||
# Search for file if not found
|
# Search for file if not found
|
||||||
if os.path.isfile(file) or file == '':
|
if os.path.isfile(file) or file == '':
|
||||||
|
|||||||
Reference in new issue
Block a user