X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;fp=src%2Fjalview%2Fgui%2FIdCanvas.java;h=3ee3316f147b4e16bca8c8f95fa012b3519b02a7;hb=eb3e681d6e82ccdd5d312d1981dfb306e7f479f0;hp=dbffc72497387933fb0cbd163798b7d84a28b4fe;hpb=cb31e23d9138e481479623374aed7767bf8934d2;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index dbffc72..3ee3316 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -256,7 +256,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI gg.fillRect(0, 0, getWidth(), imgHeight); drawIds(gg, av, av.getRanges().getStartSeq(), - av.getRanges().getEndSeq(), searchResults,true, getWidth()); + av.getRanges().getEndSeq(), searchResults, true, getWidth()); gg.dispose(); @@ -274,12 +274,16 @@ public class IdCanvas extends JPanel implements ViewportListenerI * @param startSeq * @param endSeq * @param selection - * @param forGUI when false rendering for print - * @param panelWidth width used to calculate righthand margin - usually idCanvas.getWidth() + * @param forGUI + * when false rendering for print + * @param panelWidth + * width used to calculate righthand margin - usually + * idCanvas.getWidth() * */ void drawIds(Graphics2D g, AlignViewport alignViewport, - final int startSeq, final int endSeq, List selection, boolean forGUI, int panelWidth) + final int startSeq, final int endSeq, List selection, + boolean forGUI, int panelWidth) { Font font = alignViewport.getFont(); if (alignViewport.isSeqNameItalics()) @@ -307,7 +311,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI if (alignViewport.getWrapAlignment()) { - drawIdsWrapped(g, alignViewport, startSeq, getHeight(), manuallyAdjusted ? panelWidth : -1,forGUI); + drawIdsWrapped(g, alignViewport, startSeq, getHeight(), + manuallyAdjusted ? panelWidth : -1, forGUI); return; } @@ -390,6 +395,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI /** * render sequence IDs and annotation labels when wrapped - without GUI junk + * * @param g * @param av2 * @param i @@ -398,7 +404,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI public void drawIdsWrappedNoGUI(Graphics2D g, AlignViewport av2, int i, int totalHeight) { - drawIdsWrapped(g, av2, totalHeight, totalHeight, i,false); + drawIdsWrapped(g, av2, totalHeight, totalHeight, i, false); } public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport, @@ -419,7 +425,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI if (alignViewport.isShowAnnotation()) { // in wrapped mode, no alignPanel reference is available - // FIXME: make the renderer not create a new object in wrapped mode everytime! + // FIXME: make the renderer not create a new object in wrapped mode + // everytime! labels = new AnnotationLabels(alignViewport); } @@ -457,8 +464,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI g.translate(0, ypos + (alheight * charHeight)); if (!isManuallyAdjusted()) { - int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,forGUI, - null, false); + int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false, + forGUI, null, false); thisIdWidth = idWidth < 0 ? getAnnotationsIdWidth : idWidth; if (thisIdWidth > getWidth) {