sync Merge branch 'dev' of https://github.com/MouseLand/facemap into dev

Author: Atika-Syeda

.github/workflows/test_and_deploy.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - main
+      - dev
     tags:
       - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
   pull_request:
@@ -20,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest, windows-latest, macos-13]
         python-version: [3.8, 3.9, "3.10"]
 
     steps:

facemap/.github/workflows/test_and_deploy.yml

@@ -20,7 +20,8 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest]
+        #, windows-latest, macos-latest]
         python-version: [3.8, 3.9, "3.10"]
 
     steps:

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)
@@ -1240,16 +1240,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"]

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: