root/Autoscope-Controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undid offset

Browse source
This commit is contained in:
2ManyProjects 2026-01-10 00:43:00 -06:00
parent a838deb9e2
commit ef611b6798
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/stitching_scanner.py
View file

@ -161,6 +161,7 @@ class StitchingScanner:
def _blend_horizontal_at_y(self, base: np.ndarray, strip: np.ndarray, def _blend_horizontal_at_y(self, base: np.ndarray, strip: np.ndarray,
blend_width: int, append_right: bool, blend_width: int, append_right: bool,
x_off: int = 0,
y_offset: int = 0) -> np.ndarray: y_offset: int = 0) -> np.ndarray:
h_base, w_base = base.shape[:2] h_base, w_base = base.shape[:2]
h_strip, w_strip = strip.shape[:2] h_strip, w_strip = strip.shape[:2]
@ -432,12 +433,12 @@ class StitchingScanner:
strip_start = max(0, w - append_width - BLEND_WIDTH) strip_start = max(0, w - append_width - BLEND_WIDTH)
new_strip = frame[:, strip_start:] new_strip = frame[:, strip_start:]
self.mosaic = self._blend_horizontal_at_y( self.mosaic = self._blend_horizontal_at_y(
self.mosaic, new_strip, BLEND_WIDTH, append_right=True, y_offset=y_offset) self.mosaic, new_strip, BLEND_WIDTH, append_right=True, x_off=int(self.state.current_x), y_offset=y_offset)
else: else:
strip_end = min(w, append_width + BLEND_WIDTH) strip_end = min(w, append_width + BLEND_WIDTH)
new_strip = frame[:, :strip_end] new_strip = frame[:, :strip_end]
self.mosaic = self._blend_horizontal_at_y( self.mosaic = self._blend_horizontal_at_y(
self.mosaic, new_strip, BLEND_WIDTH, append_right=False, y_offset=y_offset) self.mosaic, new_strip, BLEND_WIDTH, append_right=False, x_off=int(self.state.current_x), y_offset=y_offset)
self._displacement_since_append_x = fractional_remainder self._displacement_since_append_x = fractional_remainder
self._displacement_since_append_y = 0.0 self._displacement_since_append_y = 0.0
@ -756,7 +757,7 @@ class StitchingScanner:
# Done when we've moved enough # Done when we've moved enough
if abs(total_y) >= target_displacement: if abs(total_y) >= target_displacement:
self.log(f"Row transition complete: {abs(total_y):.1f}px") self.log(f"Row transition complete: {abs(total_y):.1f}px")
self.state.current_y -= self.state.mosaic_init_width self.state.current_y = 0
self.motion.send_command('s') self.motion.send_command('s')
time.sleep(self.config.settle_time) time.sleep(self.config.settle_time)