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 @@ -181,6 +181,8 @@ private void createUserInterface() {
final boolean isUsingAdvancedTiming = settings.isUsingAdvancedTiming();
cbxUseAdvancedTiming_ = new CheckBox("Use advanced timing settings",
12, isUsingAdvancedTiming, CheckBox.RIGHT);
cbxUseAdvancedTiming_.setToolTipText("Use the advanced timing values above "
+ "instead of the ones computed from the slice settings.");
// initial enabled or disabled state
swapTimingSettingsPanels(isUsingAdvancedTiming);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,21 @@ private void createUserInterface() {
timingSettings.scansPerSlice(), 1, 1000, 1);
spnCameraExposure_ = Spinner.createDoubleSpinner(
timingSettings.cameraExposureMs(), 0.0, 1000.0, 0.25);
spnDelayBeforeScan_.setToolTipText(
"Delay from the start of the slice to the start of the scan.");
spnScansPerSlice_.setToolTipText("Number of scanner sweeps per slice.");
// TODO: add a tooltip to the scan duration, SCAPE sets the sweep from the slice duration
spnDelayBeforeLaser_.setToolTipText(
"Delay from the start of the slice to the laser trigger.");
spnLaserTriggerDuration_.setToolTipText("How long the laser trigger stays high.");
spnDelayBeforeCamera_.setToolTipText(
"Delay from the start of the slice to the camera trigger.");
spnCameraTriggerDuration_.setToolTipText("How long the camera trigger stays high.");
spnCameraExposure_.setToolTipText("Exposure set on the camera.");

cbxAlternateScanDirection_ = new CheckBox("Alternate scan direction",
timingSettings.useAlternateScanDirection(), CheckBox.LEFT);
cbxAlternateScanDirection_.setToolTipText("Alternate the direction of the scanner sweep.");

add(lblDelayBeforeScan_, "");
add(spnDelayBeforeScan_, "wrap");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ public boolean prepareControllerForAcquisition(
try {
core_.setShutterDevice(plcLaser_.getDeviceName());
} catch (Exception e) {
model_.logging().reportError("could not set shutter to " + plcLaser_.getDeviceName());
model_.logging().reportError("could not set shutter to " + plcLaser_.getDeviceName()
+ ": " + e.getMessage());
}

if (settings.stageScan().enabled()) {
Expand Down Expand Up @@ -323,7 +324,8 @@ public boolean prepareControllerForAcquisitionSCAPE(
try {
core_.setShutterDevice(plcLaser_.getDeviceName());
} catch (Exception e) {
model_.logging().reportError("could not set shutter to " + plcLaser_.getDeviceName());
model_.logging().reportError("could not set shutter to " + plcLaser_.getDeviceName()
+ ": " + e.getMessage());
}

scanDistance_ = 0;
Expand Down Expand Up @@ -1131,7 +1133,8 @@ public void setPathPreset(int side) {
core_.waitForConfig(group, preset);
}
} catch (Exception e) {
model_.logging().reportError("Couldn't set the path config " + preset + " of group " + group);
model_.logging().reportError("Couldn't set the path config " + preset + " of group " + group
+ ": " + e.getMessage());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ void finish() {
final Datastore.SaveMode saveMode = SaveMode.convert(acqSettings_.saveMode());
datastore_.save(saveMode, savePath);
} catch (Exception e) {
model_.logging().reportError("could not save the acquisition data to: \n" + savePath);
model_.logging().reportError(e, "could not save the acquisition data to: \n" + savePath);
}
}
}
Expand Down
Loading