X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FColumnSelection.java;h=546ba1a7dbe4443e0e40da5929f4d07585b6dea5;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=3c1d6f1c1647c527db7de65cad031028fdec6022;hpb=84a5a1ae1a0b6b4817356e06f1d0be4c22ce250b;p=jalview.git
diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java
index 3c1d6f1..546ba1a 100644
--- a/src/jalview/datamodel/ColumnSelection.java
+++ b/src/jalview/datamodel/ColumnSelection.java
@@ -1,27 +1,26 @@
/*
- * 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
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * 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.
+ *
+ * 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 .
*/
package jalview.datamodel;
-import jalview.util.ShiftList;
-
import java.util.*;
+import jalview.util.*;
+
/**
* NOTE: Columns are zero based.
*/
@@ -29,13 +28,14 @@ public class ColumnSelection
{
Vector selected = new Vector();
- //Vector of int [] {startCol, endCol}
+ // Vector of int [] {startCol, endCol}
Vector hiddenColumns;
/**
* Add a column to the selection
- *
- * @param col index of column
+ *
+ * @param col
+ * index of column
*/
public void addElement(int col)
{
@@ -56,8 +56,9 @@ public class ColumnSelection
/**
* removes col from selection
- *
- * @param col index of column to be removed
+ *
+ * @param col
+ * index of column to be removed
*/
public void removeElement(int col)
{
@@ -71,13 +72,16 @@ public class ColumnSelection
/**
* removes a range of columns from the selection
- * @param start int - first column in range to be removed
- * @param end int - last col
+ *
+ * @param start
+ * int - first column in range to be removed
+ * @param end
+ * int - last col
*/
public void removeElements(int start, int end)
{
Integer colInt;
- for(int i=start; istart && start+change>region[1] )
+ if (region[0] > start && start + change > region[1])
{
- deletedHiddenColumns.addElement(
- hiddenColumns.elementAt(i));
+ deletedHiddenColumns.addElement(hiddenColumns.elementAt(i));
hiddenColumns.removeElementAt(i);
i--;
@@ -206,14 +213,16 @@ public class ColumnSelection
continue;
}
- if(region[0]>start)
+ if (region[0] > start)
{
region[0] -= change;
region[1] -= change;
}
- if(region[0]<0)
+ if (region[0] < 0)
+ {
region[0] = 0;
+ }
}
@@ -222,11 +231,15 @@ public class ColumnSelection
return deletedHiddenColumns;
}
+
/**
- * propagate shift in alignment columns to column selection
- * special version of compensateForEdit - allowing for edits within hidden regions
- * @param start beginning of edit
- * @param left shift in edit (+ve for removal, or -ve for inserts)
+ * propagate shift in alignment columns to column selection special version of
+ * compensateForEdit - allowing for edits within hidden regions
+ *
+ * @param start
+ * beginning of edit
+ * @param left
+ * shift in edit (+ve for removal, or -ve for inserts)
*/
private void compensateForDelEdits(int start, int change)
{
@@ -240,175 +253,241 @@ public class ColumnSelection
}
}
- if(hiddenColumns!=null)
+ if (hiddenColumns != null)
{
- for(int i=0; i= start)
+ if (region[0] >= start)
{
region[0] -= change;
}
- if (region[1]>= start) {
- region[1] -=change;
+ if (region[1] >= start)
+ {
+ region[1] -= change;
}
- if (region[1]0) {
- int shifted=0;
- for (int i=0,j=shifts.size(); i 0)
+ {
+ int shifted = 0;
+ for (int i = 0, j = shifts.size(); i < j; i++)
+ {
int[] sh = (int[]) shifts.elementAt(i);
- //compensateForEdit(shifted+sh[0], sh[1]);
- compensateForDelEdits(shifted+sh[0], sh[1]);
- shifted-=sh[1];
+ // compensateForEdit(shifted+sh[0], sh[1]);
+ compensateForDelEdits(shifted + sh[0], sh[1]);
+ shifted -= sh[1];
}
}
return shiftrecord.getInverse();
}
return null;
}
+
/**
- * removes intersection of position,length ranges in deletions
- * from the start,end regions marked in intervals.
+ * removes intersection of position,length ranges in deletions from the
+ * start,end regions marked in intervals.
+ *
* @param deletions
* @param intervals
* @return
*/
- private boolean pruneIntervalVector(Vector deletions, Vector intervals) {
- boolean pruned=false;
- int i=0,j=intervals.size()-1, s=0, t=deletions.size()-1;
- int hr[]=(int[]) intervals.elementAt(i);
- int sr[]=(int[]) deletions.elementAt(s);
- while (i<=j && s<=t) {
- boolean trailinghn=hr[1]>=sr[0];
- if (!trailinghn) {
- if (i= sr[0];
+ if (!trailinghn)
+ {
+ if (i < j)
+ {
+ hr = (int[]) intervals.elementAt(++i);
+ }
else
+ {
i++;
+ }
continue;
}
- int endshift=sr[0]+sr[1]; // deletion ranges - -ve means an insert
- if (endshift
=sr[0];
- boolean leadinghc=hr[0]= sr[0];
+ boolean leadinghc = hr[0] < endshift;
+ boolean trailinghc = hr[1] < endshift;
+ if (leadinghn)
+ {
+ if (trailinghc)
+ { // deleted hidden region.
intervals.removeElementAt(i);
- pruned=true;
+ pruned = true;
j--;
- if (i<=j)
- hr=(int[]) intervals.elementAt(i);
+ if (i <= j)
+ {
+ hr = (int[]) intervals.elementAt(i);
+ }
continue;
}
- if (leadinghc) {
- hr[0]=endshift; // clip c terminal region
- leadinghn=!leadinghn;
- pruned=true;
+ if (leadinghc)
+ {
+ hr[0] = endshift; // clip c terminal region
+ leadinghn = !leadinghn;
+ pruned = true;
}
}
- if (!leadinghn) {
- if (trailinghc) {
- if (trailinghn) {
- hr[1]=sr[0]-1;
- pruned=true;
+ if (!leadinghn)
+ {
+ if (trailinghc)
+ {
+ if (trailinghn)
+ {
+ hr[1] = sr[0] - 1;
+ pruned = true;
}
- } else {
+ }
+ else
+ {
// sr contained in hr
- if (s=c) { // sr[1] -ve means inseriton.
+
+ private boolean pruneColumnList(Vector deletion, Vector list)
+ {
+ int s = 0, t = deletion.size();
+ int[] sr = (int[]) list.elementAt(s++);
+ boolean pruned = false;
+ int i = 0, j = list.size();
+ while (i < j && s <= t)
+ {
+ int c = ((Integer) list.elementAt(i++)).intValue();
+ if (sr[0] <= c)
+ {
+ if (sr[1] + sr[0] >= c)
+ { // sr[1] -ve means inseriton.
list.removeElementAt(--i);
j--;
- } else {
- if (s0) {
+ public void pruneDeletions(ShiftList deletions)
+ {
+ if (deletions != null)
+ {
+ Vector shifts = deletions.shifts;
+ if (shifts != null && shifts.size() > 0)
+ {
// delete any intervals intersecting.
- if (hiddenColumns!=null) {
+ if (hiddenColumns != null)
+ {
pruneIntervalVector(shifts, hiddenColumns);
- if (hiddenColumns!=null && hiddenColumns.size()==0) {
- hiddenColumns=null;
+ if (hiddenColumns != null && hiddenColumns.size() == 0)
+ {
+ hiddenColumns = null;
}
}
- if (selected!=null && selected.size()>0) {
+ if (selected != null && selected.size() > 0)
+ {
pruneColumnList(shifts, selected);
- if (selected!=null && selected.size()==0)
- selected=null;
+ if (selected != null && selected.size() == 0)
+ {
+ selected = null;
+ }
}
// and shift the rest.
this.compensateForEdits(deletions);
}
}
}
+
/**
- * This Method is used to return all the HiddenColumn regions
- * less than the given index.
- * @param end int
+ * This Method is used to return all the HiddenColumn regions less than the
+ * given index.
+ *
+ * @param end
+ * int
* @return Vector
*/
public Vector getHiddenColumns()
{
return hiddenColumns;
}
+
/**
* Return absolute column index for a visible column index
- * @param column int column index in alignment view
+ *
+ * @param column
+ * int column index in alignment view
* @return alignment column index for column
*/
public int adjustForHiddenColumns(int column)
@@ -429,9 +508,11 @@ public class ColumnSelection
}
/**
- * Use this method to find out where a visible column is in the alignment
- * when hidden columns exist
- * @param hiddenColumn int
+ * Use this method to find out where a column will appear in the visible alignment when
+ * hidden columns exist. If the column is not visible, then the left-most visible column will always be returned.
+ *
+ * @param hiddenColumn
+ * int
* @return int
*/
public int findColumnPosition(int hiddenColumn)
@@ -440,22 +521,21 @@ public class ColumnSelection
if (hiddenColumns != null)
{
int index = 0;
- int gaps = 0;
+ int[] region;
do
{
- int[] region = (int[]) hiddenColumns.elementAt(index);
+ region = (int[]) hiddenColumns.elementAt(index++);
if (hiddenColumn > region[1])
{
- result -= region[1]+1-region[0];
+ result -= region[1] + 1 - region[0];
}
- index++;
+ } while ((hiddenColumn > region[1]) && (index < hiddenColumns.size()));
+ if (hiddenColumn>region[0] && hiddenColumn region[1])
+ if (alPos > region[1])
+ {
return region[1];
+ }
index--;
- }
- while(index >-1);
+ } while (index > -1);
}
return alPos;
@@ -543,7 +627,7 @@ public class ColumnSelection
{
while (size() > 0)
{
- int column = ( (Integer) getSelected().firstElement()).intValue();
+ int column = ((Integer) getSelected().firstElement()).intValue();
hideColumns(column);
}
@@ -551,8 +635,10 @@ public class ColumnSelection
public void hideColumns(int start, int end)
{
- if(hiddenColumns==null)
+ if (hiddenColumns == null)
+ {
hiddenColumns = new Vector();
+ }
boolean added = false;
boolean overlap = false;
@@ -560,7 +646,7 @@ public class ColumnSelection
for (int i = 0; i < hiddenColumns.size(); i++)
{
int[] region = (int[]) hiddenColumns.elementAt(i);
- if ( start<=region[1] && end>=region[0])
+ if (start <= region[1] && end >= region[0])
{
hiddenColumns.removeElementAt(i);
overlap = true;
@@ -569,51 +655,65 @@ public class ColumnSelection
else if (end < region[0] && start < region[0])
{
hiddenColumns.insertElementAt(new int[]
- {start, end}, i);
+ { start, end }, i);
added = true;
break;
}
}
- if(overlap)
+ if (overlap)
{
hideColumns(start, end);
}
else if (!added)
- hiddenColumns.addElement(new int[] {start, end});
+ {
+ hiddenColumns.addElement(new int[]
+ { start, end });
+ }
}
/**
- * This method will find a range of selected columns
- * around the column specified
- * @param res int
+ * This method will find a range of selected columns around the column
+ * specified
+ *
+ * @param res
+ * int
*/
public void hideColumns(int col)
{
// First find out range of columns to hide
- int min = col, max = col+1;
- while( contains(min) )
- { removeElement(min); min --; }
+ int min = col, max = col + 1;
+ while (contains(min))
+ {
+ removeElement(min);
+ min--;
+ }
- while( contains(max) )
- { removeElement(max); max ++; }
+ while (contains(max))
+ {
+ removeElement(max);
+ max++;
+ }
- min++; max--;
- if(min>max)
+ min++;
+ max--;
+ if (min > max)
+ {
min = max;
+ }
hideColumns(min, max);
}
public void revealAllHiddenColumns()
{
- if(hiddenColumns!=null)
+ if (hiddenColumns != null)
{
for (int i = 0; i < hiddenColumns.size(); i++)
{
int[] region = (int[]) hiddenColumns.elementAt(i);
- for (int j = region[0]; j < region[1]+1; j++)
+ for (int j = region[0]; j < region[1] + 1; j++)
{
addElement(j);
}
@@ -625,12 +725,12 @@ public class ColumnSelection
public void revealHiddenColumns(int res)
{
- for(int i=0; i= region[0] && column <= region[1])
+ if (hiddenColumns != null)
+ for (int i = 0; i < hiddenColumns.size(); i++)
{
- return false;
+ int[] region = (int[]) hiddenColumns.elementAt(i);
+ if (column >= region[0] && column <= region[1])
+ {
+ return false;
+ }
}
- }
+
return true;
}
+
/**
* Copy constructor
+ *
* @param copy
*/
- public ColumnSelection(ColumnSelection copy) {
- if (copy!=null) {
- if (copy.selected!=null) {
+ public ColumnSelection(ColumnSelection copy)
+ {
+ if (copy != null)
+ {
+ if (copy.selected != null)
+ {
selected = new Vector();
- for (int i=0,j=copy.selected.size(); i0)
+ if (hiddenColumns != null && hiddenColumns.size() > 0)
{
- for (i=0; iblockEnd)
+ if (blockStart > blockEnd)
{
break;
}
-
visibleSeq.append(seqs[i].getSequence(blockStart, blockEnd));
- blockStart = hideEnd+1;
+ blockStart = hideEnd + 1;
blockEnd = end;
}
- if(end>blockStart)
+ if (end > blockStart)
+ {
visibleSeq.append(seqs[i].getSequence(blockStart, end));
+ }
selection[i] = visibleSeq.toString();
}
}
else
{
- for(i=0; i0)
+ public int[] getVisibleContigs(int start, int end)
+ {
+ if (hiddenColumns != null && hiddenColumns.size() > 0)
{
- Vector visiblecontigs=new Vector();
+ Vector visiblecontigs = new Vector();
Vector regions = getHiddenColumns();
int vstart = start;
- int [] region;
+ int[] region;
int hideStart, hideEnd;
- for (int j = 0; vstartvstart) {
- visiblecontigs.addElement(new int[] {vstart, hideStart-1});
+ if (hideStart > vstart)
+ {
+ visiblecontigs.addElement(new int[]
+ { vstart, hideStart - 1 });
}
- vstart=hideEnd+1;
+ vstart = hideEnd + 1;
}
- if(vstart 0)
+ {
+ // then mangle the alignmentAnnotation annotation array
+ Vector annels = new Vector();
+ Annotation[] els = null;
+ Vector regions = getHiddenColumns();
+ int blockStart = start, blockEnd = end;
+ int[] region;
+ int hideStart, hideEnd, w = 0;
+
+ for (int j = 0; j < regions.size(); j++)
+ {
+ region = (int[]) regions.elementAt(j);
+ hideStart = region[0];
+ hideEnd = region[1];
+
+ if (hideStart < start)
+ {
+ continue;
+ }
+
+ blockStart = Math.min(blockStart, hideEnd + 1);
+ blockEnd = Math.min(blockEnd, hideStart);
+
+ if (blockStart > blockEnd)
+ {
+ break;
+ }
+
+ annels.addElement(els = new Annotation[blockEnd - blockStart]);
+ System.arraycopy(alignmentAnnotation.annotations, blockStart, els,
+ 0, els.length);
+ w += els.length;
+ blockStart = hideEnd + 1;
+ blockEnd = end;
+ }
+
+ if (end > blockStart)
+ {
+ annels.addElement(els = new Annotation[end - blockStart + 1]);
+ if ((els.length + blockStart) <= alignmentAnnotation.annotations.length)
+ {
+ // copy just the visible segment of the annotation row
+ System.arraycopy(alignmentAnnotation.annotations, blockStart,
+ els, 0, els.length);
+ }
+ else
+ {
+ // copy to the end of the annotation row
+ System.arraycopy(alignmentAnnotation.annotations, blockStart,
+ els, 0,
+ (alignmentAnnotation.annotations.length - blockStart));
+ }
+ w += els.length;
+ }
+ if (w == 0)
+ return;
+ Enumeration e = annels.elements();
+ alignmentAnnotation.annotations = new Annotation[w];
+ w = 0;
+ while (e.hasMoreElements())
+ {
+ Annotation[] chnk = (Annotation[]) e.nextElement();
+ System.arraycopy(chnk, 0, alignmentAnnotation.annotations, w,
+ chnk.length);
+ w += chnk.length;
+ }
+ }
+ else
+ {
+ alignmentAnnotation.restrict(start, end);
+ }
+ }
+
+ /**
+ * Invert the column selection from first to end-1. leaves hiddenColumns
+ * untouched (and unselected)
+ *
+ * @param first
+ * @param end
+ */
+ public void invertColumnSelection(int first, int width)
+ {
+ boolean hasHidden = hiddenColumns != null && hiddenColumns.size() > 0;
+ for (int i = first; i < width; i++)
+ {
+ if (contains(i))
+ {
+ removeElement(i);
+ }
+ else
+ {
+ if (!hasHidden || isVisible(i))
+ {
+ addElement(i);
+ }
+ }
+ }
+ }
+
+ /**
+ * add in any unselected columns from the given column selection, excluding
+ * any that are hidden.
+ *
+ * @param colsel
+ */
+ public void addElementsFrom(ColumnSelection colsel)
+ {
+ if (colsel != null && colsel.size() > 0)
+ {
+ Enumeration e = colsel.getSelected().elements();
+ while (e.hasMoreElements())
+ {
+ Object eo = e.nextElement();
+ if (hiddenColumns != null && isVisible(((Integer) eo).intValue()))
+ {
+ if (!selected.contains(eo))
+ {
+ selected.addElement(eo);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * set the selected columns the given column selection, excluding any columns
+ * that are hidden.
+ *
+ * @param colsel
+ */
+ public void setElementsFrom(ColumnSelection colsel)
+ {
+ selected = new Vector();
+ if (colsel.selected != null && colsel.selected.size() > 0)
+ {
+ if (hiddenColumns != null && hiddenColumns.size() > 0)
+ {
+ // only select visible columns in this columns selection
+ selected = new Vector();
+ addElementsFrom(colsel);
+ }
+ else
+ {
+ // add everything regardless
+ Enumeration en = colsel.selected.elements();
+ while (en.hasMoreElements())
+ {
+ selected.addElement(en.nextElement());
+ }
+ }
}
}
}