Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

add vertex, edge, and fill color properties #664

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
merged 5 commits into from
Oct 24, 2024
Merged

add vertex, edge, and fill color properties #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74325c1
add vertex, edge, and fill color properties
clewis7 Oct 23, 2024
e8c941e
update api docs
clewis7 Oct 23, 2024
6f84ac4
lint
clewis7 Oct 23, 2024
92856a3
requested changes
clewis7 Oct 23, 2024
a993d8e
add doc strings, fix linear selector
clewis7 Oct 24, 2024
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
3 changes: 3 additions & 0 deletions 3 docs/source/api/selectors/LinearRegionSelector.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Properties
LinearRegionSelector.axis
LinearRegionSelector.block_events
LinearRegionSelector.deleted
LinearRegionSelector.edge_color
LinearRegionSelector.event_handlers
LinearRegionSelector.fill_color
LinearRegionSelector.limits
LinearRegionSelector.name
LinearRegionSelector.offset
Expand All @@ -33,6 +35,7 @@ Properties
LinearRegionSelector.rotation
LinearRegionSelector.selection
LinearRegionSelector.supported_events
LinearRegionSelector.vertex_color
LinearRegionSelector.visible
LinearRegionSelector.world_object

Expand Down
3 changes: 3 additions & 0 deletions 3 docs/source/api/selectors/LinearSelector.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Properties
LinearSelector.axis
LinearSelector.block_events
LinearSelector.deleted
LinearSelector.edge_color
LinearSelector.event_handlers
LinearSelector.fill_color
LinearSelector.limits
LinearSelector.name
LinearSelector.offset
Expand All @@ -33,6 +35,7 @@ Properties
LinearSelector.rotation
LinearSelector.selection
LinearSelector.supported_events
LinearSelector.vertex_color
LinearSelector.visible
LinearSelector.world_object

Expand Down
3 changes: 3 additions & 0 deletions 3 docs/source/api/selectors/RectangleSelector.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Properties
RectangleSelector.axis
RectangleSelector.block_events
RectangleSelector.deleted
RectangleSelector.edge_color
RectangleSelector.event_handlers
RectangleSelector.fill_color
RectangleSelector.limits
RectangleSelector.name
RectangleSelector.offset
Expand All @@ -33,6 +35,7 @@ Properties
RectangleSelector.rotation
RectangleSelector.selection
RectangleSelector.supported_events
RectangleSelector.vertex_color
RectangleSelector.visible
RectangleSelector.world_object

Expand Down
65 changes: 65 additions & 0 deletions 65 fastplotlib/graphics/selectors/_base_selector.py
View file
Open in desktop
clewis7 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from functools import partial

import numpy as np
import pygfx

from pygfx import WorldObject, Line, Mesh, Points

Expand Down Expand Up @@ -40,6 +41,70 @@ class BaseSelector(Graphic):
def axis(self) -> str:
return self._axis

@property
def fill_color(self) -> pygfx.Color:
"""Returns the fill color of the selector, ``None`` if selector has no fill."""
return self._fill_color

@fill_color.setter
def fill_color(self, color: str | Sequence[float]):
"""
Set the fill color of the selector.

Parameters
----------
color : str | Sequence[float]
String or sequence of floats that gets converted into a ``pygfx.Color`` object.
"""
color = pygfx.Color(color)
for fill in self._fill:
fill.material.color = color
self._original_colors[fill] = color
self._fill_color = color
clewis7 marked this conversation as resolved.
Show resolved Hide resolved

@property
def vertex_color(self) -> pygfx.Color:
"""Returns the vertex color of the selector, ``None`` if selector has no vertices."""
return self._vertex_color

@vertex_color.setter
def vertex_color(self, color: str | Sequence[float]):
"""
Set the vertex color of the selector.

Parameters
----------
color : str | Sequence[float]
String or sequence of floats that gets converted into a ``pygfx.Color`` object.
"""
color = pygfx.Color(color)
for vertex in self._vertices:
vertex.material.color = color
vertex.material.edge_color = color
self._original_colors[vertex] = color
self._vertex_color = color

@property
def edge_color(self) -> pygfx.Color:
"""Returns the edge color of the selector"""
return self._edge_color

@edge_color.setter
def edge_color(self, color: str | Sequence[float]):
"""
Set the edge color of the selector.

Parameters
----------
color : str | Sequence[float]
String or sequence of floats that gets converted into a ``pygfx.Color`` object.
"""
color = pygfx.Color(color)
for edge in self._edges:
clewis7 marked this conversation as resolved.
Show resolved Hide resolved
edge.material.color = color
self._original_colors[edge] = color
self._edge_color = color

def __init__(
self,
edges: Tuple[Line, ...] = None,
Expand Down
30 changes: 27 additions & 3 deletions 30 fastplotlib/graphics/selectors/_linear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,27 @@ def limits(self, values: tuple[float, float]):
) # if values are close to zero things get weird so round them
self.selection._limits = self._limits

@property
def edge_color(self) -> pygfx.Color:
"""Returns the color of the linear selector."""
return self._edge_color

@edge_color.setter
def edge_color(self, color: str | Sequence[float]):
"""
Set the color of the linear selector.

Parameters
----------
color : str | Sequence[float]
String or sequence of floats that gets converted into a ``pygfx.Color`` object.
"""
color = pygfx.Color(color)
# only want to change inner line color
self._edges[0].material.color = color
self._original_colors[self._edges[0]] = color
self._edge_color = color

# TODO: make `selection` arg in graphics data space not world space
def __init__(
self,
Expand All @@ -56,7 +77,7 @@ def __init__(
center: float,
axis: str = "x",
parent: Graphic = None,
color: str | Sequence[float] | np.ndarray = "w",
edge_color: str | Sequence[float] | np.ndarray = "w",
thickness: float = 2.5,
arrow_keys_modifier: str = "Shift",
name: str = None,
Expand Down Expand Up @@ -92,13 +113,16 @@ def __init__(
thickness: float, default 2.5
thickness of the selector

color: str | tuple | np.ndarray, default "w"
edge_color: str | tuple | np.ndarray, default "w"
color of the selector

name: str, optional
name of linear selector

"""
self._fill_color = None
kushalkolar marked this conversation as resolved.
Show resolved Hide resolved
self._edge_color = pygfx.Color(edge_color)
self._vertex_color = None

if len(limits) != 2:
raise ValueError("limits must be a tuple of 2 integers, i.e. (int, int)")
Expand Down Expand Up @@ -134,7 +158,7 @@ def __init__(
line_inner = pygfx.Line(
# self.data.feature_data because data is a Buffer
geometry=pygfx.Geometry(positions=line_data),
material=material(thickness=thickness, color=color, pick_write=True),
material=material(thickness=thickness, color=edge_color, pick_write=True),
)

self.line_outer = pygfx.Line(
Expand Down
15 changes: 11 additions & 4 deletions 15 fastplotlib/graphics/selectors/_linear_region.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ def __init__(
name of this selector graphic

"""
self._edge_color = pygfx.Color(edge_color)
self._fill_color = pygfx.Color(fill_color)
self._vertex_color = None

# lots of very close to zero values etc. so round them, otherwise things get weird
if not len(selection) == 2:
Expand All @@ -134,13 +137,17 @@ def __init__(
if axis == "x":
mesh = pygfx.Mesh(
pygfx.box_geometry(1, size, 1),
pygfx.MeshBasicMaterial(color=pygfx.Color(fill_color), pick_write=True),
pygfx.MeshBasicMaterial(
color=pygfx.Color(self.fill_color), pick_write=True
),
)

elif axis == "y":
mesh = pygfx.Mesh(
pygfx.box_geometry(size, 1, 1),
pygfx.MeshBasicMaterial(color=pygfx.Color(fill_color), pick_write=True),
pygfx.MeshBasicMaterial(
color=pygfx.Color(self.fill_color), pick_write=True
),
)
else:
raise ValueError("`axis` must be one of 'x' or 'y'")
Expand Down Expand Up @@ -179,15 +186,15 @@ def __init__(
positions=init_line_data.copy()
), # copy so the line buffer is isolated
pygfx.LineMaterial(
thickness=edge_thickness, color=edge_color, pick_write=True
thickness=edge_thickness, color=self.edge_color, pick_write=True
),
)
line1 = pygfx.Line(
pygfx.Geometry(
positions=init_line_data.copy()
), # copy so the line buffer is isolated
pygfx.LineMaterial(
thickness=edge_thickness, color=edge_color, pick_write=True
thickness=edge_thickness, color=self.edge_color, pick_write=True
),
)

Expand Down
32 changes: 19 additions & 13 deletions 32 fastplotlib/graphics/selectors/_rectangle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ def __init__(

xmin, xmax, ymin, ymax = selection

self._fill_color = pygfx.Color(fill_color)
self._edge_color = pygfx.Color(edge_color)
self._vertex_color = pygfx.Color(vertex_color)

width = xmax - xmin
height = ymax - ymin

Expand All @@ -125,7 +129,9 @@ def __init__(

self.fill = pygfx.Mesh(
pygfx.box_geometry(width, height, 1),
pygfx.MeshBasicMaterial(color=pygfx.Color(fill_color), pick_write=True),
pygfx.MeshBasicMaterial(
color=pygfx.Color(self.fill_color), pick_write=True
),
)

self.fill.world.position = (0, 0, -2)
Expand All @@ -142,7 +148,7 @@ def __init__(

left_line = pygfx.Line(
pygfx.Geometry(positions=left_line_data.copy()),
pygfx.LineMaterial(thickness=edge_thickness, color=edge_color),
pygfx.LineMaterial(thickness=edge_thickness, color=self.edge_color),
)

# position data for the right edge line
Expand All @@ -155,7 +161,7 @@ def __init__(

right_line = pygfx.Line(
pygfx.Geometry(positions=right_line_data.copy()),
pygfx.LineMaterial(thickness=edge_thickness, color=edge_color),
pygfx.LineMaterial(thickness=edge_thickness, color=self.edge_color),
)

# position data for the left edge line
Expand All @@ -168,7 +174,7 @@ def __init__(

bottom_line = pygfx.Line(
pygfx.Geometry(positions=bottom_line_data.copy()),
pygfx.LineMaterial(thickness=edge_thickness, color=edge_color),
pygfx.LineMaterial(thickness=edge_thickness, color=self.edge_color),
)

# position data for the right edge line
Expand All @@ -181,7 +187,7 @@ def __init__(

top_line = pygfx.Line(
pygfx.Geometry(positions=top_line_data.copy()),
pygfx.LineMaterial(thickness=edge_thickness, color=edge_color),
pygfx.LineMaterial(thickness=edge_thickness, color=self.edge_color),
)

self.edges: Tuple[pygfx.Line, pygfx.Line, pygfx.Line, pygfx.Line] = (
Expand All @@ -207,9 +213,9 @@ def __init__(
pygfx.PointsMarkerMaterial(
marker="square",
size=vertex_thickness,
color=vertex_color,
color=self.vertex_color,
size_mode="vertex",
edge_color=vertex_color,
edge_color=self.vertex_color,
),
)

Expand All @@ -218,9 +224,9 @@ def __init__(
pygfx.PointsMarkerMaterial(
marker="square",
size=vertex_thickness,
color=vertex_color,
color=self.vertex_color,
size_mode="vertex",
edge_color=vertex_color,
edge_color=self.vertex_color,
),
)

Expand All @@ -231,9 +237,9 @@ def __init__(
pygfx.PointsMarkerMaterial(
marker="square",
size=vertex_thickness,
color=vertex_color,
color=self.vertex_color,
size_mode="vertex",
edge_color=vertex_color,
edge_color=self.vertex_color,
),
)

Expand All @@ -244,9 +250,9 @@ def __init__(
pygfx.PointsMarkerMaterial(
marker="square",
size=vertex_thickness,
color=vertex_color,
color=self.vertex_color,
size_mode="vertex",
edge_color=vertex_color,
edge_color=self.vertex_color,
),
)

Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.