Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
napari-segment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andrey ARISTOV
napari-segment
Commits
ce92485f
Commit
ce92485f
authored
2 years ago
by
Andrey Aristov
Browse files
Options
Downloads
Patches
Plain Diff
add logging
parent
25bac712
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/napari_segment/_widget.py
+56
-4
56 additions, 4 deletions
src/napari_segment/_widget.py
with
56 additions
and
4 deletions
src/napari_segment/_widget.py
+
56
−
4
View file @
ce92485f
...
@@ -31,6 +31,27 @@ from skimage.measure import regionprops
...
@@ -31,6 +31,27 @@ from skimage.measure import regionprops
from
matplotlib.backends.backend_qt5agg
import
FigureCanvasQTAgg
as
FigureCanvas
from
matplotlib.backends.backend_qt5agg
import
FigureCanvasQTAgg
as
FigureCanvas
from
matplotlib.figure
import
Figure
from
matplotlib.figure
import
Figure
from
threading
import
Thread
from
threading
import
Thread
import
logging
from
importlib.metadata
import
PackageNotFoundError
,
version
try
:
__version__
=
version
(
"
napari-segment
"
)
except
PackageNotFoundError
:
# package is not installed
__version__
=
"
Unknown
"
logging
.
basicConfig
(
level
=
logging
.
DEBUG
,
format
=
"
%(asctime)s %(levelname)s : %(message)s
"
)
logger
=
logging
.
getLogger
(
"
napari_segment.widget
"
)
formatter
=
logging
.
Formatter
(
"
%(asctime)s - %(name)s - %(levelname)s : %(message)s
"
)
ff
=
logging
.
FileHandler
(
"
napari-segment.log
"
)
ff
.
setFormatter
(
formatter
)
logger
.
addHandler
(
ff
)
class
ExampleQWidget
(
q
.
QWidget
):
class
ExampleQWidget
(
q
.
QWidget
):
# your QWidget.__init__ can optionally request the napari viewer instance
# your QWidget.__init__ can optionally request the napari viewer instance
...
@@ -145,9 +166,9 @@ class ExampleQWidget(q.QWidget):
...
@@ -145,9 +166,9 @@ class ExampleQWidget(q.QWidget):
self
.
max_diam
.
changed
.
connect
(
self
.
update_out
)
self
.
max_diam
.
changed
.
connect
(
self
.
update_out
)
self
.
max_ecc
.
changed
.
connect
(
self
.
update_out
)
self
.
max_ecc
.
changed
.
connect
(
self
.
update_out
)
self
.
btn
.
clicked
.
connect
(
self
.
save_params
)
self
.
btn
.
clicked
.
connect
(
self
.
save_params
)
logger
.
debug
(
"
Initialization finished.
"
)
if
self
.
input
.
current_choice
:
if
(
choice
:
=
self
.
input
.
current_choice
):
print
(
"
start
"
)
self
.
restore_params
()
self
.
restore_params
()
self
.
preprocess
()
self
.
preprocess
()
...
@@ -164,25 +185,33 @@ class ExampleQWidget(q.QWidget):
...
@@ -164,25 +185,33 @@ class ExampleQWidget(q.QWidget):
)
)
def
preprocess
(
self
):
def
preprocess
(
self
):
logger
.
debug
(
f
"
start preprocessing
{
self
.
input
.
current_choice
}
"
)
self
.
binning
=
self
.
binning_widget
.
value
self
.
binning
=
self
.
binning_widget
.
value
try
:
try
:
self
.
data
=
self
.
viewer
.
layers
[
self
.
input
.
current_choice
].
data
[
self
.
data
=
self
.
viewer
.
layers
[
self
.
input
.
current_choice
].
data
[
...,
::
self
.
binning
,
::
self
.
binning
...,
::
self
.
binning
,
::
self
.
binning
]
]
logger
.
debug
(
f
"
data after binning:
{
self
.
data
}
"
)
except
KeyError
:
except
KeyError
:
return
return
try
:
try
:
self
.
pixel_size
=
self
.
viewer
.
layers
[
self
.
input
.
current_choice
].
metadata
[
"
pixel_size_um
"
]
self
.
pixel_size
=
self
.
viewer
.
layers
[
self
.
input
.
current_choice
].
metadata
[
"
pixel_size_um
"
]
self
.
unit
=
"
um
"
self
.
unit
=
"
um
"
except
KeyError
:
except
KeyError
:
self
.
pixel_size
=
1
self
.
pixel_size
=
1
self
.
unit
=
"
px
"
self
.
unit
=
"
px
"
logger
.
debug
(
f
"
pixel size:
{
self
.
pixel_size
}
{
self
.
unit
}
"
)
self
.
ax
[
1
].
set_title
(
f
"
{
self
.
diams_title
}
,
{
self
.
unit
}
"
)
self
.
ax
[
1
].
set_title
(
f
"
{
self
.
diams_title
}
,
{
self
.
unit
}
"
)
self
.
scale
=
np
.
ones
((
len
(
self
.
data
.
shape
),))
self
.
scale
=
np
.
ones
((
len
(
self
.
data
.
shape
),))
self
.
scale
[
-
2
:]
=
self
.
binning
self
.
scale
[
-
2
:]
=
self
.
binning
logger
.
debug
(
f
'
Computed scale for napari
{
self
.
scale
}
'
)
if
isinstance
(
self
.
data
,
np
.
ndarray
):
if
isinstance
(
self
.
data
,
np
.
ndarray
):
chunksize
=
np
.
ones
(
len
(
self
.
data
.
shape
))
chunksize
=
np
.
ones
(
len
(
self
.
data
.
shape
))
chunksize
[
-
2
:]
=
self
.
data
.
shape
[
-
2
:]
# xy full size
chunksize
[
-
2
:]
=
self
.
data
.
shape
[
-
2
:]
# xy full size
...
@@ -192,6 +221,9 @@ class ExampleQWidget(q.QWidget):
...
@@ -192,6 +221,9 @@ class ExampleQWidget(q.QWidget):
else
:
else
:
self
.
ddata
=
self
.
data
.
astype
(
"
f
"
)
self
.
ddata
=
self
.
data
.
astype
(
"
f
"
)
logger
.
debug
(
f
'
Dask array:
{
self
.
ddata
}
'
)
logger
.
debug
(
f
'
Processing data with
{
self
.
use
.
value
}
'
)
# show_info(self.use.value)
# show_info(self.use.value)
if
self
.
use
.
value
==
self
.
Choices
.
GRAD
.
value
:
if
self
.
use
.
value
==
self
.
Choices
.
GRAD
.
value
:
self
.
smooth_gradient
=
self
.
ddata
.
map_blocks
(
self
.
smooth_gradient
=
self
.
ddata
.
map_blocks
(
...
@@ -210,6 +242,8 @@ class ExampleQWidget(q.QWidget):
...
@@ -210,6 +242,8 @@ class ExampleQWidget(q.QWidget):
)
)
else
:
else
:
self
.
smooth_gradient
=
np
.
zeros_like
(
self
.
ddata
)
self
.
smooth_gradient
=
np
.
zeros_like
(
self
.
ddata
)
logger
.
error
(
f
"""
Filter `
{
self
.
use
.
value
}
` not understood!
Expected
{
[
v
.
value
for
v
in
self
.
Choices
]
}
"""
)
raise
(
raise
(
ValueError
(
ValueError
(
f
"""
Filter `
{
self
.
use
.
value
}
` not understood!
f
"""
Filter `
{
self
.
use
.
value
}
` not understood!
...
@@ -218,18 +252,24 @@ class ExampleQWidget(q.QWidget):
...
@@ -218,18 +252,24 @@ class ExampleQWidget(q.QWidget):
)
)
if
not
(
name
:
=
"
Preprocessing
"
)
in
self
.
viewer
.
layers
:
if
not
(
name
:
=
"
Preprocessing
"
)
in
self
.
viewer
.
layers
:
logger
.
debug
(
f
'
No Preprocessing layer found, adding one
'
)
self
.
viewer
.
add_image
(
self
.
viewer
.
add_image
(
data
=
self
.
smooth_gradient
,
data
=
self
.
smooth_gradient
,
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
)
)
else
:
else
:
logger
.
debug
(
f
'
Updating Preprocessing layer with
{
self
.
smooth_gradient
}
'
)
self
.
viewer
.
layers
[
name
].
data
=
self
.
smooth_gradient
self
.
viewer
.
layers
[
name
].
data
=
self
.
smooth_gradient
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
logger
.
debug
(
f
'
Preprocessing finished, sending
{
self
.
smooth_gradient
}
to thresholding
'
)
self
.
threshold
()
self
.
threshold
()
def
threshold
(
self
):
def
threshold
(
self
):
logger
.
debug
(
'
Start thresholding step
'
)
if
not
self
.
input
.
current_choice
:
if
not
self
.
input
.
current_choice
:
return
return
logger
.
debug
(
f
'
Thresholding with the thr=
{
self
.
thr
.
value
}
and erode=
{
self
.
erode
.
value
}
'
)
self
.
labels
=
self
.
smooth_gradient
.
map_blocks
(
self
.
labels
=
self
.
smooth_gradient
.
map_blocks
(
partial
(
partial
(
threshold_gradient
,
thr
=
self
.
thr
.
value
,
erode
=
self
.
erode
.
value
threshold_gradient
,
thr
=
self
.
thr
.
value
,
erode
=
self
.
erode
.
value
...
@@ -237,23 +277,31 @@ class ExampleQWidget(q.QWidget):
...
@@ -237,23 +277,31 @@ class ExampleQWidget(q.QWidget):
dtype
=
np
.
int32
,
dtype
=
np
.
int32
,
)
)
if
not
(
name
:
=
"
Detections
"
)
in
self
.
viewer
.
layers
:
if
not
(
name
:
=
"
Detections
"
)
in
self
.
viewer
.
layers
:
logger
.
debug
(
f
'
No Detections layer found, adding one
'
)
self
.
viewer
.
add_labels
(
self
.
viewer
.
add_labels
(
data
=
self
.
labels
,
data
=
self
.
labels
,
opacity
=
0.3
,
opacity
=
0.3
,
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
)
)
else
:
else
:
logger
.
debug
(
f
'
Updating Detections layer with
{
self
.
labels
}
'
)
self
.
viewer
.
layers
[
name
].
data
=
self
.
labels
self
.
viewer
.
layers
[
name
].
data
=
self
.
labels
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
self
.
viewer
.
layers
[
name
].
contour
=
5
self
.
viewer
.
layers
[
name
].
contour
=
8
/
self
.
binning
logger
.
debug
(
f
'
Thresholding succesful. Sending labels
{
self
.
labels
}
to filtering
'
)
self
.
update_out
()
self
.
update_out
()
def
update_out
(
self
):
def
update_out
(
self
):
if
not
self
.
input
.
current_choice
:
if
not
self
.
input
.
current_choice
:
return
return
logger
.
debug
(
f
'
Start filtering
'
)
try
:
try
:
logger
.
debug
(
f
"""
Filtering labels by (
{
self
.
min_diam
.
value
/
self
.
binning
}
< size[px] <
{
self
.
max_diam
.
value
/
self
.
binning
}
)
and eccentricity >
{
self
.
max_ecc
.
value
}
"""
)
selected_labels
=
dask
.
array
.
map_blocks
(
selected_labels
=
dask
.
array
.
map_blocks
(
filter_labels
,
filter_labels
,
self
.
labels
,
self
.
labels
,
...
@@ -264,12 +312,16 @@ class ExampleQWidget(q.QWidget):
...
@@ -264,12 +312,16 @@ class ExampleQWidget(q.QWidget):
)
)
if
not
(
name
:
=
"
selected labels
"
)
in
self
.
viewer
.
layers
:
if
not
(
name
:
=
"
selected labels
"
)
in
self
.
viewer
.
layers
:
logger
.
debug
(
f
'
No selected labels layer found, adding one
'
)
self
.
viewer
.
add_labels
(
self
.
viewer
.
add_labels
(
data
=
selected_labels
,
data
=
selected_labels
,
opacity
=
0.5
,
opacity
=
0.5
,
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
**
{
"
name
"
:
name
,
"
scale
"
:
self
.
scale
},
)
)
else
:
else
:
logger
.
debug
(
f
'
Updating selected labels layer with
{
selected_labels
}
'
)
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
self
.
viewer
.
layers
[
name
].
scale
=
self
.
scale
self
.
viewer
.
layers
[
name
].
data
=
selected_labels
self
.
viewer
.
layers
[
name
].
data
=
selected_labels
# self.save_params()
# self.save_params()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment