Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-astronaut.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-lines-3d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-lines-colors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-lines-data.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/notebooks/screenshots/no-imgui-nb-lines.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-extent_frac_layout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-extent_layout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-gridplot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-gridplot_non_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-gridplot_viewports_check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-heatmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_cmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_rgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_rgbvminvmax.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_simple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_vminvmax.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-image_volume_mip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line_cmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line_cmap_more.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line_collection_slicing.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line_colorslice.png
2 changes: 1 addition & 1 deletion examples/screenshots/no-imgui-line_dataslice.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-line_stack.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-linear_selector.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-rect_frac_layout.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-rect_layout.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-scatter_cmap_iris.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-scatter_colorslice_iris.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-scatter_dataslice_iris.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-scatter_iris.png
4 changes: 2 additions & 2 deletions examples/screenshots/no-imgui-scatter_size.png
38 changes: 23 additions & 15 deletions fastplotlib/graphics/_axes.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,26 +161,34 @@ def __init__(
):
self._plot_area = plot_area

if x_kwargs is None:
x_kwargs = dict()

if y_kwargs is None:
y_kwargs = dict()

if z_kwargs is None:
z_kwargs = dict()
x_kwargs = x_kwargs or {}
y_kwargs = y_kwargs or {}
z_kwargs = z_kwargs or {}

generic_kwargs = dict(
tick_size=8.0,
line_width=2.0,
tick_marker="tick", # 'tick' for both-sides, 'tick_left' or 'tick_right' for one-sided
color="#fff",
)

x_kwargs = {
"tick_side": "right",
x_kwargs = dict(
tick_side="right",
**generic_kwargs,
**x_kwargs,
}
)

y_kwargs = {"tick_side": "left", **y_kwargs}
y_kwargs = dict(
tick_side="left",
**generic_kwargs,
**y_kwargs,
)

z_kwargs = {
"tick_side": "left",
z_kwargs = dict(
tick_side="left",
**generic_kwargs,
**z_kwargs,
}
)

# create ruler for each dim
self._x = pygfx.Ruler(alpha_mode="solid", **x_kwargs)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ keywords = [
requires-python = ">= 3.10"
dependencies = [
"numpy>=1.23.0",
"pygfx==0.13",
"pygfx==0.14",
"wgpu", # Let pygfx constrain the wgpu version
"cmap>=0.1.3",
# (this comment keeps this list multiline in VSCode)
Expand Down
Loading