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 93b98d6ebc29d7e8c8b3b4195c2c2fbcb53056d9..649450ade1377ec4d4437fe5e979d1af6f91cb46 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 @@ -84,9 +84,8 @@ public class WellContentDialog extends Dialog createImageViewer(images, channelState, viewContext, imgW, imgH); container.add(imageViewer); - float imageSizeMultiplyFactor = getImageSizeMultiplyFactor(images); - dialogWidth = (int) (imgW * imageSizeMultiplyFactor) * images.getTileColsNum() + 100; - dialogHeight = (int) (imgH * imageSizeMultiplyFactor) * images.getTileRowsNum() + 300; + dialogWidth = getDialogWidth(images, imgW); + dialogHeight = getDialogHeight(images, imgH); } else { dialogWidth = 300; @@ -96,6 +95,19 @@ public class WellContentDialog extends Dialog setupContentAndShow(contentDialog, container, dialogWidth, dialogHeight, title); } + private static int getDialogWidth(final WellImages images, int imgW) + { + float imageSizeMultiplyFactor = getImageSizeMultiplyFactor(images); + return (int) (imgW * imageSizeMultiplyFactor) * images.getTileColsNum() + 100; + } + + private static int getDialogHeight(final WellImages images, int imgH) + { + float imageSizeMultiplyFactor = getImageSizeMultiplyFactor(images); + return Math + .max((int) (imgH * imageSizeMultiplyFactor) * images.getTileRowsNum() + 100, 300); + } + private static SingleExperimentSearchCriteria getExperiment(WellData wellData) { return new SingleExperimentSearchCriteria(wellData.getExperimentId().getId(), wellData