X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=76020c716d79f4eec4df52b1eeeb23fde229dfb8;hb=bc1a3842b31a35a7794f4afec4911ad421c7c3e4;hp=ab21714a5fc76c4effc1da029c5d844acb54d587;hpb=3a10cfaddf4f4a0949fbecca95f97ccf1d1ca1d6;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index ab21714..76020c7 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -199,7 +199,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
     gg.translate(0, transY);
 
-    drawIds(gg, av, ss, es, searchResults);
+    drawIds(gg, av, ss, es, searchResults, true, getWidth());
 
     gg.translate(0, -transY);
 
@@ -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);
+            av.getRanges().getEndSeq(), searchResults, true, getWidth());
 
     gg.dispose();
 
@@ -274,9 +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()
+   * 
    */
   void drawIds(Graphics2D g, AlignViewport alignViewport,
-          final int startSeq, final int endSeq, List<SequenceI> selection)
+          final int startSeq, final int endSeq, List<SequenceI> selection,
+          boolean forGUI, int panelWidth)
   {
     Font font = alignViewport.getFont();
     if (alignViewport.isSeqNameItalics())
@@ -304,12 +311,12 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
     if (alignViewport.getWrapAlignment())
     {
-      drawIdsWrapped(g, alignViewport, startSeq, getHeight());
+      drawIdsWrapped(g, alignViewport, startSeq, getHeight(),
+              manuallyAdjusted ? panelWidth : -1, forGUI);
       return;
     }
 
     // Now draw the id strings
-    int panelWidth = getWidth();
     int xPos = 0;
 
     // Now draw the id strings
@@ -383,11 +390,25 @@ public class IdCanvas extends JPanel implements ViewportListenerI
   void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
           int startSeq, int pageHeight)
   {
-    drawIdsWrapped(g, alignViewport, startSeq, pageHeight, -1);
+    drawIdsWrapped(g, alignViewport, startSeq, pageHeight, -1, true);
   }
 
-  void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
-          int startSeq, int pageHeight, int idWidth)
+  /**
+   * render sequence IDs and annotation labels when wrapped - without GUI junk
+   * 
+   * @param g
+   * @param av2
+   * @param startSeq
+   * @param totalHeight
+   */
+  public void drawIdsWrappedNoGUI(Graphics2D g, AlignViewport av2,
+          int startSeq, int totalHeight)
+  {
+    drawIdsWrapped(g, av2, startSeq, totalHeight, -1, false);
+  }
+
+  public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
+          int startSeq, int pageHeight, int idWidth, boolean forGUI)
   {
     int alignmentWidth = alignViewport.getAlignment().getWidth();
     final int alheight = alignViewport.getAlignment().getHeight();
@@ -403,6 +424,9 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     AnnotationLabels labels = null;
     if (alignViewport.isShowAnnotation())
     {
+      // in wrapped mode, no alignPanel reference is available
+      // FIXME: make the renderer not create a new object in wrapped mode
+      // everytime!
       labels = new AnnotationLabels(alignViewport);
     }
 
@@ -435,21 +459,23 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
       if (labels != null && alignViewport.isShowAnnotation())
       {
-        int thisIdWidth = getWidth();
+        int getWidth = getWidth();
+        int thisIdWidth = getWidth;
         g.translate(0, ypos + (alheight * charHeight));
-        if (!manuallyAdjusted())
+        if (!isManuallyAdjusted())
         {
           int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,
-                  null);
+                  forGUI, null, false);
           thisIdWidth = idWidth < 0 ? getAnnotationsIdWidth : idWidth;
-          if (thisIdWidth > getWidth())
+          if (thisIdWidth > getWidth)
           {
             this.setPreferredSize(
-                    new Dimension(this.getHeight(), thisIdWidth));
+                    new Dimension(thisIdWidth, this.getHeight()));
             this.repaint();
+            alignViewport.setIdWidth(thisIdWidth);
           }
         }
-        labels.drawComponent(g, false, thisIdWidth);
+        labels.drawComponent(g, false, thisIdWidth, forGUI);
         g.translate(0, -ypos - (alheight * charHeight));
       }
 
@@ -608,7 +634,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
   private boolean manuallyAdjusted = false;
 
-  public boolean manuallyAdjusted()
+  public boolean isManuallyAdjusted()
   {
     return manuallyAdjusted;
   }
@@ -617,4 +643,5 @@ public class IdCanvas extends JPanel implements ViewportListenerI
   {
     manuallyAdjusted = b;
   }
+
 }