X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=a216c2936a8f36f901113cfde702f801ec4b4db8;hb=330289271fe2239a59fa318d6b2b19fdd319f8a4;hp=eb832f2f68a8b3c2c58dd8c415176c10bec59906;hpb=d545553b53ac1bd1e29eb72250cdb29745f7292f;p=jalview.git
diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
old mode 100755
new mode 100644
index eb832f2..a216c29
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -1,417 +1,263 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
- *
- * 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 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.
*/
-
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-
-import jalview.analysis.*;
-import jalview.bin.*;
-import jalview.datamodel.*;
-import jalview.schemes.*;
-
-public class AlignViewport
+import jalview.analysis.NJTree;
+import jalview.api.AlignViewportI;
+import jalview.bin.JalviewLite;
+import jalview.commands.CommandI;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+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.viewmodel.AlignmentViewport;
+
+import java.awt.Font;
+
+public class AlignViewport extends AlignmentViewport implements
+ AlignViewportI, SelectionSource, VamsasSource, CommandListener
{
int startRes;
+
int endRes;
int startSeq;
- int endSeq;
+ int endSeq;
boolean cursorMode = false;
- 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 showConservation = true;
- boolean showQuality = true;
- boolean showConsensus = true;
-
- boolean colourAppliesToAllGroups = true;
- ColourSchemeI globalColourScheme = null;
- boolean conservationColourSelected = false;
- boolean abovePIDThreshold = false;
-
- SequenceGroup selectionGroup;
-
- int charHeight;
- int charWidth;
- int wrappedWidth;
-
Font font = new Font("SansSerif", Font.PLAIN, 10);
- boolean validCharWidth = true;
- AlignmentI alignment;
- ColumnSelection colSel = new ColumnSelection();
-
- int threshold;
- int increment;
+ boolean validCharWidth = true;
NJTree currentTree = null;
- boolean scaleAboveWrapped = true;
- boolean scaleLeftWrapped = true;
- boolean scaleRightWrapped = true;
-
- // The following vector holds the features which are
- // currently visible, in the correct order or rendering
- Hashtable featuresDisplayed;
+ public jalview.bin.JalviewLite applet;
- boolean hasHiddenColumns = false;
- boolean hasHiddenRows = false;
- boolean showHiddenMarkers = true;
-
-
- public Vector vconsensus;
- AlignmentAnnotation consensus;
- AlignmentAnnotation conservation;
- AlignmentAnnotation quality;
-
- boolean autocalculateConsensus = true;
-
- public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!
-
- private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(this);
-
- boolean ignoreGapsInConsensusCalculation = false;
+ boolean MAC = false;
- jalview.bin.JalviewLite applet;
+ private AnnotationColumnChooser annotationColumnSelectionState;
- boolean MAC = false;
+ public void finalize()
+ {
+ applet = null;
+ quality = null;
+ alignment = null;
+ colSel = null;
+ }
public AlignViewport(AlignmentI al, JalviewLite applet)
{
+ super();
+ calculator = new jalview.workers.AlignCalcManager();
this.applet = applet;
- setAlignment(al);
+ alignment = al;
+ // we always pad gaps
+ this.setPadGaps(true);
this.startRes = 0;
this.endRes = al.getWidth() - 1;
this.startSeq = 0;
this.endSeq = al.getHeight() - 1;
- setFont(font);
-
- if(System.getProperty("os.name").startsWith("Mac"))
- MAC = true;
-
if (applet != null)
{
- String param = applet.getParameter("showFullId");
- if (param != null)
- {
- showJVSuffix = Boolean.valueOf(param).booleanValue();
- }
-
- param = applet.getParameter("showAnnotation");
- if (param != null)
- {
- showAnnotation = Boolean.valueOf(param).booleanValue();
- }
-
- param = applet.getParameter("showConservation");
- if (param != null)
- {
- showConservation = Boolean.valueOf(param).booleanValue();
- }
-
- param = applet.getParameter("showQuality");
+ // get the width and height scaling factors if they were specified
+ String param = applet.getParameter("widthScale");
if (param != null)
{
- showQuality = Boolean.valueOf(param).booleanValue();
+ try
+ {
+ widthScale = new Float(param).floatValue();
+ } catch (Exception e)
+ {
+ }
+ if (widthScale <= 1.0)
+ {
+ System.err
+ .println("Invalid alignment character width scaling factor ("
+ + widthScale + "). Ignoring.");
+ widthScale = 1;
+ }
+ if (applet.debug)
+ {
+ System.err
+ .println("Alignment character width scaling factor is now "
+ + widthScale);
+ }
}
-
- param = applet.getParameter("showConsensus");
+ param = applet.getParameter("heightScale");
if (param != null)
{
- showConsensus = Boolean.valueOf(param).booleanValue();
+ try
+ {
+ heightScale = new Float(param).floatValue();
+ } catch (Exception e)
+ {
+ }
+ if (heightScale <= 1.0)
+ {
+ System.err
+ .println("Invalid alignment character height scaling factor ("
+ + heightScale + "). Ignoring.");
+ heightScale = 1;
+ }
+ if (applet.debug)
+ {
+ System.err
+ .println("Alignment character height scaling factor is now "
+ + heightScale);
+ }
}
}
- // We must set conservation and consensus before setting colour,
- // as Blosum and Clustal require this to be done
- updateConservation();
- updateConsensus();
+ setFont(font);
+ MAC = new jalview.util.Platform().isAMac();
if (applet != null)
{
- String colour = applet.getParameter("defaultColour");
+ setShowJVSuffix(applet.getDefaultParameter("showFullId",
+ getShowJVSuffix()));
- if(colour == null)
- {
- colour = applet.getParameter("userDefinedColour");
- if(colour !=null)
- colour = "User Defined";
- }
+ setShowAnnotation(applet.getDefaultParameter("showAnnotation",
+ isShowAnnotation()));
+
+ showConservation = applet.getDefaultParameter("showConservation",
+ showConservation);
+
+ showQuality = applet.getDefaultParameter("showQuality", showQuality);
- if(colour != null)
+ showConsensus = applet.getDefaultParameter("showConsensus",
+ showConsensus);
+
+ setShowUnconserved(applet.getDefaultParameter("showUnconserved",
+ getShowUnconserved()));
+
+ String param = applet.getParameter("upperCase");
+ if (param != null)
{
- globalColourScheme = ColourSchemeProperty.getColour(alignment, colour);
- if (globalColourScheme != null)
+ if (param.equalsIgnoreCase("bold"))
{
- globalColourScheme.setConsensus(vconsensus);
+ setUpperCasebold(true);
}
}
+ sortByTree = applet.getDefaultParameter("sortByTree", sortByTree);
- if(applet.getParameter("userDefinedColour")!=null)
- {
- ((UserColourScheme)globalColourScheme).parseAppletParameter(
- applet.getParameter("userDefinedColour"));
- }
+ followHighlight = applet.getDefaultParameter("automaticScrolling",
+ followHighlight);
+ followSelection = followHighlight;
+ showSequenceLogo = applet.getDefaultParameter("showSequenceLogo",
+ showSequenceLogo);
- }
- }
+ normaliseSequenceLogo = applet.getDefaultParameter(
+ "normaliseSequenceLogo", applet.getDefaultParameter(
+ "normaliseLogo", normaliseSequenceLogo));
- public void showSequenceFeatures(boolean b)
- {
- showSequenceFeatures = b;
- }
+ showGroupConsensus = applet.getDefaultParameter("showGroupConsensus",
+ showGroupConsensus);
- public boolean getShowSequenceFeatures()
- {
- return showSequenceFeatures;
- }
+ showGroupConservation = applet.getDefaultParameter(
+ "showGroupConservation", showGroupConservation);
+ showConsensusHistogram = applet.getDefaultParameter(
+ "showConsensusHistogram", showConsensusHistogram);
- public void updateConservation()
- {
- if(alignment.isNucleotide())
- return;
-
- Conservation cons = new jalview.analysis.Conservation("All",
- jalview.schemes.ResidueProperties.propHash, 3,
- alignment.getSequences(), 0,
- alignment.getWidth() - 1);
- cons.calculate();
- cons.verdict(false, ConsPercGaps);
- cons.findQuality();
- int alWidth = alignment.getWidth();
- Annotation[] annotations = new Annotation[alWidth];
- Annotation[] qannotations = new Annotation[alWidth];
- String sequence = cons.getConsSequence().getSequence();
- float minR, minG, minB, maxR, maxG, 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 = cons.qualityRange[0].floatValue();
- float qmax = cons.qualityRange[1].floatValue();
-
- for (int i = 0; i < alWidth; i++)
+ }
+
+ if (applet != null)
{
- float value = 0;
- try
- {
- value = Integer.parseInt(sequence.charAt(i) + "");
- }
- catch (Exception ex)
+ String colour = applet.getParameter("defaultColour");
+
+ if (colour == null)
{
- if (sequence.charAt(i) == '*')
- {
- value = 11;
- }
- if (sequence.charAt(i) == '+')
+ colour = applet.getParameter("userDefinedColour");
+ if (colour != null)
{
- value = 10;
+ colour = "User Defined";
}
}
- float vprop = value - min;
- vprop /= max;
-
- annotations[i] = new Annotation(sequence.charAt(i) + "",
- "", ' ', value,
- new Color(minR + maxR * vprop,
- minG + maxG * vprop,
- minB + maxB * vprop));
- // Quality calc
- value = ( (Double) cons.quality.elementAt(i)).floatValue();
- vprop = value - qmin;
- vprop /= qmax;
- qannotations[i] = new Annotation(" ",
- String.valueOf(value), ' ', value,
- new
- Color(minR + maxR * vprop,
- minG + maxG * vprop,
- minB + maxB * vprop));
- }
- if (conservation == null)
- {
- conservation = new AlignmentAnnotation("Conservation",
- "Conservation of total alignment less than " +
- ConsPercGaps + "% gaps",
- annotations,
- 0f, // cons.qualityRange[0].floatValue(),
- 11f, // cons.qualityRange[1].floatValue()
- AlignmentAnnotation.BAR_GRAPH);
- if (showConservation)
+ if (colour != null)
{
- alignment.addAnnotation(conservation);
+ globalColourScheme = ColourSchemeProperty.getColour(alignment,
+ colour);
+ if (globalColourScheme != null)
+ {
+ globalColourScheme.setConsensus(hconsensus);
+ }
}
- quality = new AlignmentAnnotation("Quality",
- "Alignment Quality based on Blosum62 scores",
- qannotations,
- cons.qualityRange[0].floatValue(),
- cons.qualityRange[1].floatValue(),
- AlignmentAnnotation.BAR_GRAPH);
- if (showQuality)
+
+ if (applet.getParameter("userDefinedColour") != null)
{
- alignment.addAnnotation(quality);
+ ((UserColourScheme) globalColourScheme).parseAppletParameter(applet
+ .getParameter("userDefinedColour"));
}
}
- else
- {
- conservation.annotations = annotations;
- quality.annotations = qannotations;
- quality.graphMax = cons.qualityRange[1].floatValue();
- }
+ initAutoAnnotation();
}
- public void updateConsensus()
+ /**
+ * get the consensus sequence as displayed under the PID consensus annotation
+ * row.
+ *
+ * @return consensus sequence as a new sequence object
+ */
+ public SequenceI getConsensusSeq()
{
- Annotation[] annotations = new Annotation[alignment.getWidth()];
-
- // this routine prevents vconsensus becoming a new object each time
- // consenus is calculated. Important for speed of Blosum62
- // and PID colouring of alignment
- if (vconsensus == null)
- {
- vconsensus = alignment.getAAFrequency();
- }
- else
- {
- Vector temp = alignment.getAAFrequency();
- vconsensus.removeAllElements();
- Enumeration e = temp.elements();
- while (e.hasMoreElements())
- {
- vconsensus.addElement(e.nextElement());
- }
- }
- Hashtable hash = null;
- for (int i = 0; i < alignment.getWidth(); i++)
+ if (consensus == null)
{
- hash = (Hashtable) vconsensus.elementAt(i);
- float value = 0;
- if(ignoreGapsInConsensusCalculation)
- value = ((Float)hash.get("pid_nogaps")).floatValue();
- else
- value = ((Float)hash.get("pid_gaps")).floatValue();
-
- String maxRes = hash.get("maxResidue").toString();
- String mouseOver = hash.get("maxResidue") + " ";
- if (maxRes.length() > 1)
- {
- mouseOver = "[" + maxRes + "] ";
- maxRes = "+";
- }
-
-
- mouseOver += (int) value + "%";
- annotations[i] = new Annotation(maxRes, mouseOver, ' ', value);
-
+ updateConsensus(null);
}
-
if (consensus == null)
{
- consensus = new AlignmentAnnotation("Consensus",
- "PID", annotations, 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
- if (showConsensus)
- {
- alignment.addAnnotation(consensus);
- }
+ return null;
}
- else
+ StringBuffer seqs = new StringBuffer();
+ for (int i = 0; i < consensus.annotations.length; i++)
{
- consensus.annotations = annotations;
- }
-
- if(globalColourScheme!=null)
- globalColourScheme.setConsensus(vconsensus);
-
- }
- /**
- * get the consensus sequence as displayed under the PID consensus annotation row.
- * @return consensus sequence as a new sequence object
- */
- /**
- * get the consensus sequence as displayed under the PID consensus annotation row.
- * @return consensus sequence as a new sequence object
- */
- public SequenceI getConsensusSeq() {
- if (consensus==null)
- updateConsensus();
- if (consensus==null)
- return null;
- StringBuffer seqs=new StringBuffer();
- for (int i=0; i alignment.getWidth() - 1)
{
- // log.System.out.println(" Corrected res from " + res + " to maximum " + (alignment.getWidth()-1));
+ // log.System.out.println(" Corrected res from " + res + " to maximum " +
+ // (alignment.getWidth()-1));
res = alignment.getWidth() - 1;
}
if (res < 0)
@@ -481,149 +318,37 @@ public class AlignViewport
}
java.awt.Frame nullFrame;
+
+ protected FeatureSettings featureSettings = null;
+
+ private float heightScale = 1, widthScale = 1;
+
public void setFont(Font f)
{
font = f;
- if(nullFrame == null)
+ if (nullFrame == null)
{
nullFrame = new java.awt.Frame();
nullFrame.addNotify();
}
java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font);
- setCharHeight(fm.getHeight());
- charWidth = fm.charWidth('M');
- }
-
- public Font getFont()
- {
- return font;
- }
-
- public int getCharWidth()
- {
- return charWidth;
- }
-
- public void setCharHeight(int h)
- {
- this.charHeight = h;
- }
-
- public int getCharHeight()
- {
- return charHeight;
- }
-
- public void setWrappedWidth(int w)
- {
- this.wrappedWidth = w;
- }
-
- public int getwrappedWidth()
- {
- return wrappedWidth;
- }
-
- public AlignmentI getAlignment()
- {
- return alignment;
- }
-
- public void setAlignment(AlignmentI align)
- {
- this.alignment = align;
- }
-
- public void setWrapAlignment(boolean state)
- {
- wrapAlignment = state;
- }
-
- public void setShowText(boolean state)
- {
- showText = state;
- }
-
- public void setRenderGaps(boolean state)
- {
- renderGaps = state;
- }
-
- public boolean getColourText()
- {
- return showColourText;
- }
-
- public void setColourText(boolean state)
- {
- showColourText = state;
- }
-
- public void setShowBoxes(boolean state)
- {
- showBoxes = state;
- }
+ setCharHeight((int) (heightScale * fm.getHeight()));
+ setCharWidth((int) (widthScale * fm.charWidth('M')));
- public boolean getWrapAlignment()
- {
- return wrapAlignment;
- }
-
- public boolean getShowText()
- {
- return showText;
- }
-
- public boolean getShowBoxes()
- {
- return showBoxes;
- }
-
- public char getGapCharacter()
- {
- return getAlignment().getGapCharacter();
- }
-
- public void setGapCharacter(char gap)
- {
- if (getAlignment() != null)
+ if (isUpperCasebold())
{
- getAlignment().setGapCharacter(gap);
+ Font f2 = new Font(f.getName(), Font.BOLD, f.getSize());
+ fm = nullFrame.getGraphics().getFontMetrics(f2);
+ setCharWidth((int) (widthScale * (fm.stringWidth("MMMMMMMMMMM") / 10)));
}
}
- public void setThreshold(int thresh)
- {
- threshold = thresh;
- }
-
- public int getThreshold()
- {
- return threshold;
- }
-
- public void setIncrement(int inc)
- {
- increment = inc;
- }
-
- public int getIncrement()
- {
- return increment;
- }
-
- public void setHiddenColumns(ColumnSelection colsel)
+ public Font getFont()
{
- this.colSel = colsel;
- if(colSel.getHiddenColumns()!=null)
- hasHiddenColumns = true;
+ return font;
}
- public ColumnSelection getColumnSelection()
- {
- return colSel;
- }
public void resetSeqLimits(int height)
{
@@ -640,421 +365,150 @@ public class AlignViewport
return currentTree;
}
- public void setColourAppliesToAllGroups(boolean b)
- {
- colourAppliesToAllGroups = b;
- }
- public boolean getColourAppliesToAllGroups()
- {
- return colourAppliesToAllGroups;
- }
+ boolean centreColumnLabels;
- public boolean getShowJVSuffix()
+ public boolean getCentreColumnLabels()
{
- return showJVSuffix;
+ return centreColumnLabels;
}
- public void setShowJVSuffix(boolean b)
- {
- showJVSuffix = b;
- }
-
- public boolean getShowAnnotation()
- {
- return showAnnotation;
- }
+ public boolean followHighlight = true;
- public void setShowAnnotation(boolean b)
+ public boolean getFollowHighlight()
{
- showAnnotation = b;
+ return followHighlight;
}
- public boolean getScaleAboveWrapped()
- {
- return scaleAboveWrapped;
- }
-
- public boolean getScaleLeftWrapped()
- {
- return scaleLeftWrapped;
- }
-
- public boolean getScaleRightWrapped()
- {
- return scaleRightWrapped;
- }
-
- public void setScaleAboveWrapped(boolean b)
- {
- scaleAboveWrapped = b;
- }
-
- public void setScaleLeftWrapped(boolean b)
- {
- scaleLeftWrapped = b;
- }
-
- public void setScaleRightWrapped(boolean b)
- {
- scaleRightWrapped = b;
- }
-
- public void setIgnoreGapsConsensus(boolean b)
- {
- ignoreGapsInConsensusCalculation = b;
- updateConsensus();
- if (globalColourScheme!=null)
- {
- globalColourScheme.setThreshold(globalColourScheme.getThreshold(),
- ignoreGapsInConsensusCalculation);
-
- }
- }
+ public boolean followSelection = true;
/**
- * Property change listener for changes in alignment
- *
- * @param listener DOCUMENT ME!
+ * @return true if view selection should always follow the selections
+ * broadcast by other selection sources
*/
- public void addPropertyChangeListener(
- java.beans.PropertyChangeListener listener)
+ public boolean getFollowSelection()
{
- changeSupport.addPropertyChangeListener(listener);
+ return followSelection;
}
- /**
- * DOCUMENT ME!
- *
- * @param listener DOCUMENT ME!
- */
- public void removePropertyChangeListener(
- java.beans.PropertyChangeListener listener)
+ public void sendSelection()
{
- changeSupport.removePropertyChangeListener(listener);
+ getStructureSelectionManager().sendSelection(
+ new SequenceGroup(getSelectionGroup()),
+ new ColumnSelection(getColumnSelection()), this);
}
/**
- * Property change listener for changes in alignment
- *
- * @param prop DOCUMENT ME!
- * @param oldvalue DOCUMENT ME!
- * @param newvalue DOCUMENT ME!
+ * Returns an instance of the StructureSelectionManager scoped to this applet
+ * instance.
+ *
+ * @return
*/
- public void firePropertyChange(String prop, Object oldvalue, Object newvalue)
+ @Override
+ public StructureSelectionManager getStructureSelectionManager()
{
- changeSupport.firePropertyChange(prop, oldvalue, newvalue);
+ return jalview.structure.StructureSelectionManager
+ .getStructureSelectionManager(applet);
}
-
-
- public boolean getIgnoreGapsConsensus()
- {
- return ignoreGapsInConsensusCalculation;
- }
- public void hideSelectedColumns()
- {
- if (colSel.size() < 1)
- return;
-
- colSel.hideSelectedColumns();
- setSelectionGroup(null);
-
- hasHiddenColumns = true;
- }
-
- public void invertColumnSelection()
- {
- int column;
- for (int i = 0; i < alignment.getWidth(); i++)
- {
- column = i;
-
- if (colSel.contains(column))
- colSel.removeElement(column);
- else
- colSel.addElement(column);
-
- }
- }
-
-
- public void hideColumns(int start, int end)
- {
- if(start==end)
- colSel.hideColumns(start);
- else
- colSel.hideColumns(start, end);
-
- hasHiddenColumns = true;
- }
-
- public void hideSequence(SequenceI seq)
- {
- if(seq!=null)
- {
- alignment.getHiddenSequences().hideSequence(seq);
- hasHiddenRows = true;
- firePropertyChange("alignment", null, alignment.getSequences());
- }
- }
-
- public void hideAllSelectedSeqs()
- {
- if (selectionGroup == null)
- return;
-
- SequenceI[] seqs = selectionGroup.getSequencesInOrder(alignment);
-
- for (int i = 0; i < seqs.length; i++)
- {
- alignment.getHiddenSequences().hideSequence(seqs[i]);
- }
- firePropertyChange("alignment", null, alignment.getSequences());
- hasHiddenRows = true;
- setSelectionGroup(null);
- }
-
- public void showColumn(int col)
- {
- colSel.revealHiddenColumns(col);
- if(colSel.getHiddenColumns()==null)
- hasHiddenColumns = false;
- }
-
- public void showAllHiddenColumns()
- {
- colSel.revealAllHiddenColumns();
- hasHiddenColumns = false;
- }
-
- public void showAllHiddenSeqs()
- {
- if(alignment.getHiddenSequences().getSize()>0)
+ /**
+ * 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(selectionGroup==null)
+ if (!wholewidth && alignment.getWidth() == (1 + sge - sgs))
+ {
+ // do nothing
+ return;
+ }
+ if (colSel == null)
{
- selectionGroup = new SequenceGroup();
- selectionGroup.setEndRes(alignment.getWidth()-1);
+ colSel = new ColumnSelection();
}
- Vector tmp = alignment.getHiddenSequences().showAll();
- for(int t=0; t last)
- {
- hideStart = last;
- } else
- continue;
- }
+ return validCharWidth;
+ }
- if (hideStart>end)
- break;
-
- if (hideEnd>end)
- hideEnd=end;
-
- if (hideStart>hideEnd)
- break;
- /**
- * form operations...
- */
- if (lastblockEnd)
- {
- break;
- }
-
+ mappedCommand.doCommand(null);
+ firePropertyChange("alignment", null, getAlignment().getSequences());
- visibleSeq.append(seqs[i].getSequence(blockStart, blockEnd));
-
- blockStart = hideEnd+1;
- blockEnd = end;
- }
-
- if(end>blockStart)
- visibleSeq.append(seqs[i].getSequence(blockStart, end));
-
- selection[i] = visibleSeq.toString();
- }
- else
- {
- selection[i] = seqs[i].getSequence(start, end);
- }
+ // ap.scalePanelHolder.repaint();
+ // ap.repaint();
}
-
- return selection;
}
- public boolean getShowHiddenMarkers()
+ @Override
+ public VamsasSource getVamsasSource()
{
- return showHiddenMarkers;
+ return this;
}
- public void setShowHiddenMarkers(boolean show)
- {
- showHiddenMarkers = show;
- }
-
-
}