/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
*/\r
package jalview.datamodel;\r
\r
-import jalview.util.ShiftList;\r
-\r
import java.util.*;\r
\r
+import jalview.util.*;\r
+\r
/**\r
* NOTE: Columns are zero based.\r
*/\r
public void removeElements(int start, int end)\r
{\r
Integer colInt;\r
- for(int i=start; i<end; i++)\r
+ for (int i = start; i < end; i++)\r
{\r
colInt = new Integer(i);\r
if (selected.contains(colInt))\r
}\r
}\r
}\r
+\r
/**\r
*\r
* @return Vector containing selected columns as Integers\r
*/\r
public int columnAt(int i)\r
{\r
- return ((Integer) selected.elementAt(i)).intValue();\r
+ return ( (Integer) selected.elementAt(i)).intValue();\r
}\r
\r
/**\r
return min;\r
}\r
\r
-\r
/**\r
* propagate shift in alignment columns to column selection\r
*\r
}\r
}\r
\r
- if(hiddenColumns!=null)\r
+ if (hiddenColumns != null)\r
{\r
deletedHiddenColumns = new Vector();\r
int hSize = hiddenColumns.size();\r
- for(int i=0; i<hSize; i++)\r
+ for (int i = 0; i < hSize; i++)\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(i);\r
- if ( region[0]>start && start+change>region[1] )\r
+ if (region[0] > start && start + change > region[1])\r
{\r
deletedHiddenColumns.addElement(\r
hiddenColumns.elementAt(i));\r
continue;\r
}\r
\r
- if(region[0]>start)\r
+ if (region[0] > start)\r
{\r
region[0] -= change;\r
region[1] -= change;\r
}\r
\r
- if(region[0]<0)\r
+ if (region[0] < 0)\r
+ {\r
region[0] = 0;\r
+ }\r
\r
}\r
\r
\r
return deletedHiddenColumns;\r
}\r
+\r
/**\r
* propagate shift in alignment columns to column selection\r
* special version of compensateForEdit - allowing for edits within hidden regions\r
}\r
}\r
\r
- if(hiddenColumns!=null)\r
+ if (hiddenColumns != null)\r
{\r
- for(int i=0; i<hiddenColumns.size(); i++)\r
+ for (int i = 0; i < hiddenColumns.size(); i++)\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(i);\r
- if(region[0] >= start)\r
+ if (region[0] >= start)\r
{\r
region[0] -= change;\r
}\r
- if (region[1]>= start) {\r
- region[1] -=change;\r
+ if (region[1] >= start)\r
+ {\r
+ region[1] -= change;\r
}\r
- if (region[1]<region[0]) {\r
+ if (region[1] < region[0])\r
+ {\r
hiddenColumns.removeElementAt(i--);\r
}\r
\r
- if(region[0]<0)\r
+ if (region[0] < 0)\r
+ {\r
region[0] = 0;\r
- if(region[1] <0)\r
+ }\r
+ if (region[1] < 0)\r
+ {\r
region[1] = 0;\r
+ }\r
}\r
}\r
}\r
+\r
/**\r
* Adjust hidden column boundaries based on a series of column\r
* additions or deletions in visible regions.\r
* @param shiftrecord\r
* @return\r
*/\r
- public ShiftList compensateForEdits(ShiftList shiftrecord) {\r
- if (shiftrecord!=null) {\r
+ public ShiftList compensateForEdits(ShiftList shiftrecord)\r
+ {\r
+ if (shiftrecord != null)\r
+ {\r
Vector shifts = shiftrecord.shifts;\r
- if (shifts!=null && shifts.size()>0) {\r
- int shifted=0;\r
- for (int i=0,j=shifts.size(); i<j; i++) {\r
+ if (shifts != null && shifts.size() > 0)\r
+ {\r
+ int shifted = 0;\r
+ for (int i = 0, j = shifts.size(); i < j; i++)\r
+ {\r
int[] sh = (int[]) shifts.elementAt(i);\r
//compensateForEdit(shifted+sh[0], sh[1]);\r
- compensateForDelEdits(shifted+sh[0], sh[1]);\r
- shifted-=sh[1];\r
+ compensateForDelEdits(shifted + sh[0], sh[1]);\r
+ shifted -= sh[1];\r
}\r
}\r
return shiftrecord.getInverse();\r
}\r
return null;\r
}\r
+\r
/**\r
* removes intersection of position,length ranges in deletions\r
* from the start,end regions marked in intervals.\r
* @param intervals\r
* @return\r
*/\r
- private boolean pruneIntervalVector(Vector deletions, Vector intervals) {\r
- boolean pruned=false;\r
- int i=0,j=intervals.size()-1, s=0, t=deletions.size()-1;\r
- int hr[]=(int[]) intervals.elementAt(i);\r
- int sr[]=(int[]) deletions.elementAt(s);\r
- while (i<=j && s<=t) {\r
- boolean trailinghn=hr[1]>=sr[0];\r
- if (!trailinghn) {\r
- if (i<j)\r
- hr=(int[]) intervals.elementAt(++i);\r
+ private boolean pruneIntervalVector(Vector deletions, Vector intervals)\r
+ {\r
+ boolean pruned = false;\r
+ int i = 0, j = intervals.size() - 1, s = 0, t = deletions.size() - 1;\r
+ int hr[] = (int[]) intervals.elementAt(i);\r
+ int sr[] = (int[]) deletions.elementAt(s);\r
+ while (i <= j && s <= t)\r
+ {\r
+ boolean trailinghn = hr[1] >= sr[0];\r
+ if (!trailinghn)\r
+ {\r
+ if (i < j)\r
+ {\r
+ hr = (int[]) intervals.elementAt(++i);\r
+ }\r
else\r
+ {\r
i++;\r
+ }\r
continue;\r
}\r
- int endshift=sr[0]+sr[1]; // deletion ranges - -ve means an insert\r
- if (endshift<hr[0] || endshift<sr[0]) { // leadinghc disjoint or not a deletion\r
- if (s<t)\r
- sr=(int[]) deletions.elementAt(++s);\r
+ int endshift = sr[0] + sr[1]; // deletion ranges - -ve means an insert\r
+ if (endshift < hr[0] || endshift < sr[0])\r
+ { // leadinghc disjoint or not a deletion\r
+ if (s < t)\r
+ {\r
+ sr = (int[]) deletions.elementAt(++s);\r
+ }\r
else\r
+ {\r
s++;\r
+ }\r
continue;\r
}\r
- boolean leadinghn=hr[0]>=sr[0];\r
- boolean leadinghc=hr[0]<endshift;\r
- boolean trailinghc=hr[1]<endshift;\r
- if (leadinghn) {\r
- if (trailinghc) {// deleted hidden region.\r
+ boolean leadinghn = hr[0] >= sr[0];\r
+ boolean leadinghc = hr[0] < endshift;\r
+ boolean trailinghc = hr[1] < endshift;\r
+ if (leadinghn)\r
+ {\r
+ if (trailinghc)\r
+ { // deleted hidden region.\r
intervals.removeElementAt(i);\r
- pruned=true;\r
+ pruned = true;\r
j--;\r
- if (i<=j)\r
- hr=(int[]) intervals.elementAt(i);\r
+ if (i <= j)\r
+ {\r
+ hr = (int[]) intervals.elementAt(i);\r
+ }\r
continue;\r
}\r
- if (leadinghc) {\r
- hr[0]=endshift; // clip c terminal region\r
- leadinghn=!leadinghn;\r
- pruned=true;\r
+ if (leadinghc)\r
+ {\r
+ hr[0] = endshift; // clip c terminal region\r
+ leadinghn = !leadinghn;\r
+ pruned = true;\r
}\r
}\r
- if (!leadinghn) {\r
- if (trailinghc) {\r
- if (trailinghn) {\r
- hr[1]=sr[0]-1;\r
- pruned=true;\r
+ if (!leadinghn)\r
+ {\r
+ if (trailinghc)\r
+ {\r
+ if (trailinghn)\r
+ {\r
+ hr[1] = sr[0] - 1;\r
+ pruned = true;\r
}\r
- } else {\r
+ }\r
+ else\r
+ {\r
// sr contained in hr\r
- if (s<t)\r
- sr=(int[]) deletions.elementAt(++s);\r
+ if (s < t)\r
+ {\r
+ sr = (int[]) deletions.elementAt(++s);\r
+ }\r
else\r
+ {\r
s++;\r
+ }\r
continue;\r
}\r
}\r
}\r
return pruned; // true if any interval was removed or modified by operations.\r
}\r
- private boolean pruneColumnList(Vector deletion, Vector list) {\r
- int s=0,t=deletion.size();\r
- int[] sr=(int[])list.elementAt(s++);\r
- boolean pruned=false;\r
- int i=0, j=list.size();\r
- while (i<j && s<=t) {\r
- int c=((Integer)list.elementAt(i++)).intValue();\r
- if (sr[0]<=c) {\r
- if (sr[1]+sr[0]>=c) { // sr[1] -ve means inseriton.\r
+\r
+ private boolean pruneColumnList(Vector deletion, Vector list)\r
+ {\r
+ int s = 0, t = deletion.size();\r
+ int[] sr = (int[]) list.elementAt(s++);\r
+ boolean pruned = false;\r
+ int i = 0, j = list.size();\r
+ while (i < j && s <= t)\r
+ {\r
+ int c = ( (Integer) list.elementAt(i++)).intValue();\r
+ if (sr[0] <= c)\r
+ {\r
+ if (sr[1] + sr[0] >= c)\r
+ { // sr[1] -ve means inseriton.\r
list.removeElementAt(--i);\r
j--;\r
- } else {\r
- if (s<t)\r
- sr = (int[])deletion.elementAt(s);\r
+ }\r
+ else\r
+ {\r
+ if (s < t)\r
+ {\r
+ sr = (int[]) deletion.elementAt(s);\r
+ }\r
s++;\r
}\r
}\r
}\r
return pruned;\r
}\r
+\r
/**\r
* remove any hiddenColumns or selected columns and shift remaining\r
* based on a series of position, range deletions.\r
* @param deletions\r
*/\r
- public void pruneDeletions(ShiftList deletions) {\r
- if (deletions!=null) {\r
- Vector shifts=deletions.shifts;\r
- if (shifts!=null && shifts.size()>0) {\r
+ public void pruneDeletions(ShiftList deletions)\r
+ {\r
+ if (deletions != null)\r
+ {\r
+ Vector shifts = deletions.shifts;\r
+ if (shifts != null && shifts.size() > 0)\r
+ {\r
// delete any intervals intersecting.\r
- if (hiddenColumns!=null) {\r
+ if (hiddenColumns != null)\r
+ {\r
pruneIntervalVector(shifts, hiddenColumns);\r
- if (hiddenColumns!=null && hiddenColumns.size()==0) {\r
- hiddenColumns=null;\r
+ if (hiddenColumns != null && hiddenColumns.size() == 0)\r
+ {\r
+ hiddenColumns = null;\r
}\r
}\r
- if (selected!=null && selected.size()>0) {\r
+ if (selected != null && selected.size() > 0)\r
+ {\r
pruneColumnList(shifts, selected);\r
- if (selected!=null && selected.size()==0)\r
- selected=null;\r
+ if (selected != null && selected.size() == 0)\r
+ {\r
+ selected = null;\r
+ }\r
}\r
// and shift the rest.\r
this.compensateForEdits(deletions);\r
}\r
}\r
}\r
+\r
/**\r
* This Method is used to return all the HiddenColumn regions\r
* less than the given index.\r
{\r
return hiddenColumns;\r
}\r
+\r
/**\r
* Return absolute column index for a visible column index\r
* @param column int column index in alignment view\r
int[] region = (int[]) hiddenColumns.elementAt(index);\r
if (hiddenColumn > region[1])\r
{\r
- result -= region[1]+1-region[0];\r
+ result -= region[1] + 1 - region[0];\r
}\r
index++;\r
}\r
do\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(index);\r
- if(hiddenRegion==0)\r
+ if (hiddenRegion == 0)\r
{\r
return region[0];\r
}\r
\r
- gaps += region[1] +1 - region[0];\r
- result = region[1] +1;\r
+ gaps += region[1] + 1 - region[0];\r
+ result = region[1] + 1;\r
index++;\r
}\r
- while(index < hiddenRegion+1);\r
+ while (index < hiddenRegion + 1);\r
\r
result -= gaps;\r
}\r
do\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(index);\r
- if(alPos < region[0])\r
+ if (alPos < region[0])\r
+ {\r
return region[0];\r
+ }\r
\r
index++;\r
}\r
- while(index < hiddenColumns.size());\r
+ while (index < hiddenColumns.size());\r
}\r
\r
return alPos;\r
\r
}\r
+\r
/**\r
* THis method returns the rightmost limit of a\r
* region of an alignment with hidden columns.\r
{\r
if (hiddenColumns != null)\r
{\r
- int index = hiddenColumns.size()-1;\r
+ int index = hiddenColumns.size() - 1;\r
do\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(index);\r
- if(alPos > region[1])\r
+ if (alPos > region[1])\r
+ {\r
return region[1];\r
+ }\r
\r
index--;\r
}\r
- while(index >-1);\r
+ while (index > -1);\r
}\r
\r
return alPos;\r
\r
public void hideColumns(int start, int end)\r
{\r
- if(hiddenColumns==null)\r
+ if (hiddenColumns == null)\r
+ {\r
hiddenColumns = new Vector();\r
+ }\r
\r
boolean added = false;\r
boolean overlap = false;\r
for (int i = 0; i < hiddenColumns.size(); i++)\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(i);\r
- if ( start<=region[1] && end>=region[0])\r
+ if (start <= region[1] && end >= region[0])\r
{\r
hiddenColumns.removeElementAt(i);\r
overlap = true;\r
else if (end < region[0] && start < region[0])\r
{\r
hiddenColumns.insertElementAt(new int[]\r
- {start, end}, i);\r
+ {start, end}, i);\r
added = true;\r
break;\r
}\r
}\r
\r
- if(overlap)\r
+ if (overlap)\r
{\r
hideColumns(start, end);\r
}\r
else if (!added)\r
- hiddenColumns.addElement(new int[] {start, end});\r
+ {\r
+ hiddenColumns.addElement(new int[]\r
+ {start, end});\r
+ }\r
\r
}\r
\r
public void hideColumns(int col)\r
{\r
// First find out range of columns to hide\r
- int min = col, max = col+1;\r
- while( contains(min) )\r
- { removeElement(min); min --; }\r
+ int min = col, max = col + 1;\r
+ while (contains(min))\r
+ {\r
+ removeElement(min);\r
+ min--;\r
+ }\r
\r
- while( contains(max) )\r
- { removeElement(max); max ++; }\r
+ while (contains(max))\r
+ {\r
+ removeElement(max);\r
+ max++;\r
+ }\r
\r
- min++; max--;\r
- if(min>max)\r
+ min++;\r
+ max--;\r
+ if (min > max)\r
+ {\r
min = max;\r
+ }\r
\r
hideColumns(min, max);\r
}\r
\r
public void revealAllHiddenColumns()\r
{\r
- if(hiddenColumns!=null)\r
+ if (hiddenColumns != null)\r
{\r
for (int i = 0; i < hiddenColumns.size(); i++)\r
{\r
int[] region = (int[]) hiddenColumns.elementAt(i);\r
- for (int j = region[0]; j < region[1]+1; j++)\r
+ for (int j = region[0]; j < region[1] + 1; j++)\r
{\r
addElement(j);\r
}\r
\r
public void revealHiddenColumns(int res)\r
{\r
- for(int i=0; i<hiddenColumns.size(); i++)\r
+ for (int i = 0; i < hiddenColumns.size(); i++)\r
{\r
- int [] region = (int[])hiddenColumns.elementAt(i);\r
- if( res == region[0])\r
+ int[] region = (int[]) hiddenColumns.elementAt(i);\r
+ if (res == region[0])\r
{\r
- for (int j = region[0]; j < region[1]+1; j++)\r
+ for (int j = region[0]; j < region[1] + 1; j++)\r
{\r
addElement(j);\r
}\r
break;\r
}\r
}\r
- if(hiddenColumns.size()==0)\r
+ if (hiddenColumns.size() == 0)\r
+ {\r
hiddenColumns = null;\r
+ }\r
}\r
\r
public boolean isVisible(int column)\r
{\r
- for(int i=0; i<hiddenColumns.size(); i++)\r
+ for (int i = 0; i < hiddenColumns.size(); i++)\r
{\r
- int [] region = (int[])hiddenColumns.elementAt(i);\r
- if( column >= region[0] && column <= region[1])\r
+ int[] region = (int[]) hiddenColumns.elementAt(i);\r
+ if (column >= region[0] && column <= region[1])\r
{\r
return false;\r
}\r
}\r
return true;\r
}\r
+\r
/**\r
* Copy constructor\r
* @param copy\r
*/\r
- public ColumnSelection(ColumnSelection copy) {\r
- if (copy!=null) {\r
- if (copy.selected!=null) {\r
+ public ColumnSelection(ColumnSelection copy)\r
+ {\r
+ if (copy != null)\r
+ {\r
+ if (copy.selected != null)\r
+ {\r
selected = new Vector();\r
- for (int i=0,j=copy.selected.size(); i<j; i++) {\r
+ for (int i = 0, j = copy.selected.size(); i < j; i++)\r
+ {\r
selected.addElement(copy.selected.elementAt(i));\r
}\r
}\r
- if (copy.hiddenColumns!=null) {\r
- hiddenColumns=new Vector(copy.hiddenColumns.size());\r
- for (int i=0,j=copy.hiddenColumns.size(); i<j; i++) {\r
- int[] rh,cp;\r
- rh = (int[])copy.hiddenColumns.elementAt(i);\r
- if (rh!=null) {\r
+ if (copy.hiddenColumns != null)\r
+ {\r
+ hiddenColumns = new Vector(copy.hiddenColumns.size());\r
+ for (int i = 0, j = copy.hiddenColumns.size(); i < j; i++)\r
+ {\r
+ int[] rh, cp;\r
+ rh = (int[]) copy.hiddenColumns.elementAt(i);\r
+ if (rh != null)\r
+ {\r
cp = new int[rh.length];\r
System.arraycopy(rh, 0, cp, 0, rh.length);\r
hiddenColumns.addElement(cp);\r
}\r
}\r
}\r
+\r
/**\r
* ColumnSelection\r
*/\r
{\r
}\r
\r
- public String[] getVisibleSequenceStrings(int start, int end, SequenceI[] seqs) {\r
- int i,iSize=seqs.length;\r
+ public String[] getVisibleSequenceStrings(int start, int end,\r
+ SequenceI[] seqs)\r
+ {\r
+ int i, iSize = seqs.length;\r
String selection[] = new String[iSize];\r
- if (hiddenColumns!=null && hiddenColumns.size()>0)\r
+ if (hiddenColumns != null && hiddenColumns.size() > 0)\r
{\r
- for (i=0; i<iSize; i++) {\r
+ for (i = 0; i < iSize; i++)\r
+ {\r
StringBuffer visibleSeq = new StringBuffer();\r
Vector regions = getHiddenColumns();\r
\r
- int blockStart = start, blockEnd=end;\r
- int [] region;\r
+ int blockStart = start, blockEnd = end;\r
+ int[] region;\r
int hideStart, hideEnd;\r
\r
for (int j = 0; j < regions.size(); j++)\r
hideStart = region[0];\r
hideEnd = region[1];\r
\r
- if(hideStart < start)\r
+ if (hideStart < start)\r
{\r
continue;\r
}\r
\r
- blockStart = Math.min(blockStart, hideEnd+1);\r
+ blockStart = Math.min(blockStart, hideEnd + 1);\r
blockEnd = Math.min(blockEnd, hideStart);\r
\r
- if(blockStart>blockEnd)\r
+ if (blockStart > blockEnd)\r
{\r
break;\r
}\r
\r
-\r
visibleSeq.append(seqs[i].getSequence(blockStart, blockEnd));\r
\r
- blockStart = hideEnd+1;\r
+ blockStart = hideEnd + 1;\r
blockEnd = end;\r
}\r
\r
- if(end>blockStart)\r
+ if (end > blockStart)\r
+ {\r
visibleSeq.append(seqs[i].getSequence(blockStart, end));\r
+ }\r
\r
selection[i] = visibleSeq.toString();\r
}\r
}\r
else\r
{\r
- for(i=0; i<iSize; i++)\r
+ for (i = 0; i < iSize; i++)\r
{\r
selection[i] = seqs[i].getSequenceAsString(start, end);\r
}\r
\r
return selection;\r
}\r
+\r
/**\r
* return all visible segments between the given start and end boundaries\r
*\r
* @param end (last column - not inclusive)\r
* @return int[] {i_start, i_end, ..} where intervals lie in start<=i_start<=i_end<end\r
*/\r
- public int[] getVisibleContigs(int start, int end) {\r
- if (hiddenColumns!=null && hiddenColumns.size()>0)\r
+ public int[] getVisibleContigs(int start, int end)\r
+ {\r
+ if (hiddenColumns != null && hiddenColumns.size() > 0)\r
{\r
- Vector visiblecontigs=new Vector();\r
+ Vector visiblecontigs = new Vector();\r
Vector regions = getHiddenColumns();\r
\r
int vstart = start;\r
- int [] region;\r
+ int[] region;\r
int hideStart, hideEnd;\r
\r
- for (int j = 0; vstart<end && j < regions.size(); j++)\r
+ for (int j = 0; vstart < end && j < regions.size(); j++)\r
{\r
region = (int[]) regions.elementAt(j);\r
hideStart = region[0];\r
hideEnd = region[1];\r
\r
- if(hideEnd < vstart)\r
+ if (hideEnd < vstart)\r
{\r
continue;\r
}\r
- if (hideStart>vstart) {\r
- visiblecontigs.addElement(new int[] {vstart, hideStart-1});\r
+ if (hideStart > vstart)\r
+ {\r
+ visiblecontigs.addElement(new int[]\r
+ {vstart, hideStart - 1});\r
}\r
- vstart=hideEnd+1;\r
+ vstart = hideEnd + 1;\r
}\r
\r
- if(vstart<end)\r
- visiblecontigs.addElement(new int[] { vstart, end-1});\r
- int[] vcontigs = new int[visiblecontigs.size()*2];\r
- for (int i=0,j=visiblecontigs.size(); i<j; i++) {\r
- int [] vc = (int[]) visiblecontigs.elementAt(i);\r
+ if (vstart < end)\r
+ {\r
+ visiblecontigs.addElement(new int[]\r
+ {vstart, end - 1});\r
+ }\r
+ int[] vcontigs = new int[visiblecontigs.size() * 2];\r
+ for (int i = 0, j = visiblecontigs.size(); i < j; i++)\r
+ {\r
+ int[] vc = (int[]) visiblecontigs.elementAt(i);\r
visiblecontigs.setElementAt(null, i);\r
- vcontigs[i*2] = vc[0];\r
- vcontigs[i*2+1] = vc[1];\r
+ vcontigs[i * 2] = vc[0];\r
+ vcontigs[i * 2 + 1] = vc[1];\r
}\r
visiblecontigs.removeAllElements();\r
return vcontigs;\r
}\r
else\r
{\r
- return new int[] { start, end-1 };\r
+ return new int[]\r
+ {\r
+ start, end - 1};\r
}\r
}\r
}\r
git://source.jalview.org / jalview.git / blobdiff