From e82438620495544144c2b4c2f2459f7987989547 Mon Sep 17 00:00:00 2001 From: Carsen Stringer Date: Thu, 21 Nov 2024 10:42:44 -0500 Subject: [PATCH] enabling pupil only processing and turning off fullscreen --- facemap/gui/gui.py | 23 +++++++++++------------ facemap/process.py | 1 + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/facemap/gui/gui.py b/facemap/gui/gui.py index aad12c0..4d4b90c 100644 --- a/facemap/gui/gui.py +++ b/facemap/gui/gui.py @@ -74,7 +74,7 @@ def __init__( QtCore.QCoreApplication.setApplicationName("Facemap") pg.setConfigOptions(imageAxisOrder="row-major") - self.setGeometry(15, 5, 1470, 800)#(55, 5, 1470, 800) + self.setGeometry(15, 5, 1700, 800)#(55, 5, 1470, 800) self.setWindowTitle("Facemap") self.setStyleSheet("QMainWindow {background: 'black';}") self.styleUnpressed = ( @@ -120,7 +120,7 @@ def __init__( self.central_widget.setLayout(self.scene_grid_layout) # --- cells image self.sizeObject = QtGui.QGuiApplication.primaryScreen().availableGeometry() - self.resize(self.sizeObject.width(), self.sizeObject.height()) + #self.resize(self.sizeObject.width(), self.sizeObject.height()) self.video_window = pg.GraphicsLayoutWidget() self.video_window.viewport().setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, False) @@ -1238,16 +1238,15 @@ def process_batch(self): print(files) for file_idx, f in enumerate(files): proc = np.load(f, allow_pickle=True).item() - if proc["motSVD"] or proc["movSVD"]: - savename = process.run( - proc["filenames"], - motSVD=proc["motSVD"], - movSVD=proc["movSVD"], - GUIobject=QtWidgets, - proc=proc, - savepath=proc["save_path"], - ) - self.update_status_bar("Processed " + savename) + savename = process.run( + proc["filenames"], + motSVD=proc["motSVD"], + movSVD=proc["movSVD"], + GUIobject=QtWidgets, + proc=proc, + savepath=proc["save_path"], + ) + self.update_status_bar("Processed " + savename) if self.keypoints_checkbox.isChecked(): self.filenames = proc["filenames"] self.bbox = proc["pose_settings"]["bbox"] diff --git a/facemap/process.py b/facemap/process.py index 1d46e19..b688dac 100644 --- a/facemap/process.py +++ b/facemap/process.py @@ -710,6 +710,7 @@ def run( Lybin, Lxbin, iinds = binned_inds(Ly, Lx, sbin) LYbin, LXbin, sybin, sxbin = utils.video_placement(Lybin, Lxbin) + # number of mot/mov ROIs nroi = 0 if rois is not None: for r in rois: