From e3f83bfb221e85c312222af6744f2dc254787b89 Mon Sep 17 00:00:00 2001 From: mwinter Date: Mon, 11 Dec 2023 10:22:25 +0000 Subject: [PATCH] final state of tracker before code reorganization --- python/vernier_tracker.py | 2 +- supercollider/installation_control_v2.scd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/vernier_tracker.py b/python/vernier_tracker.py index 89a3590..23b8aa8 100644 --- a/python/vernier_tracker.py +++ b/python/vernier_tracker.py @@ -243,7 +243,7 @@ cv2.setMouseCallback("Frame", moveROI) #picam2.controls.ScalerCrop = (800, 0, 3040, 3040) #picam2.controls.ScalerCrop = (1375, 550, 1800, 1800) -picam2.controls.ScalerCrop = (945, 630, 2025, 2025) +picam2.controls.ScalerCrop = (915, 630, 2025, 2025) #picam2.controls.Brightness = 0.2 picam2.controls.Contrast = 1.1 #picam2.set_controls({"ExposureValue": 2}) diff --git a/supercollider/installation_control_v2.scd b/supercollider/installation_control_v2.scd index c3bb27d..b7d7195 100644 --- a/supercollider/installation_control_v2.scd +++ b/supercollider/installation_control_v2.scd @@ -137,10 +137,10 @@ imgSelect = { dirTuplesSeq = 2.collect({dirTuples.deepCopy.scramble.collect({arg tup; [tup, tup * -1]}).flatten}).flatten; dirAdjustRoutine = Routine({ 120.wait; - imgPositions[imgIndex] = curPos.deepCopy; + //imgPositions[imgIndex] = curPos.deepCopy; trackLock = true; //10.wait; - 100.do({arg dirAdjust; + 16.do({arg dirAdjust; "here".postln; if(dirAdjust < 8, { tarPos = imgPositions[imgIndex].deepCopy + (dirTuplesSeq[dirAdjust] * 200);