X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=a4b7f06bef72dfbd9d385662896aaecb5ef6c41e;hb=cd71fb9ef1a21678ad648ba13564b658b53ab834;hp=c5789fe0ba3eb555cd9b318a920c3597e376baf1;hpb=de468b0bf50850a89c6a8a7acfa4ff5b689ffed1;p=jalview.git

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index c5789fe..a4b7f06 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -40,7 +40,7 @@ public class OverviewPanel
   // Can set different properties in this seqCanvas than
   // main visible SeqCanvas
   SequenceRenderer sr;
-  //FeatureRenderer fr;
+  FeatureRenderer fr;
 
 
   Frame nullFrame;
@@ -57,9 +57,9 @@ public class OverviewPanel
     sr = new SequenceRenderer(av);
     sr.graphics = nullFrame.getGraphics();
     sr.renderGaps( false );
-    //fr = new FeatureRenderer(av);
-    //fr.transparency = ap.seqPanel.seqCanvas.getFeatureRenderer().transparency;
-    //fr.featuresDisplayed = ap.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed;
+    sr.forOverview = true;
+    fr = new FeatureRenderer(av);
+    fr.overview = true;
 
 
 
@@ -184,6 +184,12 @@ public class OverviewPanel
         return;
     }
 
+    if (av.showSequenceFeatures)
+   {
+     fr.featureGroups = ap.seqPanel.seqCanvas.getFeatureRenderer().featureGroups;
+     fr.featureColours = ap.seqPanel.seqCanvas.getFeatureRenderer().featureColours;
+   }
+
     resizing = true;
 
     if ( (getSize().width > 0) && (getSize().height > 0))
@@ -209,6 +215,14 @@ public class OverviewPanel
     int alwidth = av.alignment.getWidth();
     int alheight = av.alignment.getHeight();
 
+    if (av.showSequenceFeatures)
+    {
+      fr.renderOrder = ap.seqPanel.seqCanvas.getFeatureRenderer().renderOrder;
+      fr.featureGroups = ap.seqPanel.seqCanvas.getFeatureRenderer().featureGroups;
+      fr.featureColours = ap.seqPanel.seqCanvas.getFeatureRenderer().featureColours;
+      fr.sequenceFeatures = ap.seqPanel.seqCanvas.getFeatureRenderer().sequenceFeatures;
+    }
+
     if (getSize().width > 0 && getSize().height > 0)
     {
       width = getSize().width;
@@ -229,28 +243,65 @@ public class OverviewPanel
     float sampleCol = (float) alwidth / (float) width;
     float sampleRow = (float) alheight / (float) sequencesHeight;
 
-    int lastcol=-1, lastrow=-1;
-    Color color = Color.white;
-    for (int col = 0; col < width; col++)
+    int lastcol=0, lastseq=0;
+    int xstart=0, ystart=0;
+    Color color = Color.yellow;
+    int col, sameRow = 0, sameCol = 0;
+    jalview.datamodel.SequenceI sequence;
+
+    for (int row = 0; row <= sequencesHeight; row++)
     {
-      for (int row = 0; row < sequencesHeight; row++)
+      if((int)(row*sampleRow)==lastseq)
       {
-        if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow)
+        sameRow ++;
+        continue;
+      }
+
+      sequence = av.getAlignment().getSequenceAt(lastseq);
+
+      for (col = 0; col < width; col++)
+      {
+        if((int)(col*sampleCol) == lastcol)
         {
-          mg.setColor(color);
-          mg.fillRect(col,row,1,1);
+          sameCol ++;
           continue;
         }
 
-        lastrow = (int)(row*sampleRow);
         lastcol = (int)(col*sampleCol);
 
-        color = sr.findSequenceColour(av.alignment.getSequenceAt(lastrow), lastcol);
+        if(sequence.getLength()>lastcol)
+        {
+          color = sr.findSequenceColour(sequence, lastcol);
+
+          if (av.showSequenceFeatures)
+            color = fr.findFeatureColour(color,
+                                        sequence,
+                                        lastcol);
+        }
+        else
+          color = color.white;
 
         mg.setColor(color);
-        mg.fillRect(col,row,1,1);
+        if (sameCol == 1 && sameRow == 1)
+          mg.drawLine(xstart, ystart, xstart, ystart);
+        else
+          mg.fillRect(xstart, ystart, sameCol, sameRow);
+
+        xstart = col;
+        sameCol = 1;
+      }
+
+
+      lastseq = (int)(row*sampleRow);
+      ystart = row;
+      sameRow = 1;
+    }
 
-        if (av.conservation != null)
+    if (av.conservation != null)
+    {
+      for (col = 0; col < width; col++)
+      {
+        lastcol = (int) (col * sampleCol);
         {
           mg.translate(col, sequencesHeight);
           ap.annotationPanel.drawGraph(mg, av.conservation,
@@ -258,11 +309,13 @@ public class OverviewPanel
                                        graphHeight,
                                        (int) (col * sampleCol),
                                        (int) (col * sampleCol) + 1);
-          mg.translate(-col, -sequencesHeight);
+          mg.translate( -col, -sequencesHeight);
         }
       }
     }
 
+
+
     System.gc();
 
     resizing = false;