rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code formatting

Browse source
This commit is contained in:
Joel Collins 2020-10-26 14:58:09 +00:00
parent ef4e825b9c
commit 601e51d9b9
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
openflexure_microscope/api/default_extensions/scan.py
View file

@ -34,16 +34,18 @@ def construct_grid(initial, step_sizes, n_steps, style="raster"):
coord = initial coord = initial
arr.append(initial) arr.append(initial)
# for spiral, n_steps is the number of shells, and so only requires n_steps[0] # for spiral, n_steps is the number of shells, and so only requires n_steps[0]
for i in range(2, n_steps[0]+1): for i in range(2, n_steps[0] + 1):
arr.append([]) arr.append([])
side_length = (2 * i) - 1 side_length = (2 * i) - 1
# iteratively generate the next location to append # iteratively generate the next location to append
coord = [coord[ax] + [-1,1][ax] * step_sizes[ax] for ax in range(2)] coord = [coord[ax] + [-1, 1][ax] * step_sizes[ax] for ax in range(2)]
for direction in ([1,0],[0,-1],[-1,0],[0,1]): for direction in ([1, 0], [0, -1], [-1, 0], [0, 1]):
for edge_images in range(side_length-1): for _ in range(side_length - 1):
coord = [coord[ax] + direction[ax] * step_sizes[ax] for ax in range(2)] coord = [
arr[i-1].append(tuple(coord)) coord[ax] + direction[ax] * step_sizes[ax] for ax in range(2)
]
arr[i - 1].append(tuple(coord))
else: else:
for i in range(n_steps[0]): # x axis for i in range(n_steps[0]): # x axis