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

Merge branch 'new-picamera-compatibility' into 'master'

Browse source 
Handle memoryview in ndarray_to_json

See merge request openflexure/openflexure-microscope-server!40
This commit is contained in:
Joel Collins 2020-02-17 15:04:45 +00:00
commit 356ff3336b
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/utilities.py
View file

@ -23,6 +23,10 @@ def serialise_array_b64(npy_arr):
def ndarray_to_json(arr: np.ndarray): def ndarray_to_json(arr: np.ndarray):
if isinstance(arr, memoryview):
# We can transparently convert memoryview objects to arrays
# This comes in very handy for the lens shading table.
arr = np.array(arr)
b64_string, dtype, shape = serialise_array_b64(arr) b64_string, dtype, shape = serialise_array_b64(arr)
return { return {
"@type": "ndarray", "@type": "ndarray",