LMS-1882 show better well tooltip, minor refactorings

SVN: 18870

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/RealNumberRenderer.java

@@ -26,6 +26,12 @@ public final class RealNumberRenderer implements GridCellRenderer<BaseEntityMode
 
     public static String render(String value,
             RealNumberFormatingParameters realNumberFormatingParameters)
+    {
+        return render(value, realNumberFormatingParameters, true);
+    }
+
+    public static String render(String value,
+            RealNumberFormatingParameters realNumberFormatingParameters, boolean withTooltip)
     {
         if (realNumberFormatingParameters.isFormatingEnabled() == false || value.length() == 0)
         {
@@ -48,7 +54,13 @@ public final class RealNumberRenderer implements GridCellRenderer<BaseEntityMode
                 formattedValue =
                         NumberFormat.getFormat(format + EXPONENT_FORMAT).format(doubleValue);
             }
-            return MultilineHTML.wrapUpInDivWithTooltip(formattedValue, value);
+            if (withTooltip)
+            {
+                return MultilineHTML.wrapUpInDivWithTooltip(formattedValue, value);
+            } else
+            {
+                return formattedValue;
+            }
         } catch (NumberFormatException ex)
         {
             return value;
@@ -64,7 +76,7 @@ public final class RealNumberRenderer implements GridCellRenderer<BaseEntityMode
 
     public String render(float value)
     {
-        return render("" + value, realNumberFormatingParameters);
+        return render("" + value, realNumberFormatingParameters, false);
     }
 
     public Object render(BaseEntityModel<?> model, String property, ColumnData config,

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/HeatmapPresenter.java

@@ -92,7 +92,7 @@ class HeatmapPresenter
                 Color color = renderer.getColor(wellData);
                 String tooltipOrNull =
                         WellTooltipGenerator.tryGenerateTooltip(model, rowIx, colIx,
-                                featureIndexOrNull);
+                                featureIndexOrNull, realNumberRenderer);
                 viewManipulations.refreshWellStyle(rowIx, colIx, color, tooltipOrNull);
             }
         }
@@ -249,7 +249,7 @@ class HeatmapPresenter
     {
         private static final String NEWLINE = "\n";
 
-        private static final int MAX_DESCRIBED_FEATURES = 7;
+        private static final int MAX_DESCRIBED_FEATURES = 30;
 
         /**
          * Generates a short description of the well, which can be used as e.g. a tooltip
@@ -258,17 +258,21 @@ class HeatmapPresenter
          *            distinguished.
          */
         public static String tryGenerateTooltip(PlateLayouterModel model, int rowIx, int colIx,
-                Integer featureIndexOrNull)
+                Integer featureIndexOrNull, IRealNumberRenderer realNumberRenderer)
         {
-            return new WellTooltipGenerator(model).tryGenerateShortDescription(rowIx, colIx,
-                    featureIndexOrNull);
+            return new WellTooltipGenerator(model, realNumberRenderer).tryGenerateShortDescription(
+                    rowIx, colIx, featureIndexOrNull);
         }
 
         private final PlateLayouterModel model;
 
-        private WellTooltipGenerator(PlateLayouterModel model)
+        private final IRealNumberRenderer realNumberRenderer;
+
+        private WellTooltipGenerator(PlateLayouterModel model,
+                IRealNumberRenderer realNumberRenderer)
         {
             this.model = model;
+            this.realNumberRenderer = realNumberRenderer;
         }
 
         private String tryGenerateShortDescription(int rowIx, int colIx, Integer featureIndexOrNull)
@@ -327,7 +331,7 @@ class HeatmapPresenter
             {
                 return "";
             }
-            String textValue = (value == null ? "" : "" + value);
+            String textValue = (value == null ? "" : "" + renderFloat(value));
             if (distinguished)
             {
                 textValue = "<b>" + textValue + "</b>";
@@ -335,6 +339,11 @@ class HeatmapPresenter
             return featureLabels.get(featureIndex) + ": " + textValue + NEWLINE;
         }
 
+        private String renderFloat(float value)
+        {
+            return realNumberRenderer.render(value);
+        }
+
         private static String generateMetadataDescription(WellData wellData)
         {
             WellMetadata metadata = wellData.tryGetMetadata();

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/PlateLayouter.java

@@ -166,6 +166,7 @@ public class PlateLayouter
             SimpleModelComboBox<Integer> heatmapKindChooser, LayoutContainer legendContainer)
     {
         LayoutContainer container = new LayoutContainer();
+        container.setScrollMode(Scroll.AUTO);
         container.setLayout(new RowLayout());
         container.add(new Text(
                 "Hold the mouse cursor over a well or click on it to get the details."),
@@ -191,7 +192,6 @@ public class PlateLayouter
     private static LayoutContainer renderPlateLayout(Component[][] renderedWells)
     {
         LayoutContainer plateMatrix = new LayoutContainer();
-        plateMatrix.setScrollMode(Scroll.AUTO);
         TableLayout layout = new TableLayout(getColumnsNum(renderedWells) + 1);
         layout.setCellSpacing(2);
         plateMatrix.setLayout(layout);

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/FeatureVectorValues.java

@@ -18,12 +18,15 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
+import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
+
 /**
  * Bean for one feature vector of the well. Contains data set code, well position and array of
  * feature values. Float.NaN is used for unknown feature value in this array.
  * 
  * @author Tomasz Pylak
  */
+@DoNotEscape
 public class FeatureVectorValues implements IsSerializable
 {
     private WellFeatureVectorReference featureVectorReference;

screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/heatmaps/WellTooltipGeneratorTest.java

@@ -25,6 +25,7 @@ import java.util.List;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.IRealNumberRenderer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
@@ -72,7 +73,19 @@ public class WellTooltipGeneratorTest extends AssertJUnit
     private static String tryGenerateShortDescription(PlateLayouterModel model, int rowIx,
             int colIx, Integer featureIndexOrNull)
     {
-        return WellTooltipGenerator.tryGenerateTooltip(model, rowIx, colIx, featureIndexOrNull);
+        return WellTooltipGenerator.tryGenerateTooltip(model, rowIx, colIx, featureIndexOrNull,
+                createDummyRealNumberRenderer());
+    }
+
+    private static IRealNumberRenderer createDummyRealNumberRenderer()
+    {
+        return new IRealNumberRenderer()
+            {
+                public String render(float value)
+                {
+                    return "" + value;
+                }
+            };
     }
 
     @Test