diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java index 8419244e2f2e6175b00d06050c9af82d47170fb5..1262833d15b79527dbf27f69e94895ce98641f63 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooser.java @@ -102,9 +102,11 @@ class ChannelChooser /** Refreshes the displayed images, but not the rest of the GUI */ public void refresh() { + // TODO 2011-09-13, Tomasz Pylak: add transformation code for single channel if chosen + String imageTransformationCode = null; LogicalImageChannelsReference state = new LogicalImageChannelsReference(basicImage, basicChannelCodes, - selectedOverlayChannels); + imageTransformationCode, selectedOverlayChannels); Widget view = viewerFactory.create(state); imageContainer.removeAll(); imageContainer.add(view); diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java index 27f32a49fcfb81e7472c642a4f4622acb230d218..839c9fc7221bf9fae9c8dafe1efa41775057fbbe 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/WellContentDialog.java @@ -160,8 +160,11 @@ public class WellContentDialog extends Dialog String sessionId = getSessionId(viewContext); final LogicalImageReference wellImages = new LogicalImageReference(imageDataset, locationOrNull); + // TODO 2011-09-13, Tomasz Pylak: add transformation code for single channel if chosen + String imageTransformationCode = null; LogicalImageChannelsReference channelReferences = - LogicalImageChannelsReference.createWithoutOverlays(wellImages, channels); + LogicalImageChannelsReference.createWithoutOverlays(wellImages, channels, + imageTransformationCode); LayoutContainer staticTilesGrid = LogicalImageViewer.createTilesGrid(channelReferences, sessionId, imageSizePx, createImageLinks); @@ -435,8 +438,7 @@ public class WellContentDialog extends Dialog // TODO KE: pass analysis procedure from plate layout to material detail view ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ClientPluginFactory .openImagingMaterialViewer(material, getExperimentCriteria(), - AnalysisProcedureCriteria.createNoProcedures(), - viewContext); + AnalysisProcedureCriteria.createNoProcedures(), viewContext); } }; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/dto/LogicalImageChannelsReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/dto/LogicalImageChannelsReference.java index 56dbab0bdc8868d3c1e107841938e447ded8a30f..2929a72282ea2e35044a34fb79d56fd6970fc51b 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/dto/LogicalImageChannelsReference.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/dto/LogicalImageChannelsReference.java @@ -28,25 +28,29 @@ import java.util.Set; public class LogicalImageChannelsReference { public static LogicalImageChannelsReference createWithoutOverlays( - LogicalImageReference basicImage, List<String> channels) + LogicalImageReference basicImage, List<String> channels, + String imageTransformationCodeOrNull) { return new LogicalImageChannelsReference(basicImage, channels, - new HashSet<ImageDatasetChannel>()); + imageTransformationCodeOrNull, new HashSet<ImageDatasetChannel>()); } // ---- - + private final LogicalImageReference basicImage; private final List<String> channels; + private final String imageTransformationCodeOrNull; + private final Set<ImageDatasetChannel> overlayChannels; public LogicalImageChannelsReference(LogicalImageReference basicImage, List<String> channels, - Set<ImageDatasetChannel> overlayChannels) + String imageTransformationCodeOrNull, Set<ImageDatasetChannel> overlayChannels) { this.basicImage = basicImage; this.channels = channels; + this.imageTransformationCodeOrNull = imageTransformationCodeOrNull; this.overlayChannels = overlayChannels; } @@ -64,4 +68,9 @@ public class LogicalImageChannelsReference { return overlayChannels; } + + public String tryGetImageTransformationCode() + { + return imageTransformationCodeOrNull; + } }