X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=b27518607159c03661be36f5cea17bbb4b8245d4;hb=ba0bedafc61f5e83fa5a34f8ddbd0cd5222abe0e;hp=ac3ff77ee7de0938ab083b888330ef5bb9fd36b6;hpb=50ad147ba0eb763fae29b364c80632abc1155e9c;p=jalview.git
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
old mode 100755
new mode 100644
index ac3ff77..b275186
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1,20 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * 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 file is part of Jalview.
*
- * 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.
+ * Jalview 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 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview 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
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
/*
* Jalview - A Sequence Alignment Editor and Viewer
@@ -36,178 +38,114 @@
*/
package jalview.gui;
-import java.util.*;
-
-import java.awt.*;
-
-import jalview.analysis.*;
-
-import jalview.bin.*;
-
-import jalview.datamodel.*;
-
-import jalview.schemes.*;
+import jalview.analysis.AlignmentUtils;
+import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
+import jalview.analysis.NJTree;
+import jalview.api.AlignViewportI;
+import jalview.api.ViewStyleI;
+import jalview.bin.Cache;
+import jalview.commands.CommandI;
+import jalview.datamodel.AlignedCodonFrame;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.UserColourScheme;
+import jalview.structure.CommandListener;
import jalview.structure.SelectionSource;
import jalview.structure.StructureSelectionManager;
+import jalview.structure.VamsasSource;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+import jalview.ws.params.AutoCalcSetting;
+
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
/**
* DOCUMENT ME!
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.141 $
*/
-public class AlignViewport implements SelectionSource
+public class AlignViewport extends AlignmentViewport implements
+ SelectionSource, CommandListener
{
- int startRes;
-
- int endRes;
-
- int startSeq;
-
- int endSeq;
-
- 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 colourAppliesToAllGroups = true;
-
- ColourSchemeI globalColourScheme = null;
-
- boolean conservationColourSelected = false;
-
- boolean abovePIDThreshold = false;
-
- SequenceGroup selectionGroup;
-
- int charHeight;
-
- int charWidth;
-
- boolean validCharWidth;
-
- int wrappedWidth;
-
Font font;
- boolean seqNameItalics;
-
- AlignmentI alignment;
-
- ColumnSelection colSel = new ColumnSelection();
-
- int threshold;
-
- int increment;
-
NJTree currentTree = null;
- boolean scaleAboveWrapped = false;
-
- boolean scaleLeftWrapped = true;
-
- boolean scaleRightWrapped = true;
-
- boolean hasHiddenColumns = false;
-
- boolean hasHiddenRows = false;
-
- boolean showHiddenMarkers = true;
-
boolean cursorMode = false;
- // The following vector holds the features which are
- // currently visible, in the correct order or rendering
- Hashtable featuresDisplayed = null;
-
- /** DOCUMENT ME!! */
- public Hashtable[] hconsensus;
-
- AlignmentAnnotation consensus;
-
- AlignmentAnnotation conservation;
-
- AlignmentAnnotation quality;
-
- boolean autoCalculateConsensus = true;
-
- /** DOCUMENT ME!! */
- public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!
-
- // JBPNote Prolly only need this in the applet version.
- private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(
- this);
-
- boolean ignoreGapsInConsensusCalculation = false;
-
- boolean isDataset = false;
-
boolean antiAlias = false;
- boolean padGaps = false;
-
- Rectangle explodedPosition;
+ private Rectangle explodedGeometry;
String viewName;
- String sequenceSetID;
-
- boolean gatherViewsHere = false;
-
- Stack historyList = new Stack();
-
- Stack redoList = new Stack();
-
- Hashtable sequenceColours;
-
- int thresholdTextColour = 0;
-
- Color textColour = Color.black;
-
- Color textColour2 = Color.white;
-
- boolean rightAlignIds = false;
-
- Hashtable hiddenRepSequences;
+ /*
+ * Flag set true on the view that should 'gather' multiple views of the same
+ * sequence set id when a project is reloaded. Set false on all views when
+ * they are 'exploded' into separate windows. Set true on the current view
+ * when 'Gather' is performed, and also on the first tab when the first new
+ * view is created.
+ */
+ private boolean gatherViewsHere = false;
+ private AnnotationColumnChooser annotationColumnSelectionState;
/**
* Creates a new AlignViewport object.
*
- * @param al alignment to view
+ * @param al
+ * alignment to view
*/
public AlignViewport(AlignmentI al)
{
setAlignment(al);
init();
}
+
/**
* Create a new AlignViewport object with a specific sequence set ID
+ *
* @param al
- * @param seqsetid (may be null - but potential for ambiguous constructor exception)
+ * @param seqsetid
+ * (may be null - but potential for ambiguous constructor exception)
*/
public AlignViewport(AlignmentI al, String seqsetid)
{
- this(al,seqsetid,null);
+ this(al, seqsetid, null);
}
+
public AlignViewport(AlignmentI al, String seqsetid, String viewid)
{
sequenceSetID = seqsetid;
viewId = viewid;
// TODO remove these once 2.4.VAMSAS release finished
- if (Cache.log!=null && Cache.log.isDebugEnabled() && seqsetid!=null) { Cache.log.debug("Setting viewport's sequence set id : "+sequenceSetID); }
- if (Cache.log!=null && Cache.log.isDebugEnabled() && viewId!=null) { Cache.log.debug("Setting viewport's view id : "+viewId); }
+ if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null)
+ {
+ Cache.log.debug("Setting viewport's sequence set id : "
+ + sequenceSetID);
+ }
+ if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null)
+ {
+ Cache.log.debug("Setting viewport's view id : " + viewId);
+ }
setAlignment(al);
init();
}
@@ -216,85 +154,111 @@ public class AlignViewport implements SelectionSource
* Create a new AlignViewport with hidden regions
*
* @param al
- * AlignmentI
+ * AlignmentI
* @param hiddenColumns
- * ColumnSelection
+ * ColumnSelection
*/
public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns)
{
setAlignment(al);
if (hiddenColumns != null)
{
- this.colSel = hiddenColumns;
- if (hiddenColumns.getHiddenColumns() != null)
- {
- hasHiddenColumns = true;
- }
+ colSel = hiddenColumns;
}
init();
}
+
/**
* New viewport with hidden columns and an existing sequence set id
+ *
* @param al
* @param hiddenColumns
- * @param seqsetid (may be null)
+ * @param seqsetid
+ * (may be null)
*/
- public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns, String seqsetid)
+ public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+ String seqsetid)
{
- this(al,hiddenColumns,seqsetid,null);
+ this(al, hiddenColumns, seqsetid, null);
}
+
/**
* New viewport with hidden columns and an existing sequence set id and viewid
+ *
* @param al
* @param hiddenColumns
- * @param seqsetid (may be null)
- * @param viewid (may be null)
+ * @param seqsetid
+ * (may be null)
+ * @param viewid
+ * (may be null)
*/
- public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns, String seqsetid, String viewid)
+ public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+ String seqsetid, String viewid)
{
sequenceSetID = seqsetid;
viewId = viewid;
// TODO remove these once 2.4.VAMSAS release finished
- if (Cache.log!=null && Cache.log.isDebugEnabled() && seqsetid!=null) { Cache.log.debug("Setting viewport's sequence set id : "+sequenceSetID); }
- if (Cache.log!=null && Cache.log.isDebugEnabled() && viewId!=null) { Cache.log.debug("Setting viewport's view id : "+viewId); }
+ if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null)
+ {
+ Cache.log.debug("Setting viewport's sequence set id : "
+ + sequenceSetID);
+ }
+ if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null)
+ {
+ Cache.log.debug("Setting viewport's view id : " + viewId);
+ }
setAlignment(al);
if (hiddenColumns != null)
{
- this.colSel = hiddenColumns;
- if (hiddenColumns.getHiddenColumns() != null)
- {
- hasHiddenColumns = true;
- }
+ colSel = hiddenColumns;
}
init();
}
+ /**
+ * Apply any settings saved in user preferences
+ */
+ private void applyViewProperties()
+ {
+ antiAlias = Cache.getDefault("ANTI_ALIAS", false);
+
+ viewStyle.setShowJVSuffix(Cache.getDefault("SHOW_JVSUFFIX", true));
+ setShowAnnotation(Cache.getDefault("SHOW_ANNOTATIONS", true));
+
+ setRightAlignIds(Cache.getDefault("RIGHT_ALIGN_IDS", false));
+ setCentreColumnLabels(Cache.getDefault("CENTRE_COLUMN_LABELS", false));
+ autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
+
+ setPadGaps(Cache.getDefault("PAD_GAPS", true));
+ setShowNPFeats(Cache.getDefault("SHOW_NPFEATS_TOOLTIP", true));
+ setShowDBRefs(Cache.getDefault("SHOW_DBREFS_TOOLTIP", true));
+ viewStyle.setSeqNameItalics(Cache.getDefault("ID_ITALICS", true));
+ viewStyle.setWrapAlignment(Cache.getDefault("WRAP_ALIGNMENT", false));
+ viewStyle.setShowUnconserved(Cache
+ .getDefault("SHOW_UNCONSERVED", false));
+ sortByTree = Cache.getDefault("SORT_BY_TREE", false);
+ followSelection = Cache.getDefault("FOLLOW_SELECTIONS", true);
+ sortAnnotationsBy = SequenceAnnotationOrder.valueOf(Cache.getDefault(
+ Preferences.SORT_ANNOTATIONS,
+ SequenceAnnotationOrder.NONE.name()));
+ showAutocalculatedAbove = Cache.getDefault(
+ Preferences.SHOW_AUTOCALC_ABOVE, false);
+ viewStyle.setScaleProteinAsCdna(Cache.getDefault(
+ Preferences.SCALE_PROTEIN_TO_CDNA, true));
+ }
+
void init()
{
this.startRes = 0;
this.endRes = alignment.getWidth() - 1;
this.startSeq = 0;
this.endSeq = alignment.getHeight() - 1;
+ applyViewProperties();
- antiAlias = Cache.getDefault("ANTI_ALIAS", false);
-
- showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
- showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
-
- rightAlignIds = Cache.getDefault("RIGHT_ALIGN_IDS", false);
- centreColumnLabels = Cache.getDefault("CENTRE_COLUMN_LABELS", false);
- autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
-
- padGaps = Cache.getDefault("PAD_GAPS", true);
- shownpfeats = Cache.getDefault("SHOW_NPFEATS_TOOLTIP",true);
- showdbrefs = Cache.getDefault("SHOW_DBREFS_TOOLTIP",true);
-
String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "");
String fontSize = Cache.getDefault("FONT_SIZE", "10");
- seqNameItalics = Cache.getDefault("ID_ITALICS", true);
-
int style = 0;
if (fontStyle.equals("bold"))
@@ -306,7 +270,7 @@ public class AlignViewport implements SelectionSource
style = 2;
}
- setFont(new Font(fontName, style, Integer.parseInt(fontSize)));
+ setFont(new Font(fontName, style, Integer.parseInt(fontSize)), true);
alignment
.setGapCharacter(Cache.getDefault("GAP_SYMBOL", "-").charAt(0));
@@ -317,51 +281,38 @@ public class AlignViewport implements SelectionSource
{
if (!alignment.isNucleotide())
{
- conservation = new AlignmentAnnotation("Conservation",
- "Conservation of total alignment less than " + ConsPercGaps
- + "% gaps", new Annotation[1], 0f, 11f,
- AlignmentAnnotation.BAR_GRAPH);
- conservation.hasText = true;
- conservation.autoCalculated = true;
-
- if (Cache.getDefault("SHOW_CONSERVATION", true))
- {
- alignment.addAnnotation(conservation);
- }
-
- if (Cache.getDefault("SHOW_QUALITY", true))
- {
- quality = new AlignmentAnnotation("Quality",
- "Alignment Quality based on Blosum62 scores",
- new Annotation[1], 0f, 11f, AlignmentAnnotation.BAR_GRAPH);
- quality.hasText = true;
- quality.autoCalculated = true;
-
- alignment.addAnnotation(quality);
- }
- }
-
- consensus = new AlignmentAnnotation("Consensus", "PID",
- new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
- consensus.hasText = true;
- consensus.autoCalculated = true;
-
- if (Cache.getDefault("SHOW_IDENTITY", true))
- {
- alignment.addAnnotation(consensus);
+ showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
+ showQuality = Cache.getDefault("SHOW_QUALITY", true);
+ showGroupConservation = Cache.getDefault("SHOW_GROUP_CONSERVATION",
+ false);
}
+ showConsensusHistogram = Cache.getDefault("SHOW_CONSENSUS_HISTOGRAM",
+ true);
+ showSequenceLogo = Cache.getDefault("SHOW_CONSENSUS_LOGO", false);
+ normaliseSequenceLogo = Cache.getDefault("NORMALISE_CONSENSUS_LOGO",
+ false);
+ showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false);
+ showConsensus = Cache.getDefault("SHOW_IDENTITY", true);
}
-
- if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
+ initAutoAnnotation();
+ String colourProperty = alignment.isNucleotide() ? Preferences.DEFAULT_COLOUR_NUC
+ : Preferences.DEFAULT_COLOUR_PROT;
+ String propertyValue = Cache.getProperty(colourProperty);
+ if (propertyValue == null)
+ {
+ // fall back on this property for backwards compatibility
+ propertyValue = Cache.getProperty(Preferences.DEFAULT_COLOUR);
+ }
+ if (propertyValue != null)
{
globalColourScheme = ColourSchemeProperty.getColour(alignment,
- jalview.bin.Cache.getProperty("DEFAULT_COLOUR"));
+ propertyValue);
if (globalColourScheme instanceof UserColourScheme)
{
globalColourScheme = UserDefinedColours.loadDefaultColours();
((UserColourScheme) globalColourScheme).setThreshold(0,
- getIgnoreGapsConsensus());
+ isIgnoreGapsConsensus());
}
if (globalColourScheme != null)
@@ -369,840 +320,154 @@ public class AlignViewport implements SelectionSource
globalColourScheme.setConsensus(hconsensus);
}
}
-
- wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
}
/**
- * DOCUMENT ME!
+ * get the consensus sequence as displayed under the PID consensus annotation
+ * row.
*
- * @param b
- * DOCUMENT ME!
+ * @return consensus sequence as a new sequence object
*/
- public void setShowSequenceFeatures(boolean b)
- {
- showSequenceFeatures = b;
- }
-
- public boolean getShowSequenceFeatures()
- {
- return showSequenceFeatures;
- }
-
- class ConservationThread extends Thread
+ public SequenceI getConsensusSeq()
{
- AlignmentPanel ap;
-
- public ConservationThread(AlignmentPanel ap)
+ if (consensus == null)
{
- this.ap = ap;
+ updateConsensus(null);
}
-
- public void run()
+ if (consensus == null)
{
- try
+ return null;
+ }
+ StringBuffer seqs = new StringBuffer();
+ for (int i = 0; i < consensus.annotations.length; i++)
+ {
+ if (consensus.annotations[i] != null)
{
- updatingConservation = true;
-
- while (UPDATING_CONSERVATION)
- {
- try
- {
- if (ap != null)
- {
- ap.paintAlignment(false);
- }
- Thread.sleep(200);
- } catch (Exception ex)
- {
- ex.printStackTrace();
- }
- }
-
- UPDATING_CONSERVATION = true;
-
- int alWidth = alignment.getWidth();
- if (alWidth < 0)
- {
- return;
- }
-
- Conservation cons = new jalview.analysis.Conservation("All",
- jalview.schemes.ResidueProperties.propHash, 3, alignment
- .getSequences(), 0, alWidth - 1);
-
- cons.calculate();
- cons.verdict(false, ConsPercGaps);
-
- if (quality != null)
- {
- cons.findQuality();
- }
-
- char[] sequence = cons.getConsSequence().getSequence();
- float minR;
- float minG;
- float minB;
- float maxR;
- float maxG;
- float 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 = 0f;
- float qmax = 0f;
-
- char c;
-
- conservation.annotations = new Annotation[alWidth];
-
- if (quality != null)
+ if (consensus.annotations[i].description.charAt(0) == '[')
{
- quality.graphMax = cons.qualityRange[1].floatValue();
- quality.annotations = new Annotation[alWidth];
- qmin = cons.qualityRange[0].floatValue();
- qmax = cons.qualityRange[1].floatValue();
+ seqs.append(consensus.annotations[i].description.charAt(1));
}
-
- for (int i = 0; i < alWidth; i++)
+ else
{
- float value = 0;
-
- c = sequence[i];
-
- if (Character.isDigit(c))
- {
- value = (int) (c - '0');
- }
- else if (c == '*')
- {
- value = 11;
- }
- else if (c == '+')
- {
- value = 10;
- }
-
- float vprop = value - min;
- vprop /= max;
- conservation.annotations[i] = new Annotation(String.valueOf(c),
- String.valueOf(value), ' ', value, new Color(minR
- + (maxR * vprop), minG + (maxG * vprop), minB
- + (maxB * vprop)));
-
- // Quality calc
- if (quality != null)
- {
- value = ((Double) cons.quality.get(i)).floatValue();
- vprop = value - qmin;
- vprop /= qmax;
- quality.annotations[i] = new Annotation(" ", String
- .valueOf(value), ' ', value, new Color(minR
- + (maxR * vprop), minG + (maxG * vprop), minB
- + (maxB * vprop)));
- }
+ seqs.append(consensus.annotations[i].displayCharacter);
}
- } catch (OutOfMemoryError error)
- {
- new OOMWarning("calculating conservation", error);
-
- conservation = null;
- quality = null;
-
- }
-
- UPDATING_CONSERVATION = false;
- updatingConservation = false;
-
- if (ap != null)
- {
- ap.paintAlignment(true);
}
-
}
- }
- ConservationThread conservationThread;
+ SequenceI sq = new Sequence("Consensus", seqs.toString());
+ sq.setDescription("Percentage Identity Consensus "
+ + ((ignoreGapsInConsensusCalculation) ? " without gaps" : ""));
+ return sq;
+ }
- ConsensusThread consensusThread;
+ boolean validCharWidth;
- boolean consUpdateNeeded = false;
+ /**
+ * update view settings with the given font. You may need to call
+ * alignPanel.fontChanged to update the layout geometry
+ *
+ * @param setGrid
+ * when true, charWidth/height is set according to font mentrics
+ */
+ public void setFont(Font f, boolean setGrid)
+ {
+ font = f;
- static boolean UPDATING_CONSENSUS = false;
+ Container c = new Container();
- static boolean UPDATING_CONSERVATION = false;
+ java.awt.FontMetrics fm = c.getFontMetrics(font);
+ int w = viewStyle.getCharWidth(), ww = fm.charWidth('M'), h = viewStyle
+ .getCharHeight();
+ if (setGrid)
+ {
+ setCharHeight(fm.getHeight());
+ setCharWidth(ww);
+ }
+ viewStyle.setFontName(font.getName());
+ viewStyle.setFontStyle(font.getStyle());
+ viewStyle.setFontSize(font.getSize());
- boolean updatingConsensus = false;
+ validCharWidth = true;
+ }
- boolean updatingConservation = false;
+ @Override
+ public void setViewStyle(ViewStyleI settingsForView)
+ {
+ super.setViewStyle(settingsForView);
+ setFont(new Font(viewStyle.getFontName(), viewStyle.getFontStyle(),
+ viewStyle.getFontSize()), false);
+ }
/**
- * centre columnar annotation labels in displayed alignment annotation TODO:
- * add to jalviewXML and annotation display settings
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
*/
- boolean centreColumnLabels = false;
-
- private boolean showdbrefs;
-
- private boolean shownpfeats;
+ public Font getFont()
+ {
+ return font;
+ }
/**
- * trigger update of conservation annotation
+ * DOCUMENT ME!
+ *
+ * @param align
+ * DOCUMENT ME!
*/
- public void updateConservation(final AlignmentPanel ap)
+ public void setAlignment(AlignmentI align)
{
- if (alignment.isNucleotide() || conservation == null)
+ if (alignment != null && alignment.getCodonFrames() != null)
{
- return;
+ StructureSelectionManager.getStructureSelectionManager(
+ Desktop.instance).removeMappings(alignment.getCodonFrames());
+ }
+ this.alignment = align;
+ if (alignment != null && alignment.getCodonFrames() != null)
+ {
+ StructureSelectionManager.getStructureSelectionManager(
+ Desktop.instance).addMappings(alignment.getCodonFrames());
}
-
- conservationThread = new ConservationThread(ap);
- conservationThread.start();
}
/**
- * trigger update of consensus annotation
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
*/
- public void updateConsensus(final AlignmentPanel ap)
+ public char getGapCharacter()
{
- consensusThread = new ConsensusThread(ap);
- consensusThread.start();
+ return getAlignment().getGapCharacter();
}
- class ConsensusThread extends Thread
+ /**
+ * DOCUMENT ME!
+ *
+ * @param gap
+ * DOCUMENT ME!
+ */
+ public void setGapCharacter(char gap)
{
- AlignmentPanel ap;
-
- public ConsensusThread(AlignmentPanel ap)
+ if (getAlignment() != null)
{
- this.ap = ap;
+ getAlignment().setGapCharacter(gap);
}
+ }
- public void run()
- {
- updatingConsensus = true;
- while (UPDATING_CONSENSUS)
- {
- try
- {
- if (ap != null)
- {
- ap.paintAlignment(false);
- }
-
- Thread.sleep(200);
- } catch (Exception ex)
- {
- ex.printStackTrace();
- }
- }
-
- UPDATING_CONSENSUS = true;
-
- try
- {
- int aWidth = (alignment != null) ? alignment.getWidth() : 0; // null
- // pointer
- // possibility
- // here.
- if (aWidth < 0)
- {
- return;
- }
-
- consensus.annotations = null;
- consensus.annotations = new Annotation[aWidth];
-
- hconsensus = new Hashtable[aWidth];
- AAFrequency.calculate(alignment.getSequencesArray(), 0, alignment
- .getWidth(), 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 = hconsensus[i].get(AAFrequency.MAXRESIDUE)
- + " ";
-
- if (maxRes.length() > 1)
- {
- mouseOver = "[" + maxRes + "] ";
- maxRes = "+";
- }
-
- mouseOver += ((int) value + "%");
- consensus.annotations[i] = new Annotation(maxRes, mouseOver, ' ',
- value);
- }
-
- if (globalColourScheme != null)
- {
- globalColourScheme.setConsensus(hconsensus);
- }
-
- } catch (OutOfMemoryError error)
- {
- alignment.deleteAnnotation(consensus);
-
- consensus = null;
- hconsensus = null;
- new OOMWarning("calculating consensus", error);
- }
- UPDATING_CONSENSUS = false;
- updatingConsensus = false;
-
- if (ap != null)
- {
- ap.paintAlignment(true);
- }
- }
- }
-
- /**
- * 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(null);
- }
- if (consensus == null)
- {
- return null;
- }
- StringBuffer seqs = new StringBuffer();
- for (int i = 0; i < consensus.annotations.length; i++)
- {
- if (consensus.annotations[i] != null)
- {
- if (consensus.annotations[i].description.charAt(0) == '[')
- {
- seqs.append(consensus.annotations[i].description.charAt(1));
- }
- else
- {
- seqs.append(consensus.annotations[i].displayCharacter);
- }
- }
- }
-
- SequenceI sq = new Sequence("Consensus", seqs.toString());
- sq.setDescription("Percentage Identity Consensus "
- + ((ignoreGapsInConsensusCalculation) ? " without gaps" : ""));
- return sq;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public SequenceGroup getSelectionGroup()
- {
- return selectionGroup;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param sg
- * DOCUMENT ME!
- */
- public void setSelectionGroup(SequenceGroup sg)
- {
- selectionGroup = sg;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getConservationSelected()
- {
- return conservationColourSelected;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setConservationSelected(boolean b)
- {
- conservationColourSelected = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getAbovePIDThreshold()
- {
- return abovePIDThreshold;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setAbovePIDThreshold(boolean b)
- {
- abovePIDThreshold = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getStartRes()
- {
- return startRes;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getEndRes()
- {
- return endRes;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getStartSeq()
- {
- return startSeq;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param cs
- * DOCUMENT ME!
- */
- public void setGlobalColourScheme(ColourSchemeI cs)
- {
- globalColourScheme = cs;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public ColourSchemeI getGlobalColourScheme()
- {
- return globalColourScheme;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param res
- * DOCUMENT ME!
- */
- public void setStartRes(int res)
- {
- this.startRes = res;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param seq
- * DOCUMENT ME!
- */
- public void setStartSeq(int seq)
- {
- this.startSeq = seq;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param res
- * DOCUMENT ME!
- */
- public void setEndRes(int res)
- {
- if (res > (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;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param seq
- * DOCUMENT ME!
- */
- public void setEndSeq(int seq)
- {
- if (seq > alignment.getHeight())
- {
- seq = alignment.getHeight();
- }
-
- if (seq < 0)
- {
- seq = 0;
- }
-
- this.endSeq = seq;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getEndSeq()
- {
- return endSeq;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param f
- * DOCUMENT ME!
- */
- public void setFont(Font f)
- {
- font = f;
-
- Container c = new Container();
-
- java.awt.FontMetrics fm = c.getFontMetrics(font);
- setCharHeight(fm.getHeight());
- setCharWidth(fm.charWidth('M'));
- validCharWidth = true;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Font getFont()
- {
- return font;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param w
- * DOCUMENT ME!
- */
- public void setCharWidth(int w)
- {
- this.charWidth = w;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getCharWidth()
- {
- return charWidth;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param h
- * DOCUMENT ME!
- */
- public void setCharHeight(int h)
- {
- this.charHeight = h;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getCharHeight()
- {
- return charHeight;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param w
- * DOCUMENT ME!
- */
- public void setWrappedWidth(int w)
- {
- this.wrappedWidth = w;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getWrappedWidth()
- {
- return wrappedWidth;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public AlignmentI getAlignment()
- {
- return alignment;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param align
- * DOCUMENT ME!
- */
- public void setAlignment(AlignmentI align)
- {
- if (alignment != null && alignment.getCodonFrames() != null)
- {
- StructureSelectionManager.getStructureSelectionManager()
- .removeMappings(alignment.getCodonFrames());
- }
- this.alignment = align;
- if (alignment.getCodonFrames() != null)
- {
- StructureSelectionManager.getStructureSelectionManager().addMappings(
- alignment.getCodonFrames());
- }
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param state
- * DOCUMENT ME!
- */
- public void setWrapAlignment(boolean state)
- {
- wrapAlignment = state;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param state
- * DOCUMENT ME!
- */
- public void setShowText(boolean state)
- {
- showText = state;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param state
- * DOCUMENT ME!
- */
- public void setRenderGaps(boolean state)
- {
- renderGaps = state;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getColourText()
- {
- return showColourText;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param state
- * DOCUMENT ME!
- */
- public void setColourText(boolean state)
- {
- showColourText = state;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param state
- * DOCUMENT ME!
- */
- public void setShowBoxes(boolean state)
- {
- showBoxes = state;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getWrapAlignment()
- {
- return wrapAlignment;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getShowText()
- {
- return showText;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getShowBoxes()
- {
- return showBoxes;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public char getGapCharacter()
- {
- return getAlignment().getGapCharacter();
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param gap
- * DOCUMENT ME!
- */
- public void setGapCharacter(char gap)
- {
- if (getAlignment() != null)
- {
- getAlignment().setGapCharacter(gap);
- }
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param thresh
- * DOCUMENT ME!
- */
- public void setThreshold(int thresh)
- {
- threshold = thresh;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getThreshold()
- {
- return threshold;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param inc
- * DOCUMENT ME!
- */
- public void setIncrement(int inc)
- {
- increment = inc;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getIncrement()
- {
- return increment;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public ColumnSelection getColumnSelection()
- {
- return colSel;
- }
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public ColumnSelection getColumnSelection()
+ {
+ return colSel;
+ }
/**
* DOCUMENT ME!
*
* @param tree
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void setCurrentTree(NJTree tree)
{
@@ -1220,962 +485,556 @@ public class AlignViewport implements SelectionSource
}
/**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setColourAppliesToAllGroups(boolean b)
- {
- colourAppliesToAllGroups = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getColourAppliesToAllGroups()
- {
- return colourAppliesToAllGroups;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getShowJVSuffix()
- {
- return showJVSuffix;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setShowJVSuffix(boolean b)
- {
- showJVSuffix = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getShowAnnotation()
- {
- return showAnnotation;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setShowAnnotation(boolean b)
- {
- showAnnotation = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getScaleAboveWrapped()
- {
- return scaleAboveWrapped;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getScaleLeftWrapped()
- {
- return scaleLeftWrapped;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean getScaleRightWrapped()
- {
- return scaleRightWrapped;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setScaleAboveWrapped(boolean b)
- {
- scaleAboveWrapped = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setScaleLeftWrapped(boolean b)
- {
- scaleLeftWrapped = b;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param b
- * DOCUMENT ME!
- */
- public void setScaleRightWrapped(boolean b)
- {
- scaleRightWrapped = b;
- }
-
- /**
- * 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
+ * returns the visible column regions of the alignment
*
- * @param prop
- * DOCUMENT ME!
- * @param oldvalue
- * DOCUMENT ME!
- * @param newvalue
- * DOCUMENT ME!
+ * @param selectedRegionOnly
+ * true to just return the contigs intersecting with the selected
+ * area
+ * @return
*/
- public void firePropertyChange(String prop, Object oldvalue,
- Object newvalue)
- {
- changeSupport.firePropertyChange(prop, oldvalue, newvalue);
- }
-
- public void setIgnoreGapsConsensus(boolean b, AlignmentPanel ap)
- {
- ignoreGapsInConsensusCalculation = b;
- updateConsensus(ap);
- if (globalColourScheme != null)
- {
- globalColourScheme.setThreshold(globalColourScheme.getThreshold(),
- ignoreGapsInConsensusCalculation);
- }
- }
-
- public boolean getIgnoreGapsConsensus()
- {
- return ignoreGapsInConsensusCalculation;
- }
-
- public void setDataset(boolean b)
- {
- isDataset = b;
- }
-
- public boolean isDataset()
- {
- return isDataset;
- }
-
- public void hideSelectedColumns()
- {
- if (colSel.size() < 1)
- {
- return;
- }
-
- colSel.hideSelectedColumns();
- setSelectionGroup(null);
-
- hasHiddenColumns = true;
- }
-
- public void hideColumns(int start, int end)
+ public int[] getViewAsVisibleContigs(boolean selectedRegionOnly)
{
- if (start == end)
+ int[] viscontigs = null;
+ int start = 0, end = 0;
+ if (selectedRegionOnly && selectionGroup != null)
{
- colSel.hideColumns(start);
+ start = selectionGroup.getStartRes();
+ end = selectionGroup.getEndRes() + 1;
}
else
{
- colSel.hideColumns(start, end);
- }
-
- hasHiddenColumns = true;
- }
-
- public void hideRepSequences(SequenceI repSequence, SequenceGroup sg)
- {
- int sSize = sg.getSize();
- if (sSize < 2)
- {
- return;
- }
-
- if (hiddenRepSequences == null)
- {
- hiddenRepSequences = new Hashtable();
- }
-
- hiddenRepSequences.put(repSequence, sg);
-
- // Hide all sequences except the repSequence
- SequenceI[] seqs = new SequenceI[sSize - 1];
- int index = 0;
- for (int i = 0; i < sSize; i++)
- {
- if (sg.getSequenceAt(i) != repSequence)
- {
- if (index == sSize - 1)
- {
- return;
- }
-
- seqs[index++] = sg.getSequenceAt(i);
- }
- }
- sg.setSeqrep(repSequence);
- sg.setHidereps(true);
- hideSequence(seqs);
-
- }
-
- public void hideAllSelectedSeqs()
- {
- if (selectionGroup == null || selectionGroup.getSize() < 1)
- {
- return;
+ end = alignment.getWidth();
}
-
- SequenceI[] seqs = selectionGroup.getSequencesInOrder(alignment);
-
- hideSequence(seqs);
-
- setSelectionGroup(null);
+ viscontigs = colSel.getVisibleContigs(start, end);
+ return viscontigs;
}
- public void hideSequence(SequenceI[] seq)
+ /**
+ * get hash of undo and redo list for the alignment
+ *
+ * @return long[] { historyList.hashCode, redoList.hashCode };
+ */
+ public long[] getUndoRedoHash()
{
- if (seq != null)
+ // TODO: JAL-1126
+ if (historyList == null || redoList == null)
{
- for (int i = 0; i < seq.length; i++)
- {
- alignment.getHiddenSequences().hideSequence(seq[i]);
- }
- hasHiddenRows = true;
- firePropertyChange("alignment", null, alignment.getSequences());
+ return new long[]
+ { -1, -1 };
}
+ return new long[]
+ { historyList.hashCode(), this.redoList.hashCode() };
}
- public void showSequence(int index)
+ /**
+ * test if a particular set of hashcodes are different to the hashcodes for
+ * the undo and redo list.
+ *
+ * @param undoredo
+ * the stored set of hashcodes as returned by getUndoRedoHash
+ * @return true if the hashcodes differ (ie the alignment has been edited) or
+ * the stored hashcode array differs in size
+ */
+ public boolean isUndoRedoHashModified(long[] undoredo)
{
- Vector tmp = alignment.getHiddenSequences().showSequence(index,
- hiddenRepSequences);
- if (tmp.size() > 0)
- {
- if (selectionGroup == null)
- {
- selectionGroup = new SequenceGroup();
- selectionGroup.setEndRes(alignment.getWidth() - 1);
- }
-
- for (int t = 0; t < tmp.size(); t++)
- {
- selectionGroup.addSequence((SequenceI) tmp.elementAt(t), false);
- }
- firePropertyChange("alignment", null, alignment.getSequences());
- sendSelection();
- }
-
- if (alignment.getHiddenSequences().getSize() < 1)
+ if (undoredo == null)
{
- hasHiddenRows = false;
+ return true;
}
- }
-
- public void showColumn(int col)
- {
- colSel.revealHiddenColumns(col);
- if (colSel.getHiddenColumns() == null)
+ long[] cstate = getUndoRedoHash();
+ if (cstate.length != undoredo.length)
{
- hasHiddenColumns = false;
+ return true;
}
- }
-
- public void showAllHiddenColumns()
- {
- colSel.revealAllHiddenColumns();
- hasHiddenColumns = false;
- }
- public void showAllHiddenSeqs()
- {
- if (alignment.getHiddenSequences().getSize() > 0)
+ for (int i = 0; i < cstate.length; i++)
{
- if (selectionGroup == null)
- {
- selectionGroup = new SequenceGroup();
- selectionGroup.setEndRes(alignment.getWidth() - 1);
- }
- Vector tmp = alignment.getHiddenSequences().showAll(
- hiddenRepSequences);
- for (int t = 0; t < tmp.size(); t++)
+ if (cstate[i] != undoredo[i])
{
- selectionGroup.addSequence((SequenceI) tmp.elementAt(t), false);
+ return true;
}
- firePropertyChange("alignment", null, alignment.getSequences());
- sendSelection();
- hasHiddenRows = false;
- hiddenRepSequences = null;
}
+ return false;
}
- public void invertColumnSelection()
+ public boolean followSelection = true;
+
+ /**
+ * @return true if view selection should always follow the selections
+ * broadcast by other selection sources
+ */
+ public boolean getFollowSelection()
{
- colSel.invertColumnSelection(0, alignment.getWidth());
+ return followSelection;
}
- public int adjustForHiddenSeqs(int alignmentIndex)
+ /**
+ * Send the current selection to be broadcast to any selection listeners.
+ */
+ public void sendSelection()
{
- return alignment.getHiddenSequences().adjustForHiddenSeqs(
- alignmentIndex);
+ jalview.structure.StructureSelectionManager
+ .getStructureSelectionManager(Desktop.instance).sendSelection(
+ new SequenceGroup(getSelectionGroup()),
+ new ColumnSelection(getColumnSelection()), this);
}
/**
- * This method returns an array of new SequenceI objects derived from the
- * whole alignment or just the current selection with start and end points
- * adjusted
+ * return the alignPanel containing the given viewport. Use this to get the
+ * components currently handling the given viewport.
*
- * @note if you need references to the actual SequenceI objects in the
- * alignment or currently selected then use getSequenceSelection()
- * @return selection as new sequenceI objects
+ * @param av
+ * @return null or an alignPanel guaranteed to have non-null alignFrame
+ * reference
*/
- public SequenceI[] getSelectionAsNewSequence()
+ public AlignmentPanel getAlignPanel()
{
- SequenceI[] sequences;
-
- if (selectionGroup == null)
+ AlignmentPanel[] aps = PaintRefresher.getAssociatedPanels(this
+ .getSequenceSetId());
+ for (int p = 0; aps != null && p < aps.length; p++)
{
- sequences = alignment.getSequencesArray();
- AlignmentAnnotation[] annots = alignment.getAlignmentAnnotation();
- for (int i = 0; i < sequences.length; i++)
+ if (aps[p].av == this)
{
- sequences[i] = new Sequence(sequences[i], annots); // construct new
- // sequence with
- // subset of visible
- // annotation
+ return aps[p];
}
}
- else
- {
- sequences = selectionGroup.getSelectionAsNewSequences(alignment);
- }
+ return null;
+ }
- return sequences;
+ public boolean getSortByTree()
+ {
+ return sortByTree;
}
- /**
- * get the currently selected sequence objects or all the sequences in the
- * alignment.
- *
- * @return array of references to sequence objects
- */
- public SequenceI[] getSequenceSelection()
+ public void setSortByTree(boolean sort)
{
- SequenceI[] sequences;
- if (selectionGroup == null)
- {
- sequences = alignment.getSequencesArray();
- }
- else
- {
- sequences = selectionGroup.getSequencesInOrder(alignment);
- }
- return sequences;
+ sortByTree = sort;
}
/**
- * This method returns the visible alignment as text, as seen on the GUI, ie
- * if columns are hidden they will not be returned in the result. Use this for
- * calculating trees, PCA, redundancy etc on views which contain hidden
- * columns.
+ * synthesize a column selection if none exists so it covers the given
+ * selection group. if wholewidth is false, no column selection is made if the
+ * selection group covers the whole alignment width.
*
- * @return String[]
+ * @param sg
+ * @param wholewidth
*/
- public jalview.datamodel.CigarArray getViewAsCigars(
- boolean selectedRegionOnly)
+ public void expandColSelection(SequenceGroup sg, boolean wholewidth)
{
- CigarArray selection = null;
- SequenceI[] seqs = null;
- int i, iSize;
- int start = 0, end = 0;
- if (selectedRegionOnly && selectionGroup != null)
- {
- iSize = selectionGroup.getSize();
- seqs = selectionGroup.getSequencesInOrder(alignment);
- start = selectionGroup.getStartRes();
- end = selectionGroup.getEndRes(); // inclusive for start and end in
- // SeqCigar constructor
- }
- else
- {
- iSize = alignment.getHeight();
- seqs = alignment.getSequencesArray();
- end = alignment.getWidth() - 1;
- }
- SeqCigar[] selseqs = new SeqCigar[iSize];
- for (i = 0; i < iSize; i++)
+ int sgs, sge;
+ if (sg != null
+ && (sgs = sg.getStartRes()) >= 0
+ && sg.getStartRes() <= (sge = sg.getEndRes())
+ && (colSel == null || colSel.getSelected() == null || colSel
+ .getSelected().size() == 0))
{
- selseqs[i] = new SeqCigar(seqs[i], start, end);
- }
- selection = new CigarArray(selseqs);
- // now construct the CigarArray operations
- if (hasHiddenColumns)
- {
- Vector regions = colSel.getHiddenColumns();
- int[] region;
- int hideStart, hideEnd;
- int last = start;
- for (int j = 0; last < end & j < regions.size(); j++)
+ if (!wholewidth && alignment.getWidth() == (1 + sge - sgs))
{
- region = (int[]) regions.elementAt(j);
- hideStart = region[0];
- hideEnd = region[1];
- // edit hidden regions to selection range
- if (hideStart < last)
- {
- if (hideEnd > last)
- {
- hideStart = last;
- }
- else
- {
- continue;
- }
- }
-
- if (hideStart > end)
- {
- break;
- }
-
- if (hideEnd > end)
- {
- hideEnd = end;
- }
-
- if (hideStart > hideEnd)
- {
- break;
- }
- /**
- * form operations...
- */
- if (last < hideStart)
- {
- selection.addOperation(CigarArray.M, hideStart - last);
- }
- selection.addOperation(CigarArray.D, 1 + hideEnd - hideStart);
- last = hideEnd + 1;
+ // do nothing
+ return;
}
- // Final match if necessary.
- if (last < end)
+ if (colSel == null)
{
- selection.addOperation(CigarArray.M, end - last + 1);
+ colSel = new ColumnSelection();
+ }
+ for (int cspos = sg.getStartRes(); cspos <= sg.getEndRes(); cspos++)
+ {
+ colSel.addElement(cspos);
}
}
- else
- {
- selection.addOperation(CigarArray.M, end - start + 1);
- }
- return selection;
}
/**
- * return a compact representation of the current alignment selection to pass
- * to an analysis function
- *
- * @param selectedOnly
- * boolean true to just return the selected view
- * @return AlignmentView
+ * Returns the (Desktop) instance of the StructureSelectionManager
*/
- jalview.datamodel.AlignmentView getAlignmentView(boolean selectedOnly)
+ @Override
+ public StructureSelectionManager getStructureSelectionManager()
{
- // JBPNote:
- // this is here because the AlignmentView constructor modifies the
- // CigarArray
- // object. Refactoring of Cigar and alignment view representation should
- // be done to remove redundancy.
- CigarArray aligview = getViewAsCigars(selectedOnly);
- if (aligview != null)
- {
- return new AlignmentView(aligview,
- (selectedOnly && selectionGroup != null) ? selectionGroup
- .getStartRes() : 0);
- }
- return null;
+ return StructureSelectionManager
+ .getStructureSelectionManager(Desktop.instance);
}
/**
- * This method returns the visible alignment as text, as seen on the GUI, ie
- * if columns are hidden they will not be returned in the result. Use this for
- * calculating trees, PCA, redundancy etc on views which contain hidden
- * columns.
*
- * @return String[]
+ * @param pdbEntries
+ * @return an array of SequenceI arrays, one for each PDBEntry, listing which
+ * sequences in the alignment hold a reference to it
*/
- public String[] getViewAsString(boolean selectedRegionOnly)
- {
- String[] selection = null;
- SequenceI[] seqs = null;
- int i, iSize;
- int start = 0, end = 0;
- if (selectedRegionOnly && selectionGroup != null)
- {
- iSize = selectionGroup.getSize();
- seqs = selectionGroup.getSequencesInOrder(alignment);
- start = selectionGroup.getStartRes();
- end = selectionGroup.getEndRes() + 1;
- }
- else
- {
- iSize = alignment.getHeight();
- seqs = alignment.getSequencesArray();
- end = alignment.getWidth();
- }
-
- selection = new String[iSize];
- if (hasHiddenColumns)
- {
- selection = colSel.getVisibleSequenceStrings(start, end, seqs);
- }
- else
- {
- for (i = 0; i < iSize; i++)
- {
- selection[i] = seqs[i].getSequenceAsString(start, end);
- }
-
- }
- return selection;
- }
-
- public int[][] getVisibleRegionBoundaries(int min, int max)
+ public SequenceI[][] collateForPDB(PDBEntry[] pdbEntries)
{
- Vector regions = new Vector();
- int start = min;
- int end = max;
-
- do
+ List seqvectors = new ArrayList();
+ for (PDBEntry pdb : pdbEntries)
{
- if (hasHiddenColumns)
+ List seqs = new ArrayList();
+ for (SequenceI sq : alignment.getSequences())
{
- if (start == 0)
- {
- start = colSel.adjustForHiddenColumns(start);
- }
-
- end = colSel.getHiddenBoundaryRight(start);
- if (start == end)
+ Vector pdbs = sq
+ .getDatasetSequence().getPDBId();
+ if (pdbs == null)
{
- end = max;
+ continue;
}
- if (end > max)
+ for (PDBEntry p1 : pdbs)
{
- end = max;
+ if (p1.getId().equals(pdb.getId()))
+ {
+ if (!seqs.contains(sq))
+ {
+ seqs.add(sq);
+ continue;
+ }
+ }
}
}
+ seqvectors.add(seqs.toArray(new SequenceI[seqs.size()]));
+ }
+ return seqvectors.toArray(new SequenceI[seqvectors.size()][]);
+ }
- regions.addElement(new int[]
- { start, end });
-
- if (hasHiddenColumns)
- {
- start = colSel.adjustForHiddenColumns(end);
- start = colSel.getHiddenBoundaryLeft(start) + 1;
- }
- } while (end < max);
-
- int[][] startEnd = new int[regions.size()][2];
-
- regions.copyInto(startEnd);
-
- return startEnd;
+ public boolean isNormaliseSequenceLogo()
+ {
+ return normaliseSequenceLogo;
+ }
+ public void setNormaliseSequenceLogo(boolean state)
+ {
+ normaliseSequenceLogo = state;
}
- public boolean getShowHiddenMarkers()
+ /**
+ *
+ * @return true if alignment characters should be displayed
+ */
+ public boolean isValidCharWidth()
{
- return showHiddenMarkers;
+ return validCharWidth;
}
- public void setShowHiddenMarkers(boolean show)
+ private Hashtable calcIdParams = new Hashtable();
+
+ public AutoCalcSetting getCalcIdSettingsFor(String calcId)
{
- showHiddenMarkers = show;
+ return calcIdParams.get(calcId);
}
- public String getSequenceSetId()
+ public void setCalcIdSettingsFor(String calcId, AutoCalcSetting settings,
+ boolean needsUpdate)
{
- if (sequenceSetID == null)
+ calcIdParams.put(calcId, settings);
+ // TODO: create a restart list to trigger any calculations that need to be
+ // restarted after load
+ // calculator.getRegisteredWorkersOfClass(settings.getWorkerClass())
+ if (needsUpdate)
{
- sequenceSetID = alignment.hashCode() + "";
+ Cache.log.debug("trigger update for " + calcId);
}
-
- return sequenceSetID;
}
+
/**
- * unique viewId for synchronizing state with stored Jalview Project
+ * Method called when another alignment's edit (or possibly other) command is
+ * broadcast to here.
+ *
+ * To allow for sequence mappings (e.g. protein to cDNA), we have to first
+ * 'unwind' the command on the source sequences (in simulation, not in fact),
+ * and then for each edit in turn:
+ *
+ * - compute the equivalent edit on the mapped sequences
+ * - apply the mapped edit
+ * - 'apply' the source edit to the working copy of the source sequences
+ *
*
+ * @param command
+ * @param undo
+ * @param ssm
*/
- private String viewId=null;
-
-
- public String getViewId()
+ @Override
+ public void mirrorCommand(CommandI command, boolean undo,
+ StructureSelectionManager ssm, VamsasSource source)
{
- if (viewId==null)
+ /*
+ * Do nothing unless we are a 'complement' of the source. May replace this
+ * with direct calls not via SSM.
+ */
+ if (source instanceof AlignViewportI
+ && ((AlignViewportI) source).getCodingComplement() == this)
{
- viewId = this.getSequenceSetId()+"."+this.hashCode()+"";
+ // ok to continue;
}
- return viewId;
- }
-
- public void alignmentChanged(AlignmentPanel ap)
- {
- if (padGaps)
+ else
{
- alignment.padGaps();
+ return;
}
- if (hconsensus != null && autoCalculateConsensus)
+ CommandI mappedCommand = ssm.mapCommand(command, undo, getAlignment(),
+ getGapCharacter());
+ if (mappedCommand != null)
{
- updateConsensus(ap);
- updateConservation(ap);
+ AlignmentI[] views = getAlignPanel().alignFrame.getViewAlignments();
+ mappedCommand.doCommand(views);
+ getAlignPanel().alignmentChanged();
}
+ }
+
+ /**
+ * Add the sequences from the given alignment to this viewport. Optionally,
+ * may give the user the option to open a new frame, or split panel, with cDNA
+ * and protein linked.
+ *
+ * @param al
+ * @param title
+ */
+ public void addAlignment(AlignmentI al, String title)
+ {
+ // TODO: promote to AlignViewportI? applet CutAndPasteTransfer is different
+
+ // JBPComment: title is a largely redundant parameter at the moment
+ // JBPComment: this really should be an 'insert/pre/append' controller
+ // JBPComment: but the DNA/Protein check makes it a bit more complex
- // Reset endRes of groups if beyond alignment width
- int alWidth = alignment.getWidth();
- Vector groups = alignment.getGroups();
- if (groups != null)
+ // refactored from FileLoader / CutAndPasteTransfer / SequenceFetcher with
+ // this comment:
+ // TODO: create undo object for this JAL-1101
+
+ /*
+ * If any cDNA/protein mappings can be made between the alignments, offer to
+ * open a linked alignment with split frame option.
+ */
+ if (Cache.getDefault(Preferences.ENABLE_SPLIT_FRAME, true))
{
- for (int i = 0; i < groups.size(); i++)
+ if (AlignmentUtils.isMappable(al, getAlignment()))
{
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
- if (sg.getEndRes() > alWidth)
+ if (openLinkedAlignment(al, title))
{
- sg.setEndRes(alWidth - 1);
+ return;
}
}
}
- if (selectionGroup != null && selectionGroup.getEndRes() > alWidth)
+ /*
+ * No mappings, or offer declined - add sequences to this alignment
+ */
+ // TODO: JAL-407 regardless of above - identical sequences (based on ID and
+ // provenance) should share the same dataset sequence
+
+ for (int i = 0; i < al.getHeight(); i++)
{
- selectionGroup.setEndRes(alWidth - 1);
+ getAlignment().addSequence(al.getSequenceAt(i));
}
- resetAllColourSchemes();
-
- // alignment.adjustSequenceAnnotations();
+ setEndSeq(getAlignment().getHeight());
+ firePropertyChange("alignment", null, getAlignment().getSequences());
}
- void resetAllColourSchemes()
+ /**
+ * Show a dialog with the option to open and link (cDNA <-> protein) as a new
+ * alignment, either as a standalone alignment or in a split frame. Returns
+ * true if the new alignment was opened, false if not, because the user
+ * declined the offer.
+ *
+ * @param al
+ * @param title
+ */
+ protected boolean openLinkedAlignment(AlignmentI al, String title)
{
- ColourSchemeI cs = globalColourScheme;
- if (cs != null)
- {
- if (cs instanceof ClustalxColourScheme)
- {
- ((ClustalxColourScheme) cs).resetClustalX(alignment.getSequences(),
- alignment.getWidth());
- }
+ String[] options = new String[]
+ { MessageManager.getString("action.no"),
+ MessageManager.getString("label.split_window"),
+ MessageManager.getString("label.new_window"), };
+ final String question = JvSwingUtils.wrapTooltip(true,
+ MessageManager.getString("label.open_split_window?"));
+ int response = JOptionPane.showOptionDialog(Desktop.desktop, question,
+ MessageManager.getString("label.open_split_window"),
+ JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null,
+ options, options[0]);
- cs.setConsensus(hconsensus);
- if (cs.conservationApplied())
- {
- Alignment al = (Alignment) alignment;
- Conservation c = new Conservation("All",
- ResidueProperties.propHash, 3, al.getSequences(), 0, al
- .getWidth() - 1);
- c.calculate();
- c.verdict(false, ConsPercGaps);
-
- cs.setConservation(c);
- }
- }
+ if (response != 1 && response != 2)
+ {
+ return false;
+ }
+ final boolean openSplitPane = (response == 1);
+ final boolean openInNewWindow = (response == 2);
+
+ /*
+ * Identify protein and dna alignments. Make a copy of this one if opening
+ * in a new split pane.
+ */
+ AlignmentI thisAlignment = openSplitPane ? new Alignment(getAlignment())
+ : getAlignment();
+ AlignmentI protein = al.isNucleotide() ? thisAlignment : al;
+ final AlignmentI cdna = al.isNucleotide() ? al : thisAlignment;
+
+ /*
+ * Map sequences. At least one should get mapped as we have already passed
+ * the test for 'mappability'. Any mappings made will be added to the
+ * protein alignment. Note creating dataset sequences on the new alignment
+ * is a pre-requisite for building mappings.
+ */
+ al.setDataset(null);
+ AlignmentUtils.mapProteinToCdna(protein, cdna);
+
+ /*
+ * Create the AlignFrame for the added alignment. Note this will include the
+ * cDNA consensus annotation if it is protein (because the alignment holds
+ * mappings to nucleotide)
+ */
+ AlignFrame newAlignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
+ newAlignFrame.setTitle(title);
+ newAlignFrame.statusBar.setText(MessageManager.formatMessage(
+ "label.successfully_loaded_file", new Object[]
+ { title }));
- int s, sSize = alignment.getGroups().size();
- for (s = 0; s < sSize; s++)
+ // TODO if we want this (e.g. to enable reload of the alignment from file),
+ // we will need to add parameters to the stack.
+ // if (!protocol.equals(AppletFormatAdapter.PASTE))
+ // {
+ // alignFrame.setFileName(file, format);
+ // }
+
+ if (openInNewWindow)
{
- SequenceGroup sg = (SequenceGroup) alignment.getGroups().elementAt(s);
- if (sg.cs != null && sg.cs instanceof ClustalxColourScheme)
- {
- ((ClustalxColourScheme) sg.cs).resetClustalX(sg
- .getSequences(hiddenRepSequences), sg.getWidth());
- }
- sg.recalcConservation();
+ Desktop.addInternalFrame(newAlignFrame, title,
+ AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
}
- }
- public Color getSequenceColour(SequenceI seq)
- {
- if (sequenceColours == null || !sequenceColours.containsKey(seq))
+ try
{
- return Color.white;
- }
- else
+ newAlignFrame.setMaximum(jalview.bin.Cache.getDefault(
+ "SHOW_FULLSCREEN",
+ false));
+ } catch (java.beans.PropertyVetoException ex)
{
- return (Color) sequenceColours.get(seq);
}
- }
- public void setSequenceColour(SequenceI seq, Color col)
- {
- if (sequenceColours == null)
+ if (openSplitPane)
{
- sequenceColours = new Hashtable();
+ protein = openSplitFrame(newAlignFrame, thisAlignment,
+ protein.getCodonFrames());
}
- if (col == null)
- {
- sequenceColours.remove(seq);
- }
- else
- {
- sequenceColours.put(seq, col);
- }
- }
+ /*
+ * Register the mappings (held on the protein alignment) with the
+ * StructureSelectionManager (for mouseover linking).
+ */
+ final StructureSelectionManager ssm = StructureSelectionManager
+ .getStructureSelectionManager(Desktop.instance);
+ ssm.addMappings(protein.getCodonFrames());
- /**
- * returns the visible column regions of the alignment
- *
- * @param selectedRegionOnly
- * true to just return the contigs intersecting with the
- * selected area
- * @return
- */
- public int[] getViewAsVisibleContigs(boolean selectedRegionOnly)
- {
- int[] viscontigs = null;
- int start = 0, end = 0;
- if (selectedRegionOnly && selectionGroup != null)
- {
- start = selectionGroup.getStartRes();
- end = selectionGroup.getEndRes() + 1;
- }
- else
- {
- end = alignment.getWidth();
- }
- viscontigs = colSel.getVisibleContigs(start, end);
- return viscontigs;
+ return true;
}
/**
- * get hash of undo and redo list for the alignment
+ * Helper method to open a new SplitFrame holding linked dna and protein
+ * alignments.
*
- * @return long[] { historyList.hashCode, redoList.hashCode };
+ * @param newAlignFrame
+ * containing a new alignment to be shown
+ * @param complement
+ * cdna/protein complement alignment to show in the other split half
+ * @param mappings
+ * @return the protein alignment in the split frame
*/
- public long[] getUndoRedoHash()
+ protected AlignmentI openSplitFrame(AlignFrame newAlignFrame,
+ AlignmentI complement, Set mappings)
{
- if (historyList == null || redoList == null)
- return new long[]
- { -1, -1 };
- return new long[]
- { historyList.hashCode(), this.redoList.hashCode() };
- }
+ /*
+ * Make a new frame with a copy of the alignment we are adding to. If this
+ * is protein, the new frame will have a cDNA consensus annotation row
+ * added.
+ */
+ AlignFrame copyMe = new AlignFrame(complement,
+ AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
+ copyMe.setTitle(getAlignPanel().alignFrame.getTitle());
- /**
- * test if a particular set of hashcodes are different to the hashcodes for
- * the undo and redo list.
- *
- * @param undoredo
- * the stored set of hashcodes as returned by getUndoRedoHash
- * @return true if the hashcodes differ (ie the alignment has been edited) or
- * the stored hashcode array differs in size
- */
- public boolean isUndoRedoHashModified(long[] undoredo)
- {
- if (undoredo == null)
- {
- return true;
- }
- long[] cstate = getUndoRedoHash();
- if (cstate.length != undoredo.length)
- {
- return true;
- }
+ AlignmentI al = newAlignFrame.viewport.getAlignment();
+ final AlignFrame proteinFrame = al.isNucleotide() ? copyMe
+ : newAlignFrame;
+ final AlignFrame cdnaFrame = al.isNucleotide() ? newAlignFrame
+ : copyMe;
+ AlignmentI protein = proteinFrame.viewport.getAlignment();
+ protein.setCodonFrames(mappings);
- for (int i = 0; i < cstate.length; i++)
- {
- if (cstate[i] != undoredo[i])
- {
- return true;
- }
- }
- return false;
+ cdnaFrame.setVisible(true);
+ proteinFrame.setVisible(true);
+ String linkedTitle = MessageManager
+ .getString("label.linked_view_title");
+
+ /*
+ * Open in split pane. DNA sequence above, protein below.
+ */
+ JInternalFrame splitFrame = new SplitFrame(cdnaFrame, proteinFrame);
+ Desktop.addInternalFrame(splitFrame, linkedTitle, -1, -1);
+
+ return protein;
}
- public boolean getCentreColumnLabels()
+ public AnnotationColumnChooser getAnnotationColumnSelectionState()
{
- return centreColumnLabels;
+ return annotationColumnSelectionState;
}
- public void setCentreColumnLabels(boolean centrecolumnlabels)
+ public void setAnnotationColumnSelectionState(
+ AnnotationColumnChooser currentAnnotationColumnSelectionState)
{
- centreColumnLabels = centrecolumnlabels;
+ this.annotationColumnSelectionState = currentAnnotationColumnSelectionState;
}
- public void updateSequenceIdColours()
+ @Override
+ public void setIdWidth(int i)
{
- Vector groups = alignment.getGroups();
- if (sequenceColours == null)
+ super.setIdWidth(i);
+ AlignmentPanel ap = getAlignPanel();
+ if (ap != null)
{
- sequenceColours = new Hashtable();
- }
- for (int ig = 0, igSize = groups.size(); ig < igSize; ig++)
- {
- SequenceGroup sg = (SequenceGroup) groups.elementAt(ig);
- if (sg.idColour != null)
- {
- Vector sqs = sg.getSequences(hiddenRepSequences);
- for (int s = 0, sSize = sqs.size(); s < sSize; s++)
- {
- sequenceColours.put(sqs.elementAt(s), sg.idColour);
- }
- }
+ // modify GUI elements to reflect geometry change
+ Dimension idw = getAlignPanel().getIdPanel().getIdCanvas()
+ .getPreferredSize();
+ idw.width = i;
+ getAlignPanel().getIdPanel().getIdCanvas().setPreferredSize(idw);
}
}
- /**
- * enable or disable the display of Database Cross References in the sequence ID tooltip
- */
- public void setShowDbRefs(boolean show)
+ public Rectangle getExplodedGeometry()
{
- showdbrefs=show;
+ return explodedGeometry;
}
- /**
- *
- * @return true if Database References are to be displayed on tooltips.
- */
- public boolean isShowDbRefs()
+ public void setExplodedGeometry(Rectangle explodedPosition)
{
- return showdbrefs;
+ this.explodedGeometry = explodedPosition;
}
- /**
- *
- * @return true if Non-positional features are to be displayed on tooltips.
- */
- public boolean isShowNpFeats()
- {
- return shownpfeats;
- }
- /**
- * enable or disable the display of Non-Positional sequence features in the sequence ID tooltip
- * @param show
- */
- public void setShowNpFeats(boolean show)
+ public boolean isGatherViewsHere()
{
- shownpfeats=show;
+ return gatherViewsHere;
}
- /**
- *
- * @return true if view has hidden rows
- */
- public boolean hasHiddenRows()
+
+ public void setGatherViewsHere(boolean gatherViewsHere)
{
- return hasHiddenRows;
+ this.gatherViewsHere = gatherViewsHere;
}
+
/**
- *
- * @return true if view has hidden columns
+ * If this viewport has a (Protein/cDNA) complement, then scroll the
+ * complementary alignment to match this one.
*/
- public boolean hasHiddenColumns()
+ public void scrollComplementaryAlignment()
{
- return hasHiddenColumns;
- }
- /**
- * when set, view will scroll to show the highlighted position
- */
- public boolean followHighlight=true;
- /**
- * @return true if view should scroll to show the highlighted region of a sequence
- * @return
- */
- public boolean getFollowHighlight() {
- return followHighlight;
- }
- public boolean followSelection=true;
- /**
- * @return true if view selection should always follow the selections broadcast by other selection sources
- */
- public boolean getFollowSelection() {
- return followSelection;
- }
- private long sgrouphash=-1,colselhash=-1;
- /**
- * checks current SelectionGroup against record of last hash value, and updates record.
- * @return true if SelectionGroup changed since last call
- */
- boolean isSelectionGroupChanged() {
- int hc=(selectionGroup==null) ? -1 : selectionGroup.hashCode();
- if (hc!=sgrouphash)
- {
- sgrouphash = hc;
- return true;
- }
- return false;
- }
- /**
- * checks current colsel against record of last hash value, and updates record.
- * @return true if colsel changed since last call
- */
- boolean isColSelChanged() {
- int hc=(colSel==null) ? -1 : colSel.hashCode();
- if (hc!=colselhash)
+ /*
+ * Populate a SearchResults object with the mapped location to scroll to. If
+ * there is no complement, or it is not following highlights, or no mapping
+ * is found, the result will be empty.
+ */
+ SearchResults sr = new SearchResults();
+ int seqOffset = findComplementScrollTarget(sr);
+ if (!sr.isEmpty())
{
- colselhash = hc;
- return true;
+ // TODO would like next line without cast but needs more refactoring...
+ final AlignmentPanel complementPanel = ((AlignViewport) getCodingComplement()).getAlignPanel();
+ complementPanel.setFollowingComplementScroll(true);
+ complementPanel.scrollToCentre(sr, seqOffset);
}
- return false;
- }
- public void sendSelection()
- {
- jalview.structure.StructureSelectionManager.getStructureSelectionManager().sendSelection(new SequenceGroup(getSelectionGroup()), new ColumnSelection(getColumnSelection()), this);
}
}