/*
- * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
-import jalview.util.ShiftList;
+import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
+import jalview.viewmodel.annotationfilter.AnnotationFilterParameter.SearchableAnnotationField;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.List;
/**
- * NOTE: Columns are zero based.
+ * Data class holding the selected columns and hidden column ranges for a view.
+ * Ranges are base 1.
*/
public class ColumnSelection
{
- Vector selected = new Vector();
+ /**
+ * A class to hold an efficient representation of selected columns
+ */
+ private class IntList
+ {
+ /*
+ * list of selected columns (ordered by selection order, not column order)
+ */
+ private List<Integer> order;
- //Vector of int [] {startCol, endCol}
- Vector hiddenColumns;
+ /*
+ * an unmodifiable view of the selected columns list
+ */
+ private List<Integer> _uorder;
/**
- * Add a column to the selection
- *
- * @param col index of column
+ * bitfield for column selection - allows quick lookup
*/
- public void addElement(int col)
- {
- Integer column = new Integer(col);
- if (!selected.contains(column))
- {
- selected.addElement(column);
- }
- }
+ private BitSet selected;
/**
- * clears column selection
+ * Constructor
*/
- public void clear()
+ IntList()
{
- selected.removeAllElements();
+ order = new ArrayList<Integer>();
+ _uorder = Collections.unmodifiableList(order);
+ selected = new BitSet();
}
/**
- * removes col from selection
- *
- * @param col index of column to be removed
+ * Copy constructor
+ *
+ * @param other
*/
- public void removeElement(int col)
+ IntList(IntList other)
{
- Integer colInt = new Integer(col);
-
- if (selected.contains(colInt))
+ this();
+ if (other != null)
+ {
+ int j = other.size();
+ for (int i = 0; i < j; i++)
{
- selected.removeElement(colInt);
+ add(other.elementAt(i));
}
+ }
}
/**
- * removes a range of columns from the selection
- * @param start int - first column in range to be removed
- * @param end int - last col
+ * adds a new column i to the selection - only if i is not already selected
+ *
+ * @param i
*/
- public void removeElements(int start, int end)
+ void add(int i)
{
- Integer colInt;
- for(int i=start; i<end; i++)
+ if (!selected.get(i))
{
- colInt = new Integer(i);
- if (selected.contains(colInt))
- {
- selected.removeElement(colInt);
- }
+ order.add(Integer.valueOf(i));
+ selected.set(i);
}
}
- /**
- *
- * @return Vector containing selected columns as Integers
- */
- public Vector getSelected()
+
+ void clear()
{
- return selected;
+ order.clear();
+ selected.clear();
}
- /**
- *
- * @param col index to search for in column selection
- *
- * @return true if Integer(col) is in selection.
- */
- public boolean contains(int col)
+ void remove(int col)
{
- return selected.contains(new Integer(col));
+
+ Integer colInt = new Integer(col);
+
+ if (selected.get(col))
+ {
+ // if this ever changes to List.remove(), ensure Integer not int
+ // argument
+ // as List.remove(int i) removes the i'th item which is wrong
+ order.remove(colInt);
+ selected.clear(col);
+ }
}
- /**
- * DOCUMENT ME!
- *
- * @param i DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int columnAt(int i)
+ boolean contains(Integer colInt)
{
- return ((Integer) selected.elementAt(i)).intValue();
+ return selected.get(colInt);
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int size()
+ boolean isEmpty()
{
- return selected.size();
+ return order.isEmpty();
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Returns a read-only view of the selected columns list
+ *
+ * @return
*/
- public int getMax()
+ List<Integer> getList()
{
- int max = -1;
-
- for (int i = 0; i < selected.size(); i++)
- {
- if (columnAt(i) > max)
- {
- max = columnAt(i);
- }
- }
-
- return max;
+ return _uorder;
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int getMin()
+ int size()
{
- int min = 1000000000;
-
- for (int i = 0; i < selected.size(); i++)
- {
- if (columnAt(i) < min)
- {
- min = columnAt(i);
- }
- }
-
- return min;
+ return order.size();
}
-
/**
- * propagate shift in alignment columns to column selection
- *
- * @param start beginning of edit
- * @param left shift in edit (+ve for removal, or -ve for inserts)
+ * gets the column that was selected first, second or i'th
+ *
+ * @param i
+ * @return
*/
- public void compensateForEdit(int start, int change)
+ int elementAt(int i)
{
- for (int i = 0; i < size(); i++)
- {
- int temp = columnAt(i);
-
- if (temp >= start)
- {
- selected.setElementAt(new Integer(temp - change), i);
- }
- }
-
- if(hiddenColumns!=null)
- {
- for(int i=0; i<hiddenColumns.size(); i++)
- {
- int[] region = (int[]) hiddenColumns.elementAt(i);
- if(region[0] > start)
- {
- region[0] -= change;
- region[1] -= change;
- }
- if(region[0]<0)
- region[0] = 0;
- if(region[1] <0)
- region[1] = 0;
- }
- }
+ return order.get(i);
}
- /**
- * 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)
- {
- for (int i = 0; i < size(); i++)
- {
- int temp = columnAt(i);
- if (temp >= start)
- {
- selected.setElementAt(new Integer(temp - change), i);
- }
- }
-
- if(hiddenColumns!=null)
+ protected boolean pruneColumnList(final List<int[]> shifts)
+ {
+ int s = 0, t = shifts.size();
+ int[] sr = shifts.get(s++);
+ boolean pruned = false;
+ int i = 0, j = order.size();
+ while (i < j && s <= t)
+ {
+ int c = order.get(i++).intValue();
+ if (sr[0] <= c)
{
- for(int i=0; i<hiddenColumns.size(); i++)
+ if (sr[1] + sr[0] >= c)
+ { // sr[1] -ve means inseriton.
+ order.remove(--i);
+ selected.clear(c);
+ j--;
+ }
+ else
{
- int[] region = (int[]) hiddenColumns.elementAt(i);
- if(region[0] >= start)
+ if (s < t)
{
- region[0] -= change;
+ sr = shifts.get(s);
}
- if (region[1]>= start) {
- region[1] -=change;
- }
- if (region[1]<region[0]) {
- hiddenColumns.removeElementAt(i--);
- }
-
- if(region[0]<0)
- region[0] = 0;
- if(region[1] <0)
- region[1] = 0;
- }
- }
- }
- /**
- * Adjust hidden column boundaries based on a series of column
- * additions or deletions in visible regions.
- * @param shiftrecord
- * @return
- */
- public ShiftList compensateForEdits(ShiftList shiftrecord) {
- if (shiftrecord!=null) {
- Vector shifts = shiftrecord.shifts;
- if (shifts!=null && shifts.size()>0) {
- int shifted=0;
- for (int i=0,j=shifts.size(); i<j; i++) {
- int[] sh = (int[]) shifts.get(i);
- //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.
- * @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<j)
- hr=(int[]) intervals.elementAt(++i);
- else
- i++;
- continue;
- }
- int endshift=sr[0]+sr[1]; // deletion ranges - -ve means an insert
- if (endshift<hr[0] || endshift<sr[0]) { // leadinghc disjoint or not a deletion
- if (s<t)
- sr=(int[]) deletions.elementAt(++s);
- else
s++;
- continue;
- }
- boolean leadinghn=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;
- j--;
- if (i<=j)
- hr=(int[]) intervals.elementAt(i);
- continue;
- }
- 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;
- }
- } else {
- // sr contained in hr
- if (s<t)
- sr=(int[]) deletions.elementAt(++s);
- else
- s++;
- continue;
}
}
}
- return pruned; // true if any interval was removed or modified by operations.
- }
- private boolean pruneColumnList(Vector deletion, Vector list) {
- int s=0,t=deletion.size();
- int[] sr=(int[])list.get(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 (s<t)
- sr = (int[])deletion.elementAt(s);
- s++;
- }
- }
- }
return pruned;
}
+
/**
- * remove any hiddenColumns or selected columns and shift remaining
- * based on a series of position, range deletions.
- * @param deletions
+ * shift every selected column at or above start by change
+ *
+ * @param start
+ * - leftmost column to be shifted
+ * @param change
+ * - delta for shift
*/
- 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) {
- pruneIntervalVector(shifts, hiddenColumns);
- if (hiddenColumns!=null && hiddenColumns.size()==0) {
- hiddenColumns=null;
- }
- }
- if (selected!=null && selected.size()>0) {
- pruneColumnList(shifts, selected);
- if (selected!=null && selected.size()==0)
- selected=null;
- }
- // and shift the rest.
- this.compensateForEdits(deletions);
+ void compensateForEdits(int start, int change)
+ {
+ BitSet mask = new BitSet();
+ for (int i = 0; i < order.size(); i++)
+ {
+ int temp = order.get(i);
+
+ if (temp >= start)
+ {
+ // clear shifted bits and update List of selected columns
+ selected.clear(temp);
+ mask.set(temp - change);
+ order.set(i, new Integer(temp - change));
}
}
+ // lastly update the bitfield all at once
+ selected.or(mask);
}
- /**
- * This Method is used to return all the HiddenColumn regions
- * less than the given index.
- * @param end int
- * @return Vector
- */
- public Vector getHiddenColumns()
+
+ boolean isSelected(int column)
{
- return hiddenColumns;
+ return selected.get(column);
}
- /**
- * Return absolute column index for a visible column index
- * @param column int column index in alignment view
- * @return alignment column index for column
- */
- public int adjustForHiddenColumns(int column)
+
+ int getMaxColumn()
{
- int result = column;
- if (hiddenColumns != null)
- {
- for (int i = 0; i < hiddenColumns.size(); i++)
- {
- int[] region = (int[]) hiddenColumns.elementAt(i);
- if (result >= region[0])
- {
- result += region[1] - region[0] + 1;
- }
- }
- }
- return result;
+ return selected.length() - 1;
+ }
+
+ int getMinColumn()
+ {
+ return selected.get(0) ? 0 : selected.nextSetBit(0);
}
/**
- * Use this method to find out where a visible column is in the alignment
- * when hidden columns exist
- * @param hiddenColumn int
- * @return int
+ * @return a series of selection intervals along the range
*/
- public int findColumnPosition(int hiddenColumn)
+ List<int[]> getRanges()
{
- int result = hiddenColumn;
- if (hiddenColumns != null)
+ List<int[]> rlist = new ArrayList<int[]>();
+ if (selected.isEmpty())
{
- int index = 0;
- int gaps = 0;
- do
- {
- int[] region = (int[]) hiddenColumns.elementAt(index);
- if (hiddenColumn > region[1])
- {
- result -= region[1]+1-region[0];
- }
- index++;
- }
- while (index < hiddenColumns.size());
-
- result -= gaps;
+ return rlist;
}
+ int next = selected.nextSetBit(0), clear = -1;
+ while (next != -1)
+ {
+ clear = selected.nextClearBit(next);
+ rlist.add(new int[] { next, clear - 1 });
+ next = selected.nextSetBit(clear);
+ }
+ return rlist;
+ }
- return result;
+ @Override
+ public int hashCode()
+ {
+ // TODO Auto-generated method stub
+ return selected.hashCode();
}
- /**
- * Use this method to determine where the next hiddenRegion starts
- */
- public int findHiddenRegionPosition(int hiddenRegion)
+ @Override
+ public boolean equals(Object obj)
{
- int result = 0;
- if (hiddenColumns != null)
+ if (obj instanceof IntList)
{
- int index = 0;
- int gaps = 0;
- do
- {
- int[] region = (int[]) hiddenColumns.elementAt(index);
- if(hiddenRegion==0)
- {
- return region[0];
- }
+ return ((IntList) obj).selected.equals(selected);
+ }
+ return false;
+ }
+ }
- gaps += region[1] +1 - region[0];
- result = region[1] +1;
- index++;
- }
- while(index < hiddenRegion+1);
+ IntList selection = new IntList();
- result -= gaps;
- }
+ /**
+ * Add a column to the selection
+ *
+ * @param col
+ * index of column
+ */
+ public void addElement(int col)
+ {
+ selection.add(col);
+ }
- return result;
- }
+ /**
+ * clears column selection
+ */
+ public void clear()
+ {
+ selection.clear();
+ }
- /**
- * THis method returns the rightmost limit of a
- * region of an alignment with hidden columns.
- * In otherwords, the next hidden column.
- * @param index int
- */
- public int getHiddenBoundaryRight(int alPos)
+ /**
+ * Removes value 'col' from the selection (not the col'th item)
+ *
+ * @param col
+ * index of column to be removed
+ */
+ public void removeElement(int col)
+ {
+ selection.remove(col);
+ }
+
+ /**
+ * removes a range of columns from the selection
+ *
+ * @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; i < end; i++)
{
- if (hiddenColumns != null)
+ colInt = new Integer(i);
+ if (selection.contains(colInt))
{
- int index = 0;
- do
- {
- int[] region = (int[]) hiddenColumns.elementAt(index);
- if(alPos < region[0])
- return region[0];
-
- index++;
- }
- while(index < hiddenColumns.size());
+ selection.remove(colInt);
}
+ }
+ }
+
+ /**
+ * Returns a read-only view of the (possibly empty) list of selected columns
+ * <p>
+ * The list contains no duplicates but is not necessarily ordered. It also may
+ * include columns hidden from the current view. To modify (for example sort)
+ * the list, you should first make a copy.
+ * <p>
+ * The list is not thread-safe: iterating over it could result in
+ * ConcurrentModificationException if it is modified by another thread.
+ */
+ public List<Integer> getSelected()
+ {
+ return selection.getList();
+ }
+
+ /**
+ * @return list of int arrays containing start and end column position for
+ * runs of selected columns ordered from right to left.
+ */
+ public List<int[]> getSelectedRanges()
+ {
+ return selection.getRanges();
+ }
+
+ /**
+ *
+ * @param col
+ * index to search for in column selection
+ *
+ * @return true if col is selected
+ */
+ public boolean contains(int col)
+ {
+ return (col > -1) ? selection.isSelected(col) : false;
+ }
- return alPos;
+ /**
+ * Answers true if no columns are selected, else false
+ */
+ public boolean isEmpty()
+ {
+ return selection == null || selection.isEmpty();
+ }
+ /**
+ * rightmost selected column
+ *
+ * @return rightmost column in alignment that is selected
+ */
+ public int getMax()
+ {
+ if (selection.isEmpty())
+ {
+ return -1;
}
- /**
- * THis method returns the rightmost limit of a
- * region of an alignment with hidden columns.
- * In otherwords, the next hidden column.
- * @param index int
- */
- public int getHiddenBoundaryLeft(int alPos)
+ return selection.getMaxColumn();
+ }
+
+ /**
+ * Leftmost column in selection
+ *
+ * @return column index of leftmost column in selection
+ */
+ public int getMin()
+ {
+ if (selection.isEmpty())
{
- if (hiddenColumns != null)
- {
- int index = hiddenColumns.size()-1;
- do
- {
- int[] region = (int[]) hiddenColumns.elementAt(index);
- if(alPos > region[1])
- return region[1];
+ return 1000000000;
+ }
+ return selection.getMinColumn();
+ }
- index--;
- }
- while(index >-1);
+ public void hideSelectedColumns(AlignmentI al)
+ {
+ synchronized (selection)
+ {
+ for (int[] selregions : selection.getRanges())
+ {
+ al.getHiddenColumns().hideColumns(selregions[0], selregions[1]);
}
+ selection.clear();
+ }
+
+ }
- return alPos;
+ /**
+ * Hides the specified column and any adjacent selected columns
+ *
+ * @param res
+ * int
+ */
+ public void hideSelectedColumns(int col, HiddenColumns hidden)
+ {
+ /*
+ * deselect column (whether selected or not!)
+ */
+ removeElement(col);
+
+ /*
+ * find adjacent selected columns
+ */
+ int min = col - 1, max = col + 1;
+ while (contains(min))
+ {
+ removeElement(min);
+ min--;
}
- public void hideSelectedColumns()
+ while (contains(max))
{
- while (size() > 0)
- {
- int column = ( (Integer) getSelected().firstElement()).intValue();
- hideColumns(column);
- }
+ removeElement(max);
+ max++;
+ }
+ /*
+ * min, max are now the closest unselected columns
+ */
+ min++;
+ max--;
+ if (min > max)
+ {
+ min = max;
}
- public void hideColumns(int start, int end)
+ hidden.hideColumns(min, max);
+ }
+
+
+
+
+
+ /**
+ * Copy constructor
+ *
+ * @param copy
+ */
+ public ColumnSelection(ColumnSelection copy)
+ {
+ if (copy != null)
{
- if(hiddenColumns==null)
- hiddenColumns = new Vector();
+ selection = new IntList(copy.selection);
+ }
+ }
+
+ /**
+ * ColumnSelection
+ */
+ public ColumnSelection()
+ {
+ }
- boolean added = false;
- boolean overlap = false;
- for (int i = 0; i < hiddenColumns.size(); i++)
+
+
+
+
+ /**
+ * 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, AlignmentI al)
+ {
+ boolean hasHidden = al.getHiddenColumns().hasHidden();
+ for (int i = first; i < width; i++)
+ {
+ if (contains(i))
{
- int[] region = (int[]) hiddenColumns.elementAt(i);
- if ( start<=region[1] && end>=region[0])
+ removeElement(i);
+ }
+ else
+ {
+ if (!hasHidden || al.getHiddenColumns().isVisible(i))
{
- hiddenColumns.removeElementAt(i);
- overlap = true;
- break;
+ addElement(i);
}
- else if (end < region[0] && start < region[0])
+ }
+ }
+ }
+
+ /**
+ * set the selected columns to the given column selection, excluding any
+ * columns that are hidden.
+ *
+ * @param colsel
+ */
+ public void setElementsFrom(ColumnSelection colsel,
+ HiddenColumns hiddenColumns)
+ {
+ selection = new IntList();
+ if (colsel.selection != null && colsel.selection.size() > 0)
+ {
+ if (hiddenColumns.hasHidden())
+ {
+ // only select visible columns in this columns selection
+ for (Integer col : colsel.getSelected())
{
- hiddenColumns.insertElementAt(new int[]
- {start, end}, i);
- added = true;
- break;
+ if (hiddenColumns != null
+ && hiddenColumns.isVisible(col.intValue()))
+ {
+ selection.add(col);
+ }
}
}
-
- if(overlap)
+ else
{
- hideColumns(start, end);
+ // add everything regardless
+ for (Integer col : colsel.getSelected())
+ {
+ addElement(col);
+ }
}
- else if (!added)
- hiddenColumns.addElement(new int[] {start, end});
-
}
+ }
- /**
- * 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 --; }
- while( contains(max) )
- { removeElement(max); max ++; }
+ /**
+ *
+ * @return true if there are columns marked
+ */
+ public boolean hasSelectedColumns()
+ {
+ return (selection != null && selection.size() > 0);
+ }
- min++; max--;
- hideColumns(min, max);
- }
- public void revealAllHiddenColumns()
+ public boolean filterAnnotations(Annotation[] annotations,
+ AnnotationFilterParameter filterParams)
+ {
+ // JBPNote - this method needs to be refactored to become independent of
+ // viewmodel package
+ this.clear();
+ int count = 0;
+ do
{
- if(hiddenColumns!=null)
+ if (annotations[count] != null)
{
- for (int i = 0; i < hiddenColumns.size(); i++)
+
+ boolean itemMatched = false;
+
+ if (filterParams.getThresholdType() == AnnotationFilterParameter.ThresholdType.ABOVE_THRESHOLD
+ && annotations[count].value >= filterParams
+ .getThresholdValue())
+ {
+ itemMatched = true;
+ }
+ if (filterParams.getThresholdType() == AnnotationFilterParameter.ThresholdType.BELOW_THRESHOLD
+ && annotations[count].value <= filterParams
+ .getThresholdValue())
+ {
+ itemMatched = true;
+ }
+
+ if (filterParams.isFilterAlphaHelix()
+ && annotations[count].secondaryStructure == 'H')
+ {
+ itemMatched = true;
+ }
+
+ if (filterParams.isFilterBetaSheet()
+ && annotations[count].secondaryStructure == 'E')
+ {
+ itemMatched = true;
+ }
+
+ if (filterParams.isFilterTurn()
+ && annotations[count].secondaryStructure == 'S')
{
- int[] region = (int[]) hiddenColumns.elementAt(i);
- for (int j = region[0]; j < region[1]+1; j++)
+ itemMatched = true;
+ }
+
+ String regexSearchString = filterParams.getRegexString();
+ if (regexSearchString != null
+ && !filterParams.getRegexSearchFields().isEmpty())
+ {
+ List<SearchableAnnotationField> fields = filterParams
+ .getRegexSearchFields();
+ try
+ {
+ if (fields.contains(SearchableAnnotationField.DISPLAY_STRING)
+ && annotations[count].displayCharacter
+ .matches(regexSearchString))
+ {
+ itemMatched = true;
+ }
+ } catch (java.util.regex.PatternSyntaxException pse)
+ {
+ if (annotations[count].displayCharacter
+ .equals(regexSearchString))
+ {
+ itemMatched = true;
+ }
+ }
+ if (fields.contains(SearchableAnnotationField.DESCRIPTION)
+ && annotations[count].description != null
+ && annotations[count].description
+ .matches(regexSearchString))
{
- addElement(j);
+ itemMatched = true;
}
}
+
+ if (itemMatched)
+ {
+ this.addElement(count);
+ }
}
+ count++;
+ } while (count < annotations.length);
+ return false;
+ }
+
+ /**
+ * Returns a hashCode built from selected columns ranges
+ */
+ @Override
+ public int hashCode()
+ {
+ return selection.hashCode();
+ }
- hiddenColumns = null;
+ /**
+ * Answers true if comparing to a ColumnSelection with the same selected
+ * columns and hidden columns, else false
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof ColumnSelection))
+ {
+ return false;
}
+ ColumnSelection that = (ColumnSelection) obj;
- public void revealHiddenColumns(int res)
+ /*
+ * check columns selected are either both null, or match
+ */
+ if (this.selection == null)
{
- for(int i=0; i<hiddenColumns.size(); i++)
+ if (that.selection != null)
{
- int [] region = (int[])hiddenColumns.elementAt(i);
- if( res == region[0])
- {
- for (int j = region[0]; j < region[1]+1; j++)
- {
- addElement(j);
- }
-
- hiddenColumns.removeElement(region);
- break;
- }
+ return false;
}
- if(hiddenColumns.size()==0)
- hiddenColumns = null;
}
+ if (!this.selection.equals(that.selection))
+ {
+ return false;
+ }
+
+ return true;
+ }
- public boolean isVisible(int column)
+ /**
+ * Updates the column selection depending on the parameters, and returns true
+ * if any change was made to the selection
+ *
+ * @param markedColumns
+ * a set identifying marked columns (base 0)
+ * @param startCol
+ * the first column of the range to operate over (base 0)
+ * @param endCol
+ * the last column of the range to operate over (base 0)
+ * @param invert
+ * if true, deselect marked columns and select unmarked
+ * @param extendCurrent
+ * if true, extend rather than replacing the current column selection
+ * @param toggle
+ * if true, toggle the selection state of marked columns
+ *
+ * @return
+ */
+ public boolean markColumns(BitSet markedColumns, int startCol,
+ int endCol, boolean invert, boolean extendCurrent, boolean toggle)
+ {
+ boolean changed = false;
+ if (!extendCurrent && !toggle)
+ {
+ changed = !this.isEmpty();
+ clear();
+ }
+ if (invert)
{
- for(int i=0; i<hiddenColumns.size(); i++)
+ // invert only in the currently selected sequence region
+ int i = markedColumns.nextClearBit(startCol);
+ int ibs = markedColumns.nextSetBit(startCol);
+ while (i >= startCol && i <= endCol)
{
- int [] region = (int[])hiddenColumns.elementAt(i);
- if( column >= region[0] && column <= region[1])
+ if (ibs < 0 || i < ibs)
+ {
+ changed = true;
+ if (toggle && contains(i))
+ {
+ removeElement(i++);
+ }
+ else
+ {
+ addElement(i++);
+ }
+ }
+ else
{
- return false;
+ i = markedColumns.nextClearBit(ibs);
+ ibs = markedColumns.nextSetBit(i);
}
}
- return true;
}
- /**
- * Copy constructor
- * @param copy
- */
- public ColumnSelection(ColumnSelection copy) {
- if (copy!=null) {
- if (copy.selected!=null) {
- selected = new Vector();
- for (int i=0,j=copy.selected.size(); i<j; i++) {
- selected.set(i, ((Integer) copy.selected.get(i)));
- }
+ else
+ {
+ int i = markedColumns.nextSetBit(startCol);
+ while (i >= startCol && i <= endCol)
+ {
+ changed = true;
+ if (toggle && contains(i))
+ {
+ removeElement(i);
}
- if (copy.hiddenColumns!=null) {
- hiddenColumns=new Vector();
- for (int i=0,j=copy.hiddenColumns.size(); i<j; i++) {
- int[] rh,cp;
- rh = (int[])copy.hiddenColumns.get(i);
- if (rh!=null) {
- cp = new int[rh.length];
- System.arraycopy(rh, 0, cp, 0, rh.length);
- hiddenColumns.set(i, cp);
- }
- }
+ else
+ {
+ addElement(i);
}
+ i = markedColumns.nextSetBit(i + 1);
}
}
+ return changed;
+ }
/**
- * ColumnSelection
+ * Adjusts column selections, and the given selection group, to match the
+ * range of a stretch (e.g. mouse drag) operation
+ * <p>
+ * Method refactored from ScalePanel.mouseDragged
+ *
+ * @param res
+ * current column position, adjusted for hidden columns
+ * @param sg
+ * current selection group
+ * @param min
+ * start position of the stretch group
+ * @param max
+ * end position of the stretch group
*/
- public ColumnSelection()
+ public void stretchGroup(int res, SequenceGroup sg, int min, int max)
{
+ if (!contains(res))
+ {
+ addElement(res);
+ }
+
+ if (res > sg.getStartRes())
+ {
+ // expand selection group to the right
+ sg.setEndRes(res);
+ }
+ if (res < sg.getStartRes())
+ {
+ // expand selection group to the left
+ sg.setStartRes(res);
+ }
+
+ /*
+ * expand or shrink column selection to match the
+ * range of the drag operation
+ */
+ for (int col = min; col <= max; col++)
+ {
+ if (col < sg.getStartRes() || col > sg.getEndRes())
+ {
+ // shrinking drag - remove from selection
+ removeElement(col);
+ }
+ else
+ {
+ // expanding drag - add to selection
+ addElement(col);
+ }
+ }
}
}
git://source.jalview.org / jalview.git / blobdiff