Skip to content

Commit 40df9e8

Browse files
committed
Fix NoneType error and add logs
1 parent 94eb99e commit 40df9e8

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

exports/flat/flat_export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def save_frame(self, frame, predicted_frames, cv2, labels_and_boxes, labeled_fra
6262
f'{self.result_dir_path}/{unix_time}.png',
6363
frame)
6464

65-
if labeled_frame.any():
65+
if labeled_frame is not None:
6666
os.makedirs(self.result_labeled_dir_path, exist_ok=True)
6767

6868
cv2.imwrite(

exports/yolov8/yolov8_export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def save_frame(self, frame, predicted_frames, cv2, labels_and_boxes, labeled_fra
7575
f'{self.image_dir_path}/{unix_time}.png',
7676
frame)
7777

78-
if labeled_frame.any():
78+
if labeled_frame is not None:
7979
os.makedirs(self.result_labeled_dir_path, exist_ok=True)
8080

8181
cv2.imwrite(

projects/base_project.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def create_proj_save_dir(self):
4444
_cur_dir = pdirname(pabspath(__file__))
4545
self.proj_dir = pjoin(_cur_dir, f'../data/{self.name}')
4646
self.proj_dir = pabspath(self.proj_dir) # normalise the link
47-
print(f'1. Created/Found project folder under {self.proj_dir} path')
47+
print(f'3. Created/Found project folder under {self.proj_dir} path')
4848

4949
def connect_models(self):
5050
"""

projects/helmet/helmet_project.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def __init__(self):
2727
super().__init__()
2828
self._config = self.__read_config__(config_path)
2929
self.temp_path = self._config.get('temp')
30-
self.min_width = int(self._config.get('min_width')) if self._config.get('min_width') else 0
31-
self.min_height = int(self._config.get('min_height')) if self._config.get('min_height') else 0
30+
self.min_width = int(self._config.get('min_width', '0'))
31+
self.min_height = int(self._config.get('min_height', '0'))
3232
self.models, self.models_allowed_classes = self.connect_models()
3333
self.mapping = self.class_mapping(self.models)
3434
self.create_proj_save_dir()
@@ -83,7 +83,7 @@ def class_mapping(self, models):
8383
result = []
8484

8585
# Iterate through each class index in model_classes[0]
86-
for i, class_index in enumerate(model_classes[0]):
86+
for class_index in model_classes[0]:
8787
class_name = model_names[0][class_index] # Get the class name from the first model
8888

8989
# Create a list to store the mapping for this class
@@ -140,6 +140,6 @@ def connect_models(self):
140140
if not models:
141141
raise ModuleNotFoundError('Model not found!')
142142

143-
print(f'2. Using device: {self.device}')
144-
print(f"3. Using {len(models)} models: {[model_name for model_name in self._config.get('models')]}")
143+
print(f'1. Using device: {self.device}')
144+
print(f"2. Using {len(models)} models: {[model_name for model_name in self._config.get('models')]}")
145145
return models, models_allowed_classes

services/harvest_service.py

+1
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def predict_frame(self, frame, skip_frames_counter):
225225
if condition_met:
226226
self.predicted_frames = self.export.save_frame(frame, self.predicted_frames, cv2, labels_and_boxes, labeled_frame)
227227
skip_frames_counter = self._var.FRAMES_SKIP_AFTER_DETECT
228+
print(f'5.3. Done, skipping the next {self._var.FRAMES_SKIP_AFTER_DETECT} frames')
228229
print(f'Currently in frame: {self.frame_number}')
229230
self.frame_number += 1
230231
return skip_frames_counter

0 commit comments

Comments
 (0)