From 454e03f0198c629f2c15ef1b27fb890a4df0be61 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Tue, 4 Dec 2012 14:53:44 +0000
Subject: [PATCH] SP-366 BIS-254: SOB-6: fixing dependencies
SVN: 27855
---
.../application/detailviewers/ChannelChooserPanel.java | 5 -----
.../screening/shared/basic/dto/ImageDatasetParameters.java | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooserPanel.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooserPanel.java
index d04fad25187..6efe18c4688 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooserPanel.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ChannelChooserPanel.java
@@ -86,11 +86,6 @@ public class ChannelChooserPanel extends LayoutContainer
"Grayscale images with color depth higher then 8 bits are transformed in the optimal way for a single image. Otherwise no filter is applied.",
"", false));
- public static final LabeledItem<InternalImageTransformationInfo> USER_DEFINED_RESCALING_TRANSFORMATION =
- convertToLabeledItem(new InternalImageTransformationInfo(
- ScreeningConstants.USER_DEFINED_RESCALING_CODE, "User defined",
- "User defined intensity rescaling", "", false));
-
private final IMessageProvider messageProvider;
private IDefaultChannelState defaultChannelState;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
index a5bce90cfc0..8c9ede0b88f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ImageDatasetParameters.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers.ChannelChooserPanel;
/**
* Describes the images in the dataset: tiles geometry, channels, dataset code and plate geometry if
@@ -132,7 +131,9 @@ public class ImageDatasetParameters implements Serializable
{
List<InternalImageTransformationInfo> result =
new ArrayList<InternalImageTransformationInfo>();
- result.add(ChannelChooserPanel.USER_DEFINED_RESCALING_TRANSFORMATION.getItem());
+ result.add(new InternalImageTransformationInfo(
+ ScreeningConstants.USER_DEFINED_RESCALING_CODE, "User defined",
+ "User defined intensity rescaling", "", false));
for (InternalImageChannel channel : channels)
{
--
GitLab