From 18b0cb0ba29515dfa134693f3956eb3d7ca406c9 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 13 Aug 2010 11:27:16 +0000
Subject: [PATCH] screening: well dialog size
SVN: 17446
---
.../detailviewers/WellContentDialog.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
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 93b98d6ebc2..649450ade13 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
--
GitLab