Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pose bbox bugs #94

Merged
merged 1 commit into from
Mar 17, 2023
Merged

Fix pose bbox bugs #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified facemap/gui/ops_user.npy
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions facemap/pose/pose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ def pose_prediction_setup(self):
self.bbox.append([x1, x2, y1, y2])

# Update resize and add padding flags
if x2 - x1 != y2 - y1:
if x2 - x1 != y2 - y1: # if not a square frame view then add padding
self.add_padding = True
if x2 - x1 != 256 or y2 - y1 != 256:
if x2 - x1 != 256 or y2 - y1 != 256: # if not 256x256 then resize
self.resize = True
prompt = (
"No bbox set. Using entire frame view: {} and resize={}".format(
Expand Down
41 changes: 29 additions & 12 deletions facemap/pose/pose_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import numpy as np
import pyqtgraph as pg
from PyQt5 import QtCore
from matplotlib import cm
from PyQt5.QtWidgets import (
QDesktopWidget,
Expand Down Expand Up @@ -53,21 +54,21 @@ def draw_user_bbox(self):
def plot_bbox_roi(self):
# Plot bbox on GUI
for i, bbox in enumerate(self.bbox):
x1, x2, y1, y2 = bbox
y1, y2, x1, x2 = bbox
dy, dx = y2 - y1, x2 - x1
xrange = np.arange(y1 + self.gui.sx[i], y2 + self.gui.sx[i]).astype(
xrange = np.arange(x1 + self.gui.sx[i], x2 + self.gui.sx[i]).astype(
np.int32
)
yrange = np.arange(x1 + self.gui.sy[i], x2 + self.gui.sy[i]).astype(
yrange = np.arange(y1 + self.gui.sy[i], y2 + self.gui.sy[i]).astype(
np.int32
)
x1, y1 = yrange[0], xrange[0]
y1, x1 = yrange[0], xrange[0]
self.gui.add_ROI(
roitype=4 + 1,
roistr="bbox_{}".format(i),
moveable=False,
resizable=False,
pos=(x1, y1, dx, dy),
pos=(y1, x1, dy, dx),
ivid=i,
yrange=yrange,
xrange=xrange,
Expand All @@ -82,6 +83,10 @@ def adjust_bbox(self):
dy, dx = y2 - y1, x2 - x1
if dx != dy: # If bbox is not square then add padding to image
self.add_padding = True
if dy != 256 or dx != 256: # If bbox is not 256, 256 then resize image
self.resize = True
self.bbox[i] = x1, x2, y1, y2
"""
larger_dim = max(dx, dy)
if larger_dim < self.img_xy[0] or larger_dim < self.img_xy[1]:
# If the largest dimension of the image is smaller than the minimum required dimension,
Expand All @@ -96,6 +101,7 @@ def adjust_bbox(self):
y_dims=(y1, y2),
)
self.bbox[i] = x1, x2, y1, y2
"""
print("BBOX after adjustment:", self.bbox)
print("RESIZE:", self.resize)
print("PADDING:", self.add_padding)
Expand All @@ -105,7 +111,7 @@ class ROI_popup(QDialog):
def __init__(self, frame, video_id, gui, pose, last_video):
super().__init__()
window_max_size = QDesktopWidget().screenGeometry(-1)
fraction = 0.3
fraction = 0.5
aspect_ratio = 1.5
self.resize(
int(np.floor(window_max_size.width() * fraction)),
Expand All @@ -121,11 +127,19 @@ def __init__(self, frame, video_id, gui, pose, last_video):
self.verticalLayout = QVBoxLayout(self)
self.win = pg.GraphicsLayoutWidget()
self.win.setObjectName("Dialog " + str(video_id + 1))
ROI_win = self.win.addViewBox(invertY=True)
# fix image in ROI window
ROI_win = self.win.addViewBox(invertY=True, lockAspect=True, enableMouse=False)
self.img = pg.ImageItem(self.frame)
ROI_win.addItem(self.img)
shape_y, shape_x = self.frame.shape[0], self.frame.shape[1]
ROI_win.setRange(xRange=[0, shape_x], yRange=[0, shape_y])
self.roi = pg.RectROI(
[0, 0], [100, 100], pen=pg.mkPen("r", width=2), movable=True, resizable=True
[0, 0],
[int(np.floor(0.6 * shape_x)), int(np.floor(0.5 * shape_y))],
pen=pg.mkPen("r", width=2),
movable=True,
resizable=True,
maxBounds=QtCore.QRectF(0, 0, shape_x, shape_y),
)
ROI_win.addItem(self.roi)
self.win.show()
Expand Down Expand Up @@ -162,7 +176,10 @@ def __init__(self, frame, video_id, gui, pose, last_video):
self.exec_()

def get_coordinates(self):
print("self.frame shape:", self.frame.shape)
print("self.img shape:", self.img.shape)
roi_tuple, _ = self.roi.getArraySlice(self.frame, self.img, returnSlice=False)
print("roi_tuple:", roi_tuple)
(x1, x2), (y1, y2) = roi_tuple[0], roi_tuple[1]
return (x1, x2), (y1, y2)

Expand All @@ -172,8 +189,8 @@ def skip_exec(self):
self.close()

def next_exec(self):
(x1, x2), (y1, y2) = self.get_coordinates()
self.pose.bbox.append([x1, x2, y1, y2])
(y1, y2), (x1, x2) = self.get_coordinates()
self.pose.bbox.append([y1, y2, x1, x2])
self.resize = False
self.add_padding = False
self.pose.adjust_bbox()
Expand All @@ -185,8 +202,8 @@ def cancel_exec(self):

def done_exec(self):
# User finished drawing ROI
(x1, x2), (y1, y2) = self.get_coordinates()
self.pose.bbox.append([x1, x2, y1, y2])
(y1, y2), (x1, x2) = self.get_coordinates()
self.pose.bbox.append([y1, y2, x1, x2])
self.resize = False
self.add_padding = False
self.pose.plot_bbox_roi()
Expand Down