Skip to content

Commit 681ea08

Browse files
committed
Fix some pylint warnings
1 parent 6c06a89 commit 681ea08

7 files changed

Lines changed: 22 additions & 13 deletions

File tree

sigima_/algorithms/image.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ def remove_overlapping_disks(coords: np.ndarray) -> np.ndarray:
710710
return coords
711711

712712

713+
# pylint: disable=too-many-positional-arguments
713714
def find_blobs_opencv(
714715
data: np.ndarray,
715716
min_threshold: float | None = None,

sigima_/computation/base.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ def dst_n_to_1(
265265
return dst
266266

267267

268+
# TODO: `src2` is not used for now, but it may be used in the future, should we keep it?
269+
# pylint: disable=unused-argument
268270
def dst_2_to_1(
269271
src1: SignalObj | ImageObj,
270272
src2: SignalObj | ImageObj,

sigima_/computation/image/extraction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def update_from_obj(self, obj: ImageObj) -> None:
236236
self.x0 = obj.xc
237237
self.y0 = obj.yc
238238

239-
def choice_callback(self, item, value):
239+
def choice_callback(self, item, value): # pylint: disable=unused-argument
240240
"""Callback for choice item"""
241241
if value == "centroid":
242242
self.y0, self.x0 = alg.get_centroid_fourier(self.__obj.get_masked_view())

sigima_/computation/image/fourier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def update_from_obj(self, obj: ImageObj) -> None:
5050
self.__obj = obj
5151
self.choice_callback(None, self.strategy)
5252

53-
def choice_callback(self, item, value):
53+
def choice_callback(self, item, value): # pylint: disable=unused-argument
5454
"""Callback to update padding values"""
5555
if self.__obj is None:
5656
return

sigima_/computation/image/geometry.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ def rotate270(src: ImageObj) -> ImageObj:
178178
return dst
179179

180180

181+
# pylint: disable=unused-argument
181182
def hflip_coords(dst: ImageObj, src: ImageObj, coords: np.ndarray) -> None:
182183
"""Apply HFlip to coords"""
183184
coords[:, ::2] = dst.x0 + dst.width - coords[:, ::2]
@@ -199,6 +200,7 @@ def fliph(src: ImageObj) -> ImageObj:
199200
return dst
200201

201202

203+
# pylint: disable=unused-argument
202204
def vflip_coords(dst: ImageObj, src: ImageObj, coords: np.ndarray) -> None:
203205
"""Apply VFlip to coords"""
204206
coords[:, 1::2] = dst.y0 + dst.height - coords[:, 1::2]

sigima_/obj/base.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
from copy import deepcopy
1616
from typing import Any, Generic, Iterator, Literal, Type, TypeVar
1717

18-
if sys.version_info >= (3, 11):
19-
# Use Self from typing module in Python 3.11+
20-
from typing import Self
21-
else:
22-
# Use Self from typing_extensions module in Python < 3.11
23-
from typing_extensions import Self
24-
2518
import guidata.dataset as gds
2619
import numpy as np
2720
import pandas as pd
@@ -31,6 +24,13 @@
3124
from sigima_.algorithms import coordinates
3225
from sigima_.algorithms.datatypes import is_integer_dtype
3326

27+
if sys.version_info >= (3, 11):
28+
# Use Self from typing module in Python 3.11+
29+
from typing import Self
30+
else:
31+
# Use Self from typing_extensions module in Python < 3.11
32+
from typing_extensions import Self
33+
3434
ROI_KEY = "_roi_"
3535

3636

@@ -624,8 +624,6 @@ class BaseObjMeta(abc.ABCMeta, gds.DataSetMeta):
624624
class NoDefaultOption:
625625
"""Marker class for metadata option without default value"""
626626

627-
pass
628-
629627

630628
class BaseObj(Generic[TypeROI], metaclass=BaseObjMeta):
631629
"""Object (signal/image) interface"""
@@ -876,7 +874,8 @@ def transform_coords(
876874
self,
877875
coords: np.ndarray,
878876
orig: BaseObj[TypeROI],
879-
func: Callable,
877+
func: Callable[[BaseObj[TypeROI], BaseObj[TypeROI], np.ndarray], None]
878+
| Callable[[BaseObj[TypeROI], BaseObj[TypeROI], np.ndarray, gds.DataSet], None],
880879
param: gds.DataSet | None,
881880
) -> None:
882881
"""Transform coordinates
@@ -893,7 +892,11 @@ def transform_coords(
893892
func(self, orig, coords, param)
894893

895894
def transform_shapes(
896-
self, orig: BaseObj[TypeROI], func: Callable, param: gds.DataSet | None = None
895+
self,
896+
orig: BaseObj[TypeROI],
897+
func: Callable[[BaseObj[TypeROI], BaseObj[TypeROI], np.ndarray], None]
898+
| Callable[[BaseObj[TypeROI], BaseObj[TypeROI], np.ndarray, gds.DataSet], None],
899+
param: gds.DataSet | None = None,
897900
) -> None:
898901
"""Apply transform function to result shape / annotations coordinates.
899902

sigima_/obj/image.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ def get_data(self, roi_index: int | None = None) -> np.ndarray:
881881
view.mask = np.isnan(self.data)
882882
return view
883883
single_roi = self.roi.get_single_roi(roi_index)
884+
# pylint: disable=unbalanced-tuple-unpacking
884885
x0, y0, x1, y1 = self.physical_to_indices(single_roi.get_bounding_box(self))
885886
return self.get_masked_view()[y0:y1, x0:x1]
886887

0 commit comments

Comments
 (0)