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 @@ -21,9 +21,9 @@ interface Builder<T extends Builder<T>> {
T saveDirectory(final String directory);

/**
* Sets the folder name.
* Sets the save name prefix, used for the acquisition folder name.
*
* @param name the name of the folder
* @param name the save name prefix
* @throws IllegalArgumentException if the name cannot be used as a Windows file name
*/
T saveNamePrefix(final String name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,44 @@ public interface AcquisitionSettingsDispim extends AcquisitionSettings {
Builder copyBuilder();

/**
* Returns the immutable DefaultTimingSettings instance.
* Returns the immutable TimingSettings instance.
*
* @return immutable DefaultTimingSettings instance.
* @return immutable TimingSettings instance.
*/
TimingSettings timing();

/**
* Returns the immutable DefaultSliceSettings instance.
* Returns the immutable SliceSettings instance.
*
* @return immutable DefaultSliceSettings instance.
* @return immutable SliceSettings instance.
*/
SliceSettings slice();

/**
* Returns the immutable DefaultSliceSettingsLS instance.
* Returns the immutable SliceSettingsLightSheet instance.
*
* @return immutable DefaultSliceSettingsLS instance.
* @return immutable SliceSettingsLightSheet instance.
*/
SliceSettingsLightSheet sliceLS();

/**
* Returns the immutable DefaultScanSettings instance.
* Returns the immutable StageScanSettings instance.
*
* @return immutable DefaultScanSettings instance.
* @return immutable StageScanSettings instance.
*/
StageScanSettings stageScan();

/**
* Returns the immutable DefaultSheetCalibration instance.
* Returns the immutable SheetCalibration instance.
*
* @return immutable DefaultSheetCalibration instance.
* @return immutable SheetCalibration instance.
*/
SheetCalibration sheetCalibration(final int view);

/**
* Returns the immutable DefaultSliceCalibration instance.
* Returns the immutable SliceCalibration instance.
*
* @return immutable DefaultSliceCalibration instance.
* @return immutable SliceCalibration instance.
*/
SliceCalibration sliceCalibration(final int view);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public interface AcquisitionSettingsScape extends AcquisitionSettings {
Builder copyBuilder();

/**
* Returns the immutable DefaultTimingSettings instance.
* Returns the immutable TimingSettings instance.
*
* @return immutable DefaultTimingSettings instance.
* @return immutable TimingSettings instance.
*/
TimingSettings timing();

Expand All @@ -27,23 +27,23 @@ public interface AcquisitionSettingsScape extends AcquisitionSettings {
SliceSettings slice();

/**
* Returns the immutable DefaultScanSettings instance.
* Returns the immutable StageScanSettings instance.
*
* @return immutable DefaultScanSettings instance.
* @return immutable StageScanSettings instance.
*/
StageScanSettings stageScan();

/**
* Returns the immutable DefaultSheetCalibration instance.
* Returns the immutable SheetCalibration instance.
*
* @return immutable DefaultSheetCalibration instance.
* @return immutable SheetCalibration instance.
*/
SheetCalibration sheetCalibration();

/**
* Returns the immutable DefaultSliceCalibration instance.
* Returns the immutable SliceCalibration instance.
*
* @return immutable DefaultSliceCalibration instance.
* @return immutable SliceCalibration instance.
*/
SliceCalibration sliceCalibration();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ public T saveDirectory(final String directory) {
}

/**
* Sets the folder name.
* Sets the save name prefix, used for the acquisition folder name.
*
* @param name the name of the folder
* @param name the save name prefix
* @throws IllegalArgumentException if the name cannot be used as a Windows file name
*/
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ void finish() {
final String savePath = FileUtils.createUniquePath(
acqSettings_.saveDirectory(), acqSettings_.saveNamePrefix());
try {
// convert from DataStorage.SaveMode to Datastore.SaveMode
// convert from SaveMode to Datastore.SaveMode
final Datastore.SaveMode saveMode = SaveMode.convert(acqSettings_.saveMode());
datastore_.save(saveMode, savePath);
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ boolean setup() {
model_.logging().reportError("XY positions expected but the position list is empty");
return false;
}
// this is needed for LSMAcquisitionEvents to work with multiple positions
// a position's z is taken from its entry for the Core-Focus device,
// so without one a stored z would be skipped
if (core_.getFocusDevice().isEmpty()) {
model_.logging().reportError(
"The default focus device \"Core-Focus\" needs to be set to use multiple positions.");
Expand Down
Loading