From c0894ae565bde66d380ce3c3f485b63668d80a73 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 12 Apr 2011 09:58:34 +0000
Subject: [PATCH] LMS-2165 minor - new material detail view: cleanup of the gui
SVN: 20829
---
.../FeatureVectorSummaryViewer.java | 2 +-
.../detailviewers/LayoutUtils.java | 2 +
.../MaterialDisambiguationGrid.java | 2 +-
.../MaterialReplicaFeatureSummaryViewer.java | 55 +------------------
4 files changed, 5 insertions(+), 56 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/FeatureVectorSummaryViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/FeatureVectorSummaryViewer.java
index ee54948262e..ebae1cbdcdd 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/FeatureVectorSummaryViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/FeatureVectorSummaryViewer.java
@@ -146,7 +146,7 @@ public class FeatureVectorSummaryViewer
final IDisposableComponent gridComponent =
FeatureVectorSummaryGrid.create(viewContext, experiment);
- panel.add(gridComponent.getComponent(), new RowData(1, 700));
+ panel.add(gridComponent.getComponent(), new RowData(1, LayoutUtils.ONE_PAGE_GRID_HEIGHT_PX));
return new IDisposableComponent()
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LayoutUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LayoutUtils.java
index ba9e29158a7..0b046ff92f3 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LayoutUtils.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LayoutUtils.java
@@ -26,6 +26,8 @@ import com.extjs.gxt.ui.client.widget.layout.RowData;
*/
public class LayoutUtils
{
+ public static final int ONE_PAGE_GRID_HEIGHT_PX = 700;
+
private static final int MARGIN_SIZE_PX = 10;
/** @return layout data with big margin on all sides */
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialDisambiguationGrid.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialDisambiguationGrid.java
index 2c178251749..f9ab814847d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialDisambiguationGrid.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialDisambiguationGrid.java
@@ -222,7 +222,7 @@ public class MaterialDisambiguationGrid extends TypedTableGrid<Material>
setHeader(viewContext.getMessage(Dict.MATERIAL_DISAMBIGUATION_GRID_EXPLANATION));
linkToMaterialDetails();
setBorders(true);
- setHeight(700);
+ setHeight(LayoutUtils.ONE_PAGE_GRID_HEIGHT_PX);
}
private void linkToMaterialDetails()
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialReplicaFeatureSummaryViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialReplicaFeatureSummaryViewer.java
index fc3ce46e303..c4691c73689 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialReplicaFeatureSummaryViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialReplicaFeatureSummaryViewer.java
@@ -277,8 +277,7 @@ public class MaterialReplicaFeatureSummaryViewer
final IDisposableComponent gridComponent =
MaterialReplicaFeatureSummaryGrid.create(screeningViewContext, new TechId(
experiment), new TechId(material));
- // TODO 2011-04-12, Tomasz Pylak: correct the height
- panel.add(gridComponent.getComponent(), new RowData(1, 700));
+ panel.add(gridComponent.getComponent(), new RowData(1, LayoutUtils.ONE_PAGE_GRID_HEIGHT_PX));
screeningViewContext.getService().listWellImages(new TechId(material.getId()),
new TechId(experiment.getId()), new ImagesFoundCallback(panel));
@@ -335,10 +334,6 @@ public class MaterialReplicaFeatureSummaryViewer
Html headingWidget = createHeader(headingText);
panel.add(headingWidget, new RowData(1, -1, new Margins(0, 0, 20, 0)));
- // Widget experimentProperties =
- // createPropertiesSection(viewContext, experiment.getProperties(), "Assay properties");
- // panel.add(experimentProperties, new RowData(-1, -1, propertiesMargin()));
-
return panel;
}
@@ -407,54 +402,6 @@ public class MaterialReplicaFeatureSummaryViewer
linkPanel.add(linkWidget);
panel.add(linkPanel, new RowData(-1, -1, new Margins(0, 0, 20, 200)));
- // Widget materialProperties =
- // createPropertiesSection(viewContext, material.getProperties(), "Gene properties");
- // panel.add(materialProperties, new RowData(-1, -1, propertiesMargin()));
-
return panel;
}
-
- // private static Widget createPropertiesSection(
- // final IViewContext<IScreeningClientServiceAsync> viewContext,
- // List<IEntityProperty> properties, String sectionTitle)
- // {
- // LayoutContainer panel = new LayoutContainer();
- // panel.setLayout(new RowLayout(Orientation.VERTICAL));
- // Html panelTitle = new Html(sectionTitle);
- // panelTitle.setTagName("h5");
- // panel.add(panelTitle, new RowData(1, -1, propertiesTitleMargin()));
- //
- // // experiment properties
- // Map<String, Object> propertyMap = new LinkedHashMap<String, Object>();
- // PropertiesPanelUtils.addEntityProperties(viewContext, propertyMap, properties);
- //
- // PropertyGrid propertyGrid = new PropertyGrid(viewContext, propertyMap.size());
- // final IPropertyValueRenderer<IEntityProperty> renderer =
- // PropertyValueRenderers.createEntityPropertyPropertyValueRenderer(viewContext);
- // propertyGrid.registerPropertyValueRenderer(EntityProperty.class, renderer);
- // propertyGrid.registerPropertyValueRenderer(GenericEntityProperty.class, renderer);
- // propertyGrid.registerPropertyValueRenderer(VocabularyTermEntityProperty.class, renderer);
- // propertyGrid.registerPropertyValueRenderer(MaterialEntityProperty.class, renderer);
- // propertyGrid.registerPropertyValueRenderer(ManagedEntityProperty.class, renderer);
- //
- // propertyGrid.setProperties(propertyMap);
- // panel.add(propertyGrid);
- //
- // return panel;
- // }
-
- // private static Margins headingTitleMargin()
- // {
- // return new Margins(20, 20, 30, 20);
- // }
-
- // private static Margins propertiesTitleMargin()
- // {
- // return new Margins(0, 20, 10, 20);
- // }
-
- // private static Margins propertiesMargin()
- // {
- // return new Margins(0, 20, 20, 0);
- // }
}
--
GitLab