Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ interface Builder<T extends Builder<T>> {
/**
* Sets the time point interval between time points in seconds.
*
* @param timePointInterval the time point interval in seconds
* @param timePointIntervalSec the time point interval in seconds
* @return {@code this} builder
*/
T timePointInterval(final double timePointInterval);
T timePointIntervalSec(final double timePointIntervalSec);

/**
* Sets the acquisition mode.
Expand Down Expand Up @@ -229,7 +229,7 @@ interface Builder<T extends Builder<T>> {
*
* @return the time point interval in seconds.
*/
double timePointInterval();
double timePointIntervalSec();

/**
* Returns the acquisition mode.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public interface TimingSettings {
*
* @return the delay time in milliseconds
*/
double delayBeforeScan();
double delayBeforeScanMs();

/**
* Returns the number of one way beam scans per slice.
Expand All @@ -28,49 +28,49 @@ public interface TimingSettings {
*
* @return the time in milliseconds of one beam scan sweep
*/
double scanDuration();
double scanDurationMs();

/**
* Returns the delay time in milliseconds before the laser trigger.
*
* @return the delay time in milliseconds before the laser trigger
*/
double delayBeforeLaser();
double delayBeforeLaserMs();

/**
* Returns the laser trigger duration in milliseconds.
*
* @return the laser trigger duration in milliseconds
*/
double laserTriggerDuration();
double laserTriggerDurationMs();

/**
* Returns the delay time in milliseconds before the camera is triggered.
*
* @return the delay time in milliseconds before the camera is triggered
*/
double delayBeforeCamera();
double delayBeforeCameraMs();

/**
* Returns the camera trigger duration in milliseconds.
*
* @return the camera trigger duration in milliseconds
*/
double cameraTriggerDuration();
double cameraTriggerDurationMs();

/**
* Returns the duration in milliseconds that the camera shutter is open.
*
* @return the duration in milliseconds that the camera shutter is open
*/
double cameraExposure();
double cameraExposureMs();

/**
* Returns the duration in milliseconds of each slice.
*
* @return the duration in milliseconds of each slice
*/
double sliceDuration();
double sliceDurationMs();

/**
* Returns true if the scan direction is inverted.
Expand All @@ -86,7 +86,7 @@ interface Builder {
*
* @param delayMs the delay time in milliseconds
*/
Builder delayBeforeScan(final double delayMs);
Builder delayBeforeScanMs(final double delayMs);

/**
* Sets the number of one way beam scans per slice
Expand All @@ -100,42 +100,42 @@ interface Builder {
*
* @param durationMs the duration in milliseconds
*/
Builder scanDuration(final double durationMs);
Builder scanDurationMs(final double durationMs);

/**
* Sets the delay time before the laser trigger.
*
* @param delayMs the delay in milliseconds
*/
Builder delayBeforeLaser(final double delayMs);
Builder delayBeforeLaserMs(final double delayMs);

/**
* Sets the duration of the laser trigger.
*
* @param durationMs the duration in milliseconds
*/
Builder laserTriggerDuration(final double durationMs);
Builder laserTriggerDurationMs(final double durationMs);

/**
* Sets the delay before the camera trigger is fired.
*
* @param delayMs the delay in milliseconds
*/
Builder delayBeforeCamera(final double delayMs);
Builder delayBeforeCameraMs(final double delayMs);

/**
* Sets the duration of the camera trigger.
*
* @param durationMs the duration in milliseconds
*/
Builder cameraTriggerDuration(final double durationMs);
Builder cameraTriggerDurationMs(final double durationMs);

/**
* Sets the camera exposure time.
*
* @param exposureMs the exposure time in milliseconds
*/
Builder cameraExposure(final double exposureMs);
Builder cameraExposureMs(final double exposureMs);

/**
* Sets the scan direction.
Expand All @@ -147,7 +147,7 @@ interface Builder {
/**
* Computes the slice duration from the other timing settings.
*/
double sliceDuration();
double sliceDurationMs();

/**
* Creates an immutable instance of TimingSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public abstract static class Builder<T extends Builder<T>> implements Acquisitio
private int postMoveDelay_ = 0;
private boolean useTimePoints_ = false;
private int numTimePoints_ = 1;
private double timePointInterval_ = 0.0;
private double timePointIntervalSec_ = 0.0;
private AcquisitionMode acquisitionMode_ = AcquisitionMode.NO_SCAN;

private DefaultAutofocusSettings.Builder afBuilder_ = DefaultAutofocusSettings.builder();
Expand All @@ -56,7 +56,7 @@ public Builder(final AcquisitionSettings settings) {
postMoveDelay_ = settings.postMoveDelay();
useTimePoints_ = settings.isUsingTimePoints();
numTimePoints_ = settings.numTimePoints();
timePointInterval_ = settings.timePointInterval();
timePointIntervalSec_ = settings.timePointIntervalSec();
acquisitionMode_ = settings.acquisitionMode();
afBuilder_ = settings.autofocus().copyBuilder();
channelBuilder_ = settings.channels().copyBuilder();
Expand Down Expand Up @@ -193,12 +193,12 @@ public T numTimePoints(final int numTimePoints) {
/**
* Sets the time point interval between time points in seconds.
*
* @param timePointInterval the time point interval in seconds
* @param timePointIntervalSec the time point interval in seconds
* @return {@code this} builder
*/
@Override
public T timePointInterval(final double timePointInterval) {
timePointInterval_ = timePointInterval;
public T timePointIntervalSec(final double timePointIntervalSec) {
timePointIntervalSec_ = timePointIntervalSec;
return self();
}

Expand Down Expand Up @@ -277,7 +277,7 @@ public VolumeSettings.Builder volumeBuilder() {
private final int postMoveDelay_;
private final boolean useTimePoints_;
private final int numTimePoints_;
private final double timePointInterval_;
private final double timePointIntervalSec_;
private final AcquisitionMode acquisitionMode_;

private final DefaultAutofocusSettings autofocus_;
Expand All @@ -302,7 +302,7 @@ protected BaseAcquisitionSettings(Builder<?> builder) {
postMoveDelay_ = builder.postMoveDelay_;
useTimePoints_ = builder.useTimePoints_;
numTimePoints_ = builder.numTimePoints_;
timePointInterval_ = builder.timePointInterval_;
timePointIntervalSec_ = builder.timePointIntervalSec_;
acquisitionMode_ = builder.acquisitionMode_;
autofocus_ = builder.afBuilder_.build();
channels_ = builder.channelBuilder_.build();
Expand Down Expand Up @@ -425,8 +425,8 @@ public int numTimePoints() {
* @return the time point interval in seconds.
*/
@Override
public double timePointInterval() {
return timePointInterval_;
public double timePointIntervalSec() {
return timePointIntervalSec_;
}

/**
Expand Down
Loading
Loading