Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refactoring of np_to_pil in case float input but in a correct range. #199

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
ernestoarbitrio merged 1 commit into from
Dec 30, 2020
Merged

Refactoring of np_to_pil in case float input but in a correct range. #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/histolab/filters/image_filters_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def invert(img: PIL.Image.Image) -> PIL.Image.Image:
def kmeans_segmentation(
img: PIL.Image.Image, n_segments: int = 800, compactness: float = 10.0
) -> PIL.Image.Image:
"""Segment an RGB image with K-means segmentation
"""Segment an image with K-means segmentation

By using K-means segmentation (color/space proximity) each segment is
colored based on the average color for that segment.
Expand All @@ -284,7 +284,7 @@ def kmeans_segmentation(
Returns
-------
PIL.Image.Image
Image where each segment has been colored based on the average
RGB image where each segment has been colored based on the average
color for that segment.
"""
img_arr = np.array(img)
Expand Down
6 changes: 5 additions & 1 deletion src/histolab/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ def _transform_bool(image_array):
return image_array.astype(np.uint8) * 255

def _transform_float(image_array):
return (image_array * 255).astype(np.uint8)
return (
image_array.astype(np.uint8)
if np.max(image_array) > 1
else (image_array * 255).astype(np.uint8)
)

types_factory = {
"bool": _transform_bool(np_img),
Expand Down
Binary file modified tests/expectations/pil-images-rgb/diagnostic-slide-thumb-hsv-rgb-to-lab.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/expectations/pil-images-rgb/diagnostic-slide-thumb-rgb-to-lab.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/expectations/pil-images-rgb/diagnostic-slide-thumb-ycbcr-rgb-to-lab.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/expectations/python-expr/np-to-pil-la.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[[229, 249], [190, 172]], [[179, 193], [158, 179]]]
[[[27, 7], [66, 84]], [[77, 63], [98, 77]]]
8 changes: 4 additions & 4 deletions tests/expectations/python-expr/threshold-to-mask-140.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
[False, False, False, True, True],
[True, True, True, True, True],
[False, False, False, False, False],
[True, True, False, False, True],
[True, False, True, False, False],
[True, False, False, True, True],
[False, True, False, True, False],
[True, True, True, False, False],
[False, False, True, True, True],
]
18 changes: 9 additions & 9 deletions tests/expectations/python-expr/threshold-to-mask-37.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
[False, False, False, False],
[False, False, False, False],
[False, False, False, False],
[False, False, True, False],
[False, False, False, False],
[False, False, False, False],
],
[
[True, False, True, False],
[True, False, False, False],
[False, False, False, True],
[False, False, False, False],
[True, False, True, False],
[False, False, False, False],
[False, False, True, False],
],
[
[False, False, False, False],
[False, False, False, False],
[True, False, False, False],
[False, False, False, False],
[False, False, True, True],
[True, False, False, False],
[False, False, False, True],
],
[
[False, False, False, False],
[False, False, False, False],
[True, True, True, False],
[False, False, True, False],
[False, False, False, False],
[False, False, False, False],
],
[
[True, False, False, False],
[True, False, False, False],
[False, False, False, False],
[True, False, False, False],
[False, False, False, False],
[False, False, False, False],
[False, False, False, False],
[False, False, False, False],
],
]
18 changes: 9 additions & 9 deletions tests/expectations/python-expr/threshold-to-mask-39.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
[
[
[True, True, True],
[False, True, False],
[True, True, True],
[True, True, False],
[True, True, True],
[True, True, True],
[False, True, False],
],
[
[True, True, True],
[True, True, True],
[True, True, False],
[True, True, True],
[True, True, False],
[True, True, True],
],
[
[True, True, True],
[False, True, True],
[True, True, True],
[False, True, True],
[True, False, True],
[True, True, True],
[True, True, False],
],
[
[True, True, False],
[False, False, True],
[True, True, True],
[True, True, False],
[False, True, True],
[False, True, True],
[True, False, True],
],
[
[True, True, True],
[False, False, True],
[True, False, False],
[True, True, True],
[True, False, True],
[True, False, True],
[True, True, True],
],
]