X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=8e12ff5c3a81e7eb49629ed6c40952ce85c4b5c3;hb=f3d57563c0364d1d44889156e264414fa32b5443;hp=5944b806f65f9ce098d6c52a9feec9c0e6204977;hpb=9b3219d225131af5a165553f206ebf8da304ee23;p=jalview.git
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 5944b80..8e12ff5 100644
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -18,31 +18,15 @@
* along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 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.gui;
import jalview.analysis.AlignmentUtils;
import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
-import jalview.analysis.NJTree;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
+import jalview.api.FeatureColourI;
+import jalview.api.FeatureSettingsModelI;
+import jalview.api.FeaturesDisplayedI;
import jalview.api.ViewStyleI;
import jalview.bin.Cache;
import jalview.commands.CommandI;
@@ -50,17 +34,20 @@ import jalview.datamodel.AlignedCodonFrame;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.PDBEntry;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SearchResults;
-import jalview.datamodel.Sequence;
+import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
+import jalview.renderer.ResidueShader;
+import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.ResidueColourScheme;
import jalview.schemes.UserColourScheme;
-import jalview.structure.CommandListener;
import jalview.structure.SelectionSource;
import jalview.structure.StructureSelectionManager;
import jalview.structure.VamsasSource;
+import jalview.util.ColorUtils;
import jalview.util.MessageManager;
import jalview.viewmodel.AlignmentViewport;
import jalview.ws.params.AutoCalcSetting;
@@ -68,15 +55,13 @@ import jalview.ws.params.AutoCalcSetting;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
+import java.awt.FontMetrics;
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!
@@ -84,20 +69,18 @@ import javax.swing.JOptionPane;
* @author $author$
* @version $Revision: 1.141 $
*/
-public class AlignViewport extends AlignmentViewport implements
- SelectionSource, CommandListener
+public class AlignViewport extends AlignmentViewport
+ implements SelectionSource
{
Font font;
- NJTree currentTree = null;
-
boolean cursorMode = false;
boolean antiAlias = false;
- private Rectangle explodedGeometry;
+ private Rectangle explodedGeometry = null;
- String viewName;
+ private String viewName = null;
/*
* Flag set true on the view that should 'gather' multiple views of the same
@@ -118,7 +101,7 @@ public class AlignViewport extends AlignmentViewport implements
*/
public AlignViewport(AlignmentI al)
{
- setAlignment(al);
+ super(al);
init();
}
@@ -136,20 +119,21 @@ public class AlignViewport extends AlignmentViewport implements
public AlignViewport(AlignmentI al, String seqsetid, String viewid)
{
+ super(al);
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);
+ 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();
+
}
/**
@@ -160,12 +144,12 @@ public class AlignViewport extends AlignmentViewport implements
* @param hiddenColumns
* ColumnSelection
*/
- public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns)
+ public AlignViewport(AlignmentI al, HiddenColumns hiddenColumns)
{
- setAlignment(al);
+ super(al);
if (hiddenColumns != null)
{
- colSel = hiddenColumns;
+ al.setHiddenColumns(hiddenColumns);
}
init();
}
@@ -178,7 +162,7 @@ public class AlignViewport extends AlignmentViewport implements
* @param seqsetid
* (may be null)
*/
- public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+ public AlignViewport(AlignmentI al, HiddenColumns hiddenColumns,
String seqsetid)
{
this(al, hiddenColumns, seqsetid, null);
@@ -194,25 +178,26 @@ public class AlignViewport extends AlignmentViewport implements
* @param viewid
* (may be null)
*/
- public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+ public AlignViewport(AlignmentI al, HiddenColumns hiddenColumns,
String seqsetid, String viewid)
{
+ super(al);
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);
+ 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)
{
- colSel = hiddenColumns;
+ al.setHiddenColumns(hiddenColumns);
}
init();
}
@@ -222,7 +207,7 @@ public class AlignViewport extends AlignmentViewport implements
*/
private void applyViewProperties()
{
- antiAlias = Cache.getDefault("ANTI_ALIAS", false);
+ antiAlias = Cache.getDefault("ANTI_ALIAS", true);
viewStyle.setShowJVSuffix(Cache.getDefault("SHOW_JVSUFFIX", true));
setShowAnnotation(Cache.getDefault("SHOW_ANNOTATIONS", true));
@@ -236,25 +221,21 @@ public class AlignViewport extends AlignmentViewport implements
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));
+ 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));
+ 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();
String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
@@ -295,93 +276,54 @@ public class AlignViewport extends AlignmentViewport implements
false);
showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false);
showConsensus = Cache.getDefault("SHOW_IDENTITY", true);
+
+ showOccupancy = Cache.getDefault(Preferences.SHOW_OCCUPANCY, true);
}
initAutoAnnotation();
- String colourProperty = alignment.isNucleotide() ? Preferences.DEFAULT_COLOUR_NUC
+ 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)
+ String schemeName = Cache.getProperty(colourProperty);
+ if (schemeName == null)
{
- globalColourScheme = ColourSchemeProperty.getColour(alignment,
- propertyValue);
-
- if (globalColourScheme instanceof UserColourScheme)
- {
- globalColourScheme = UserDefinedColours.loadDefaultColours();
- ((UserColourScheme) globalColourScheme).setThreshold(0,
- isIgnoreGapsConsensus());
- }
-
- if (globalColourScheme != null)
- {
- globalColourScheme.setConsensus(hconsensus);
- }
+ // only DEFAULT_COLOUR available in Jalview before 2.9
+ schemeName = Cache.getDefault(Preferences.DEFAULT_COLOUR,
+ ResidueColourScheme.NONE);
}
- }
+ ColourSchemeI colourScheme = ColourSchemeProperty
+ .getColourScheme(this, alignment, schemeName);
+ residueShading = new ResidueShader(colourScheme);
- /**
- * 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)
+ if (colourScheme instanceof UserColourScheme)
{
- updateConsensus(null);
+ residueShading = new ResidueShader(
+ UserDefinedColours.loadDefaultColours());
+ residueShading.setThreshold(0, isIgnoreGapsConsensus());
}
- if (consensus == null)
+
+ if (residueShading != null)
{
- return null;
+ residueShading.setConsensus(hconsensus);
}
- 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;
+ setColourAppliesToAllGroups(true);
}
boolean validCharWidth;
/**
- * 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
+ * {@inheritDoc}
*/
+ @Override
public void setFont(Font f, boolean setGrid)
{
font = f;
Container c = new Container();
- java.awt.FontMetrics fm = c.getFontMetrics(font);
- int w = viewStyle.getCharWidth(), ww = fm.charWidth('M'), h = viewStyle
- .getCharHeight();
if (setGrid)
{
+ FontMetrics fm = c.getFontMetrics(font);
+ int ww = fm.charWidth('M');
setCharHeight(fm.getHeight());
setCharWidth(ww);
}
@@ -398,7 +340,6 @@ public class AlignViewport extends AlignmentViewport implements
super.setViewStyle(settingsForView);
setFont(new Font(viewStyle.getFontName(), viewStyle.getFontStyle(),
viewStyle.getFontSize()), false);
-
}
/**
@@ -417,10 +358,11 @@ public class AlignViewport extends AlignmentViewport implements
* @param align
* DOCUMENT ME!
*/
+ @Override
public void setAlignment(AlignmentI align)
{
replaceMappings(align);
- this.alignment = align;
+ super.setAlignment(align);
}
/**
@@ -461,7 +403,7 @@ public class AlignViewport extends AlignmentViewport implements
AlignmentI al = getAlignment();
if (al != null)
{
- Set mappings = al.getCodonFrames();
+ List mappings = al.getCodonFrames();
if (mappings != null)
{
StructureSelectionManager ssm = StructureSelectionManager
@@ -503,63 +445,6 @@ public class AlignViewport extends AlignmentViewport implements
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- @Override
- public ColumnSelection getColumnSelection()
- {
- return colSel;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param tree
- * DOCUMENT ME!
- */
- public void setCurrentTree(NJTree tree)
- {
- currentTree = tree;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public NJTree getCurrentTree()
- {
- return currentTree;
- }
-
- /**
- * 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;
- }
-
- /**
* get hash of undo and redo list for the alignment
*
* @return long[] { historyList.hashCode, redoList.hashCode };
@@ -623,9 +508,11 @@ public class AlignViewport extends AlignmentViewport implements
public void sendSelection()
{
jalview.structure.StructureSelectionManager
- .getStructureSelectionManager(Desktop.instance).sendSelection(
- new SequenceGroup(getSelectionGroup()),
- new ColumnSelection(getColumnSelection()), this);
+ .getStructureSelectionManager(Desktop.instance)
+ .sendSelection(new SequenceGroup(getSelectionGroup()),
+ new ColumnSelection(getColumnSelection()),
+ new HiddenColumns(getAlignment().getHiddenColumns()),
+ this);
}
/**
@@ -638,8 +525,8 @@ public class AlignViewport extends AlignmentViewport implements
*/
public AlignmentPanel getAlignPanel()
{
- AlignmentPanel[] aps = PaintRefresher.getAssociatedPanels(this
- .getSequenceSetId());
+ AlignmentPanel[] aps = PaintRefresher
+ .getAssociatedPanels(this.getSequenceSetId());
for (int p = 0; aps != null && p < aps.length; p++)
{
if (aps[p].av == this)
@@ -661,39 +548,6 @@ public class AlignViewport extends AlignmentViewport implements
}
/**
- * 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.
- *
- * @param sg
- * @param wholewidth
- */
- public void expandColSelection(SequenceGroup sg, boolean wholewidth)
- {
- int sgs, sge;
- if (sg != null
- && (sgs = sg.getStartRes()) >= 0
- && sg.getStartRes() <= (sge = sg.getEndRes())
- && (colSel == null || colSel.getSelected() == null || colSel
- .getSelected().size() == 0))
- {
- if (!wholewidth && alignment.getWidth() == (1 + sge - sgs))
- {
- // do nothing
- return;
- }
- if (colSel == null)
- {
- colSel = new ColumnSelection();
- }
- for (int cspos = sg.getStartRes(); cspos <= sg.getEndRes(); cspos++)
- {
- colSel.addElement(cspos);
- }
- }
- }
-
- /**
* Returns the (Desktop) instance of the StructureSelectionManager
*/
@Override
@@ -703,42 +557,6 @@ public class AlignViewport extends AlignmentViewport implements
.getStructureSelectionManager(Desktop.instance);
}
- /**
- *
- * @param pdbEntries
- * @return an array of SequenceI arrays, one for each PDBEntry, listing which
- * sequences in the alignment hold a reference to it
- */
- public SequenceI[][] collateForPDB(PDBEntry[] pdbEntries)
- {
- List seqvectors = new ArrayList();
- for (PDBEntry pdb : pdbEntries)
- {
- List seqs = new ArrayList();
- for (SequenceI sq : alignment.getSequences())
- {
- Vector pdbs = sq.getDatasetSequence().getAllPDBEntries();
- if (pdbs == null)
- {
- continue;
- }
- for (PDBEntry p1 : pdbs)
- {
- 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()][]);
- }
-
@Override
public boolean isNormaliseSequenceLogo()
{
@@ -760,7 +578,7 @@ public class AlignViewport extends AlignmentViewport implements
return validCharWidth;
}
- private Hashtable calcIdParams = new Hashtable();
+ private Hashtable calcIdParams = new Hashtable<>();
public AutoCalcSetting getCalcIdSettingsFor(String calcId)
{
@@ -790,7 +608,8 @@ public class AlignViewport extends AlignmentViewport implements
*
* - compute the equivalent edit on the mapped sequences
* - apply the mapped edit
- * - 'apply' the source edit to the working copy of the source sequences
+ * - 'apply' the source edit to the working copy of the source
+ * sequences
*
*
* @param command
@@ -855,7 +674,7 @@ public class AlignViewport extends AlignmentViewport implements
* Check if any added sequence could be the object of a mapping or
* cross-reference; if so, make the mapping explicit
*/
- realiseMappings(getAlignment(), toAdd);
+ getAlignment().realiseMappings(toAdd.getSequences());
/*
* If any cDNA/protein mappings exist or can be made between the alignments,
@@ -863,17 +682,6 @@ public class AlignViewport extends AlignmentViewport implements
*/
if (Cache.getDefault(Preferences.ENABLE_SPLIT_FRAME, true))
{
- // if (toAdd.getDataset() == null)
- // {
- // // need to create ds seqs
- // for (SequenceI sq : toAdd.getSequences())
- // {
- // if (sq.getDatasetSequence() == null)
- // {
- // sq.createDatasetSequence();
- // }
- // }
- // }
if (AlignmentUtils.isMappable(toAdd, getAlignment()))
{
if (openLinkedAlignment(toAdd, title))
@@ -889,61 +697,26 @@ public class AlignViewport extends AlignmentViewport implements
// TODO: JAL-407 regardless of above - identical sequences (based on ID and
// provenance) should share the same dataset sequence
+ AlignmentI al = getAlignment();
+ String gap = String.valueOf(al.getGapCharacter());
for (int i = 0; i < toAdd.getHeight(); i++)
{
- getAlignment().addSequence(toAdd.getSequenceAt(i));
- }
-
- setEndSeq(getAlignment().getHeight());
- firePropertyChange("alignment", null, getAlignment().getSequences());
- }
-
- /**
- * Check if any added sequence could be the object of a mapping or
- * cross-reference; if so, make the mapping explicit. Returns the count of
- * mappings updated.
- *
- * @param al
- * @param toAdd
- */
- protected int realiseMappings(AlignmentI al, AlignmentI toAdd)
- {
- // TODO this is proof of concept
- // we might want to give the user some choice here
- int count = 0;
- for (SequenceI seq : toAdd.getSequences())
- {
- count += realiseMappingsTo(al, seq);
- }
- return count;
- }
-
- /**
- * If the alignment holds any mappings to a dummy (placeholder) sequence that
- * matches the given sequence, then update the mapping to point to the
- * sequence. Returns the number of mappings updated.
- *
- * @param al
- * @param seq
- * @return
- */
- protected int realiseMappingsTo(AlignmentI al, SequenceI seq)
- {
- int count = 0;
- Set mappings = al.getDataset().getCodonFrames();
- // TODO are mappings on alignment or alignment dataset?!?
- for (AlignedCodonFrame mapping : mappings)
- {
+ SequenceI seq = toAdd.getSequenceAt(i);
/*
- * TODO could just go straight to realiseWith() here unless we want
- * to give the user some choice before going ahead
+ * experimental!
+ * - 'align' any mapped sequences as per existing
+ * e.g. cdna to genome, domain hit to protein sequence
+ * very experimental! (need a separate menu option for this)
+ * - only add mapped sequences ('select targets from a dataset')
*/
- if (mapping.isRealisableWith(seq))
+ if (true /*AlignmentUtils.alignSequenceAs(seq, al, gap, true, true)*/)
{
- count += mapping.realiseWith(seq);
+ al.addSequence(seq);
}
}
- return count;
+
+ ranges.setEndSeq(getAlignment().getHeight());
+ firePropertyChange("alignment", null, getAlignment().getSequences());
}
/**
@@ -957,15 +730,14 @@ public class AlignViewport extends AlignmentViewport implements
*/
protected boolean openLinkedAlignment(AlignmentI al, String title)
{
- String[] options = new String[] {
- MessageManager.getString("action.no"),
+ 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,
+ int response = JvOptionPane.showOptionDialog(Desktop.desktop, question,
MessageManager.getString("label.open_split_window"),
- JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null,
+ JvOptionPane.DEFAULT_OPTION, JvOptionPane.PLAIN_MESSAGE, null,
options, options[0]);
if (response != 1 && response != 2)
@@ -1000,12 +772,13 @@ public class AlignViewport extends AlignmentViewport implements
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 }));
+ newAlignFrame.setStatus(MessageManager
+ .formatMessage("label.successfully_loaded_file", new Object[]
+ { title }));
// 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))
+ // if (!protocol.equals(DataSourceType.PASTE))
// {
// alignFrame.setFileName(file, format);
// }
@@ -1018,8 +791,8 @@ public class AlignViewport extends AlignmentViewport implements
try
{
- newAlignFrame.setMaximum(jalview.bin.Cache.getDefault(
- "SHOW_FULLSCREEN", false));
+ newAlignFrame.setMaximum(
+ jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
} catch (java.beans.PropertyVetoException ex)
{
}
@@ -1051,8 +824,8 @@ public class AlignViewport extends AlignmentViewport implements
* is protein, the mappings to cDNA will be registered with
* StructureSelectionManager as a side-effect.
*/
- AlignFrame copyMe = new AlignFrame(complement,
- AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
+ AlignFrame copyMe = new AlignFrame(complement, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
copyMe.setTitle(getAlignPanel().alignFrame.getTitle());
AlignmentI al = newAlignFrame.viewport.getAlignment();
@@ -1092,10 +865,9 @@ public class AlignViewport extends AlignmentViewport implements
if (ap != null)
{
// modify GUI elements to reflect geometry change
- Dimension idw = getAlignPanel().getIdPanel().getIdCanvas()
- .getPreferredSize();
+ Dimension idw = ap.getIdPanel().getIdCanvas().getPreferredSize();
idw.width = i;
- getAlignPanel().getIdPanel().getIdCanvas().setPreferredSize(idw);
+ ap.getIdPanel().getIdCanvas().setPreferredSize(idw);
}
}
@@ -1130,15 +902,16 @@ public class AlignViewport extends AlignmentViewport implements
* there is no complement, or it is not following highlights, or no mapping
* is found, the result will be empty.
*/
- SearchResults sr = new SearchResults();
+ SearchResultsI sr = new SearchResults();
int verticalOffset = findComplementScrollTarget(sr);
if (!sr.isEmpty())
{
// TODO would like next line without cast but needs more refactoring...
final AlignmentPanel complementPanel = ((AlignViewport) getCodingComplement())
.getAlignPanel();
- complementPanel.setDontScrollComplement(true);
+ complementPanel.setToScrollComplementPanel(false);
complementPanel.scrollToCentre(sr, verticalOffset);
+ complementPanel.setToScrollComplementPanel(true);
}
}
@@ -1172,4 +945,140 @@ public class AlignViewport extends AlignmentViewport implements
return true;
}
+ /**
+ * Applies the supplied feature settings descriptor to currently known
+ * features. This supports an 'initial configuration' of feature colouring
+ * based on a preset or user favourite. This may then be modified in the usual
+ * way using the Feature Settings dialogue.
+ *
+ * @param featureSettings
+ */
+ @Override
+ public void applyFeaturesStyle(FeatureSettingsModelI featureSettings)
+ {
+ transferFeaturesStyles(featureSettings, false);
+ }
+
+ /**
+ * Applies the supplied feature settings descriptor to currently known features.
+ * This supports an 'initial configuration' of feature colouring based on a
+ * preset or user favourite. This may then be modified in the usual way using
+ * the Feature Settings dialogue.
+ *
+ * @param featureSettings
+ */
+ @Override
+ public void mergeFeaturesStyle(FeatureSettingsModelI featureSettings)
+ {
+ transferFeaturesStyles(featureSettings, true);
+ }
+
+ /**
+ * when mergeOnly is set, then group and feature visibility or feature colours
+ * are not modified for features and groups already known to the feature
+ * renderer. Feature ordering is always adjusted, and transparency is always set
+ * regardless.
+ *
+ * @param featureSettings
+ * @param mergeOnly
+ */
+ private void transferFeaturesStyles(FeatureSettingsModelI featureSettings,
+ boolean mergeOnly)
+ {
+ if (featureSettings == null)
+ {
+ return;
+ }
+
+ FeatureRenderer fr = getAlignPanel().getSeqPanel().seqCanvas
+ .getFeatureRenderer();
+ List origRenderOrder = new ArrayList<>();
+ List origGroups = new ArrayList<>();
+ // preserve original render order - allows differentiation between user configured colours and autogenerated ones
+ origRenderOrder.addAll(fr.getRenderOrder());
+ origGroups.addAll(fr.getFeatureGroups());
+
+ fr.findAllFeatures(true);
+ List renderOrder = fr.getRenderOrder();
+ FeaturesDisplayedI displayed = fr.getFeaturesDisplayed();
+ if (!mergeOnly)
+ {
+ // only clear displayed features if we are mergeing
+ // displayed.clear();
+ }
+ // TODO this clears displayed.featuresRegistered - do we care?
+ //
+ // JAL-3330 - JBP - yes we do - calling applyFeatureStyle to a view where
+ // feature visibility has already been configured is not very friendly
+ /*
+ * set feature colour if specified by feature settings
+ * set visibility of all features
+ */
+ for (String type : renderOrder)
+ {
+ FeatureColourI preferredColour = featureSettings
+ .getFeatureColour(type);
+ FeatureColourI origColour = fr.getFeatureStyle(type);
+ if (!mergeOnly || (!origRenderOrder.contains(type)
+ || origColour == null
+ || (!origColour.isGraduatedColour()
+ && origColour.getColour() != null
+ && origColour.getColour().equals(
+ ColorUtils.createColourFromName(type)))))
+ {
+ // if we are merging, only update if there wasn't already a colour defined for
+ // this type
+ if (preferredColour != null)
+ {
+ fr.setColour(type, preferredColour);
+ }
+ if (featureSettings.isFeatureDisplayed(type))
+ {
+ displayed.setVisible(type);
+ }
+ else if (featureSettings.isFeatureHidden(type))
+ {
+ displayed.setHidden(type);
+ }
+ }
+ }
+
+ /*
+ * set visibility of feature groups
+ */
+ for (String group : fr.getFeatureGroups())
+ {
+ if (!mergeOnly || !origGroups.contains(group))
+ {
+ // when merging, display groups only if the aren't already marked as not visible
+ fr.setGroupVisibility(group,
+ featureSettings.isGroupDisplayed(group));
+ }
+ }
+
+ /*
+ * order the features
+ */
+ if (featureSettings.optimiseOrder())
+ {
+ // TODO not supported (yet?)
+ }
+ else
+ {
+ fr.orderFeatures(featureSettings);
+ }
+ fr.setTransparency(featureSettings.getTransparency());
+
+ fr.notifyFeaturesChanged();
+ }
+
+ public String getViewName()
+ {
+ return viewName;
+ }
+
+ public void setViewName(String viewName)
+ {
+ this.viewName = viewName;
+ }
}