Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# DO NOT MERGE THIS BRANCH WITH MASTER
This branch contains IDG specific changes. It removes the analysis tab from the details panel and removes the interactors tab from the context panel of a context selected entity.

[<img src=https://user-images.githubusercontent.com/6883670/31999264-976dfb86-b98a-11e7-9432-0316345a72ea.png height=75 />](https://reactome.org)

Diagram Viewer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public ViewerContainer(EventBus eventBus) {
leftTopLauncher = new LeftTopLauncherPanel(eventBus);
rightContainerPanel = new RightContainerPanel();
bottomContainerPanel = new BottomContainerPanel();
rightTopLauncherPanel = new RightTopLauncherPanel(eventBus);


initialise();
Expand Down Expand Up @@ -151,7 +152,7 @@ protected void initialise() {

//Launcher panels
this.add(leftTopLauncher);
this.add(new RightTopLauncherPanel(eventBus));
this.add(rightTopLauncherPanel);

//Settings panel
rightContainerPanel.add(hideableContainerPanel = new HideableContainerPanel(eventBus));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class ContextInfoPanel extends Composite implements ClickHandler {
private List<Button> btns = new LinkedList<>();
private Button molecules;
private Button pathways;
private Button interactors;
// private Button interactors;

private DeckLayoutPanel container;

Expand All @@ -41,12 +41,12 @@ public ContextInfoPanel(ContextDialogPanel parent, EventBus eventBus, DiagramObj
buttonsPanel.setStyleName(RESOURCES.getCSS().buttonsPanel());
buttonsPanel.add(this.molecules = getButton("Molecules", RESOURCES.molecules()));
buttonsPanel.add(this.pathways = getButton("Pathways", RESOURCES.pathways()));
buttonsPanel.add(this.interactors = getButton("Interactors", RESOURCES.interactors()));
// buttonsPanel.add(this.interactors = getButton("Interactors", RESOURCES.interactors()));
GraphObject graphObject = diagramObject.getGraphObject();

// Disable the interactors' tab in case of anything else besides protein and chemical
boolean enabled = graphObject instanceof GraphSimpleEntity || graphObject instanceof GraphEntityWithAccessionedSequence;
this.interactors.setEnabled(enabled);
// this.interactors.setEnabled(enabled);

this.molecules.addStyleName(RESOURCES.getCSS().buttonSelected());

Expand All @@ -57,7 +57,7 @@ public ContextInfoPanel(ContextDialogPanel parent, EventBus eventBus, DiagramObj
InteractorsDialogPanel interactorsDialogPanel = new InteractorsDialogPanel(eventBus, diagramObject, context);
this.container.add(moleculesDialogPanel);
this.container.add(pathwaysDialogPanel);
this.container.add(interactorsDialogPanel);
// this.container.add(interactorsDialogPanel);
this.container.showWidget(0);
this.container.setAnimationVertical(true);
this.container.setAnimationDuration(500);
Expand Down Expand Up @@ -103,10 +103,10 @@ public void onClick(ClickEvent event) {
((MoleculesDialogPanel)this.container.getVisibleWidget()).forceDraw();
}else if(btn.equals(this.pathways)){
this.container.showWidget(1);
}else if(btn.equals(this.interactors)){
}/*else if(btn.equals(this.interactors)){
this.container.showWidget(2);
((InteractorsDialogPanel)this.container.getVisibleWidget()).forceDraw();
}
}*/
}

public void redraw() {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.