From c3d17bf8cd43fe710f94a1111e845a0c435bb0c9 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 23 Jan 2017 14:38:47 +0000 Subject: [PATCH] JAL-2349 ContactMatrixI provided max/min getters --- src/jalview/datamodel/Alignment.java | 4 ++-- src/jalview/datamodel/ContactMatrix.java | 11 +++++++++++ src/jalview/datamodel/ContactMatrixI.java | 4 ++++ src/jalview/datamodel/SeqDistanceContactMatrix.java | 12 ++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java index b251a89..d65f5b3 100755 --- a/src/jalview/datamodel/Alignment.java +++ b/src/jalview/datamodel/Alignment.java @@ -1973,8 +1973,8 @@ public class Alignment implements AlignmentI AlignmentAnnotation aa = new AlignmentAnnotation("Contact Matrix", "Contact Matrix", _aa); aa.graph = AlignmentAnnotation.CUSTOMRENDERER; - aa.graphMin = 0f; - aa.graphMax = 100f; + aa.graphMin = cm.getMin(); + aa.graphMax = cm.getMax(); aa.editable = false; // aa.autoCalculated = true; contactmaps.put(aa.annotationId, cm); diff --git a/src/jalview/datamodel/ContactMatrix.java b/src/jalview/datamodel/ContactMatrix.java index baf6e27..801b292 100644 --- a/src/jalview/datamodel/ContactMatrix.java +++ b/src/jalview/datamodel/ContactMatrix.java @@ -126,4 +126,15 @@ public class ContactMatrix implements ContactMatrixI }); } + @Override + public float getMin() + { + return min; + } + + @Override + public float getMax() + { + return max; + } } diff --git a/src/jalview/datamodel/ContactMatrixI.java b/src/jalview/datamodel/ContactMatrixI.java index 9a7f138..2b7b4ec 100644 --- a/src/jalview/datamodel/ContactMatrixI.java +++ b/src/jalview/datamodel/ContactMatrixI.java @@ -5,4 +5,8 @@ public interface ContactMatrixI ContactListI getContactList(int column); + float getMin(); + + float getMax(); + } diff --git a/src/jalview/datamodel/SeqDistanceContactMatrix.java b/src/jalview/datamodel/SeqDistanceContactMatrix.java index 721e5ca..8f9bdf6 100644 --- a/src/jalview/datamodel/SeqDistanceContactMatrix.java +++ b/src/jalview/datamodel/SeqDistanceContactMatrix.java @@ -14,6 +14,18 @@ public class SeqDistanceContactMatrix implements ContactMatrixI { this.width = width; } + + @Override + public float getMin() + { + return 0f; + } + + @Override + public float getMax() + { + return width; + } @Override public ContactListI getContactList(final int column) { -- 1.7.10.2