Skip to content

Commit fa88e5c

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent ad38b14 commit fa88e5c

30 files changed

Lines changed: 170 additions & 99 deletions

src/napari_stress/_approximation/expansion.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import numpy as np
21
from typing import TYPE_CHECKING
32

3+
import numpy as np
4+
45
if TYPE_CHECKING:
56
import napari
67

src/napari_stress/_approximation/expansion_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from abc import ABC, abstractmethod
22
from typing import TYPE_CHECKING
3+
34
if TYPE_CHECKING:
45
import napari
56

src/napari_stress/_approximation/expansion_napari.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
from napari_tools_menu import register_function
21
from typing import TYPE_CHECKING
2+
3+
from napari_tools_menu import register_function
4+
35
if TYPE_CHECKING:
46
import napari
57

src/napari_stress/_approximation/fit_ellipsoid.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
from typing import TYPE_CHECKING
2+
13
import deprecation
24
import numpy as np
35
from napari.types import PointsData, VectorsData
46
from napari_tools_menu import register_function
5-
from typing import TYPE_CHECKING
7+
68
if TYPE_CHECKING:
79
import napari
810

9-
from .._version import __version__
1011
from .._utils.frame_by_frame import frame_by_frame
12+
from .._version import __version__
1113

1214

1315
@deprecation.deprecated(

src/napari_stress/_measurements/curvature.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from typing import TYPE_CHECKING
2+
13
import numpy as np
24
import pandas as pd
35
from napari.layers import Layer
@@ -23,7 +25,6 @@
2325
manifold,
2426
)
2527

26-
from typing import TYPE_CHECKING
2728
if TYPE_CHECKING:
2829
import napari
2930

@@ -256,7 +257,8 @@ def calculate_patch_fitted_curvature_on_pointcloud(
256257
df = pd.DataFrame(
257258
{
258259
"mean_curvature": mean_curvatures,
259-
"gaussian_curvature": principal_curvatures[:, 0] * principal_curvatures[:, 1],
260+
"gaussian_curvature": principal_curvatures[:, 0]
261+
* principal_curvatures[:, 1],
260262
"principal_curvature_1": principal_curvatures[:, 0],
261263
"principal_curvature_2": principal_curvatures[:, 1],
262264
}
@@ -384,7 +386,9 @@ def calculate_mean_curvature_on_manifold(
384386

385387
# Makre sure orientation is inward,
386388
# so H is positive (for Ellipsoid, and small deviations):
387-
Orientations = [np.dot(x, y) for x, y in zip(centered_lbdv_pts, normals)]
389+
Orientations = [
390+
np.dot(x, y) for x, y in zip(centered_lbdv_pts, normals, strict=False)
391+
]
388392
num_pos_orr = np.sum(np.asarray(Orientations).flatten() > 0)
389393

390394
Orientation = 1.0 # unchanged (we want INWARD)

src/napari_stress/_measurements/geodesics.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
from typing import TYPE_CHECKING
2+
13
import numpy as np
24
from napari.types import LayerDataTuple, SurfaceData
35
from napari_tools_menu import register_function
46

57
from .._utils.frame_by_frame import frame_by_frame
68

7-
from typing import TYPE_CHECKING
89
if TYPE_CHECKING:
910
import napari
1011

@@ -28,6 +29,7 @@ def geodesic_distance_matrix(surface: SurfaceData) -> np.ndarray:
2829
2930
"""
3031
import gdist
32+
3133
from .._utils import sanitize_faces
3234

3335
# Reorder the faces of the surface to ensure consistent orientation
@@ -36,7 +38,8 @@ def geodesic_distance_matrix(surface: SurfaceData) -> np.ndarray:
3638
faces = sanitized_surface[1]
3739

3840
distance_matrix = gdist.local_gdist_matrix(
39-
vertices, faces, max_distance=1e9).toarray()
41+
vertices, faces, max_distance=1e9
42+
).toarray()
4043

4144
return distance_matrix
4245

@@ -66,6 +69,7 @@ def geodesic_path(
6669
6770
"""
6871
import potpourri3d as pp3d
72+
6973
from .._utils import sanitize_faces
7074

7175
sanitized_surface = sanitize_faces(surface)
@@ -234,6 +238,7 @@ def local_extrema_analysis(
234238
- `min_max_pair_anisotropies`: Difference in input value `(vertices, faces, values)` between all pairs of local minima and maxima.
235239
"""
236240
from .._utils import sanitize_faces
241+
237242
feature = surface[2]
238243
surface = sanitize_faces(surface)
239244
triangles = surface[1]

src/napari_stress/_measurements/intensity.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
from typing import TYPE_CHECKING
2+
13
import numpy as np
24
import pandas as pd
35
from napari.types import LayerDataTuple
46
from napari_tools_menu import register_function
57

68
from .._utils.frame_by_frame import frame_by_frame
7-
from typing import TYPE_CHECKING
9+
810
if TYPE_CHECKING:
911
import napari
1012

13+
1114
@register_function(
1215
menu="Measurement > Measure intensities on surface (n-STRESS)"
1316
)

src/napari_stress/_measurements/stresses.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from typing import TYPE_CHECKING
2+
23
if TYPE_CHECKING:
34
import napari
45

src/napari_stress/_measurements/toolbox.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import TYPE_CHECKING
44

55
if TYPE_CHECKING:
6-
import napari
6+
pass
77

88
import numpy as np
99
from magicgui.widgets import create_widget
@@ -597,9 +597,7 @@ def comprehensive_analysis(
597597

598598
GDM = None
599599
if GDM is None:
600-
GDM = measurements.geodesic_distance_matrix(
601-
surface_cell_stress
602-
)
600+
GDM = measurements.geodesic_distance_matrix(surface_cell_stress)
603601

604602
if maximal_distance is None:
605603
maximal_distance = int(np.floor(np.nanmax(GDM[np.inf != GDM])))

src/napari_stress/_reconstruction/fit_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import inspect
22
from enum import Enum
33
from typing import TYPE_CHECKING
4+
45
if TYPE_CHECKING:
56
import napari
67

0 commit comments

Comments
 (0)