X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FContactMapRenderer.java;h=a8f6c1b0644fbf4d2c5a1c96d0a7e6675cb8747f;hb=beb2fee66dde629e3bbb7febb38d0116e1a64df2;hp=10f87b1e041ef78fc3f7efcf4fe0fc033911c643;hpb=a059dd46fe149a476bd274562cd27b2dc7d390dd;p=jalview.git diff --git a/src/jalview/renderer/ContactMapRenderer.java b/src/jalview/renderer/ContactMapRenderer.java index 10f87b1..a8f6c1b 100644 --- a/src/jalview/renderer/ContactMapRenderer.java +++ b/src/jalview/renderer/ContactMapRenderer.java @@ -5,12 +5,14 @@ package jalview.renderer; import java.awt.Color; import java.awt.Graphics; +import java.util.Iterator; import jalview.api.AlignViewportI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Annotation; import jalview.datamodel.ColumnSelection; import jalview.datamodel.ContactListI; +import jalview.datamodel.ContactMatrixI; import jalview.datamodel.ContactRange; import jalview.datamodel.HiddenColumns; import jalview.renderer.api.AnnotationRowRendererI; @@ -19,8 +21,80 @@ import jalview.renderer.api.AnnotationRowRendererI; * @author jprocter * */ -public class ContactMapRenderer implements AnnotationRowRendererI +public abstract class ContactMapRenderer implements AnnotationRowRendererI { + /** + * bean holding colours for shading + * + * @author jprocter + * + */ + public class Shading + { + /** + * shown when no data available from map + */ + Color no_data; + /** + * shown for region not currently visible - should normally not see this + */ + Color hidden; + /** + * linear shading scheme min/max + */ + Color maxColor, minColor; + + /** + * linear shading scheme min/max for selected region + */ + Color selMinColor, selMaxColor; + + public Shading(Color no_data, Color hidden, Color maxColor, + Color minColor, Color selMinColor, Color selMaxColor) + { + super(); + this.no_data = no_data; + this.hidden = hidden; + this.maxColor = maxColor; + this.minColor = minColor; + this.selMinColor = selMinColor; + this.selMaxColor = selMaxColor; + } + + } + + final Shading shade; + + /** + * build an EBI-AlphaFold style renderer of PAE matrices + * + * @return + */ + public static ContactMapRenderer newPAERenderer() + { + return new ContactMapRenderer() + { + @Override + public Shading getShade() + { + return new Shading(Color.pink, Color.red, + + new Color(246, 252, 243), new Color(0, 60, 26), + new Color(26, 0, 60), new Color(243, 246, 252)); + } + }; + } + + /** + * + * @return instance of Shading used to initialise the renderer + */ + public abstract Shading getShade(); + + public ContactMapRenderer() + { + this.shade = getShade(); + } @Override public void renderRow(Graphics g, int charWidth, int charHeight, @@ -37,12 +111,13 @@ public class ContactMapRenderer implements AnnotationRowRendererI int x = 0, y2 = y; - g.setColor(Color.pink); + g.setColor(shade.no_data); g.drawLine(x, y2, (eRes - sRes) * charWidth, y2); int column; int aaMax = aa_annotations.length - 1; + ContactMatrixI cm = viewport.getContactMatrix(_aa); while (x < eRes - sRes) { column = sRes + x; @@ -50,12 +125,12 @@ public class ContactMapRenderer implements AnnotationRowRendererI { column = hiddenColumns.visibleToAbsoluteColumn(column); } - // // TODO: highlight columns selected - // boolean colsel = false; - // if (columnSelection != null) - // { - // colsel = columnSelection.contains(column); - // } + // TODO: highlight columns selected + boolean colsel = false; + if (columnSelection != null) + { + colsel = columnSelection.contains(column); + } if (column > aaMax) { @@ -67,61 +142,81 @@ public class ContactMapRenderer implements AnnotationRowRendererI x++; continue; } - if (_aa.sequenceRef != null) - { - // get the sequence position for the column - column = _aa.sequenceRef.findPosition(column) - 1; - } ContactListI contacts = viewport.getContactList(_aa, column); if (contacts == null) { - return; - } - int contact_height = contacts.getContactHeight(); - // fractional number of contacts covering each pixel - double contacts_per_pixel = ((double) contact_height) - / ((double) _aa.graphHeight); - - int pixels_step; - - if (contacts_per_pixel >= 1) - { - // many contacts rendered per pixel - pixels_step = 1; - } - else - { - // pixel height for each contact - pixels_step = (int) Math - .ceil(((double) _aa.graphHeight) / (double) contact_height); + x++; + continue; } - - int cstart = 0, cend; - - for (int ht = y2, - eht = y2 - _aa.graphHeight; ht >= eht; ht -= pixels_step) + // ContactListI from viewport can map column -> group + Color gpcol = (cm == null) ? Color.white + : contacts.getColourForGroup(); // cm.getColourForGroup(cm.getGroupsFor(column)); + // feature still in development - highlight or omit regions hidden in + // the alignment - currently marks them as red rows + boolean maskHiddenCols = false; + // TODO: optionally pass visible column mask to the ContactGeometry object + // so it maps + // only visible contacts to geometry + // Bean holding mapping from contact list to pixels + // TODO: allow bracketing/limiting of range on contacts to render (like + // visible column mask but more flexible?) + + // COntactListI provides mapping for column -> cm-groupmapping + final ContactGeometry cgeom = new ContactGeometry(contacts, + _aa.graphHeight); + + for (int ht = y2, eht = y2 + - _aa.graphHeight; ht >= eht; ht -= cgeom.pixels_step) { - cstart = (int) Math.floor(((double) y2 - ht) * contacts_per_pixel); - cend = (int) Math.min(contact_height, - Math.ceil(cstart + contacts_per_pixel * pixels_step)); - - // TODO show maximum colour for range - sort of done - // also need a 'getMaxPosForRange(start,end)' to accurately render - Color col = getColorForRange(min, max, contacts, cstart, cend); - + ContactGeometry.contactInterval ci = cgeom.mapFor(y2 - ht, + y2 - ht + cgeom.pixels_step); + // cstart = (int) Math.floor(((double) y2 - ht) * contacts_per_pixel); + // cend = (int) Math.min(contact_height, + // Math.ceil(cstart + contacts_per_pixel * pixels_step)); + + Color col; + boolean rowsel = false, containsHidden = false; + if (columnSelection != null) + { + rowsel = cgeom.intersects(ci, columnSelection, hiddenColumns, + maskHiddenCols); + } // TODO: show selected region - // if (colsel || columnSelection!=null && - // columnSelection.intersects(cstart,cend)) - // { - // g.setColor(col.brighter()); - // } - // else + if (colsel || rowsel) + { + + col = getSelectedColorForRange(min, max, contacts, ci.cStart, + ci.cEnd); + if (colsel && rowsel) + { + col = new Color(col.getBlue(), col.getGreen(), col.getRed()); + } + else + { + col = new Color(col.getBlue(), col.getBlue(), col.getBlue()); + } + } + else + { + col = getColorForRange(min, max, contacts, ci.cStart, ci.cEnd); + } + if (containsHidden) + { + col = shade.hidden; + } + if (gpcol != null && gpcol != Color.white) { - g.setColor(col); + // todo - could overlay group as a transparent rectangle ? + col = new Color( + (int) (((float) (col.getRed() + gpcol.getRed())) / 2f), + (int) (((float) (col.getGreen() + gpcol.getGreen())) + / 2f), + (int) (((float) (col.getBlue() + gpcol.getBlue())) / 2f)); } - if (pixels_step > 1) + g.setColor(col); + if (cgeom.pixels_step > 1) { - g.fillRect(x * charWidth, ht, charWidth, 1 + pixels_step); + g.fillRect(x * charWidth, ht, charWidth, 1 + cgeom.pixels_step); } else { @@ -133,12 +228,10 @@ public class ContactMapRenderer implements AnnotationRowRendererI } - Color minColor = Color.white, maxColor = Color.magenta; - Color shadeFor(float min, float max, float value) { - return jalview.util.ColorUtils.getGraduatedColour(value, 0, minColor, - max, maxColor); + return jalview.util.ColorUtils.getGraduatedColour(value, 0, + shade.minColor, max, shade.maxColor); } public Color getColorForRange(float min, float max, ContactListI cl, @@ -149,4 +242,13 @@ public class ContactMapRenderer implements AnnotationRowRendererI return shadeFor(min, max, (float) cr.getMean()); } + public Color getSelectedColorForRange(float min, float max, + ContactListI cl, int i, int j) + { + ContactRange cr = cl.getRangeFor(i, j); + // average for moment - probably more interested in maxIntProj though + return jalview.util.ColorUtils.getGraduatedColour((float) cr.getMean(), + 0, shade.selMinColor, max, shade.selMaxColor); + } + }