*/
package jalview.viewmodel;
-import jalview.analysis.AAFrequency;
import jalview.analysis.Conservation;
import jalview.api.AlignCalcManagerI;
import jalview.api.AlignViewportI;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.schemes.Blosum62ColourScheme;
-import jalview.schemes.ClustalxColourScheme;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.PIDColourScheme;
import jalview.schemes.ResidueProperties;
import java.awt.Color;
import java.util.ArrayList;
import java.util.BitSet;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
*/
public abstract class AlignmentViewport implements AlignViewportI
{
+ /*
+ * A viewport that is a slave of (driven by) this one in some sense.
+ */
+ AlignViewportI slave = null;
+
/**
* alignment displayed in the viewport. Please use get/setter
*/
// calculation till later or to do all calculations in thread.
// via changecolour
globalColourScheme = cs;
- boolean recalc=false;
- if (cs!=null)
+ boolean recalc = false;
+ if (cs != null)
{
cs.setConservationApplied(recalc = getConservationSelected());
- if (getAbovePIDThreshold() || cs instanceof PIDColourScheme || cs instanceof Blosum62ColourScheme)
+ if (getAbovePIDThreshold() || cs instanceof PIDColourScheme
+ || cs instanceof Blosum62ColourScheme)
{
recalc = true;
cs.setThreshold(threshold, ignoreGapsInConsensusCalculation);
- } else {
+ }
+ else
+ {
cs.setThreshold(0, ignoreGapsInConsensusCalculation);
}
if (recalc)
|| cs instanceof Blosum62ColourScheme)
{
sg.cs.setThreshold(threshold, getIgnoreGapsConsensus());
- recalc=true;
+ recalc = true;
}
else
{
if (getConservationSelected())
{
sg.cs.setConservationApplied(true);
- recalc=true;
+ recalc = true;
}
else
{
sg.cs.setConservation(null);
// sg.cs.setThreshold(0, getIgnoreGapsConsensus());
}
- if (recalc) {
+ if (recalc)
+ {
sg.recalcConservation();
- } else {
+ }
+ else
+ {
sg.cs.alignmentChanged(sg, hiddenRepSequences);
}
}
* view
*/
protected Hashtable[] hStrucConsensus = null;
-
+
protected Conservation hconservation = null;
+
@Override
public void setConservation(Conservation cons)
{
hconservation = cons;
}
+
/**
* percentage gaps allowed in a column before all amino acid properties should
* be considered unconserved
AlignmentAnnotation alignmentAnnotation)
{
if (!alignmentAnnotation.autoCalculated)
+ {
return false;
+ }
if (calculator.workingInvolvedWith(alignmentAnnotation))
{
// System.err.println("grey out ("+alignmentAnnotation.label+")");
protected boolean showConsensus = true;
- Hashtable sequenceColours;
+ private Map<SequenceI, Color> sequenceColours = new HashMap<SequenceI, Color>();
/**
* Property change listener for changes in alignment
selectionGroup = new SequenceGroup();
selectionGroup.setEndRes(alignment.getWidth() - 1);
}
- Vector tmp = alignment.getHiddenSequences().showAll(
+ List<SequenceI> tmp = alignment.getHiddenSequences().showAll(
hiddenRepSequences);
- for (int t = 0; t < tmp.size(); t++)
+ for (SequenceI seq : tmp)
{
- selectionGroup.addSequence((SequenceI) tmp.elementAt(t), false);
+ selectionGroup.addSequence(seq, false);
+ setSequenceAnnotationsVisible(seq, true);
}
hasHiddenRows = false;
public void showSequence(int index)
{
- Vector tmp = alignment.getHiddenSequences().showSequence(index,
+ List<SequenceI> tmp = alignment.getHiddenSequences().showSequence(
+ index,
hiddenRepSequences);
if (tmp.size() > 0)
{
selectionGroup.setEndRes(alignment.getWidth() - 1);
}
- for (int t = 0; t < tmp.size(); t++)
+ for (SequenceI seq : tmp)
{
- selectionGroup.addSequence((SequenceI) tmp.elementAt(t), false);
+ selectionGroup.addSequence(seq, false);
+ setSequenceAnnotationsVisible(seq, true);
}
// JBPNote: refactor: only update flag if we modified visiblity (used to
// do this regardless)
for (int i = 0; i < seq.length; i++)
{
alignment.getHiddenSequences().hideSequence(seq[i]);
+ setSequenceAnnotationsVisible(seq[i], false);
}
hasHiddenRows = true;
firePropertyChange("alignment", null, alignment.getSequences());
}
}
+ /**
+ * Set visibility for any annotations for the given sequence.
+ *
+ * @param sequenceI
+ */
+ protected void setSequenceAnnotationsVisible(SequenceI sequenceI,
+ boolean visible)
+ {
+ for (AlignmentAnnotation ann : alignment.getAlignmentAnnotation())
+ {
+ if (ann.sequenceRef == sequenceI)
+ {
+ ann.visible = visible;
+ }
+ }
+ }
+
public void hideRepSequences(SequenceI repSequence, SequenceGroup sg)
{
int sSize = sg.getSize();
}
+ @Override
+ public List<AlignmentAnnotation> getVisibleAlignmentAnnotation(boolean selectedOnly)
+ {
+ ArrayList<AlignmentAnnotation> ala = new ArrayList<AlignmentAnnotation>();
+ AlignmentAnnotation[] aa;
+ if ((aa=alignment.getAlignmentAnnotation())!=null)
+ {
+ for (AlignmentAnnotation annot:aa)
+ {
+ AlignmentAnnotation clone = new AlignmentAnnotation(annot);
+ if (selectedOnly && selectionGroup!=null)
+ {
+ colSel.makeVisibleAnnotation(selectionGroup.getStartRes(), selectionGroup.getEndRes(),clone);
+ } else {
+ colSel.makeVisibleAnnotation(clone);
+ }
+ ala.add(clone);
+ }
+ }
+ return ala;
+ }
+
/**
* @return the padGaps
*/
{
conservation = new AlignmentAnnotation("Conservation",
"Conservation of total alignment less than "
- + getConsPercGaps() + "% gaps",
- new Annotation[1], 0f, 11f,
- AlignmentAnnotation.BAR_GRAPH);
+ + getConsPercGaps() + "% gaps", new Annotation[1],
+ 0f, 11f, AlignmentAnnotation.BAR_GRAPH);
conservation.hasText = true;
conservation.autoCalculated = true;
alignment.addAnnotation(conservation);
}
}
}
+
private void initQuality()
{
if (showQuality)
{
quality = new AlignmentAnnotation("Quality",
"Alignment Quality based on Blosum62 scores",
- new Annotation[1], 0f, 11f,
- AlignmentAnnotation.BAR_GRAPH);
+ new Annotation[1], 0f, 11f, AlignmentAnnotation.BAR_GRAPH);
quality.hasText = true;
quality.autoCalculated = true;
alignment.addAnnotation(quality);
}
}
}
+
private void initRNAStructure()
{
- if (alignment.hasRNAStructure() && strucConsensus==null)
+ if (alignment.hasRNAStructure() && strucConsensus == null)
{
strucConsensus = new AlignmentAnnotation("StrucConsensus", "PID",
- new Annotation[1], 0f, 100f,
- AlignmentAnnotation.BAR_GRAPH);
+ new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
strucConsensus.hasText = true;
strucConsensus.autoCalculated = true;
}
}
}
+
/*
* (non-Javadoc)
*
if (aan[an].autoCalculated && aan[an].groupRef != null)
{
oldrfs.add(aan[an].groupRef);
- alignment.deleteAnnotation(aan[an],false);
+ alignment.deleteAnnotation(aan[an], false);
}
}
}
@Override
public Color getSequenceColour(SequenceI seq)
{
- Color sqc=Color.white;
- if (sequenceColours != null)
- {
- sqc = (Color) sequenceColours.get(seq);
- if (sqc == null) {
- sqc = Color.white;
- }
- }
- return sqc;
+ Color sqc = sequenceColours.get(seq);
+ return (sqc == null ? Color.white : sqc);
}
@Override
public void setSequenceColour(SequenceI seq, Color col)
{
- if (sequenceColours == null)
- {
- sequenceColours = new Hashtable();
- }
-
if (col == null)
{
sequenceColours.remove(seq);
@Override
public void updateSequenceIdColours()
{
- if (sequenceColours == null)
- {
- sequenceColours = new Hashtable();
- }
for (SequenceGroup sg : alignment.getGroups())
{
if (sg.idColour != null)
@Override
public void clearSequenceColours()
{
- sequenceColours = null;
+ sequenceColours.clear();
};
+
+ @Override
+ public AlignViewportI getSlave()
+ {
+ return this.slave;
+ }
+
+ @Override
+ public void setSlave(AlignViewportI sl)
+ {
+ if (this == sl.getSlave())
+ {
+ System.err.println("Ignoring recursive setSlave request");
+ }
+ else
+ {
+ this.slave = sl;
+ }
+ }
}