X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FContactListImpl.java;h=7058ac7f4ed1d00bfd67977fed5efa34c4aa0acb;hb=ca160187a050f6d4e50158cd5b51f75c83a7179e;hp=8e806e48e0e2fa393b33a83020075f9722b0ce9c;hpb=4acbc5576fb42bf6f97202811c92a7cfe9900076;p=jalview.git diff --git a/src/jalview/datamodel/ContactListImpl.java b/src/jalview/datamodel/ContactListImpl.java index 8e806e4..7058ac7 100644 --- a/src/jalview/datamodel/ContactListImpl.java +++ b/src/jalview/datamodel/ContactListImpl.java @@ -1,5 +1,9 @@ package jalview.datamodel; +import java.awt.Color; + +import jalview.renderer.ContactGeometry.contactInterval; + /** * helper class to compute min/max/mean for a range on a contact list * @@ -51,9 +55,9 @@ public class ContactListImpl implements ContactListI { from_column = 0; } - if (to_column > getContactHeight()) + if (to_column >= getContactHeight()) { - to_column = getContactHeight(); + to_column = getContactHeight()-1; } ContactRange cr = new ContactRange(); cr.setFrom_column(from_column); @@ -84,7 +88,7 @@ public class ContactListImpl implements ContactListI } } } - if (tot > 0) + if (tot > 0 && to_column>from_column) { cr.setMean(tot / (1 + to_column - from_column)); } @@ -95,4 +99,15 @@ public class ContactListImpl implements ContactListI return cr; } + @Override + public int[] getMappedPositionsFor(int cStart, int cEnd) + { + return clist.getMappedPositionsFor(cStart, cEnd); + } + + @Override + public Color getColourForGroup() + { + return clist.getColourForGroup(); + } }