Skip to content

Add sync toggle and opposite-view ROI outline #1241

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

Open
SomeKindOfDuck wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add sync toggle and opposite-view ROI outline #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9934802
Add sync toggle for cell and not-cell views
SomeKindOfDuck May 23, 2026
bdc0910
Show selected ROI outline in opposite view
SomeKindOfDuck May 25, 2026
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
12 changes: 4 additions & 8 deletions suite2p/gui/buttons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ def press(self, parent, bid):
parent.p1.setYRange(self.yrange[0], self.yrange[1])
parent.p2.setXRange(self.xrange[0], self.xrange[1])
parent.p2.setYRange(self.yrange[0], self.yrange[1])
parent.p2.setXLink("plot1")
parent.p2.setYLink("plot1")
parent.update_roi_view_sync(source_view=parent.p1)
parent.show()


Expand All @@ -124,20 +123,17 @@ def press(self, parent):
bid = self.bid
ts = 100
if bid == 0:
parent.p2.linkView(parent.p2.XAxis, view=None)
parent.p2.linkView(parent.p2.YAxis, view=None)
parent.win.ci.layout.setColumnStretchFactor(0, ts)
parent.win.ci.layout.setColumnStretchFactor(1, 0)
parent.update_roi_view_sync(source_view=parent.p2)
elif bid == 1:
parent.win.ci.layout.setColumnStretchFactor(0, ts)
parent.win.ci.layout.setColumnStretchFactor(1, ts)
parent.p2.setXLink("plot1")
parent.p2.setYLink("plot1")
parent.update_roi_view_sync(source_view=parent.p1)
elif bid == 2:
parent.p2.linkView(parent.p2.XAxis, view=None)
parent.p2.linkView(parent.p2.YAxis, view=None)
parent.win.ci.layout.setColumnStretchFactor(0, 0)
parent.win.ci.layout.setColumnStretchFactor(1, ts)
parent.update_roi_view_sync(source_view=parent.p1)
# only enable selection buttons when not in "both" view
if bid != 1:
if parent.ops_plot["color"] != 0:
Expand Down
14 changes: 6 additions & 8 deletions suite2p/gui/graphics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ def __init__(self, parent=None, border=None, lockAspect=False, enableMouse=True,
self.menu = ViewBoxMenu(self)
self.name = name
self.parent = parent
if self.name == "plot2":
self.setXLink(parent.p1)
self.setYLink(parent.p1)

# set state
self.state["enableMenu"] = enableMenu
Expand All @@ -68,10 +65,12 @@ def mouseClickEvent(self, ev):
return
else:
if ev.button() == QtCore.Qt.RightButton:
if ichosen not in self.parent.imerge:
self.parent.imerge = [ichosen]
self.parent.ichosen = ichosen
self.parent.imerge = [ichosen]
self.parent.ichosen = ichosen
masks.flip_plot(self.parent)
self.parent.imerge = []
self.parent.ichosen = -1
self.parent.update_plot()
else:
merged = False
if ev.modifiers() == QtCore.Qt.ShiftModifier or ev.modifiers(
Expand Down Expand Up @@ -102,8 +101,7 @@ def mouseClickEvent(self, ev):
def zoom_plot(self):
self.setXRange(0, self.parent.ops["Lx"])
self.setYRange(0, self.parent.ops["Ly"])
self.parent.p2.setXLink(self.parent.p1)
self.parent.p2.setYLink(self.parent.p1)
self.parent.update_roi_view_sync(source_view=self)
self.parent.show()


Expand Down
62 changes: 62 additions & 0 deletions suite2p/gui/gui2p.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@ def make_buttons(self):
self.checkBoxN.setEnabled(False)
self.l0.addWidget(self.checkBoxN, b0, 18, 1, 2)

self.checkBoxSync = QCheckBox("sync views")
self.checkBoxSync.setStyleSheet("color: white;")
self.checkBoxSync.setToolTip(
"Synchronize panning and zooming between cell and not-cell views"
)
self.syncviews = False
self._syncing_roi_views = False
self._roi_view_sync_connected = False
self.checkBoxSync.stateChanged.connect(self.sync_views)
self.l0.addWidget(self.checkBoxSync, b0, 21, 1, 3)

return b0

def roi_text(self, state):
Expand Down Expand Up @@ -238,6 +249,57 @@ def zoom_cell(self, state):
self.zoomtocell = False
self.update_plot()

def sync_views(self, state):
self.syncviews = QtCore.Qt.CheckState(state) == QtCore.Qt.Checked
if self.loaded:
self.update_roi_view_sync()

def _mirror_roi_view_range(self, src, dst, force=False):
if self._syncing_roi_views:
return
if not force and not self.syncviews:
return

self._syncing_roi_views = True
try:
x_range, y_range = src.viewRange()
dst.setRange(xRange=x_range, yRange=y_range, padding=0)
finally:
self._syncing_roi_views = False

def update_roi_view_sync(self, source_view=None):
if not hasattr(self, "p1") or not hasattr(self, "p2"):
return
if source_view is None:
source_view = self.p1

self.p1.linkView(self.p1.XAxis, view=None)
self.p1.linkView(self.p1.YAxis, view=None)
self.p2.linkView(self.p2.XAxis, view=None)
self.p2.linkView(self.p2.YAxis, view=None)

if not self._roi_view_sync_connected:
self.p1.sigRangeChanged.connect(
lambda *_: self._mirror_roi_view_range(self.p1, self.p2)
)
self.p2.sigRangeChanged.connect(
lambda *_: self._mirror_roi_view_range(self.p2, self.p1)
)
self._roi_view_sync_connected = True

if not self.syncviews:
self.win.show()
self.show()
return

if source_view is self.p2:
self._mirror_roi_view_range(self.p2, self.p1, force=True)
else:
self._mirror_roi_view_range(self.p1, self.p2, force=True)

self.win.show()
self.show()

def make_graphics(self, b0):
##### -------- MAIN PLOTTING AREA ---------- ####################
self.win = pg.GraphicsLayoutWidget()
Expand Down
20 changes: 20 additions & 0 deletions suite2p/gui/masks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,25 @@ def draw_masks(parent): #settings, stat, settings_plot, iscell, ichosen):

if view == 0:
for n in parent.imerge:
wplot = int(1 - parent.iscell[n])
ypix = parent.stat[n]["ypix"].flatten()
xpix = parent.stat[n]["xpix"].flatten()
v = (parent.rois["iROI"][wplot][:, ypix, xpix] > -1).sum(axis=0) - 1
v = 1 - v / 3
M[wplot] = make_chosen_ROI(M[wplot], ypix, xpix, v)
opposite_plot = 1 - wplot
ycirc = parent.stat[n]["ycirc"]
xcirc = parent.stat[n]["xcirc"]
M[opposite_plot] = make_chosen_circle(
M[opposite_plot],
ycirc,
xcirc,
np.array([255, 0, 0], dtype=np.uint8),
1,
)
else:
for n in parent.imerge:
wplot = int(1 - parent.iscell[n])
ycirc = parent.stat[n]["ycirc"]
xcirc = parent.stat[n]["xcirc"]
ypix = parent.stat[n]["ypix"].flatten()
Expand All @@ -341,6 +353,14 @@ def draw_masks(parent): #settings, stat, settings_plot, iscell, ichosen):
col = parent.colors["cols"][color, n]
sat = 1
M[wplot] = make_chosen_circle(M[wplot], ycirc, xcirc, col, sat)
opposite_plot = 1 - wplot
M[opposite_plot] = make_chosen_circle(
M[opposite_plot],
ycirc,
xcirc,
np.array([255, 0, 0], dtype=np.uint8),
1,
)

return M[0], M[1]

Expand Down