From e06af50389f849be0bfe4fa97d39f4519ef2c711 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Fri, 18 Jan 2019 11:00:18 +0100 Subject: change to cli_proc --- megapixels/app/models/bbox.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'megapixels/app/models/bbox.py') diff --git a/megapixels/app/models/bbox.py b/megapixels/app/models/bbox.py index 608aaaf8..8ecc8971 100644 --- a/megapixels/app/models/bbox.py +++ b/megapixels/app/models/bbox.py @@ -252,11 +252,14 @@ class BBox: # Create from @classmethod - def from_xywh_norm(cls, x, y, w, h): + def from_xywh_norm_dim(cls, x, y, w, h, dim): """Converts w, y, w, h to normalized BBox :returns BBox """ - return cls(x, y, x + w, y + h) + x1, y1 = (x * dim[0], y * dim[1]) + x2, y2 = (w * dim[0]) + x1, (h * dim[1]) + y1 + rect = cls.normalize(cls, (x1, y1, x2, y2), dim) + return cls(*rect) @classmethod def from_xyxy_dim(cls, x1, y1, x2, y2, dim): -- cgit v1.2.3-70-g09d2