Skip to content

Commit

Permalink
RF: Refactor the code by removing version constraints in the call to …
Browse files Browse the repository at this point in the history
…the warn_on_args_to_kwargs decorator
  • Loading branch information
WassCodeur committed Jun 21, 2024
1 parent 0383055 commit f2de303
Show file tree
Hide file tree
Showing 17 changed files with 92 additions and 92 deletions.
16 changes: 8 additions & 8 deletions fury/colormap.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
cm, have_matplotlib, _ = optional_package("matplotlib.cm")


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def colormap_lookup_table(
*,
scale_range=(0, 1),
Expand Down Expand Up @@ -245,7 +245,7 @@ def orient2rgb(v):
return orient


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def line_colors(streamlines, *, cmap="rgb_standard"):
"""Create colors for streamlines to be used in actor.line.
Expand Down Expand Up @@ -312,7 +312,7 @@ def simple_cmap(v):
return simple_cmap


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def create_colormap(v, *, name="plasma", auto=True):
"""Create colors from a specific colormap and return it
as an array of shape (N,3) where every row gives the corresponding
Expand Down Expand Up @@ -516,7 +516,7 @@ def _lab2rgb(lab):
return _xyz2rgb(tmp)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def distinguishable_colormap(*, bg=(0, 0, 0), exclude=None, nb_colors=None):
"""Generate colors that are maximally perceptually distinct.
Expand Down Expand Up @@ -909,7 +909,7 @@ def get_xyz_coords(illuminant, observer):
) from err


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def xyz2lab(xyz, *, illuminant="D65", observer="2"):
"""XYZ to CIE-LAB color space conversion.
Expand Down Expand Up @@ -957,7 +957,7 @@ def xyz2lab(xyz, *, illuminant="D65", observer="2"):
return np.concatenate([x[..., np.newaxis] for x in [L, a, b]], axis=-1)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def lab2xyz(lab, *, illuminant="D65", observer="2"):
"""CIE-LAB to XYZcolor space conversion.
Expand Down Expand Up @@ -1009,7 +1009,7 @@ def lab2xyz(lab, *, illuminant="D65", observer="2"):
return out


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def rgb2lab(rgb, *, illuminant="D65", observer="2"):
"""Conversion from the sRGB color space (IEC 61966-2-1:1999)
to the CIE Lab colorspace under the given illuminant and observer.
Expand Down Expand Up @@ -1040,7 +1040,7 @@ def rgb2lab(rgb, *, illuminant="D65", observer="2"):
return xyz2lab(rgb2xyz(rgb), illuminant=illuminant, observer=observer)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def lab2rgb(lab, *, illuminant="D65", observer="2"):
"""Lab to RGB color space conversion.
Expand Down
2 changes: 1 addition & 1 deletion fury/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from fury.io import load_image


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def matplotlib_figure_to_numpy(
fig, *, dpi=100, fname=None, flip_up_down=True, transparent=False
):
Expand Down
2 changes: 1 addition & 1 deletion fury/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def decorator(func):
Examples:
---------
>>> @warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
>>> @warn_on_args_to_kwargs()
... def f(a, b, *, c, d=1, e=1):
... return a + b + c + d + e
>>> f(1, 2, 3, 4, 5)
Expand Down
24 changes: 12 additions & 12 deletions fury/gltf.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@


class glTF:
@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, filename, *, apply_normals=False):
"""Read and generate actors from glTF files.
Expand Down Expand Up @@ -123,7 +123,7 @@ def actors(self):

return self._actors

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def inspect_scene(self, *, scene_id=0):
"""Loop over nodes in a scene.
Expand All @@ -141,7 +141,7 @@ def inspect_scene(self, *, scene_id=0):
for i, animation in enumerate(self.gltf.animations):
self.transverse_channels(animation, i)

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def transverse_node(self, nextnode_id, matrix, *, parent=None, is_joint=False):
"""Load mesh and generates transformation matrix.
Expand Down Expand Up @@ -656,7 +656,7 @@ def generate_tmatrix(self, transf, prop):
matrix = transf
return matrix

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def transverse_animations(
self,
animation,
Expand Down Expand Up @@ -756,7 +756,7 @@ def update_skin(self, animation):
utils.update_actor(self._actors[i])
utils.compute_bounds(self._actors[i])

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def initialize_skin(self, animation, *, bones=False, length=0.2):
"""Create bones and add to the animation and initialise `update_skin`
Expand All @@ -778,7 +778,7 @@ def initialize_skin(self, animation, *, bones=False, length=0.2):
animation.add_actor(list(self._bactors.values()))
self.update_skin(animation)

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def apply_skin_matrix(self, vertices, joint_matrices, *, actor_index=0):
"""Apply the skinnig matrix, that transform the vertices.
Expand Down Expand Up @@ -872,7 +872,7 @@ def skin_animation(self):
root_animation.add_actor(self._actors)
return root_animations

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def get_joint_actors(self, *, length=0.5, with_transforms=False):
"""Create an arrow actor for each bone in a skinned model.
Expand Down Expand Up @@ -1067,7 +1067,7 @@ def main_animation(self):
return main_animation


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def export_scene(scene, *, filename="default.gltf"):
"""Generate gltf from FURY scene.
Expand Down Expand Up @@ -1300,7 +1300,7 @@ def write_scene(gltf, nodes):
gltf.scenes.append(scene)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def write_node(gltf, *, mesh_id=None, camera_id=None):
"""Create node
Expand Down Expand Up @@ -1369,7 +1369,7 @@ def write_camera(gltf, camera):
gltf.cameras.append(cam)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def get_prim(vertex, index, color, tcoord, normal, material, *, mode=4):
"""Return a Primitive object.
Expand Down Expand Up @@ -1440,7 +1440,7 @@ def write_material(gltf, basecolortexture: int, uri: str):
gltf.images.append(image)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def write_accessor(
gltf, bufferview, byte_offset, comp_type, count, accssor_type, *, max=None, min=None
):
Expand Down Expand Up @@ -1479,7 +1479,7 @@ def write_accessor(
gltf.accessors.append(accessor)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def write_bufferview(gltf, buffer, byte_offset, byte_length, *, byte_stride=None):
"""Write bufferview in the gltf.
Expand Down
4 changes: 2 additions & 2 deletions fury/interactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def _process_event(self, obj, evt):

self.event.reset() # Event fully processed.

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def _button_clicked(self, button, *, last_event=-1, before_last_event=-2):
if len(self.history) < abs(before_last_event):
return False
Expand Down Expand Up @@ -388,7 +388,7 @@ def force_render(self):
"""Causes the scene to refresh."""
self.GetInteractor().GetRenderWindow().Render()

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def add_callback(self, prop, event_type, callback, *, priority=0, args=None):
"""Add a callback associated to a specific event for a VTK prop.
Expand Down
10 changes: 5 additions & 5 deletions fury/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from fury.utils import set_input


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def load_cubemap_texture(fnames, *, interpolate_on=True, mipmap_on=True):
"""Load a cube map texture from a list of 6 images.
Expand Down Expand Up @@ -76,7 +76,7 @@ def load_cubemap_texture(fnames, *, interpolate_on=True, mipmap_on=True):
return texture


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def load_image(filename, *, as_vtktype=False, use_pillow=True):
"""Load an image.
Expand Down Expand Up @@ -220,7 +220,7 @@ def load_text(file):
return text


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def save_image(
arr,
filename,
Expand Down Expand Up @@ -381,7 +381,7 @@ def load_polydata(file_name):
return reader.GetOutput()


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def save_polydata(polydata, file_name, *, binary=False, color_array_name=None):
"""Save a vtk polydata to a supported format file.
Expand Down Expand Up @@ -432,7 +432,7 @@ def save_polydata(polydata, file_name, *, binary=False, color_array_name=None):
writer.Write()


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def load_sprite_sheet(sheet_path, nb_rows, nb_cols, *, as_vtktype=False):
"""Process and load sprites from a sprite sheet.
Expand Down
12 changes: 6 additions & 6 deletions fury/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class GridLayout(Layout):
"""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(
self,
*,
Expand Down Expand Up @@ -186,7 +186,7 @@ def compute_sizes(self, actor):
class HorizontalLayout(GridLayout):
"""Provide functionalities for laying out actors in a horizontal layout."""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, *, cell_padding=0, cell_shape="rect"):
"""Initialize the Horizontal layout.
Expand Down Expand Up @@ -242,7 +242,7 @@ def compute_positions(self, actors):
class VerticalLayout(GridLayout):
"""Provide functionalities for laying out actors in a vertical stack."""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, *, cell_padding=0, cell_shape="rect"):
"""Initialize the Vertical layout.
Expand Down Expand Up @@ -297,7 +297,7 @@ def compute_positions(self, actors):
class XLayout(HorizontalLayout):
"""Provide functionalities for laying out actors along x-axis."""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, *, direction="x+", cell_padding=0, cell_shape="rect"):
"""Initialize the X layout.
Expand Down Expand Up @@ -383,7 +383,7 @@ def apply(self, actors):
class YLayout(VerticalLayout):
"""Provide functionalities for laying out actors along y-axis."""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, *, direction="y+", cell_padding=0, cell_shape="rect"):
"""Initialize the Y layout.
Expand Down Expand Up @@ -469,7 +469,7 @@ def apply(self, actors):
class ZLayout(GridLayout):
"""Provide functionalities for laying out actors along z-axis."""

@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def __init__(self, *, direction="z+", cell_padding=0, cell_shape="rect"):
"""Initialize the Z layout.
Expand Down
6 changes: 3 additions & 3 deletions fury/material.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def coat_ior(self, coat_ior):
self.__actor_properties.SetCoatIOR(coat_ior)


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def manifest_pbr(
actor,
*,
Expand Down Expand Up @@ -211,7 +211,7 @@ def manifest_pbr(
return None


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def manifest_principled(
actor,
*,
Expand Down Expand Up @@ -611,7 +611,7 @@ def uniforms_callback(_caller, _event, calldata=None):
return None


@warn_on_args_to_kwargs(from_version="0.0.0", until_version="0.10.0")
@warn_on_args_to_kwargs()
def manifest_standard(
actor,
*,
Expand Down
Loading

0 comments on commit f2de303

Please sign in to comment.