From 55cc7e79c9e6f1f5f8b25d38dd6a48639b422fd2 Mon Sep 17 00:00:00 2001 From: Luke Parry Date: Fri, 4 Mar 2022 16:49:50 +0000 Subject: [PATCH] Added jumpDelay and jumpSpeed to match changes in libSLM --- pyslm/geometry/geometry.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pyslm/geometry/geometry.py b/pyslm/geometry/geometry.py index c76fcd8..8adca3c 100644 --- a/pyslm/geometry/geometry.py +++ b/pyslm/geometry/geometry.py @@ -60,6 +60,7 @@ def __init__(self): self._laserMode = 1 self._pointDistance = 0 self._pointExposureTime = 0 + self._pointDelay = 0 self._jumpDelay = 0 self._jumpSpeed = 0 @@ -175,16 +176,27 @@ def pointDistance(self, pointDistance: int): self._pointDistance = pointDistance @property - def jumpDelay(self) ->int: - """ The jump delay time (usually expressed as an integer :math:`\\mu m`) """ - return self._jumpDelay + def pointDelay(self) -> int: + """ + The delay added between individual point exposure (usually expressed as an integer [:math:`\\mu s]`). + This must be set to zero (default) if it is not explicitly used. + """ + return self._pointDelay - @jumpDelay.setter - def jumpDelay(self, delay: int): + @pointDelay.setter + def pointDelay(self, delay: int): + self._pointDelay = delay + + @property + def jumpDelay(self) -> int: """ - The jump speed between scan vectors (usually expressed as an integer :math:`mm/s`). This must be set to + The jump delay between scan vectors (usually expressed as an integer [:math:`\mu s`]). This must be set to zero (default) if it is not explicitly used. """ + return self._jumpDelay + + @jumpDelay.setter + def jumpDelay(self, delay: int): self._jumpDelay = delay @property