Skip to content

Commit

Permalink
kind of works for updating now
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathandunn
nathandunn committed Apr 3, 2020
1 parent bcff08b commit 0c047cd
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 55 deletions.
13 changes: 12 additions & 1 deletion src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.java
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -741,6 +741,17 @@ private static void updateAnnotationInfo(AnnotationInfo annotationInfo) {

}

private static void setAnnotationDescription(AnnotationInfo annotationInfo) {
if(annotationInfo!=null){
annotationDescription.setVisible(true);
annotationDescription.setHTML("&nbsp;&nbsp;&nbsp;&nbsp;<b>"+annotationInfo.getType() + "</b>: " + annotationInfo.getName() +"");
}
else{
annotationDescription.setVisible(false);
annotationDescription.setHTML("");
}
}

private static void reselectSubTab() {
// attempt to select the last tab
if (tabPanel.getSelectedIndex() != selectedSubTabIndex) {
Expand Down
119 changes: 65 additions & 54 deletions src/gwt/org/bbop/apollo/gwt/client/AnnotatorPanel.ui.xml
View file
Expand Up @@ -94,6 +94,11 @@
width: 40px;
margin-top: 5px;
}

.annotationDescription {
border-top: solid 2px gray;
border-bottom: solid 2px gray;
}
</ui:style>
<gwt:DockLayoutPanel ui:field="splitPanel">
<gwt:north size="140">
Expand Down Expand Up @@ -162,60 +167,66 @@
</gwt:DockLayoutPanel>
</gwt:center>
<gwt:south size="440">
<gwt:TabLayoutPanel barHeight="35" ui:field="tabPanel">
<gwt:tab>
<gwt:header>Details</gwt:header>
<b:Container fluid="true" width="100%">
<b:Row>
<gwt:HTML text="placeholder" ui:field="annotationDescription" visible="true"/>
<apollo:GeneDetailPanel ui:field="geneDetailPanel" visible="false"/>
<apollo:VariantDetailPanel ui:field="variantDetailPanel" visible="false"/>
<apollo:TranscriptDetailPanel ui:field="transcriptDetailPanel" visible="false"/>
<apollo:RepeatRegionDetailPanel ui:field="repeatRegionDetailPanel" visible="false"/>
</b:Row>
</b:Container>
</gwt:tab>
<gwt:tab>
<gwt:header>Coding</gwt:header>
<apollo:ExonDetailPanel ui:field="exonDetailPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Alternate Alleles</gwt:header>
<apollo:VariantAllelesPanel ui:field="variantAllelesPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Variant Info</gwt:header>
<apollo:VariantInfoPanel ui:field="variantInfoPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Allele Info</gwt:header>
<apollo:AlleleInfoPanel ui:field="alleleInfoPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>GO</gwt:header>
<apollo:GoPanel ui:field="goPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Gene Product</gwt:header>
<apollo:GeneProductPanel ui:field="geneProductPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Provenance</gwt:header>
<apollo:ProvenancePanel ui:field="provenancePanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>DbXref</gwt:header>
<apollo:DbXrefPanel ui:field="dbXrefPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Comment</gwt:header>
<apollo:CommentPanel ui:field="commentPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Attributes</gwt:header>
<apollo:AttributePanel ui:field="attributePanel"/>
</gwt:tab>
</gwt:TabLayoutPanel>
<gwt:DockLayoutPanel>
<gwt:north size="20">
<gwt:HTML text="placeholder" ui:field="annotationDescription" visible="false" styleName="{style.annotationDescription}"/>
</gwt:north>
<gwt:center>
<gwt:TabLayoutPanel barHeight="35" ui:field="tabPanel">
<gwt:tab>
<gwt:header>Details</gwt:header>
<b:Container fluid="true" width="100%">
<b:Row>
<apollo:GeneDetailPanel ui:field="geneDetailPanel" visible="false"/>
<apollo:VariantDetailPanel ui:field="variantDetailPanel" visible="false"/>
<apollo:TranscriptDetailPanel ui:field="transcriptDetailPanel" visible="false"/>
<apollo:RepeatRegionDetailPanel ui:field="repeatRegionDetailPanel" visible="false"/>
</b:Row>
</b:Container>
</gwt:tab>
<gwt:tab>
<gwt:header>Coding</gwt:header>
<apollo:ExonDetailPanel ui:field="exonDetailPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Alternate Alleles</gwt:header>
<apollo:VariantAllelesPanel ui:field="variantAllelesPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Variant Info</gwt:header>
<apollo:VariantInfoPanel ui:field="variantInfoPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Allele Info</gwt:header>
<apollo:AlleleInfoPanel ui:field="alleleInfoPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>GO</gwt:header>
<apollo:GoPanel ui:field="goPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Gene Product</gwt:header>
<apollo:GeneProductPanel ui:field="geneProductPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Provenance</gwt:header>
<apollo:ProvenancePanel ui:field="provenancePanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>DbXref</gwt:header>
<apollo:DbXrefPanel ui:field="dbXrefPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Comment</gwt:header>
<apollo:CommentPanel ui:field="commentPanel"/>
</gwt:tab>
<gwt:tab>
<gwt:header>Attributes</gwt:header>
<apollo:AttributePanel ui:field="attributePanel"/>
</gwt:tab>
</gwt:TabLayoutPanel>
</gwt:center>
</gwt:DockLayoutPanel>
</gwt:south>
</gwt:DockLayoutPanel>
</ui:UiBinder>

0 comments on commit 0c047cd

Please sign in to comment.