diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java index 3d51fa509ffc3af0ed5c667f36a127120cd02a4a..2f54c2e3565294a36e93f74083a22bffd3131ab6 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java @@ -133,8 +133,11 @@ public class ImageDataSetInformation extends BasicDataSetInformation @Override public String toString() { - return "[ dataset code: " + super.getDataSetCode() + ", tile Rows Number: " - + tileRowsNumber + ", tile Columns Number: " + tileColumnsNumber + ", channels: " + String imgConfig = + imageStorageConfiguratonOrNull != null ? ", config = " + + imageStorageConfiguratonOrNull.toString() : ""; + return "[ dataset: " + super.getDataSetCode() + ", tile: " + tileRowsNumber + "x" + + tileColumnsNumber + imgConfig + ", channels: " + CollectionUtils.abbreviate(channels, -1) + ", images: " + CollectionUtils.abbreviate(images, 20); } diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java index 7dde8735f4be60b114029b91cda334299bc99f62..5674ac8a2762653e5166efb2ff6971140a7412be 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java @@ -16,6 +16,8 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1; +import ch.systemsx.cisd.common.utilities.AbstractHashable; + /** * Configuration of how images should be stored. By default: * <UL> @@ -25,7 +27,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1; * * @author Tomasz Pylak */ -public class ImageStorageConfiguraton +public class ImageStorageConfiguraton extends AbstractHashable { /** No thumbnails are generated by default. */ private ThumbnailsStorageFormat thumbnailsStorageFormatOrNull = null; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java index 990a3b6f4de58f06505051ca1a2b7d7d00b36f47..e75029fa8ace524138d1a41daa4316698a73b799 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java @@ -16,12 +16,14 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1; +import ch.systemsx.cisd.common.utilities.AbstractHashable; + /** * Configuration parameters which describe how thumbnails should be generated. * * @author Tomasz Pylak */ -public class ThumbnailsStorageFormat +public class ThumbnailsStorageFormat extends AbstractHashable { /** Maximum default width and height of a thumbnail */ public static final int DEFAULT_THUMBNAIL_MAX_SIZE = 200;