From: amwaterhouse Date: Mon, 13 Nov 2006 11:14:01 +0000 (+0000) Subject: Colours in viewport X-Git-Tag: Release_2_2~130 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2267a3de329c0fb4848c6e1a42ad2d52c658f759 Colours in viewport --- diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 6586a68..147c2dd 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -980,6 +980,7 @@ public void itemStateChanged(ItemEvent evt) protected void deleteGroups_actionPerformed() { viewport.alignment.deleteAllGroups(); + viewport.sequenceColours.clear(); viewport.setSelectionGroup(null); alignPanel.repaint(); diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 1fa3e3f..ca9b447 100755 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -1,1067 +1,1087 @@ -/* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -package jalview.appletgui; - -import java.util.*; - -import java.awt.*; - -import jalview.analysis.*; -import jalview.bin.*; -import jalview.datamodel.*; -import jalview.schemes.*; - -public class AlignViewport -{ - int startRes; - int endRes; - - int startSeq; - int endSeq; - - - boolean cursorMode = false; - - boolean showJVSuffix = true; - boolean showText = true; - boolean showColourText = false; - boolean showBoxes = true; - boolean wrapAlignment = false; - boolean renderGaps = true; - boolean showSequenceFeatures = false; - boolean showAnnotation = true; - boolean showConservation = true; - boolean showQuality = true; - boolean showConsensus = true; - boolean upperCasebold = false; - - boolean colourAppliesToAllGroups = true; - ColourSchemeI globalColourScheme = null; - boolean conservationColourSelected = false; - boolean abovePIDThreshold = false; - - SequenceGroup selectionGroup; - - int charHeight; - int charWidth; - int wrappedWidth; - - Font font = new Font("SansSerif", Font.PLAIN, 10); - boolean validCharWidth = true; - AlignmentI alignment; - - ColumnSelection colSel = new ColumnSelection(); - - int threshold; - int increment; - - NJTree currentTree = null; - - boolean scaleAboveWrapped = true; - boolean scaleLeftWrapped = true; - boolean scaleRightWrapped = true; - - // The following vector holds the features which are - // currently visible, in the correct order or rendering - public Hashtable featuresDisplayed; - - boolean hasHiddenColumns = false; - boolean hasHiddenRows = false; - boolean showHiddenMarkers = true; - - - public Hashtable [] hconsensus; - AlignmentAnnotation consensus; - AlignmentAnnotation conservation; - AlignmentAnnotation quality; - - boolean autocalculateConsensus = true; - - public int ConsPercGaps = 25; // JBPNote : This should be a scalable property! - - private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(this); - - boolean ignoreGapsInConsensusCalculation = false; - - jalview.bin.JalviewLite applet; - - boolean MAC = false; - - public AlignViewport(AlignmentI al, JalviewLite applet) - { - this.applet = applet; - setAlignment(al); - this.startRes = 0; - this.endRes = al.getWidth() - 1; - this.startSeq = 0; - this.endSeq = al.getHeight() - 1; - setFont(font); - - if(System.getProperty("os.name").startsWith("Mac")) - MAC = true; - - if (applet != null) - { - String param = applet.getParameter("showFullId"); - if (param != null) - { - showJVSuffix = Boolean.valueOf(param).booleanValue(); - } - - param = applet.getParameter("showAnnotation"); - if (param != null) - { - showAnnotation = Boolean.valueOf(param).booleanValue(); - } - - param = applet.getParameter("showConservation"); - if (param != null) - { - showConservation = Boolean.valueOf(param).booleanValue(); - } - - param = applet.getParameter("showQuality"); - if (param != null) - { - showQuality = Boolean.valueOf(param).booleanValue(); - } - - param = applet.getParameter("showConsensus"); - if (param != null) - { - showConsensus = Boolean.valueOf(param).booleanValue(); - } - - param = applet.getParameter("upperCase"); - if (param != null) - { - if(param.equalsIgnoreCase("bold")) - upperCasebold = true; - } - - } - // We must set conservation and consensus before setting colour, - // as Blosum and Clustal require this to be done - updateConservation(); - updateConsensus(); - - - if (applet != null) - { - String colour = applet.getParameter("defaultColour"); - - if(colour == null) - { - colour = applet.getParameter("userDefinedColour"); - if(colour !=null) - colour = "User Defined"; - } - - if(colour != null) - { - globalColourScheme = ColourSchemeProperty.getColour(alignment, colour); - if (globalColourScheme != null) - { - globalColourScheme.setConsensus(hconsensus); - } - } - - if(applet.getParameter("userDefinedColour")!=null) - { - ((UserColourScheme)globalColourScheme).parseAppletParameter( - applet.getParameter("userDefinedColour")); - } - - - } - } - - public void showSequenceFeatures(boolean b) - { - showSequenceFeatures = b; - } - - public boolean getShowSequenceFeatures() - { - return showSequenceFeatures; - } - - - public void updateConservation() - { - if(alignment.isNucleotide()) - return; - - Conservation cons = new jalview.analysis.Conservation("All", - jalview.schemes.ResidueProperties.propHash, 3, - alignment.getSequences(), 0, - alignment.getWidth() - 1); - cons.calculate(); - cons.verdict(false, ConsPercGaps); - cons.findQuality(); - int alWidth = alignment.getWidth(); - Annotation[] annotations = new Annotation[alWidth]; - Annotation[] qannotations = new Annotation[alWidth]; - String sequence = cons.getConsSequence().getSequence(); - float minR, minG, minB, maxR, maxG, maxB; - minR = 0.3f; - minG = 0.0f; - minB = 0f; - maxR = 1.0f - minR; - maxG = 0.9f - minG; - maxB = 0f - minB; // scalable range for colouring both Conservation and Quality - float min = 0f; - float max = 11f; - float qmin = cons.qualityRange[0].floatValue(); - float qmax = cons.qualityRange[1].floatValue(); - - for (int i = 0; i < alWidth; i++) - { - float value = 0; - try - { - value = Integer.parseInt(sequence.charAt(i) + ""); - } - catch (Exception ex) - { - if (sequence.charAt(i) == '*') - { - value = 11; - } - if (sequence.charAt(i) == '+') - { - value = 10; - } - } - float vprop = value - min; - vprop /= max; - - annotations[i] = new Annotation(sequence.charAt(i) + "", - "", ' ', value, - new Color(minR + maxR * vprop, - minG + maxG * vprop, - minB + maxB * vprop)); - // Quality calc - value = ( (Double) cons.quality.elementAt(i)).floatValue(); - vprop = value - qmin; - vprop /= qmax; - qannotations[i] = new Annotation(" ", - String.valueOf(value), ' ', value, - new - Color(minR + maxR * vprop, - minG + maxG * vprop, - minB + maxB * vprop)); - } - - if (conservation == null) - { - conservation = new AlignmentAnnotation("Conservation", - "Conservation of total alignment less than " + - ConsPercGaps + "% gaps", - annotations, - 0f, // cons.qualityRange[0].floatValue(), - 11f, // cons.qualityRange[1].floatValue() - AlignmentAnnotation.BAR_GRAPH); - if (showConservation) - { - alignment.addAnnotation(conservation); - } - quality = new AlignmentAnnotation("Quality", - "Alignment Quality based on Blosum62 scores", - qannotations, - cons.qualityRange[0].floatValue(), - cons.qualityRange[1].floatValue(), - AlignmentAnnotation.BAR_GRAPH); - if (showQuality) - { - alignment.addAnnotation(quality); - } - } - else - { - conservation.annotations = annotations; - quality.annotations = qannotations; - quality.graphMax = cons.qualityRange[1].floatValue(); - } - - } - - public void updateConsensus() - { - // this routine prevents vconsensus becoming a new object each time - // consenus is calculated. Important for speed of Blosum62 - // and PID colouring of alignment - int aWidth = alignment.getWidth(); - - Annotation[] annotations = new Annotation[aWidth]; - - hconsensus = new Hashtable[aWidth]; - AAFrequency.calculate(alignment.getSequencesArray(), - 0, aWidth, - hconsensus); - - for (int i = 0; i < aWidth; i++) - { - float value = 0; - if(ignoreGapsInConsensusCalculation) - value = ((Float)hconsensus[i].get(AAFrequency.PID_NOGAPS)).floatValue(); - else - value = ((Float)hconsensus[i].get(AAFrequency.PID_GAPS)).floatValue(); - - String maxRes = hconsensus[i].get(AAFrequency.MAXRESIDUE).toString(); - String mouseOver = maxRes; - if (maxRes.length() > 1) - { - mouseOver = "[" + maxRes + "] "; - maxRes = "+"; - } - - - mouseOver += (int) value + "%"; - annotations[i] = new Annotation(maxRes, mouseOver, ' ', value); - - } - - if (consensus == null) - { - consensus = new AlignmentAnnotation("Consensus", - "PID", annotations, 0f, 100f, AlignmentAnnotation.BAR_GRAPH); - if (showConsensus) - { - alignment.addAnnotation(consensus); - } - } - else - { - consensus.annotations = annotations; - } - - if(globalColourScheme!=null) - globalColourScheme.setConsensus(hconsensus); - - } - /** - * get the consensus sequence as displayed under the PID consensus annotation row. - * @return consensus sequence as a new sequence object - */ - /** - * get the consensus sequence as displayed under the PID consensus annotation row. - * @return consensus sequence as a new sequence object - */ - public SequenceI getConsensusSeq() { - if (consensus==null) - updateConsensus(); - if (consensus==null) - return null; - StringBuffer seqs=new StringBuffer(); - for (int i=0; i alignment.getWidth() - 1) - { - // log.System.out.println(" Corrected res from " + res + " to maximum " + (alignment.getWidth()-1)); - res = alignment.getWidth() - 1; - } - if (res < 0) - { - res = 0; - } - this.endRes = res; - } - - public void setEndSeq(int seq) - { - if (seq > alignment.getHeight()) - { - seq = alignment.getHeight(); - } - if (seq < 0) - { - seq = 0; - } - this.endSeq = seq; - } - - public int getEndSeq() - { - return endSeq; - } - - java.awt.Frame nullFrame; - public void setFont(Font f) - { - font = f; - if(nullFrame == null) - { - nullFrame = new java.awt.Frame(); - nullFrame.addNotify(); - } - - java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font); - setCharHeight(fm.getHeight()); - charWidth = fm.charWidth('M'); - - if(upperCasebold) - { - Font f2 = new Font(f.getName(), Font.BOLD, f.getSize()); - fm = nullFrame.getGraphics().getFontMetrics(f2); - charWidth = fm.stringWidth("MMMMMMMMMMM") / 10; - } - } - - public Font getFont() - { - return font; - } - - public int getCharWidth() - { - return charWidth; - } - - public void setCharHeight(int h) - { - this.charHeight = h; - } - - public int getCharHeight() - { - return charHeight; - } - - public void setWrappedWidth(int w) - { - this.wrappedWidth = w; - } - - public int getwrappedWidth() - { - return wrappedWidth; - } - - public AlignmentI getAlignment() - { - return alignment; - } - - public void setAlignment(AlignmentI align) - { - this.alignment = align; - } - - public void setWrapAlignment(boolean state) - { - wrapAlignment = state; - } - - public void setShowText(boolean state) - { - showText = state; - } - - public void setRenderGaps(boolean state) - { - renderGaps = state; - } - - public boolean getColourText() - { - return showColourText; - } - - public void setColourText(boolean state) - { - showColourText = state; - } - - public void setShowBoxes(boolean state) - { - showBoxes = state; - } - - public boolean getWrapAlignment() - { - return wrapAlignment; - } - - public boolean getShowText() - { - return showText; - } - - public boolean getShowBoxes() - { - return showBoxes; - } - - public char getGapCharacter() - { - return getAlignment().getGapCharacter(); - } - - public void setGapCharacter(char gap) - { - if (getAlignment() != null) - { - getAlignment().setGapCharacter(gap); - } - } - - public void setThreshold(int thresh) - { - threshold = thresh; - } - - public int getThreshold() - { - return threshold; - } - - public void setIncrement(int inc) - { - increment = inc; - } - - public int getIncrement() - { - return increment; - } - - public void setHiddenColumns(ColumnSelection colsel) - { - this.colSel = colsel; - if(colSel.getHiddenColumns()!=null) - hasHiddenColumns = true; - } - - public ColumnSelection getColumnSelection() - { - return colSel; - } - - public void resetSeqLimits(int height) - { - setEndSeq(height / getCharHeight()); - } - - public void setCurrentTree(NJTree tree) - { - currentTree = tree; - } - - public NJTree getCurrentTree() - { - return currentTree; - } - - public void setColourAppliesToAllGroups(boolean b) - { - colourAppliesToAllGroups = b; - } - - public boolean getColourAppliesToAllGroups() - { - return colourAppliesToAllGroups; - } - - public boolean getShowJVSuffix() - { - return showJVSuffix; - } - - public void setShowJVSuffix(boolean b) - { - showJVSuffix = b; - } - - public boolean getShowAnnotation() - { - return showAnnotation; - } - - public void setShowAnnotation(boolean b) - { - showAnnotation = b; - } - - public boolean getScaleAboveWrapped() - { - return scaleAboveWrapped; - } - - public boolean getScaleLeftWrapped() - { - return scaleLeftWrapped; - } - - public boolean getScaleRightWrapped() - { - return scaleRightWrapped; - } - - public void setScaleAboveWrapped(boolean b) - { - scaleAboveWrapped = b; - } - - public void setScaleLeftWrapped(boolean b) - { - scaleLeftWrapped = b; - } - - public void setScaleRightWrapped(boolean b) - { - scaleRightWrapped = b; - } - - public void setIgnoreGapsConsensus(boolean b) - { - ignoreGapsInConsensusCalculation = b; - updateConsensus(); - if (globalColourScheme!=null) - { - globalColourScheme.setThreshold(globalColourScheme.getThreshold(), - ignoreGapsInConsensusCalculation); - - } - } - - /** - * Property change listener for changes in alignment - * - * @param listener DOCUMENT ME! - */ - public void addPropertyChangeListener( - java.beans.PropertyChangeListener listener) - { - changeSupport.addPropertyChangeListener(listener); - } - - /** - * DOCUMENT ME! - * - * @param listener DOCUMENT ME! - */ - public void removePropertyChangeListener( - java.beans.PropertyChangeListener listener) - { - changeSupport.removePropertyChangeListener(listener); - } - - /** - * Property change listener for changes in alignment - * - * @param prop DOCUMENT ME! - * @param oldvalue DOCUMENT ME! - * @param newvalue DOCUMENT ME! - */ - public void firePropertyChange(String prop, Object oldvalue, Object newvalue) - { - changeSupport.firePropertyChange(prop, oldvalue, newvalue); - } - - - - public boolean getIgnoreGapsConsensus() - { - return ignoreGapsInConsensusCalculation; - } - public void hideSelectedColumns() - { - if (colSel.size() < 1) - return; - - colSel.hideSelectedColumns(); - setSelectionGroup(null); - - hasHiddenColumns = true; - } - - public void invertColumnSelection() - { - int column; - for (int i = 0; i < alignment.getWidth(); i++) - { - column = i; - - if (colSel.contains(column)) - colSel.removeElement(column); - else - colSel.addElement(column); - - } - } - - - public void hideColumns(int start, int end) - { - if(start==end) - colSel.hideColumns(start); - else - colSel.hideColumns(start, end); - - hasHiddenColumns = true; - } - - public void hideAllSelectedSeqs() - { - if (selectionGroup == null) - return; - - SequenceI[] seqs = selectionGroup.getSequencesInOrder(alignment); - - hideSequence(seqs); - - setSelectionGroup(null); - } - - public void hideSequence(SequenceI [] seq) - { - if(seq!=null) - { - for (int i = 0; i < seq.length; i++) - alignment.getHiddenSequences().hideSequence(seq[i]); - - hasHiddenRows = true; - firePropertyChange("alignment", null, alignment.getSequences()); - } - } - - public void showColumn(int col) - { - colSel.revealHiddenColumns(col); - if(colSel.getHiddenColumns()==null) - hasHiddenColumns = false; - } - - public void showAllHiddenColumns() - { - colSel.revealAllHiddenColumns(); - hasHiddenColumns = false; - } - - public void showAllHiddenSeqs() - { - if(alignment.getHiddenSequences().getSize()>0) - { - if(selectionGroup==null) - { - selectionGroup = new SequenceGroup(); - selectionGroup.setEndRes(alignment.getWidth()-1); - } - Vector tmp = alignment.getHiddenSequences().showAll(); - for(int t=0; t