Skip to content

use correct name for live button on setup panel, update calib setting… #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bls337 merged 1 commit into from
Dec 5, 2025
Merged

use correct name for live button on setup panel, update calib setting… #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private void createEventHandlers() {
// live mode
btnLiveMode_.registerListener(e -> {
closeLiveModeWindow();
final CameraBase camera = model_.devices().getDevice("ImagingCamera");
final CameraBase camera = model_.devices().getFirstImagingCamera();
if (camera != null) {
try {
model_.studio().core().setCameraDevice(camera.getDeviceName());
Expand All @@ -147,6 +147,7 @@ private void createEventHandlers() {
isLivePressed = true;
model_.studio().live().setLiveModeOn(true);
} else {
// TODO: use correct name for camera, ImagingCamera1, etc
model_.studio().logs().showError(
"No device for \"ImagingCamera\" set in the device adapter.");
}
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ private void createEventHandlers() {
// FIXME: update channelOffset
// was: channelOffset = ASIdiSPIM.getFrame().getAcquisitionPanel().getChannelOffset();
final double newOffset = piezoPosition - rate * scannerPosition - channelOffset;
txtOffset_.setText(String.format("%.3f μm", newOffset));
//txtOffset_.setText(String.format("%.3f μm", newOffset));
lblOffsetValue_.setText(String.format("%.3f μm", newOffset));
model_.acquisitions().settingsBuilder()
.sliceCalibrationBuilder(pathNum_).sliceOffset(newOffset);
model_.studio().logs().logMessage("updated offset for view " + pathNum_ + "; new value is " +
newOffset + " (with channel offset of " + channelOffset + ")");
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public SetupPanel(final LightSheetManager model, final int pathNum) {
cameraPanel_ = new CameraPanel(model_);

// TODO: add joystick panel back in
//leftPanel_.add(joystickPanel_, "growx, wrap");
leftPanel_.add(excitationPanel_, "growx, wrap");
//leftPanel_.add(joystickPanel_, "growx, wrap");
if (model_.devices().getDeviceAdapter().getMicroscopeGeometry() == GeometryType.SCAPE) {
singleAxisPanel_ = new SingleAxisPanel(model_);
leftPanel_.add(singleAxisPanel_, "growx, wrap");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/positions/PositionUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void setup() {
}

private void createPollingTask() {
worker_ = new SwingWorker<Void, Void>() {
worker_ = new SwingWorker<>() {
@Override
protected Void doInBackground() {
while (isPolling_.get()) {
Expand Down
Loading