[bls337]

• Add AcquisitionEvent.setTimeoutMs. The timeout could be set from JSON but not from Java. The default is still null, meaning no time limit.

[bls337]

@nicost This is my first PR to AcqEngJ, please take a look. Please keep an eye on this repo, I will be making a number of PRs to fix issues.

[bls337]

@marktsuchida if you have a chance, please take a look

[marktsuchida]

Looks good to me but I think propagating the timeout in the merge constructor doesn't actually do much, because the timeout is read from each sub-event of a sequence:

AcqEngJ/src/main/java/org/micromanager/acqj/internal/Engine.java

Line 537 in 83adb86

if (event.getSequence().get(i).getTimeoutMs() != null) {

So the effect is only visible if you call getTimeoutMs() on the merged event itself, and might be slightly misleading if the sub-events have differing timeouts. Maybe that's still a good thing (for consistency with the other two fields you mentioned) — just wanted to be sure it's intentional.

[bls337]

@marktsuchida Thanks. I was trying to be consistent but upon further inspection it was unnecessary.

Unlike the minimum start time and exposure, nothing in AcqEngJ reads the timeout off the merged event, so I dropped the line and the test.

The new commit's CI needs approving again.

[marktsuchida]

@bls337 Thanks!