Moved axes_to_array into general utilities (55c3014d) · Commits · OpenFlexure / openflexure-microscope-server

openflexure_microscope/init.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@ __version__ = "0.1.0"

		from .microscope import Microscope
		from . import config
		from . import utilities
		No newline at end of file

+0 −18

Original line number	Diff line number	Diff line
		@@ -43,24 +43,6 @@ class JsonPayload:
		return val


		def axes_to_array(coordinate_dictionary, axis_keys=['x', 'y', 'z'], base_array=None):
		"""Takes key-value pairs of a JSON value, and maps onto an array"""
		# If no base array is given
		if not base_array:
		# Create an array of zeros
		base_array = [0]*len(axis_keys)
		else:
		# Create a copy of the passed base_array
		base_array = copy.copy(base_array)

		# Do the mapping
		for axis, key in enumerate(axis_keys):
		if key in coordinate_dictionary:
		base_array[axis] = coordinate_dictionary[key]

		return base_array


		def gen(camera):
		"""Video streaming generator function."""
		while True:

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		import copy

		def axes_to_array(coordinate_dictionary, axis_keys=['x', 'y', 'z'], base_array=None):
		"""Takes key-value pairs of a JSON value, and maps onto an array"""
		# If no base array is given
		if not base_array:
		# Create an array of zeros
		base_array = [0]*len(axis_keys)
		else:
		# Create a copy of the passed base_array
		base_array = copy.copy(base_array)

		# Do the mapping
		for axis, key in enumerate(axis_keys):
		if key in coordinate_dictionary:
		base_array[axis] = coordinate_dictionary[key]

		return base_array
		No newline at end of file