JAL-3855 2349 TODO

[jalview.git] / src / jalview / renderer / ContactMapRenderer.java

diff --git a/src/jalview/renderer/ContactMapRenderer.java b/src/jalview/renderer/ContactMapRenderer.java
index c4f308e..11c51e9 100644 (file)
--- a/src/jalview/renderer/ContactMapRenderer.java
+++ b/src/jalview/renderer/ContactMapRenderer.java
@@ -3,6 +3,9 @@
  */
 package jalview.renderer;
 
+import java.awt.Color;
+import java.awt.Graphics;
+
 import jalview.api.AlignViewportI;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Annotation;
@@ -12,9 +15,6 @@ import jalview.datamodel.ContactRange;
 import jalview.datamodel.HiddenColumns;
 import jalview.renderer.api.AnnotationRowRendererI;
 
-import java.awt.Color;
-import java.awt.Graphics;
-
 /**
  * @author jprocter
  *
@@ -24,10 +24,10 @@ public class ContactMapRenderer implements AnnotationRowRendererI
 
   @Override
   public void renderRow(Graphics g, int charWidth, int charHeight,
-          boolean hasHiddenColumns, AlignViewportI viewport, HiddenColumns hiddenColumns,
-          ColumnSelection columnSelection, AlignmentAnnotation _aa,
-          Annotation[] aa_annotations, int sRes, int eRes, float min,
-          float max, int y)
+          boolean hasHiddenColumns, AlignViewportI viewport,
+          HiddenColumns hiddenColumns, ColumnSelection columnSelection,
+          AlignmentAnnotation _aa, Annotation[] aa_annotations, int sRes,
+          int eRes, float min, float max, int y)
   {
     if (sRes > aa_annotations.length)
     {
@@ -50,6 +50,12 @@ public class ContactMapRenderer implements AnnotationRowRendererI
       {
         column = hiddenColumns.visibleToAbsoluteColumn(column);
       }
+      // // TODO: highlight columns selected
+      // boolean colsel = false;
+      // if (columnSelection != null)
+      // {
+      // colsel = columnSelection.contains(column);
+      // }
 
       if (column > aaMax)
       {
@@ -103,6 +109,13 @@ public class ContactMapRenderer implements AnnotationRowRendererI
         // also need a 'getMaxPosForRange(start,end)' to accurately render
         Color col = getColorForRange(min, max, contacts, cstart, cend);
 
+        // TODO: show selected region
+        // if (colsel || columnSelection!=null &&
+        // columnSelection.intersects(cstart,cend))
+        // {
+        // g.setColor(col.brighter());
+        // }
+        // else
         {
           g.setColor(col);
         }
@@ -120,6 +133,7 @@ public class ContactMapRenderer implements AnnotationRowRendererI
 
   }
 
+  // Shading parameters
   Color minColor = Color.white, maxColor = Color.magenta;
 
   Color shadeFor(float min, float max, float value)