Skip to content
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

get timepoints control to work correctly #153

Merged
merged 1 commit into from
Sep 28, 2023
Merged

get timepoints control to work correctly #153

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
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.Objects;

public class NavigationTab extends Panel {
public class NavigationTab extends Panel {

private final NavigationPanel navigationPanel_;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ private void createUserInterface() {

// TODO: update duration labels
private void createEventHandlers() {
final DefaultAcquisitionSettingsDISPIM.Builder asb_ =
final DefaultAcquisitionSettingsDISPIM.Builder asb =
model_.acquisitions().settingsBuilder();

spnNumTimePoints_.registerListener(e -> {
asb_.numTimePoints(spnNumTimePoints_.getInt());
asb.numTimePoints(spnNumTimePoints_.getInt());
//updateDurationLabels();
//System.out.println("getNumTimePoints: " + model_.acquisitions().getAcquisitionSettings().getNumTimePoints());
});

spnTimePointInterval_.registerListener(e -> {
asb_.timePointInterval(spnTimePointInterval_.getInt());
asb.timePointInterval(spnTimePointInterval_.getInt());
//updateDurationLabels();
//System.out.println("getTimePointInterval: " + model_.acquisitions().getAcquisitionSettings().getTimePointInterval());
});
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ private void runAcquisitionSCAPE() {
// System.out.println(asb_.build());
final boolean isPolling = frame_.getNavigationPanel().isPolling();
if (isPolling) {
System.out.println("stopped!");
studio_.logs().logMessage("stopped position polling");
//System.out.println("stopped!");
frame_.getNavigationPanel().stopPolling();
}

Expand All @@ -200,9 +201,6 @@ private void runAcquisitionSCAPE() {
asb_.sheetCalibrationBuilder(1).useAutoSheetWidth(true);
asb_.sheetCalibrationBuilder(1).autoSheetWidthPerPixel(0.0);

// TODO: put this here for now... (make sure vars are updated)
setAcquisitionSettings(asb_.build());

final boolean isLiveModeOn = studio_.live().isLiveModeOn();
if (isLiveModeOn) {
studio_.live().setLiveModeOn(false);
Expand Down Expand Up @@ -634,6 +632,7 @@ public void close() {

// start polling for navigation panel
if (isPolling) {
studio_.logs().logMessage("started position polling after acquisition");
frame_.getNavigationPanel().startPolling();
}
}
Expand Down