Skip to content

Commit 0524488

Browse files
committed
allow extrinsic file without perspective data
1 parent f2fdce1 commit 0524488

4 files changed

Lines changed: 6 additions & 16 deletions

File tree

motion_analysis_2d/display_items/tracker_item.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ def set_tracker_pos(self, name, frame_i, bbox_all, target_all):
444444
target.setPos((roi.pos()[0] + offset[0], roi.pos()[1] + offset[1]))
445445
roi.blockSignals(False)
446446
target.blockSignals(False)
447-
logger.trace(f"Tracker move pos are not available.")
447+
logger.debug(f"Tracker move pos are not available.")
448448
else:
449449
bbox_pos = bbox_i[:2]
450450
bbox_size = bbox_i[2:]
@@ -460,7 +460,7 @@ def set_tracker_pos(self, name, frame_i, bbox_all, target_all):
460460
self._items["offset"][i] = [
461461
round(a) for a in target.pos() - self.calc_centre_roi(roi)
462462
]
463-
logger.trace(f"Tracker {name} moved.")
463+
logger.debug(f"Tracker {name} moved.")
464464

465465
if len(children) > 0:
466466
for child_name, child_type in children:

motion_analysis_2d/display_widgets/frame_widget.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ def set_image(self, img, raw=False):
254254
self.img = cv.cvtColor(img, cv.COLOR_BGR2RGB)
255255
self.im_item.setImage(self.img)
256256

257-
logger.trace(f"Set image.")
257+
logger.debug(f"Set image.")
258258

259259
def update_frame(self, img, frame_no, t_sec):
260260
self.set_image(img)
261261
self.update_frame_label(frame_no, t_sec)
262-
logger.trace(f"Frame updated.")
262+
logger.debug(f"Frame updated.")
263263

264264
def add_frame_label(self):
265265
frame_label = pg.TextItem(
@@ -278,7 +278,7 @@ def update_frame_label(self, frame_no, time, fps=None):
278278
self.frame_label.setText(
279279
f"Frame: {frame_no}\n" f"Time: {time:.2f} s\n" f"FPS: {fps:.0f}\n"
280280
)
281-
logger.trace(f"Frame label updated: {frame_no}.")
281+
logger.debug(f"Frame label updated: {frame_no}.")
282282

283283
def update_scaling(self, scaling):
284284
self.scaling = scaling

motion_analysis_2d/funcs/logger_setup.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33

44
from motion_analysis_2d.defs import log_file
55

6-
# add trace level
7-
logging.TRACE = 5
8-
logging.addLevelName(logging.TRACE, "TRACE")
9-
logging.Logger.trace = lambda inst, msg, *args, **kwargs: inst.log(
10-
logging.trace, msg, *args, **kwargs
11-
)
12-
logging.trace = lambda msg, *args, **kwargs: logging.log(
13-
logging.TRACE, msg, *args, **kwargs
14-
)
15-
166

177
def setup_logger(name, logging_level=logging.INFO):
188
formatter = logging.Formatter("%(asctime)s %(name)s %(levelname)s: %(message)s")

motion_analysis_2d/workers/worker_stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def set_intrinsic_prop(self, cal_ok, map_x, map_y):
174174
self.intrinsic_prop = None
175175

176176
def set_extrinsic_prop(self, cal_ok, trans_mat, output_size):
177-
if cal_ok:
177+
if cal_ok and trans_mat is not None and output_size is not None:
178178
self.extrinsic_prop = (trans_mat, output_size)
179179
else:
180180
self.extrinsic_prop = None

0 commit comments

Comments
 (0)