X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=60430ed9bf8304a4bb11bbf64efa385a8af2056e;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=8f615aa55480e4eda1d6155f2e371d13e0b0dcd7;hpb=746d44733521ab266aea00b724175a6ade377bcd;p=jalview.git
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 8f615aa..60430ed 100644
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* 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.
- *
+ * 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 Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
/*
* Jalview - A Sequence Alignment Editor and Viewer
@@ -35,29 +38,33 @@
*/
package jalview.gui;
-import java.util.*;
-
-import java.awt.*;
-
-import jalview.analysis.*;
-import jalview.api.AlignCalcManagerI;
+import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
+import jalview.analysis.NJTree;
import jalview.api.AlignViewportI;
-import jalview.api.AlignmentViewPanel;
-import jalview.api.OOMHandlerI;
-
-import jalview.bin.*;
-
-import jalview.datamodel.*;
-
-import jalview.schemes.*;
+import jalview.bin.Cache;
+import jalview.commands.CommandI;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.UserColourScheme;
import jalview.structure.SelectionSource;
import jalview.structure.StructureSelectionManager;
import jalview.structure.VamsasSource;
import jalview.viewmodel.AlignmentViewport;
-import jalview.workers.AlignCalcManager;
-import jalview.workers.ConsensusThread;
-import jalview.workers.ConservationThread;
-import jalview.workers.StrucConsensusThread;
+import jalview.ws.params.AutoCalcSetting;
+
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Stack;
+import java.util.Vector;
/**
* DOCUMENT ME!
@@ -65,10 +72,9 @@ import jalview.workers.StrucConsensusThread;
* @author $author$
* @version $Revision: 1.141 $
*/
-public class AlignViewport extends AlignmentViewport implements SelectionSource, VamsasSource, AlignViewportI
+public class AlignViewport extends AlignmentViewport implements
+ SelectionSource, VamsasSource, AlignViewportI
{
- private static final int RIGHT_JUSTIFY = 1;
-
int startRes;
int endRes;
@@ -93,11 +99,7 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
boolean showAnnotation = true;
- boolean colourAppliesToAllGroups = true;
-
- boolean conservationColourSelected = false;
-
- boolean abovePIDThreshold = false;
+ SequenceAnnotationOrder sortAnnotationsBy = null;
int charHeight;
@@ -111,10 +113,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
boolean seqNameItalics;
- int threshold;
-
- int increment;
-
NJTree currentTree = null;
boolean scaleAboveWrapped = false;
@@ -141,11 +139,9 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
boolean gatherViewsHere = false;
- Stack historyList = new Stack();
-
- Stack redoList = new Stack();
+ Stack historyList = new Stack();
- Hashtable sequenceColours;
+ Stack redoList = new Stack();
int thresholdTextColour = 0;
@@ -328,21 +324,18 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
{
if (!alignment.isNucleotide())
{
- showConservation=Cache.getDefault("SHOW_CONSERVATION", true);
- showQuality=Cache.getDefault("SHOW_QUALITY", true);
+ 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);
+ normaliseSequenceLogo = Cache.getDefault("NORMALISE_CONSENSUS_LOGO",
+ false);
showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false);
- showConsensus=Cache.getDefault("SHOW_IDENTITY", true);
- consensus = new AlignmentAnnotation("Consensus", "PID",
- new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
- consensus.hasText = true;
- consensus.autoCalculated = true;
+ showConsensus = Cache.getDefault("SHOW_IDENTITY", true);
}
initAutoAnnotation();
if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
@@ -363,12 +356,15 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
}
}
- wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
- showUnconserved = jalview.bin.Cache.getDefault("SHOW_UNCONSERVED",
- false);
- sortByTree = jalview.bin.Cache.getDefault("SORT_BY_TREE", false);
- followSelection = jalview.bin.Cache.getDefault("FOLLOW_SELECTIONS",
- true);
+ wrapAlignment = Cache.getDefault("WRAP_ALIGNMENT", false);
+ showUnconserved = 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);
}
/**
@@ -437,50 +433,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
return sq;
}
-
- /**
- * GUI state
- *
- * @return true if conservation based shading is enabled
- */
- public boolean getConservationSelected()
- {
- return conservationColourSelected;
- }
-
- /**
- * GUI state
- *
- * @param b
- * enable conservation based shading
- */
- public void setConservationSelected(boolean b)
- {
- conservationColourSelected = b;
- }
-
- /**
- * GUI state
- *
- * @return true if percent identity threshold is applied to shading
- */
- public boolean getAbovePIDThreshold()
- {
- return abovePIDThreshold;
- }
-
- /**
- * GUI state
- *
- *
- * @param b
- * indicate if percent identity threshold is applied to shading
- */
- public void setAbovePIDThreshold(boolean b)
- {
- abovePIDThreshold = b;
- }
-
/**
* DOCUMENT ME!
*
@@ -702,7 +654,7 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
Desktop.instance).removeMappings(alignment.getCodonFrames());
}
this.alignment = align;
- if (alignment!=null && alignment.getCodonFrames() != null)
+ if (alignment != null && alignment.getCodonFrames() != null)
{
StructureSelectionManager.getStructureSelectionManager(
Desktop.instance).addMappings(alignment.getCodonFrames());
@@ -831,48 +783,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
/**
* 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()
@@ -904,27 +814,6 @@ public class AlignViewport extends AlignmentViewport 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()
@@ -1027,7 +916,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
scaleRightWrapped = b;
}
-
public void setDataset(boolean b)
{
isDataset = b;
@@ -1038,8 +926,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
return isDataset;
}
-
-
public boolean getShowHiddenMarkers()
{
return showHiddenMarkers;
@@ -1050,35 +936,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
showHiddenMarkers = show;
}
- public Color getSequenceColour(SequenceI seq)
- {
- if (sequenceColours == null || !sequenceColours.containsKey(seq))
- {
- return Color.white;
- }
- else
- {
- return (Color) sequenceColours.get(seq);
- }
- }
-
- public void setSequenceColour(SequenceI seq, Color col)
- {
- if (sequenceColours == null)
- {
- sequenceColours = new Hashtable();
- }
-
- if (col == null)
- {
- sequenceColours.remove(seq);
- }
- else
- {
- sequenceColours.put(seq, col);
- }
- }
-
/**
* returns the visible column regions of the alignment
*
@@ -1111,9 +968,12 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
*/
public long[] getUndoRedoHash()
{
+ // TODO: JAL-1126
if (historyList == null || redoList == null)
+ {
return new long[]
{ -1, -1 };
+ }
return new long[]
{ historyList.hashCode(), this.redoList.hashCode() };
}
@@ -1159,27 +1019,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
centreColumnLabels = centrecolumnlabels;
}
- public void updateSequenceIdColours()
- {
- Vector groups = alignment.getGroups();
- if (sequenceColours == 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(getHiddenRepSequences());
- for (int s = 0, sSize = sqs.size(); s < sSize; s++)
- {
- sequenceColours.put(sqs.elementAt(s), sg.idColour);
- }
- }
- }
- }
-
/**
* enable or disable the display of Database Cross References in the sequence
* ID tooltip
@@ -1371,7 +1210,9 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
Vector pdbs = alignment.getSequenceAt(i).getDatasetSequence()
.getPDBId();
if (pdbs == null)
+ {
continue;
+ }
SequenceI sq;
for (int p = 0; p < pdbs.size(); p++)
{
@@ -1379,7 +1220,9 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
if (p1.getId().equals(pdb.getId()))
{
if (!seqs.contains(sq = alignment.getSequenceAt(i)))
+ {
seqs.add(sq);
+ }
continue;
}
@@ -1390,7 +1233,6 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
return seqvectors.toArray(new SequenceI[seqvectors.size()][]);
}
-
public boolean isNormaliseSequenceLogo()
{
return normaliseSequenceLogo;
@@ -1401,13 +1243,54 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
normaliseSequenceLogo = state;
}
-
/**
*
- * @return true if alignment characters should be displayed
+ * @return true if alignment characters should be displayed
*/
public boolean isValidCharWidth()
{
return validCharWidth;
}
+
+ private Hashtable calcIdParams = new Hashtable();
+
+ private boolean showAutocalculatedAbove;
+
+ public AutoCalcSetting getCalcIdSettingsFor(String calcId)
+ {
+ return calcIdParams.get(calcId);
+ }
+
+ public void setCalcIdSettingsFor(String calcId, AutoCalcSetting settings,
+ boolean needsUpdate)
+ {
+ 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)
+ {
+ Cache.log.debug("trigger update for " + calcId);
+ }
+ }
+
+ protected SequenceAnnotationOrder getSortAnnotationsBy()
+ {
+ return sortAnnotationsBy;
+ }
+
+ protected void setSortAnnotationsBy(SequenceAnnotationOrder sortAnnotationsBy)
+ {
+ this.sortAnnotationsBy = sortAnnotationsBy;
+ }
+
+ protected boolean isShowAutocalculatedAbove()
+ {
+ return showAutocalculatedAbove;
+ }
+
+ protected void setShowAutocalculatedAbove(boolean showAutocalculatedAbove)
+ {
+ this.showAutocalculatedAbove = showAutocalculatedAbove;
+ }
}