Commit da8f5cf4 authored by Edward Andò's avatar Edward Andò
Browse files

Merge branch 'splitImage' of gricad-gitlab.univ-grenoble-alpes.fr:ttk/spam into splitImage

parents f40784da 96e7271d
Pipeline #64763 failed with stages
in 14 minutes and 1 second
# If you're changing this, consider relaunching:
# https://gricad-gitlab.univ-grenoble-alpes.fr/ttk/docker-ttk/-/pipelines
numpy==1.19.5 # Python >=3.6
scipy==1.5.4 # Python >=3.6
scikit-image==0.17.2 # Python >=3.6
tifffile==2020.8.25 # Python >=3.6
matplotlib==3.3.4 # Python >=3.6
SimpleITK==2.0.2
progressbar==2.5
gmsh==4.8.0
meshio==4.3.11 # Python >=3.6
# Anything later than this causes an abort at the end of sphinx 3.5.2 build
pybind11==2.5.0 # Python !=3.0, !=3.1, !=3.2, !=3.3, !=3.4, >=2.7
# multigrid solver for random walker segmentation
pyamg==4.0.0
############
# Optional #
############
# mpi
# mpi4py==3.0.3
# Jupyter
#ipykernel==5.5.0 # Python >=3.5
ipython==7.16.1 # Python >=3.6
# R (correlated random field)
rpy2==3.2.2
#############
# Graphical #
#############
#PyQt5==5.15.4 # Python >=3.6
#PyQt5-sip==12.8.1 # Python >=3.5
#qimage2ndarray==1.8.3
# If you're changing this, consider relaunching:
# https://gricad-gitlab.univ-grenoble-alpes.fr/ttk/docker-ttk/-/pipelines
# https://gricad-gitlab.univ-grenoble-alpes.fr/ttk/docker-ttk/-/pipelines
# numpy==1.20.1 # Python >=3.7
numpy==1.19.5 # Python >=3.6
numpy==1.20.1 # Python >=3.7
# scipy==1.6.1 # Python >=3.7
scipy==1.5.4 # Python >=3.6
scipy==1.6.1 # Python >=3.7
# scikit-image==0.18.1 # Python >=3.7
scikit-image==0.17.2 # Python >=3.6
scikit-image==0.18.1 # Python >=3.7
# tifffile==2021.3.16 # Python >=3.7
tifffile==2020.8.25 # Python >=3.6
tifffile==2021.3.16 # Python >=3.7
matplotlib==3.3.4 # Python >=3.6
......@@ -19,10 +15,10 @@ SimpleITK==2.0.2
progressbar==2.5
gmsh==4.8.0 # not needed if you can install it with apt install python3-gmsh
gmsh==4.8.0
meshio==4.3.11 # Python >=3.6
# Anything later than this causes an abort at the end of sphinx build
# Anything later than this causes an abort at the end of sphinx 3.5.2 build
pybind11==2.5.0 # Python !=3.0, !=3.1, !=3.2, !=3.3, !=3.4, >=2.7
# multigrid solver for random walker segmentation
......@@ -37,8 +33,7 @@ pyamg==4.0.0
# Jupyter
#ipykernel==5.5.0 # Python >=3.5
#ipython==7.21.0 # Python >=3.7
ipython==7.16.1 # Python >=3.6
ipython==7.21.0 # Python >=3.7
# R (correlated random field)
rpy2==3.2.2
......
......@@ -621,7 +621,7 @@ def splitImage(im, divisions, margin, verbose=False):
(blockSize[0] + 2*margin, blockSize[1] + 2*margin, blockSize[2] + 2*margin),
boxOrigin=(blockOrigin[0], blockOrigin[1], blockOrigin[2]))
# Save the results
output.update({str(zBlock).zfill(2) + str(yBlock).zfill(2) + str(xBlock).zfill(2): [blockOrigin, imBlock]})
output.update({str(zBlock) + str(yBlock) + str(xBlock): [blockOrigin, imBlock]})
# Save the margin
output.update({'margin':margin})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment