diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java index 34405b5..59496ec 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java @@ -108,10 +108,10 @@ public String[] getAvailableGroups() { ArrayList strGroups = new ArrayList<>(); // strGroups.add("None"); for (String group : groups) { -// System.out.println("grp: " + group); // StrVector st = model_.studio().core().getAvailableConfigGroups(); // for (String s : st) // System.out.println(s); + // a channel group must have multiple presets to be detected if (model_.studio().core().getAvailableConfigs(group).size() > 1) { strGroups.add(group); } diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java index 8cb48fa..e9f420a 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java @@ -245,27 +245,21 @@ boolean run() { - - if (projectionMode) { - // DiSPIM always uses 45 degrees - double theta = Math.PI / 4; - double zStep = acqSettings_.volumeSettings().sliceStepSize(); - int numZSlices = acqSettings_.volumeSettings().slicesPerView(); - int cameraWidth = (int) core_.getImageWidth(); - int cameraHeight = (int) core_.getImageHeight(); - double pixelSizeXYUm = core_.getPixelSizeUm(); - - int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views - if (acqSettings_.isUsingChannels()) { - numUniqueProcessorsNeeded *= acqSettings_.channels().length; - } - - AcqEngJStackProcessors proc = - new AcqEngJStackProcessors(ObliqueStackProcessor.YX_PROJECTION, theta, - pixelSizeXYUm, - zStep, numZSlices, cameraWidth, cameraHeight, numUniqueProcessorsNeeded); - currentAcquisition_.addImageProcessor(proc); - } + // TODO: how much of this do we need? use the projector plugin... +// if (projectionMode) { +// // DiSPIM always uses 45 degrees +// double theta = Math.PI / 4; +// double zStep = acqSettings_.volumeSettings().sliceStepSize(); +// int numZSlices = acqSettings_.volumeSettings().slicesPerView(); +// int cameraWidth = (int) core_.getImageWidth(); +// int cameraHeight = (int) core_.getImageHeight(); +// double pixelSizeXYUm = core_.getPixelSizeUm(); +// +// int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views +// if (acqSettings_.isUsingChannels()) { +// numUniqueProcessorsNeeded *= acqSettings_.channels().length; +// } +// } long acqButtonStart = System.currentTimeMillis(); diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java index 4dc1c53..540dcef 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java @@ -283,27 +283,21 @@ boolean run() { - - if (projectionMode) { - // DiSPIM always uses 45 degrees - double theta = Math.PI / 4; - double zStep = acqSettings_.volumeSettings().sliceStepSize(); - int numZSlices = acqSettings_.volumeSettings().slicesPerView(); - int cameraWidth = (int) core_.getImageWidth(); - int cameraHeight = (int) core_.getImageHeight(); - double pixelSizeXYUm = core_.getPixelSizeUm(); - - int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views - if (acqSettings_.isUsingChannels()) { - numUniqueProcessorsNeeded *= acqSettings_.channels().length; - } - - AcqEngJStackProcessors proc = - new AcqEngJStackProcessors(ObliqueStackProcessor.YX_PROJECTION, theta, - pixelSizeXYUm, - zStep, numZSlices, cameraWidth, cameraHeight, numUniqueProcessorsNeeded); - currentAcquisition_.addImageProcessor(proc); - } + // TODO: how much of this do we need? use the projector plugin... +// if (projectionMode) { +// // DiSPIM always uses 45 degrees +// double theta = Math.PI / 4; +// double zStep = acqSettings_.volumeSettings().sliceStepSize(); +// int numZSlices = acqSettings_.volumeSettings().slicesPerView(); +// int cameraWidth = (int) core_.getImageWidth(); +// int cameraHeight = (int) core_.getImageHeight(); +// double pixelSizeXYUm = core_.getPixelSizeUm(); +// +// int numUniqueProcessorsNeeded = 2; // Always keep enough around for 2 views +// if (acqSettings_.isUsingChannels()) { +// numUniqueProcessorsNeeded *= acqSettings_.channels().length; +// } +// } long acqButtonStart = System.currentTimeMillis();