Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aliby-mirror
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Swain Lab
aliby
aliby-mirror
Commits
7206793a
Commit
7206793a
authored
2 years ago
by
Alán Muñoz
Browse files
Options
Downloads
Patches
Plain Diff
refactor(Image): Rename ImageLocal->ImageLocalOME
parent
522a0bf9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/aliby/io/dataset.py
+2
-2
2 additions, 2 deletions
src/aliby/io/dataset.py
src/aliby/io/image.py
+2
-1
2 additions, 1 deletion
src/aliby/io/image.py
src/aliby/tile/tiler.py
+2
-2
2 additions, 2 deletions
src/aliby/tile/tiler.py
with
6 additions
and
5 deletions
src/aliby/io/dataset.py
+
2
−
2
View file @
7206793a
...
@@ -7,7 +7,7 @@ from typing import Union
...
@@ -7,7 +7,7 @@ from typing import Union
import
omero
import
omero
from
agora.io.bridge
import
BridgeH5
from
agora.io.bridge
import
BridgeH5
from
aliby.io.image
import
ImageLocal
from
aliby.io.image
import
ImageLocal
OME
from
aliby.io.omero
import
BridgeOmero
from
aliby.io.omero
import
BridgeOmero
...
@@ -42,7 +42,7 @@ class DatasetLocal:
...
@@ -42,7 +42,7 @@ class DatasetLocal:
@property
@property
def
date
(
self
):
def
date
(
self
):
return
ImageLocal
(
list
(
self
.
get_images
().
values
())[
0
]).
date
return
ImageLocal
OME
(
list
(
self
.
get_images
().
values
())[
0
]).
date
def
get_images
(
self
):
def
get_images
(
self
):
return
{
f
.
name
:
str
(
f
)
for
f
in
self
.
fpath
.
glob
(
"
*.tif
"
)}
return
{
f
.
name
:
str
(
f
)
for
f
in
self
.
fpath
.
glob
(
"
*.tif
"
)}
...
...
This diff is collapsed.
Click to expand it.
src/aliby/io/image.py
+
2
−
1
View file @
7206793a
...
@@ -62,6 +62,7 @@ class BaseLocalImage(ABC):
...
@@ -62,6 +62,7 @@ class BaseLocalImage(ABC):
return
self
return
self
def
format_data
(
self
,
img
):
def
format_data
(
self
,
img
):
# Format image using x and y size from metadata.
self
.
_formatted_img
=
da
.
rechunk
(
self
.
_formatted_img
=
da
.
rechunk
(
img
,
img
,
...
@@ -207,7 +208,7 @@ class ImageDir(BaseLocalImage):
...
@@ -207,7 +208,7 @@ class ImageDir(BaseLocalImage):
- One folders per position.
- One folders per position.
- Images are flat.
- Images are flat.
- Channel, Time, z-stack and the others are determined by filenames.
- Channel, Time, z-stack and the others are determined by filenames.
- Provides Dimorder as
TCZYX
- Provides Dimorder as
it is set in the filenames, or expects order during instatiation
"""
"""
def
__init__
(
self
,
path
:
t
.
Union
[
str
,
PosixPath
]):
def
__init__
(
self
,
path
:
t
.
Union
[
str
,
PosixPath
]):
...
...
This diff is collapsed.
Click to expand it.
src/aliby/tile/tiler.py
+
2
−
2
View file @
7206793a
...
@@ -30,7 +30,7 @@ from skimage.registration import phase_cross_correlation
...
@@ -30,7 +30,7 @@ from skimage.registration import phase_cross_correlation
from
agora.abc
import
ParametersABC
,
ProcessABC
from
agora.abc
import
ParametersABC
,
ProcessABC
from
agora.io.writer
import
BridgeH5
from
agora.io.writer
import
BridgeH5
from
aliby.io.image
import
Image
,
ImageLocal
,
ImageDir
from
aliby.io.image
import
Image
,
ImageLocal
OME
,
ImageDir
from
aliby.tile.traps
import
segment_traps
from
aliby.tile.traps
import
segment_traps
...
@@ -262,7 +262,7 @@ class Tiler(ProcessABC):
...
@@ -262,7 +262,7 @@ class Tiler(ProcessABC):
@classmethod
@classmethod
def
from_h5
(
def
from_h5
(
cls
,
cls
,
image
:
t
.
Union
[
Image
,
ImageLocal
,
ImageDir
],
image
:
t
.
Union
[
Image
,
ImageLocal
OME
,
ImageDir
],
filepath
:
t
.
Union
[
str
,
PosixPath
],
filepath
:
t
.
Union
[
str
,
PosixPath
],
parameters
:
TilerParameters
=
None
,
parameters
:
TilerParameters
=
None
,
):
):
...
...
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