Skip to content

Bump cellier #15

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

Merged
kevinyamauchi merged 2 commits into from
Jun 13, 2026
Merged

Bump cellier #15

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
b4cdece
update cellier API
kevinyamauchi Jun 13, 2026
724cde9
bump cellier
kevinyamauchi Jun 13, 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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies = [
"typer >= 0.12",
"rich >= 13",
"numpy >= 1.24",
"cellier[pyside]>=0.0.21",
"cellier[pyside]>=0.0.22",
"jupyterlab>=4.5.6",
"aiohttp >= 3.9",
"zarr >= 3.0",
Expand Down
60 changes: 29 additions & 31 deletions src/oz_viewer/viewer/_orthoviewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,11 @@ def __init__(

def _init_sc_controls(self) -> None:
"""Create and connect single-channel slider/combo widgets."""
from cellier.v2.gui.visuals._colormap import QtColormapComboBox
from cellier.v2.gui.visuals._contrast_limits import QtClimRangeSlider
from cellier.v2.gui.visuals._image import QtVolumeRenderControls
from cellier.gui.visuals import (
QtClimRangeSlider,
QtColormapComboBox,
QtVolumeRenderControls,
)

visuals = self._visuals
controller = self._controller
Expand Down Expand Up @@ -731,8 +733,7 @@ def _on_mode_toggle(self) -> None:
# ------------------------------------------------------------------

def _build_multichannel(self) -> None:
from cellier.v2.visuals._channel_appearance import ChannelAppearance
from cellier.v2.visuals._image import MultiscaleImageRenderConfig
from cellier.visuals import ChannelAppearance, MultiscaleImageRenderConfig

initial_clim_max = self._clim_range[1]
colormaps = _DEFAULT_COLORMAPS
Expand Down Expand Up @@ -793,7 +794,7 @@ def _build_multichannel(self) -> None:

def _build_single_channel(self) -> None:
"""Hot-add SC visuals and build the page-0 controls panel."""
from cellier.v2.visuals._image import (
from cellier.visuals import (
MultiscaleImageAppearance,
MultiscaleImageRenderConfig,
)
Expand Down Expand Up @@ -1128,9 +1129,9 @@ def _make_axis_meshes(
spatial_axes: tuple[int, int, int],
n_dims: int,
) -> tuple:
from cellier.v2.data.mesh._mesh_memory_store import MeshMemoryStore
from cellier.v2.transform import AffineTransform
from cellier.v2.visuals._mesh_memory import MeshFlatAppearance
from cellier.data.mesh import MeshMemoryStore
from cellier.transform import AffineTransform
from cellier.visuals import MeshFlatAppearance

color_z = _PLANE_COLOR_XY
color_y = _PLANE_COLOR_XZ
Expand Down Expand Up @@ -1251,8 +1252,8 @@ def _make_plane_mesh(
spatial_axes: tuple[int, int, int] = (0, 1, 2),
n_dims: int = 3,
):
from cellier.v2.data.mesh._mesh_memory_store import MeshMemoryStore
from cellier.v2.visuals._mesh_memory import MeshFlatAppearance
from cellier.data.mesh import MeshMemoryStore
from cellier.visuals import MeshFlatAppearance

positions = _make_plane_positions(
z_world,
Expand Down Expand Up @@ -1430,7 +1431,7 @@ def on_channel_changed(self, new_ch: int) -> None:
self._update_3d()

def _update_3d(self) -> None:
from cellier.v2.transform import AffineTransform
from cellier.transform import AffineTransform

for visual_id, centre_nd in zip(
(self._xy_axis_visual_id, self._xz_axis_visual_id, self._yz_axis_visual_id),
Expand Down Expand Up @@ -1594,29 +1595,29 @@ def build_ortho_viewer_model(

Returns
-------
tuple[cellier.v2.viewer_model.ViewerModel, int | None]
tuple[cellier.viewer_model.ViewerModel, int | None]
``(viewer_model, effective_channel_axis)`` where ``effective_channel_axis``
is the resolved channel axis index (auto-detected or user-supplied) or
``None`` when no channel axis is present.
"""
import yaozarrs
from cellier.v2.data.image import OMEZarrImageDataStore
from cellier.v2.scene.cameras import (
from cellier.data.image import OMEZarrImageDataStore
from cellier.scene.cameras import (
OrbitCameraController,
OrthographicCamera,
PanZoomCameraController,
PerspectiveCamera,
)
from cellier.v2.scene.canvas import Canvas
from cellier.v2.scene.dims import (
from cellier.scene.canvas import Canvas
from cellier.scene.dims import (
AxisAlignedSelection,
CoordinateSystem,
DimsManager,
)
from cellier.v2.scene.scene import Scene
from cellier.v2.transform import AffineTransform
from cellier.v2.viewer_model import DataManager, ViewerModel
from cellier.v2.visuals._image import (
from cellier.scene.scene import Scene
from cellier.transform import AffineTransform
from cellier.viewer_model import DataManager, ViewerModel
from cellier.visuals import (
MultiscaleImageAppearance,
MultiscaleImageRenderConfig,
MultiscaleImageVisual,
Expand Down Expand Up @@ -2100,17 +2101,14 @@ def _build_and_show(
_perf_mark(perf, "viewer.build.start", theme=theme)
apply_theme(QApplication.instance(), theme)
_perf_mark(perf, "viewer.build.theme_applied")
from cellier.v2.controller import CellierController
from cellier.v2.gui._scene import QtCanvasWidget, QtDimsSliders
from cellier.v2.render._config import (
from cellier.controller import CellierController
from cellier.gui import QtCanvasWidget, QtDimsSliders
from cellier.render import (
RenderManagerConfig,
SlicingConfig,
TemporalAccumulationConfig,
)
from cellier.v2.visuals._canvas_overlay import (
CenteredAxes2D,
CenteredAxes2DAppearance,
)
from cellier.visuals import CenteredAxes2D, CenteredAxes2DAppearance

# User-supplied channel_axis drives the initial mode.
# Auto-detected channel axes always start in single-channel mode with the
Expand Down Expand Up @@ -2167,8 +2165,8 @@ def _first_visual(scene):
initial_multichannel_visual_ids: list | None = None
initial_channel_appearances: dict | None = None
if initial_mode == "multichannel" and effective_channel_axis is not None:
from cellier.v2.visuals._channel_appearance import ChannelAppearance
from cellier.v2.visuals._image import MultiscaleImageRenderConfig as _MC_RCfg
from cellier.visuals import ChannelAppearance
from cellier.visuals import MultiscaleImageRenderConfig as _MC_RCfg

colormaps = _DEFAULT_COLORMAPS
initial_channel_appearances = {
Expand Down Expand Up @@ -2567,7 +2565,7 @@ def eventFilter(self, watched, event):
if spatial_ndim == 3:
# Seed 3D orientation with post-fit camera state
def _seed_camera_event(scene_id):
from cellier.v2.events._events import CameraChangedEvent
from cellier.events import CameraChangedEvent

canvas_view = controller.get_canvas_view(
controller.get_canvas_ids(scene_id)[0]
Expand Down
35 changes: 18 additions & 17 deletions src/oz_viewer/viewer/_viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ def __init__(
geometry: _ViewerGeometry,
data_store=None,
) -> None:
from cellier.v2.gui.visuals._colormap import QtColormapComboBox
from cellier.v2.gui.visuals._contrast_limits import QtClimRangeSlider
from cellier.v2.gui.visuals._image import QtVolumeRenderControls
from cellier.gui.visuals import (
QtClimRangeSlider,
QtColormapComboBox,
QtVolumeRenderControls,
)
from PySide6 import QtCore, QtWidgets
from PySide6.QtWidgets import QStackedWidget

Expand Down Expand Up @@ -415,8 +417,7 @@ def _set_mc_visible(self, visible: bool) -> None:
ch.visible = visible

def _build_mc_visual(self) -> None:
from cellier.v2.visuals._channel_appearance import ChannelAppearance
from cellier.v2.visuals._image import MultiscaleImageRenderConfig
from cellier.visuals import ChannelAppearance, MultiscaleImageRenderConfig

geo = self._geo
channel_appearances = {
Expand Down Expand Up @@ -491,26 +492,26 @@ def build_viewer_model(

Returns
-------
tuple[cellier.v2.viewer_model.ViewerModel, _ViewerGeometry]
tuple[cellier.viewer_model.ViewerModel, _ViewerGeometry]
"""
import yaozarrs
from cellier.v2.data.image import OMEZarrImageDataStore
from cellier.v2.scene.cameras import (
from cellier.data.image import OMEZarrImageDataStore
from cellier.scene.cameras import (
OrbitCameraController,
OrthographicCamera,
PanZoomCameraController,
PerspectiveCamera,
)
from cellier.v2.scene.canvas import Canvas
from cellier.v2.scene.dims import (
from cellier.scene.canvas import Canvas
from cellier.scene.dims import (
AxisAlignedSelection,
CoordinateSystem,
DimsManager,
)
from cellier.v2.scene.scene import Scene
from cellier.v2.transform import AffineTransform
from cellier.v2.viewer_model import DataManager, ViewerModel
from cellier.v2.visuals._image import (
from cellier.scene.scene import Scene
from cellier.transform import AffineTransform
from cellier.viewer_model import DataManager, ViewerModel
from cellier.visuals import (
MultiscaleImageAppearance,
MultiscaleImageRenderConfig,
MultiscaleImageVisual,
Expand Down Expand Up @@ -841,9 +842,9 @@ def _build_and_show_viewer(
apply_theme(QApplication.instance(), theme)
_perf_mark(perf, "viewer.build.theme_applied")

from cellier.v2.controller import CellierController
from cellier.v2.gui._scene import QtCanvasWidget
from cellier.v2.render._config import (
from cellier.controller import CellierController
from cellier.gui import QtCanvasWidget
from cellier.render import (
RenderManagerConfig,
SlicingConfig,
TemporalAccumulationConfig,
Expand Down
12 changes: 6 additions & 6 deletions src/oz_viewer/viewer/_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(
decimals: int = 2,
parent=None,
) -> None:
from cellier.v2.events import AppearanceUpdateEvent
from cellier.events import AppearanceUpdateEvent
from qtpy.QtCore import Qt
from superqt import QLabeledDoubleRangeSlider

Expand Down Expand Up @@ -87,7 +87,7 @@ def _on_visual_changed(self, event) -> None:
self._slider.blockSignals(False)

def subscription_specs(self) -> list:
from cellier.v2.events import AppearanceChangedEvent, SubscriptionSpec
from cellier.events import AppearanceChangedEvent, SubscriptionSpec

if not self._visual_ids:
return []
Expand Down Expand Up @@ -122,7 +122,7 @@ def __init__(
initial_colormap,
parent=None,
) -> None:
from cellier.v2.events import AppearanceUpdateEvent
from cellier.events import AppearanceUpdateEvent
from superqt import QColormapComboBox

self._id = uuid4()
Expand Down Expand Up @@ -155,7 +155,7 @@ def _on_visual_changed(self, event) -> None:
self._combo.blockSignals(False)

def subscription_specs(self) -> list:
from cellier.v2.events import AppearanceChangedEvent, SubscriptionSpec
from cellier.events import AppearanceChangedEvent, SubscriptionSpec

if not self._visual_ids:
return []
Expand Down Expand Up @@ -192,7 +192,7 @@ def __init__(
decimals: int = 2,
parent=None,
) -> None:
from cellier.v2.events import AppearanceUpdateEvent
from cellier.events import AppearanceUpdateEvent
from qtpy.QtCore import Qt
from superqt import QLabeledDoubleSlider

Expand Down Expand Up @@ -230,7 +230,7 @@ def _on_visual_changed(self, event) -> None:
self._slider.blockSignals(False)

def subscription_specs(self) -> list:
from cellier.v2.events import AppearanceChangedEvent, SubscriptionSpec
from cellier.events import AppearanceChangedEvent, SubscriptionSpec

if not self._visual_ids:
return []
Expand Down
Loading