From 74e53831a61cb5c3d342fa302cd2cd8d16eacf7b Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 8 Sep 2005 15:50:42 +0000 Subject: [PATCH] If no consensus, disable certain colour options --- src/jalview/gui/AlignFrame.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index ba9237b..46b2cc5 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -68,6 +68,17 @@ public class AlignFrame { viewport = new AlignViewport(al); + if(viewport.vconsensus==null) + { + //Out of memory caluclating consensus. + BLOSUM62Colour.setEnabled(false); + PIDColour.setEnabled(false); + conservationMenuItem.setEnabled(false); + modifyConservation.setEnabled(false); + abovePIDThreshold.setEnabled(false); + modifyPID.setEnabled(false); + } + alignPanel = new AlignmentPanel(this, viewport); alignPanel.annotationPanel.adjustPanelHeight(); alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel. @@ -96,6 +107,7 @@ public class AlignFrame } }); + addServiceListeners(); } @@ -1022,14 +1034,16 @@ public class AlignFrame viewport.setStartRes(seq.findIndex(startRes)-1); - viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); } public void alignmentChanged() { - viewport.updateConsensus(); - viewport.updateConservation(); + if(viewport.vconsensus!=null) + { + viewport.updateConsensus(); + viewport.updateConservation(); + } resetAllColourSchemes(); alignPanel.repaint(); } -- 1.7.10.2