X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=0acf4253802f323ef6913819782b2cc1545aefaf;hb=9807ea8cc4e867378c52d51b832168d4bc611d29;hp=af24c9ff5c60b9b66c5a906a911109a874c172fb;hpb=df7880a58e6b16d65f9ed8dbe4433efffbe8abec;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index af24c9f..0acf425 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -81,9 +81,7 @@ public class AlignmentPanel extends GAlignmentPanel
     annotationPanel = new AnnotationPanel(this);
     alabels = new AnnotationLabels(this);
 
-    annotationSpaceFillerHolder.setPreferredSize(annotationPanel.
-                                                 getPreferredSize());
-    annotationScroller.setPreferredSize(annotationPanel.getPreferredSize());
+
     annotationScroller.setViewportView(annotationPanel);
     annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);
 
@@ -242,22 +240,34 @@ public class AlignmentPanel extends GAlignmentPanel
    *
    * @param results DOCUMENT ME!
    */
-  public void highlightSearchResults(int[] results)
+  public void highlightSearchResults(SearchResults results)
   {
     seqPanel.seqCanvas.highlightSearchResults(results);
 
     // do we need to scroll the panel?
     if (results != null)
     {
-      SequenceI seq = av.alignment.getSequenceAt(results[0]);
-      int start = seq.findIndex(results[1]) - 1;
-      int end = seq.findIndex(results[2]) - 1;
+      SequenceI seq = results.getResultSequence(0);
+      int seqIndex = av.alignment.findIndex(seq);
+      int start = seq.findIndex(results.getResultStart(0)) - 1;
+      int end = seq.findIndex(results.getResultEnd(0)) - 1;
 
-      if ( (av.getStartRes() > start) || (av.getEndRes() < end) ||
-          ( (av.getStartSeq() > results[0]) ||
-           (av.getEndSeq() < results[0])))
+      if(!av.wrapAlignment)
       {
-        setScrollValues(start, results[0]);
+        if ( (av.getStartRes() > end)  || (av.getEndRes() < start) ||
+           ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+        {
+          setScrollValues(start, seqIndex);
+        }
+      }
+      else
+      {
+        int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+        if( start<av.getStartRes() || start>(av.getStartRes()+cwidth) )
+        {
+          vscroll.setValue(start / cwidth);
+          av.startRes = vscroll.getValue() * cwidth;
+        }
       }
     }
   }
@@ -480,28 +490,33 @@ public class AlignmentPanel extends GAlignmentPanel
       overviewPanel.setBoxPosition();
     }
 
-    int xShift = av.getStartRes() - oldX;
-    int yShift = av.getStartSeq() - oldY;
+    int scrollX = av.startRes - oldX;
+    int scrollY = av.startSeq - oldY;
 
-    if ( (xShift != 0 && yShift != 0) ||
-        (Math.abs(xShift) > av.getEndRes() - av.getStartRes()
-         || Math.abs(yShift) > av.getEndSeq() - av.getStartSeq())
-        || av.getWrapAlignment()
-        || !fastPaint)
+    if (av.getWrapAlignment() || !fastPaint)
     {
-      // Either no shift at all, or shift greater than visible amount
       repaint();
     }
     else
     {
-      idPanel.idCanvas.fastPaint(yShift);
-      seqPanel.seqCanvas.fastPaint(xShift, yShift);
-
-      scalePanel.repaint();
-
-      if (av.getShowAnnotation())
+      // Make sure we're not trying to draw a panel
+      // larger than the visible window
+      if(scrollX>av.endRes-av.startRes)
+        scrollX = av.endRes-av.startRes;
+      else if(scrollX<av.startRes-av.endRes)
+        scrollX = av.startRes - av.endRes;
+
+      if(scrollX!=0 || scrollY!=0)
       {
-        annotationPanel.fastPaint(xShift);
+        idPanel.idCanvas.fastPaint(scrollY);
+        seqPanel.seqCanvas.fastPaint(scrollX,
+                                     scrollY);
+        scalePanel.repaint();
+
+        if (av.getShowAnnotation())
+        {
+          annotationPanel.fastPaint(scrollX);
+        }
       }
     }
   }
@@ -657,6 +672,9 @@ public class AlignmentPanel extends GAlignmentPanel
     Color currentColor = null;
     Color currentTextColor = null;
 
+    pg.setFont(new Font(av.getFont().getName(),
+                        Font.ITALIC,
+                        av.getFont().getSize()));
     for (int i = startSeq; i < endSeq; i++)
     {
       if ( (av.getSelectionGroup() != null) &&
@@ -686,16 +704,17 @@ public class AlignmentPanel extends GAlignmentPanel
                     (av.getCharHeight() / 5));
     }
 
+    pg.setFont(av.getFont());
+
     // draw main sequence panel
     pg.translate(idWidth, 0);
-    seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq,
-                                 startRes, startSeq, 0);
+    seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq, 0);
 
     if (av.showAnnotation && (endSeq == av.alignment.getHeight()))
     {
-      pg.translate( -idWidth, (endSeq - startSeq) * av.charHeight + 3);
+      pg.translate( -idWidth-3, (endSeq - startSeq) * av.charHeight + 3);
       alabels.drawComponent( (Graphics2D) pg, idWidth);
-      pg.translate(idWidth, 0);
+      pg.translate(idWidth+3, 0);
       annotationPanel.drawComponent( (Graphics2D) pg, startRes, endRes +
                                     1);
     }
@@ -773,14 +792,14 @@ public class AlignmentPanel extends GAlignmentPanel
       }
       if (labels != null)
       {
-        pg.translate(0,
+        pg.translate(-3,
                      ypos +
                      (av.getAlignment().getHeight() * av.charHeight));
 
         pg.setFont(av.getFont());
         labels.drawComponent(pg, idWidth);
         pg.setFont(italic);
-        pg.translate(0,
+        pg.translate(+3,
                      -ypos -
                      (av.getAlignment().getHeight() * av.charHeight));
       }
@@ -841,15 +860,19 @@ public class AlignmentPanel extends GAlignmentPanel
       if (av.getWrapAlignment())
       {
         if(im.getGraphics()!=null)
+        {
           printWrappedAlignment(im.getGraphics(), width, height, 0);
+          im.writeImage();
+        }
       }
       else
       {
         if(im.getGraphics()!=null)
+        {
           printUnwrapped(im.getGraphics(), width, height, 0);
+          im.writeImage();
+        }
       }
-
-      im.writeImage();
     }
     catch (OutOfMemoryError err)
     {
@@ -916,7 +939,7 @@ public class AlignmentPanel extends GAlignmentPanel
           sy = s * av.charHeight + scaleHeight;
 
           SequenceI seq = av.alignment.getSequenceAt(s);
-          java.util.Vector features = seq.getDatasetSequence().getSequenceFeatures();
+          SequenceFeature [] features = seq.getDatasetSequence().getSequenceFeatures();
           SequenceGroup[] groups = av.alignment.findAllGroups(seq);
           for(res =0; res<alwidth; res++)
           {
@@ -963,33 +986,32 @@ public class AlignmentPanel extends GAlignmentPanel
                   + " onMouseOver=\"toolTip('"
                   + alIndex + " " + triplet );
               }
-                fSize = features.size();
+                fSize = features.length;
                 for (f = 0; f < fSize; f++)
                 {
-                  SequenceFeature sf = (SequenceFeature) features.elementAt(f);
 
-                  if ( (sf.getBegin() <= seq.findPosition(res)) &&
-                      (sf.getEnd() >= seq.findPosition(res)))
+                  if ( (features[f].getBegin() <= seq.findPosition(res)) &&
+                      (features[f].getEnd() >= seq.findPosition(res)))
                   {
-                    if (sf.getType().equals("disulfide bond"))
+                    if (features[f].getType().equals("disulfide bond"))
                     {
-                      if (sf.getBegin() == seq.findPosition(res)
-                          || sf.getEnd() == seq.findPosition(res))
+                      if (features[f].getBegin() == seq.findPosition(res)
+                          || features[f].getEnd() == seq.findPosition(res))
                       {
-                        text.append("<br>disulfide bond " + sf.getBegin() + ":" +
-                                       sf.getEnd());
+                        text.append("<br>disulfide bond " + features[f].getBegin() + ":" +
+                                       features[f].getEnd());
                       }
                     }
                     else
                     {
                       text.append("<br>");
-                      text.append(sf.getType());
-                      if (sf.getDescription() != null && !sf.getType().equals(sf.getDescription()))
-                        text.append(" " + sf.getDescription());
+                      text.append(features[f].getType());
+                      if (features[f].getDescription() != null && !features[f].getType().equals(features[f].getDescription()))
+                        text.append(" " + features[f].getDescription());
 
-                      if (sf.getStatus() != null && sf.getStatus().length()>0)
+                      if (features[f].getStatus() != null && features[f].getStatus().length()>0)
                       {
-                        text.append(" (" + sf.getStatus() + ")");
+                        text.append(" (" + features[f].getStatus() + ")");
                       }
                     }
                   }