Skip to content

feat(reader): use vtk implementation if available #156

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
jourdain wants to merge 10 commits into
base: main
Choose a base branch
from
Open

feat(reader): use vtk implementation if available #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b6043e
feat(reader): use vtk implementation if available
jourdain Jan 7, 2025
7e0dd77
feat(xarray): enable more tutorial dataset
jourdain Jan 8, 2025
fc06a32
feat(vtkreader): add initial integration if available
jourdain Jan 8, 2025
04eac6e
fix(vtkreader): need to set PAN3D_USE_VTK_XARRAY to enable reader
jourdain Jan 10, 2025
7159cb3
wip: cf reader
jourdain Jan 18, 2025
afc1236
wip: try to enable cell-data
jourdain Jan 18, 2025
85eae17
wip: integrate new python reader
jourdain Jan 23, 2025
891cef4
wip: cleaner reader
jourdain Jan 24, 2025
4edb1ab
wip: start supporting slicing
jourdain Jan 25, 2025
a8edf18
wip: more CF coverage with slicing
jourdain Jan 27, 2025
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
1 change: 1 addition & 0 deletions .codespellrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[codespell]
skip = CHANGELOG.md,tests/data/*
ignore-words-list = degreee
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_modules
.venv*
*.nc
*.data-origin.json
*.vtk

examples/jupyter/*.gif
site/*
Expand Down
23 changes: 8 additions & 15 deletions pan3d/catalogs/xarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,14 @@
# "name": "ASE_ice_velocity",
# "description": "MEaSUREs InSAR-Based Ice Velocity of the Amundsen Sea Embayment, Antarctica, Version 1",
# },
# -------------------------------------------------------------------------
# {
# "name": "rasm",
# "description": "Output of the Regional Arctic System Model (RASM)",
# },
# -------------------------------------------------------------------------
# {
# "name": "ROMS_example",
# "description": "Regional Ocean Model System (ROMS) output",
# },
# -------------------------------------------------------------------------
# {
# "name": "tiny",
# "description": "small synthetic dataset with a 1D data variable",
# },
{
"name": "rasm",
"description": "Output of the Regional Arctic System Model (RASM)",
},
{
"name": "ROMS_example",
"description": "Regional Ocean Model System (ROMS) output",
},
# -------------------------------------------------------------------------
# needs pandas[xarray]
# {
Expand Down
201 changes: 148 additions & 53 deletions pan3d/ui/preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from pan3d.ui.css import base, preview
from pan3d.ui.collapsible import CollapsableSection
from pan3d.xarray.cf.constants import Projection


class SummaryToolbar(v3.VCard):
Expand Down Expand Up @@ -226,6 +227,19 @@ def update_information(self, xr, available_arrays=None):
"value": f"[{xr[name].values[0]}, {xr[name].values[-1]}]",
}
)
elif len(shape) > 1:
attrs.append(
{
"key": "dims",
"value": f'({", ".join(xr[name].dims)})',
}
)
attrs.append(
{
"key": "shape",
"value": f'({", ".join([str(v) for v in xr[name].shape])})',
}
)
if name in data:
icon = "mdi-database"
order = 2
Expand Down Expand Up @@ -264,6 +278,7 @@ def __init__(self, source, update_rendering):
self.state.setdefault("max_time_width", 0)
self.state.setdefault("max_time_index_width", 0)
self.state.setdefault("dataset_bounds", [0, 1, 0, 1, 0, 1])
self.state.setdefault("projection_mode", "Spherical")

with self.content:
v3.VSelect(
Expand Down Expand Up @@ -528,10 +543,11 @@ def __init__(self, source, update_rendering):
size="sm",
classes="mx-2",
)
v3.VDivider()

# Slice steps
with v3.VTooltip(text="Level Of Details / Slice stepping"):
with v3.VTooltip(
text="Level Of Details / Slice stepping", v_if="axis_names.length"
):
with html.Template(v_slot_activator="{ props }"):
with v3.VRow(
v_bind="props",
Expand All @@ -542,7 +558,7 @@ def __init__(self, source, update_rendering):
"mdi-stairs",
classes="ml-2 text-medium-emphasis",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[0]"):
with v3.VCol(classes="pa-0", v_if="axis_names.length > 0"):
v3.VTextField(
v_model_number=("slice_x_step", 1),
hide_details=True,
Expand All @@ -553,7 +569,7 @@ def __init__(self, source, update_rendering):
raw_attrs=['min="1"'],
type="number",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[1]"):
with v3.VCol(classes="pa-0", v_if="axis_names.length > 1"):
v3.VTextField(
v_model_number=("slice_y_step", 1),
hide_details=True,
Expand All @@ -564,7 +580,7 @@ def __init__(self, source, update_rendering):
raw_attrs=['min="1"'],
type="number",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[2]"):
with v3.VCol(classes="pa-0", v_if="axis_names.length > 2"):
v3.VTextField(
v_model_number=("slice_z_step", 1),
hide_details=True,
Expand All @@ -576,63 +592,115 @@ def __init__(self, source, update_rendering):
type="number",
)

# Actor scaling
with v3.VTooltip(text="Representation scaling"):
# Projection mode + scaling
with v3.VTooltip(
text=(
"projection_mode === 'Spherical' ? `Spherical Projection: scaling=${spherical_scale} bias=${spherical_bias}` : 'Euclidean Projection'",
)
):
with html.Template(v_slot_activator="{ props }"):
with v3.VRow(
with v3.VCol(
v_bind="props",
no_gutter=True,
classes="align-center my-0 mx-0 border-b-thin",
classes="align-center pa-0 my-0 mx-0 border-b-thin",
):
v3.VIcon(
"mdi-ruler-square",
classes="ml-2 text-medium-emphasis",
v3.VSelect(
prepend_inner_icon=(
"projection_mode === 'Spherical' ? 'mdi-earth' : 'mdi-earth-box'",
),
v_model=("projection_mode", "Spherical"),
items=("['Spherical', 'Euclidean']",),
hide_details=True,
density="compact",
flat=True,
variant="solo",
classes="mx-n1",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[0]"):
v3.VTextField(
v_model=("scale_x", 1),
with v3.VCol(
no_gutter=True,
classes="align-center my-0 mx-0 pa-0",
v_if="projection_mode === 'Spherical'",
):
v3.VSlider(
prepend_icon="mdi-radius-outline",
v_model=("spherical_bias", 6378137),
min=1,
max=6378137,
step=100,
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
classes="mr-4",
end=self.server.controller.view_update,
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[1]"):
v3.VTextField(
v_model=("scale_y", 1),
v3.VSlider(
prepend_icon="mdi-magnify",
v_model=("spherical_scale", 100),
min=1,
max=1000,
step=20,
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
classes="mr-4",
end=self.server.controller.view_update,
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[2]"):
v3.VTextField(
v_model=("scale_z", 1),
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
with v3.VRow(
no_gutter=True,
classes="align-center my-0 mx-0",
v_else=True,
):
v3.VIcon(
"mdi-ruler-square",
classes="ml-2 text-medium-emphasis",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[0]"):
v3.VTextField(
v_model=("scale_x", 1),
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[1]"):
v3.VTextField(
v_model=("scale_y", 1),
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
)
with v3.VCol(classes="pa-0", v_if="axis_names?.[2]"):
v3.VTextField(
v_model=("scale_z", 1),
hide_details=True,
density="compact",
flat=True,
variant="solo",
reverse=True,
raw_attrs=[
'pattern="^\d*(\.\d)?$"', # noqa: W605
'min="0.001"',
'step="0.1"',
],
type="number",
)

# Time slider
with v3.VTooltip(
Expand Down Expand Up @@ -676,19 +744,29 @@ def update_from_source(self, source=None):
self.state.data_arrays_available = source.available_arrays
self.state.data_arrays = source.arrays
self.state.color_by = None
self.state.axis_names = [source.x, source.y, source.z]
self.state.axis_names = []
self.state.slice_extents = source.slice_extents
self.state.projection_mode = (
"Spherical"
if source.projection == Projection.SPHERICAL
else "Euclidean"
)
self.state.spherical_bias = source.vertical_bias
self.state.spherical_scale = source.vertical_scale
slices = source.slices
for axis in XYZ:
for idx, name in enumerate(self.state.slice_extents):
axis = XYZ[idx]
self.state.axis_names.append(name)
self.state.dirty("axis_names")
# default
axis_extent = self.state.slice_extents.get(getattr(source, axis))
axis_extent = self.state.slice_extents.get(name)
self.state[f"slice_{axis}_range"] = axis_extent
self.state[f"slice_{axis}_cut"] = 0
self.state[f"slice_{axis}_step"] = 1
self.state[f"slice_{axis}_type"] = "range"

# use slice info if available
axis_slice = slices.get(getattr(source, axis))
axis_slice = slices.get(name)
if axis_slice is not None:
if isinstance(axis_slice, int):
# cut
Expand Down Expand Up @@ -758,8 +836,7 @@ def on_change(self, slice_t, **_):
return

slices = {self.source.t: slice_t}
for axis in XYZ:
axis_name = getattr(self.source, axis)
for axis, axis_name in zip(XYZ, self.source.slice_extents.keys()):
if axis_name is None:
continue

Expand All @@ -776,6 +853,7 @@ def on_change(self, slice_t, **_):

self.source.slices = slices
ds = self.source()

self.state.dataset_bounds = ds.bounds

self.ctrl.view_reset_clipping_range()
Expand All @@ -800,7 +878,24 @@ def _on_array_selection(self, data_arrays, **_):
elif len(data_arrays) == 0:
self.state.color_by = None

self.source.arrays = data_arrays
if set(self.source.arrays) != set(data_arrays):
self.source.arrays = data_arrays
self.update_from_source(self.source)

@change("spherical_bias", "spherical_scale", "projection_mode")
def _on_projection_change(
self, spherical_bias, spherical_scale, projection_mode, **_
):
if projection_mode == "Spherical":
self.source.projection = Projection.SPHERICAL
self.source.vertical_bias = spherical_bias
self.source.vertical_scale = spherical_scale
else:
self.source.projection = Projection.EUCLIDEAN
self.source.vertical_bias = 0
self.source.vertical_scale = 1

self.ctrl.view_reset_camera()


class ControlPanel(v3.VCard):
Expand Down
Loading
Loading