X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=760ece0c6d00f11454d66f77c4ffc8309d5b0c94;hb=608002f963630dd631941e34f1a6a93b6dcbd823;hp=2f7cd7638ffc73bccadff4327285318d425cad61;hpb=af9772ad2e3c28a8f075ace5c97ec1f863f96726;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 2f7cd76..760ece0 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -24,6 +24,8 @@ 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 java.awt.BasicStroke; import java.awt.BorderLayout; @@ -122,17 +124,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) {