diff --git a/uk/ac/sanger/artemis/components/alignment/BamView.java b/uk/ac/sanger/artemis/components/alignment/BamView.java index 4631271e9df77f6f00e084f2d8276f7917ece408..03d3c42717914a11c98e3f446ced2274d1df0655 100644 --- a/uk/ac/sanger/artemis/components/alignment/BamView.java +++ b/uk/ac/sanger/artemis/components/alignment/BamView.java @@ -624,7 +624,7 @@ public class BamView extends JPanel bamList.size() > 1) { // merge multiple BAM files - Collections.sort(readsInView, new SAMRecordPositionComparator()); + Collections.sort(readsInView, new SAMRecordPositionComparator(BamView.this)); } } catch (OutOfMemoryError ome) diff --git a/uk/ac/sanger/artemis/components/alignment/SAMRecordPositionComparator.java b/uk/ac/sanger/artemis/components/alignment/SAMRecordPositionComparator.java index d1ff725a208c00245be759996435f529a06e1a3a..7b42f795010a674a0a06592efe9563801899657b 100644 --- a/uk/ac/sanger/artemis/components/alignment/SAMRecordPositionComparator.java +++ b/uk/ac/sanger/artemis/components/alignment/SAMRecordPositionComparator.java @@ -30,14 +30,23 @@ import net.sf.samtools.SAMRecord; class SAMRecordPositionComparator implements Comparator<Object> { + public BamView bamView; + public SAMRecordPositionComparator(BamView bamView) + { + this.bamView = bamView; + } + public int compare(Object o1, Object o2) { SAMRecord pr1 = (SAMRecord) o1; SAMRecord pr2 = (SAMRecord) o2; - if(pr1.getAlignmentStart() < pr2.getAlignmentStart()) + int offset1 = bamView.getSequenceOffset(pr1.getReferenceName()); + int offset2 = bamView.getSequenceOffset(pr2.getReferenceName()); + + if(pr1.getAlignmentStart()+offset1 < pr2.getAlignmentStart()+offset2) return -1; - else if(pr1.getAlignmentStart() > pr2.getAlignmentStart()) + else if(pr1.getAlignmentStart()+offset1 > pr2.getAlignmentStart()+offset2) return 1; return 0; }