From f58c7c88a5ad00a764ce98f9a0e5ce8dc2fe13bb Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 13 Sep 2011 09:59:01 +0000
Subject: [PATCH] LMS-2502 GUI interface to pass the transformation
SVN: 22907
---
.../detailviewers/ChannelChooser.java | 4 +++-
.../detailviewers/WellContentDialog.java | 8 +++++---
.../dto/LogicalImageChannelsReference.java | 17 +++++++++++++----
3 files changed, 21 insertions(+), 8 deletions(-)
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 8419244e2f2..1262833d15b 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 27f32a49fcf..839c9fc7221 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 56dbab0bdc8..2929a72282e 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;
+ }
}
--
GitLab