Skip to content

use <> for iterators #325

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
merged 1 commit into from
Nov 10, 2025
Merged

use <> for iterators #325

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/LightSheetManagerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2025";
public static final String description = "A plugin to control various types of light sheet microscopes.";
public static final String menuName = "Light Sheet Manager";
public static final String version = "0.5.0";
public static final String version = "0.5.1";

private Studio studio_;
private LightSheetManager model_;
Expand Down
14 changes: 7 additions & 7 deletions ...main/java/org/micromanager/lightsheetmanager/model/acquisitions/LSMAcquisitionEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static Iterator<AcquisitionEvent> createTimelapseMultiChannelVolumeAcqEve
}
Function<AcquisitionEvent, Iterator<AcquisitionEvent>> timelapse =
timelapse(acquisitionSettings.numTimePoints(),
(double) acquisitionSettings.timePointInterval());
acquisitionSettings.timePointInterval());

if (acquisitionSettings.numChannels() == 1) {
throw new RuntimeException("Expected multiple channels but only one found");
Expand Down Expand Up @@ -167,10 +167,10 @@ public static Iterator<AcquisitionEvent> createAcqEvents(
}

public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> cameras(String[] cameraDeviceNames) {
return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
return (AcquisitionEvent event) -> new Iterator<>() {

private int cameraIndex_ = 0;
private String[] cameraDeviceNames_ = cameraDeviceNames;
private final String[] cameraDeviceNames_ = cameraDeviceNames;

@Override
public boolean hasNext() {
Expand All @@ -190,7 +190,7 @@ public AcquisitionEvent next() {

public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> zStack(
int startSliceIndex, int stopSliceIndex) {
return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
return (AcquisitionEvent event) -> new Iterator<>() {

private int zIndex_ = startSliceIndex;

Expand All @@ -212,7 +212,7 @@ public AcquisitionEvent next() {

public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> timelapse(
int numTimePoints, Double intervalMs) {
return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
return (AcquisitionEvent event) -> new Iterator<>() {

int frameIndex_ = 0;

Expand Down Expand Up @@ -243,7 +243,7 @@ public AcquisitionEvent next() {
*/
public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> channels(
ChannelSpec[] channelList) {
return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
return (AcquisitionEvent event) -> new Iterator<>() {
int index = 0;

@Override
Expand Down Expand Up @@ -289,7 +289,7 @@ public AcquisitionEvent next() {
*/
public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> positions(
PositionList positionList) {
return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
return (AcquisitionEvent event) -> new Iterator<>() {
int index = 0;

@Override
Expand Down
Loading