X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=fc4638697a6fd6b9cd96f5b0391285fd4c5b708d;hb=7be3a744db5213f49e70178ade126d1cc797c762;hp=36b0a31948a7164b6860d34f7af91de8250d8b34;hpb=f7d45a21db810c5f8f7ca668d1a28f1403defe32;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 36b0a31..fc46386 100755 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * 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 @@ -50,19 +50,21 @@ public class AlignViewport 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 = new SequenceGroup(); + 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(); @@ -78,7 +80,11 @@ public class AlignViewport // The following vector holds the features which are // currently visible, in the correct order or rendering - Hashtable featuresDisplayed = null; + public Hashtable featuresDisplayed; + + boolean hasHiddenColumns = false; + boolean hasHiddenRows = false; + boolean showHiddenMarkers = true; public Vector vconsensus; @@ -94,8 +100,13 @@ public class AlignViewport 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; @@ -103,6 +114,9 @@ public class AlignViewport this.endSeq = al.getHeight() - 1; setFont(font); + if(System.getProperty("os.name").startsWith("Mac")) + MAC = true; + if (applet != null) { String param = applet.getParameter("showFullId"); @@ -134,20 +148,48 @@ public class AlignViewport { 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 && applet.getParameter("defaultColour") != null) + + if (applet != null) { - globalColourScheme = ColourSchemeProperty.getColour(alignment, - applet.getParameter("defaultColour")); - if (globalColourScheme != 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(vconsensus); + } + } + + if(applet.getParameter("userDefinedColour")!=null) { - globalColourScheme.setConsensus(vconsensus); + ((UserColourScheme)globalColourScheme).parseAppletParameter( + applet.getParameter("userDefinedColour")); } + + } } @@ -324,7 +366,32 @@ public class AlignViewport globalColourScheme.setConsensus(vconsensus); } - + /** + * 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= y1 && y <= y2) - { - return i; - } - y1 = y2; - } - else - { - return -1; - } - } - return -1; + this.colSel = colsel; + if(colSel.getHiddenColumns()!=null) + hasHiddenColumns = true; } public ColumnSelection getColumnSelection() @@ -713,6 +768,307 @@ public class AlignViewport { 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