From 0c047cde1ee14a9298066aba7ff2a30054b9d168 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Fri, 3 Apr 2020 13:07:11 -0700 Subject: [PATCH] kind of works for updating now --- .../apollo/gwt/client/AnnotatorPanel.java | 13 +- .../apollo/gwt/client/AnnotatorPanel.ui.xml | 119 ++++++++++-------- 2 files changed, 77 insertions(+), 55 deletions(-) diff --git a/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.java b/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.java index b217c6a8cf..726cc0389d 100644 --- a/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.java +++ b/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.java @@ -614,7 +614,7 @@ private static void updateAnnotationInfo(AnnotationInfo annotationInfo) { annotationDescription.setHTML("nothing selected"); return; } - annotationDescription.setHTML(annotationInfo.getName() + " " + annotationInfo.getType()); + setAnnotationDescription(annotationInfo); String type = annotationInfo.getType(); hideDetailPanels(); switch (type) { @@ -741,6 +741,17 @@ private static void updateAnnotationInfo(AnnotationInfo annotationInfo) { } + private static void setAnnotationDescription(AnnotationInfo annotationInfo) { + if(annotationInfo!=null){ + annotationDescription.setVisible(true); + annotationDescription.setHTML("    "+annotationInfo.getType() + ": " + annotationInfo.getName() +""); + } + else{ + annotationDescription.setVisible(false); + annotationDescription.setHTML(""); + } + } + private static void reselectSubTab() { // attempt to select the last tab if (tabPanel.getSelectedIndex() != selectedSubTabIndex) { diff --git a/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.ui.xml b/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.ui.xml index 1e9dc865db..22df43c8e2 100644 --- a/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.ui.xml +++ b/src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.ui.xml @@ -94,6 +94,11 @@ width: 40px; margin-top: 5px; } + + .annotationDescription { + border-top: solid 2px gray; + border-bottom: solid 2px gray; + } @@ -162,60 +167,66 @@ - - - Details - - - - - - - - - - - - Coding - - - - Alternate Alleles - - - - Variant Info - - - - Allele Info - - - - GO - - - - Gene Product - - - - Provenance - - - - DbXref - - - - Comment - - - - Attributes - - - + + + + + + + + Details + + + + + + + + + + + Coding + + + + Alternate Alleles + + + + Variant Info + + + + Allele Info + + + + GO + + + + Gene Product + + + + Provenance + + + + DbXref + + + + Comment + + + + Attributes + + + + +