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

minor updates #287

Merged
merged 1 commit into from
May 10, 2024
Merged

minor updates #287

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
13 changes: 2 additions & 11 deletions ...ain/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class AdvancedTimingPanel extends Panel {

private CheckBox cbxAlternateScanDirection_;

private LightSheetManagerModel model_;
private final LightSheetManagerModel model_;

public AdvancedTimingPanel(final LightSheetManagerModel model) {
super("Advanced Timing Settings");
Expand Down Expand Up @@ -68,7 +68,7 @@ private void createUserInterface() {
timingSettings.cameraExposure(), 0.0, 1000.0, 0.25);

cbxAlternateScanDirection_ = new CheckBox(
"Alternate Scan Direction", false, CheckBox.LEFT);
"Alternate scan direction", false, CheckBox.LEFT);

add(lblDelayBeforeScan, "");
add(spnDelayBeforeScan_, "wrap");
Expand All @@ -94,55 +94,46 @@ private void createEventHandlers() {
spnDelayBeforeScan_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().delayBeforeScan(spnDelayBeforeScan_.getDouble());
//System.out.println("delayBeforeScan: " + acqSettings.getTimingSettings().delayBeforeScan());
});

spnScansPerSlice_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().scansPerSlice(spnScansPerSlice_.getInt());
//System.out.println("scansPerSlice: " + acqSettings.getTimingSettings().scansPerSlice());
});

spnScanDuration_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().scanDuration(spnScanDuration_.getDouble());
//System.out.println("scanDuration: " + acqSettings.getTimingSettings().scanDuration());
});

spnDelayBeforeLaser_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().delayBeforeLaser(spnDelayBeforeLaser_.getDouble());
//System.out.println("delayBeforeLaser: " + acqSettings.getTimingSettings().delayBeforeLaser());
});

spnLaserTriggerDuration_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().laserTriggerDuration(spnLaserTriggerDuration_.getDouble());
//System.out.println("laserTriggerDuration: " + acqSettings.getTimingSettings().laserTriggerDuration());
});

spnDelayBeforeCamera_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().delayBeforeCamera(spnDelayBeforeCamera_.getDouble());
//System.out.println("delayBeforeCamera: " + acqSettings.getTimingSettings().delayBeforeCamera());
});

spnCameraTriggerDuration_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().cameraTriggerDuration(spnCameraTriggerDuration_.getDouble());
//System.out.println("cameraTriggerDuration: " + acqSettings.getTimingSettings().cameraTriggerDuration());
});

spnCameraExposure_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().cameraExposure(spnCameraExposure_.getDouble());
//System.out.println("cameraExposure: " + acqSettings.getTimingSettings().cameraExposure());
});

cbxAlternateScanDirection_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.timingSettingsBuilder().useAlternateScanDirection(cbxAlternateScanDirection_.isSelected());
//System.out.println("useAlternateScanDirection: " + acqSettings.getTimingSettings().useAlternateScanDirection());
});
}
}
11 changes: 6 additions & 5 deletions ...main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import java.util.Objects;

// TODO: virtual slit panel not needed in SCAPE mode
public class SliceSettingsPanel extends Panel {

// regular panel
Expand Down Expand Up @@ -66,7 +67,7 @@ private void createUserInterface() {
// virtual slit panel
lblScanResetTime_ = new Label("Scan Reset Time [ms]:");
lblScanSettleTime_ = new Label("Scan Settle Time [ms]:");
lblShutterWidth_ = new Label("Shutter Width [\u00B5s]:");
lblShutterWidth_ = new Label("Shutter Width [µs]:");
lblShutterSpeed_ = new Label("1 / (shutter speed):");
spnScanResetTime_ = Spinner.createDoubleSpinner(
sliceSettingsLS.scanResetTime(), 1.0, 100.0, 0.25);
Expand All @@ -88,11 +89,11 @@ private void createEventHandlers() {

// regular panel
cbxMinimizeSlicePeriod_.registerListener(e -> {
final boolean selected = !cbxMinimizeSlicePeriod_.isSelected();
lblSlicePeriod_.setEnabled(selected);
spnSlicePeriod_.setEnabled(selected);
final boolean selected = cbxMinimizeSlicePeriod_.isSelected();
lblSlicePeriod_.setEnabled(!selected);
spnSlicePeriod_.setEnabled(!selected);
model_.acquisitions().settingsBuilder()
.sliceSettingsBuilder().minimizeSlicePeriod(!selected);
.sliceSettingsBuilder().minimizeSlicePeriod(selected);
});

spnSlicePeriod_.registerListener(e -> {
Expand Down
12 changes: 3 additions & 9 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ChannelTable extends JScrollPane {
private ChannelTableData tableData_;
private ChannelTableModel tableModel_;

private LightSheetManagerModel model_;
private final LightSheetManagerModel model_;

public ChannelTable(final LightSheetManagerModel model) {
model_ = Objects.requireNonNull(model);
Expand Down Expand Up @@ -83,12 +83,10 @@ public JTable getTable() {
}

public void updatePresetCombos(final String channelGroup) {
//System.out.println("channelGroup: " + channelGroup);
final String[] presets = getAllPresets(channelGroup);
cmbPresets_.removeAllItems();
for (String preset : presets) {
cmbPresets_.addItem(preset);
//System.out.println("preset " + preset);
}
cmbPresets_.setSelectedItem(channelGroup);
}
Expand All @@ -98,7 +96,6 @@ private String[] getAllPresets(final String configGroup) {
return model_.studio().core().getAvailableConfigs(configGroup).toArray();
}


// TODO: probably should be in the model
public String[] getAvailableGroups() {
StrVector groups;
Expand All @@ -123,10 +120,7 @@ public String[] getAvailableGroups() {
}

public void setHeaderRowColor(final boolean state) {
if (state) {
table_.getTableHeader().setForeground(Color.BLACK);
} else {
table_.getTableHeader().setForeground(Color.GRAY);
}
table_.getTableHeader().setForeground(state ? Color.BLACK : Color.GRAY);
}

}
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private void createEventHandlers() {
final Object currentLabel = cmbChannelGroup_.getSelectedItem();
final String[] groupLabels = table_.getAvailableGroups();
cmbChannelGroup_.removeAllItems();
for (String label : groupLabels){
for (String label : groupLabels) {
cmbChannelGroup_.addItem(label);
//System.out.println(label);
if (label.equals(currentLabel)) {
Expand Down
Loading