")
try:
- self.frame_apply[data_ix] = frame_apply[data_ix]
+ self._frame_apply[data_ix] = frame_apply[data_ix]
except Exception:
raise IndexError(
f"key index {data_ix} out of bounds for `frame_apply`, the bounds are 0 - {len(self.data)}"
@@ -521,14 +534,14 @@ def __init__(
f"you have passed a: <{type(frame_apply)}>"
)
+ # current_index stores {dimension_index: slice_index} for every dimension
+ self._current_index: Dict[str, int] = {sax: 0 for sax in self.slider_dims}
+
self._window_funcs = None
self.window_funcs = window_funcs
self._sliders: Dict[str, Any] = dict()
- # current_index stores {dimension_index: slice_index} for every dimension
- self._current_index: Dict[str, int] = {sax: 0 for sax in self.slider_dims}
-
# get max bound for all data arrays for all dimensions
self._dims_max_bounds: Dict[str, int] = {k: np.inf for k in self.slider_dims}
for _dim in list(self._dims_max_bounds.keys()):
@@ -537,7 +550,7 @@ def __init__(
self._dims_max_bounds[_dim], array.shape[order.index(_dim)]
)
- grid_plot_kwargs_default = {"controllers": "sync"}
+ grid_plot_kwargs_default = {"controller_ids": "sync"}
if grid_plot_kwargs is None:
grid_plot_kwargs = dict()
@@ -575,6 +588,19 @@ def __init__(
self.block_sliders = False
self._image_widget_toolbar = None
+ @property
+ def frame_apply(self) -> Union[dict, None]:
+ return self._frame_apply
+
+ @frame_apply.setter
+ def frame_apply(self, frame_apply: Dict[int, callable]):
+ if frame_apply is None:
+ frame_apply = dict()
+
+ self._frame_apply = frame_apply
+ # force update image graphic
+ self.current_index = self.current_index
+
@property
def window_funcs(self) -> Dict[str, _WindowFunctions]:
"""
@@ -591,6 +617,8 @@ def window_funcs(self) -> Dict[str, _WindowFunctions]:
def window_funcs(self, sa: Union[int, Dict[str, int]]):
if sa is None:
self._window_funcs = None
+ # force frame to update
+ self.current_index = self.current_index
return
# for a single dim
@@ -606,7 +634,7 @@ def window_funcs(self, sa: Union[int, Dict[str, int]]):
dim_str = self.slider_dims[0]
self._window_funcs = dict()
- self._window_funcs[dim_str] = _WindowFunctions(*sa)
+ self._window_funcs[dim_str] = _WindowFunctions(self, *sa)
# for multiple dims
elif isinstance(sa, dict):
@@ -636,7 +664,7 @@ def window_funcs(self, sa: Union[int, Dict[str, int]]):
if sa[k] is None:
self._window_funcs[k] = None
else:
- self._window_funcs[k] = _WindowFunctions(*sa[k])
+ self._window_funcs[k] = _WindowFunctions(self, *sa[k])
else:
raise TypeError(
@@ -644,6 +672,9 @@ def window_funcs(self, sa: Union[int, Dict[str, int]]):
f"You have passed a {type(sa)}. See the docstring."
)
+ # force frame to update
+ self.current_index = self.current_index
+
def _process_indices(
self, array: np.ndarray, slice_indices: Dict[Union[int, str], int]
) -> np.ndarray:
@@ -750,14 +781,14 @@ def _get_window_indices(self, data_ix, dim, indices_dim):
return indices_dim
def _process_frame_apply(self, array, data_ix) -> np.ndarray:
- if callable(self.frame_apply):
- return self.frame_apply(array)
+ if callable(self._frame_apply):
+ return self._frame_apply(array)
- if data_ix not in self.frame_apply.keys():
+ if data_ix not in self._frame_apply.keys():
return array
- elif self.frame_apply[data_ix] is not None:
- return self.frame_apply[data_ix](array)
+ elif self._frame_apply[data_ix] is not None:
+ return self._frame_apply[data_ix](array)
return array
@@ -783,8 +814,14 @@ def reset_vmin_vmax_frame(self):
ImageGraphic instead of the data in the full data array. For example, if a post-processing
function is used, the range of values in the ImageGraphic can be very different from the
range of values in the full data array.
+
+ TODO: We could think of applying the frame_apply funcs to a subsample of the entire array to get a better estimate of vmin vmax?
"""
+
for subplot in self.gridplot:
+ if "histogram_lut" not in subplot.docks["right"]:
+ continue
+
hlut = subplot.docks["right"]["histogram_lut"]
# set the data using the current image graphic data
hlut.set_data(subplot["image_widget_managed"].data())
@@ -854,6 +891,7 @@ def set_data(
frame = self._process_frame_apply(frame, i)
new_graphic = ImageGraphic(data=frame, name="image_widget_managed")
subplot.insert_graphic(graphic=new_graphic)
+ subplot.docks["right"]["histogram_lut"].image_graphic = new_graphic
if new_array.ndim > 2:
# to set max of time slider, txy or tzxy
@@ -876,11 +914,12 @@ def set_data(
def show(self, toolbar: bool = True, sidecar: bool = False, sidecar_kwargs: dict = None):
"""
- Show the widget
+ Show the widget.
Returns
-------
OutputContext
+ ImageWidget just uses the Gridplot output context
"""
if self.gridplot.canvas.__class__.__name__ == "JupyterWgpuCanvas":
self._image_widget_toolbar = IpywidgetImageWidgetToolbar(self)
@@ -888,13 +927,15 @@ def show(self, toolbar: bool = True, sidecar: bool = False, sidecar_kwargs: dict
elif self.gridplot.canvas.__class__.__name__ == "QWgpuCanvas":
self._image_widget_toolbar = QToolbarImageWidget(self)
- return self.gridplot.show(
+ self._output = self.gridplot.show(
toolbar=toolbar,
sidecar=sidecar,
sidecar_kwargs=sidecar_kwargs,
add_widgets=[self._image_widget_toolbar]
)
+ return self._output
+
def close(self):
"""Close Widget"""
self.gridplot.close()
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index d0bc814f2..000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-numpy
-jupyterlab
-jupyter_rfb
-pygfx>=0.1.10
-imageio
\ No newline at end of file
diff --git a/setup.py b/setup.py
index f7195461c..8e8977b57 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
"pytest",
"nbmake",
"scipy",
- "imageio",
+ "imageio[pyav]",
"jupyterlab",
"jupyter-rfb>=0.4.1",
"ipywidgets>=8.0.0,<9",
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy
