From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 31 Aug 2018 15:08:32 +0000 (+0100)
Subject: JAL-3095 account for sequence start when highlighting selections in trimmed VARNA... 
X-Git-Tag: Release_2_10_5~32
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=24b87a0d78ade5dfd8c0e040d12482cbcd9ea297

JAL-3095 account for sequence start when highlighting selections in trimmed VARNA model
---

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index aad4a96..3a64716 100644
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -428,15 +428,28 @@ public class AppVarna extends JInternalFrame
     {
       return;
     }
-    if (seqsel != null && seqsel.getSize() > 0)
+
+    RnaModel rnaModel = models.get(rna);
+
+    if (seqsel != null && seqsel.getSize() > 0
+            && seqsel.contains(rnaModel.seq))
     {
       int start = seqsel.getStartRes(), end = seqsel.getEndRes();
-      ShiftList shift = offsets.get(rna);
-      if (shift != null)
+      if (rnaModel.gapped)
+      {
+        ShiftList shift = offsets.get(rna);
+        if (shift != null)
+        {
+          start = shift.shift(start);
+          end = shift.shift(end);
+        }
+      }
+      else
       {
-        start = shift.shift(start);
-        end = shift.shift(end);
+        start = rnaModel.seq.findPosition(start) - rnaModel.seq.getStart();
+        end = rnaModel.seq.findPosition(end) - rnaModel.seq.getStart();
       }
+
       selectionHighlighter.highlightRegion(rna, start, end);
       selectionHighlighter.getLastHighlight()
               .setOutlineColor(seqsel.getOutlineColour());