git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GRPAH_HEIGHT variable
[jalview.git]
/
src
/
jalview
/
analysis
/
AlignmentSorter.java
diff --git
a/src/jalview/analysis/AlignmentSorter.java
b/src/jalview/analysis/AlignmentSorter.java
index
3881266
..
64682c1
100755
(executable)
--- a/
src/jalview/analysis/AlignmentSorter.java
+++ b/
src/jalview/analysis/AlignmentSorter.java
@@
-83,6
+83,7
@@
public class AlignmentSorter {
}
\r
\r
/** */
\r
}
\r
\r
/** */
\r
+ static boolean sortIdAscending = true;
\r
public static void sortByID(AlignmentI align) {
\r
int nSeq = align.getHeight();
\r
\r
public static void sortByID(AlignmentI align) {
\r
int nSeq = align.getHeight();
\r
\r
@@
-96,9
+97,15
@@
public class AlignmentSorter {
\r
QuickSort.sort(ids,seqs);
\r
\r
\r
QuickSort.sort(ids,seqs);
\r
\r
- setReverseOrder(align,seqs);
\r
+ if(sortIdAscending)
\r
+ setReverseOrder(align,seqs);
\r
+ else
\r
+ setOrder(align, seqs);
\r
+
\r
+ sortIdAscending = !sortIdAscending;
\r
}
\r
\r
}
\r
\r
+ static boolean sortGroupAscending = true;
\r
public static void sortByGroup(AlignmentI align) {
\r
int nSeq = align.getHeight();
\r
Vector groups = align.getGroups();
\r
public static void sortByGroup(AlignmentI align) {
\r
int nSeq = align.getHeight();
\r
Vector groups = align.getGroups();
\r
@@
-120,7
+127,12
@@
public class AlignmentSorter {
}
\r
}
\r
\r
}
\r
}
\r
\r
- setOrder(align,seqs);
\r
+ if(sortGroupAscending)
\r
+ setOrder(align,seqs);
\r
+ else
\r
+ setReverseOrder( align, vectorToArray(seqs));
\r
+
\r
+ sortGroupAscending = ! sortGroupAscending;
\r
}
\r
\r
private static SequenceI [] vectorToArray(Vector tmp) {
\r
}
\r
\r
private static SequenceI [] vectorToArray(Vector tmp) {
\r
@@
-132,6
+144,7
@@
public class AlignmentSorter {
return seqs;
\r
}
\r
\r
return seqs;
\r
}
\r
\r
+ static boolean sortTreeAscending = true;
\r
public static void sortByTree(AlignmentI align, NJTree tree) {
\r
int nSeq = align.getHeight();
\r
\r
public static void sortByTree(AlignmentI align, NJTree tree) {
\r
int nSeq = align.getHeight();
\r
\r
@@
-146,7
+159,12
@@
public class AlignmentSorter {
}
\r
}
\r
\r
}
\r
}
\r
\r
- setOrder(align,tmp);
\r
+ if(sortTreeAscending)
\r
+ setOrder(align,tmp);
\r
+ else
\r
+ setReverseOrder(align, vectorToArray(tmp));
\r
+
\r
+ sortTreeAscending = !sortTreeAscending;
\r
}
\r
\r
private static void addStrays(AlignmentI align, Vector seqs) {
\r
}
\r
\r
private static void addStrays(AlignmentI align, Vector seqs) {
\r