Merge branch 'develop' into features/JAL-2094_colourInterface

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 2f7cd76..1355b9b 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -24,6 +24,9 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SearchResults;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
+import jalview.renderer.ScaleRenderer;
+import jalview.renderer.ScaleRenderer.ScaleMark;
+import jalview.util.ColorUtils;
 
 import java.awt.BasicStroke;
 import java.awt.BorderLayout;
@@ -122,17 +125,17 @@ public class SeqCanvas extends JComponent
   private void drawNorthScale(Graphics g, int startx, int endx, int ypos)
   {
     updateViewport();
-    for (Object[] mark : jalview.renderer.ScaleRenderer.calculateMarks(av,
-            startx, endx))
+    for (ScaleMark mark : new ScaleRenderer().calculateMarks(av, startx,
+            endx))
     {
-      int mpos = ((Integer) mark[1]).intValue(); // (i - startx - 1)
+      int mpos = mark.column; // (i - startx - 1)
       if (mpos < 0)
       {
         continue;
       }
-      String mstring = (String) mark[2];
+      String mstring = mark.text;
 
-      if (Boolean.valueOf((Boolean) mark[0]))
+      if (mark.major)
       {
         if (mstring != null)
         {
@@ -846,7 +849,7 @@ public class SeqCanvas extends JComponent
               else
               {
                 g.setStroke(new BasicStroke());
-                g.setColor(group.getOutlineColour());
+                g.setColor(ColorUtils.getColor(group.getOutlineColour()));
               }
             }
           }