Commit e99ffdcc authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

+2 tests

parent 51770119
......@@ -24,6 +24,15 @@ __copyright__ = "Copyright 2018, Elphel, Inc."
__license__ = "GPL-3.0+"
__email__ = "oleg@elphel.com"
'''
Notes:
- Pillow 5.1.0. Version 4.1.1 throws error (VelueError):
~$ (sudo) pip3 install Pillow --upgrade
~$ python3
>>> import PIL
>>> PIL.PILLOW_VERSION
'5.1.0'
'''
from PIL import Image
import xml.etree.ElementTree as ET
......
#!/usr/bin/env python3
from PIL import Image
import xml.etree.ElementTree as ET
import numpy as np
import matplotlib.pyplot as plt
import imagej_tiff as ijt
#tiff = ijt.imagej_tiff('test.tiff')
#print(tiff.nimages)
#print(tiff.labels)
#print(tiff.infos)
#tiff.show_images(['X-corr','Y-corr',0,2])
#plt.show()
import json
import xml.etree.ElementTree as ET
import xml.dom.minidom as minidom
import ast
def calc_packed_value(layer,index,tile):
t = tile.flatten()
a = layer[index]
res = 0
for i in a:
res += t[i[0]]*i[1]
return res
def iterate_tile(lut,tile):
# hard coded layers names
lst = ['diagm-pair','diago-pair']
#lut['diagm-pair']
#stack = ijt.getstack(lst)
e = ET.parse('tile_packing_table.xml').getroot()
#print(ET.tostring(e))
#reparsed = minidom.parseString(ET.tostring(e,""))
#print(reparsed.toprettyxml(indent="\t"))
# LUT is a dict
LUT = {}
for table in e:
layer = table.get('layer')
LUT[layer] = []
for row in table:
LUT[layer].append(ast.literal_eval(row.text))
print(LUT)
print("Done")
#!/usr/bin/env python3
__copyright__ = "Copyright 2018, Elphel, Inc."
__license__ = "GPL-3.0+"
__email__ = "oleg@elphel.com"
'''
Open all tiffs in a folder, combine a single tiff from randomly selected
tiles from originals
'''
from PIL import Image
import os
import sys
import glob
import imagej_tiff as ijt
import numpy as np
import itertools
# USAGE: python3 test_3.py some-path
VALUES_LAYER_NAME = 'other'
try:
src = sys.argv[1]
except IndexError:
src = "."
tlist = glob.glob(src+"/*.tiff")
print("Found "+str(len(tlist))+" tiff files:")
print("\n".join(tlist))
''' WARNING, assuming:
- timestamps and part of names match
- layer order and names are identical
'''
# open the first one to get dimensions and other info
tiff = ijt.imagej_tiff(tlist[0])
#del tlist[0]
# shape as tiles? make a copy or make writeable
# (242, 324, 9, 9, 5)
# get labels
labels = tiff.labels.copy()
labels.remove(VALUES_LAYER_NAME)
print("Image data layers: "+str(labels))
print("Values layer: "+str([VALUES_LAYER_NAME]))
# create copies
tiles = np.copy(tiff.getstack(labels,shape_as_tiles=True))
tiles_bkp = np.copy(tiles)
values = np.copy(tiff.getvalues(label=VALUES_LAYER_NAME))
print("Tiled tiff shape: "+str(tiles.shape))
# now generate a layer of indices to get other tiles
indices = np.random.random_integers(0,len(tlist)-1,size=(tiles.shape[0],tiles.shape[1]))
#print(indices.shape)
# counts tiles from a certain tiff
shuffle_counter = np.zeros(len(tlist),np.int32)
shuffle_counter[0] = tiles.shape[0]*tiles.shape[1]
for i in range(1,len(tlist)):
#print(tlist[i])
tmp_tiff = ijt.imagej_tiff(tlist[i])
tmp_tiles = tmp_tiff.getstack(labels,shape_as_tiles=True)
tmp_vals = tmp_tiff.getvalues(label=VALUES_LAYER_NAME)
#tmp_tiles =
#tiles[indices==i] = tmp_tiff[indices==i]
# straight and clear
# can do quicker?
for y,x in itertools.product(range(indices.shape[0]),range(indices.shape[1])):
if indices[y,x]==i:
tiles[y,x] = tmp_tiles[y,x]
values[y,x] = tmp_vals[y,x]
shuffle_counter[i] +=1
# check shuffle counter
for i in range(1,len(shuffle_counter)):
shuffle_counter[0] -= shuffle_counter[i]
print("Tiffs shuffle counter = "+str(shuffle_counter))
# test later
# now pack from 9x9 to 1x25
# tiles and values
#!/usr/bin/env python3
from PIL import Image
import xml.etree.ElementTree as ET
import numpy as np
import matplotlib.pyplot as plt
import imagej_tiff as ijt
#tiff = ijt.imagej_tiff('test.tiff')
#print(tiff.nimages)
#print(tiff.labels)
#print(tiff.infos)
#tiff.show_images(['X-corr','Y-corr',0,2])
#plt.show()
import json
import xml.etree.ElementTree as ET
import xml.dom.minidom as minidom
import ast
import itertools
class PackingTable:
def __init__(self,filename,layers_of_interest):
e = ET.parse(filename).getroot()
#print(ET.tostring(e))
#reparsed = minidom.parseString(ET.tostring(e,""))
#print(reparsed.toprettyxml(indent="\t"))
# Parse xml:
# td = tmp_dict
td = {}
for table in e:
layer = table.get('layer')
td[layer] = []
for row in table:
# safe evaluation
td[layer].append(ast.literal_eval(row.text))
# order
LUT = []
for layer in layers_of_interest:
LUT.append(td[layer])
self.lut = LUT
# A tile consists of layers
# layer is packed from 9x9 to 25x1
def pack_layer(layer,lut_row):
#print(layer.shape)
t = layer.flatten()
out = np.array([])
# iterate through rows
for i in range(len(lut_row)):
val = 0
# process row value
for j in lut_row[i]:
if np.isnan(t[j[0]]):
val = np.nan
break
val += t[j[0]]*j[1]
out = np.append(out,val)
return out
# tile and lut already ordered and indices match
def pack_tile(tile,lut):
out = np.array([])
for i in range(len(lut)):
layer = pack_layer(tile[:,:,i],lut[i])
out = np.append(out,layer)
return out
# hard coded layers names
#lst = ['diagm-pair','diago-pair']
#lut['diagm-pair']
#stack = ijt.getstack(lst)
#out = []
#for item in lst:
# layer = pack_layer(tile[labels.index(item)],lut[item])
# out.append(layer)
#return out
def get_packed_square(tiles,values,lut,i,j,radius):
out = np.array([])
# max
Y = tiles.shape[0]
X = tiles.shape[1]
#print("Number of elements: "+str(2*radius+1))
#for k in range(1):
# print(k)
for k in range(2*radius+1):
y = i+k-radius
if y<0:
y = 0
elif y>(Y-1):
y = Y-1
for l in range(2*radius+1):
x = j+l-radius
if x<0:
x = 0
elif x>(X-1):
x = X-1
#print(str(k)+" "+str(l))
# tiles[y,x] and lut are with layers
packed_tile = pack_tile(tiles[y,x],lut)
#packed_tile = np.array([])
out = np.append(out,packed_tile)
return out
# VARS
# tiff name
tiff_name = "1521849031_093189-ML_DATA-08B-O-OFFS1.0.tiff"
# packing table name
ptab_name = "tile_packing_table.xml"
# CONSTANTS
RADIUS = 1
LAYERS_OF_INTEREST = ['diagm-pair','diago-pair']
# MAIN
# get packing table
pt = PackingTable(ptab_name,LAYERS_OF_INTEREST).lut
# get tiff
tiff = ijt.imagej_tiff(tiff_name)
tiles = tiff.getstack(LAYERS_OF_INTEREST,shape_as_tiles=True)
values = tiff.getvalues(label='other')
#tiff.show_images(LAYERS_OF_INTEREST)
#plt.show()
print(tiles.shape)
# now iterate through tiles, get neighbors
# 9x9 2 layers, no neighbors
l = np.zeros((9,9))
for y,x in itertools.product(range(l.shape[0]),range(l.shape[1])):
l[y,x] = 9*y + x
print(l)
l_packed = pack_layer(l,pt[0])
#print(l_packed.shape)
#print(l_packed)
# a few assertions
assert l_packed[0]==(l[0,2]*1.0+l[0,3]*1.0+l[0,4]*1.0+l[0,5]*1.0+l[0,6]*1.0)
assert l_packed[1]==(l[1,1]*1.0+l[1,2]*1.0+l[2,1]*1.0+l[2,2]*1.0)
assert l_packed[15]==(l[4,4]*1.0)
print("Test: pack_layer() ... ok")
l1 = l
l2 = l*2
ls = np.dstack((l1,l2))
#equivalent: ls = np.stack((l1,l2),axis=2)
#print(ls)
#print(ls.shape)
l_packed = pack_tile(ls,pt)
#print(l_packed)
# a few assertions for layer 2
assert l_packed[25]==(ls[0,2,1]*1.0+ls[0,3,1]*1.0+ls[0,4,1]*1.0+ls[0,5,1]*1.0+ls[0,6,1]*1.0)
assert l_packed[26]==(ls[1,1,1]*1.0+ls[1,2,1]*1.0+ls[2,1,1]*1.0+ls[2,2,1]*1.0)
assert l_packed[40]==(ls[4,4,1]*1.0)
print("Test: pack_tile() ... ok")
#for i in range(tiles.shape[0]):
# for j in range(tiles.shape[1]):
#print("tile: "+str(i)+", "+str(j))
# FEED = get_packed_square(tiles,values,pt,i,j,RADIUS)
#xy = [(x,y) for x in range(tiles.shape[0]) for y in range(tiles.shape[1])]
#for x,y in xy:
# FEED = get_packed_square(tiles,values,pt,x,y,RADIUS)
#def gps(i,j):
#a = i
#for k in range(3):
#for l in range(3):
#a += k+l
#return a
#for x,y in itertools.product(range(3*tiles.shape[0]),range(3*tiles.shape[1])):
# print(str(x)+" "+str(y))
#FEED = get_packed_square(tiles,values,pt,x,y,RADIUS)
#FEED = gps(x,y)
#for i in range(tiles.shape[0]):
# for j in range(tiles.shape[1]):
# b = gps(i,j)
#for i in range(tiles.shape[0]*tiles.shape[1]):
# b = gps(i,i)
# basic test
#print(tiles[150,100])
#print(values[150,100])
#FEED = get_packed_square(tiles,values,pt,150,100,RADIUS)
#print(FEED)
#print(FEED.shape)
print("Done")
Markdown is supported
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