X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=71cc48344d6380a0038dc8e8337b0aaee04245dd;hb=454688abf087254742210ace4c82bedc918e7590;hp=d1f130bffe41ff97b6d7750e745e0e8ee6b4f86c;hpb=b69e028fe41a867e72cda2a6d69182ff0c6bd90e;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index d1f130b..71cc483 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -46,6 +46,7 @@ public class IdCanvas extends JPanel
     FontMetrics fm;
     AnnotationLabels labels = null;
     AnnotationPanel ap;
+    Font idfont;
 
     /**
      * Creates a new IdCanvas object.
@@ -82,7 +83,7 @@ public class IdCanvas extends JPanel
             gg.setColor(Color.white);
         }
         else if ((av.getSelectionGroup() != null) &&
-                av.getSelectionGroup().getSequences(false).contains(s))
+                av.getSelectionGroup().getSequences(null).contains(s))
         {
             gg.setColor(Color.lightGray);
             gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
@@ -219,10 +220,13 @@ public class IdCanvas extends JPanel
      */
     void drawIds(int starty, int endy)
     {
-      Font italic = new Font(av.getFont().getName(), Font.ITALIC,
+     if(av.seqNameItalics)
+      idfont = new Font(av.getFont().getName(), Font.ITALIC,
                              av.getFont().getSize());
+    else
+      idfont = av.getFont();
 
-      gg.setFont(italic);
+      gg.setFont(idfont);
       fm = gg.getFontMetrics();
 
       if (av.antiAlias)
@@ -271,14 +275,14 @@ public class IdCanvas extends JPanel
             {
               for (int i = starty; i < alheight; i++)
               {
+                SequenceI s = av.alignment.getSequenceAt(i);
                 if (av.hasHiddenRows)
                 {
-                  setHiddenFont(i);
+                  setHiddenFont(s);
                 }
                 else
-                  gg.setFont(italic);
+                  gg.setFont(idfont);
 
-                SequenceI s = av.alignment.getSequenceAt(i);
                 drawIdString(gg, s, i, 0, ypos);
               }
 
@@ -310,7 +314,7 @@ public class IdCanvas extends JPanel
 
               if (av.hasHiddenRows)
               {
-                setHiddenFont(i);
+                setHiddenFont(sequence);
               }
 
                 // Selected sequence colours
@@ -321,7 +325,7 @@ public class IdCanvas extends JPanel
                   currentTextColor = Color.white;
                 }
                 else if ( (av.getSelectionGroup() != null) &&
-                         av.getSelectionGroup().getSequences(false).contains(
+                         av.getSelectionGroup().getSequences(null).contains(
                              sequence))
                 {
                   currentColor = Color.lightGray;
@@ -419,19 +423,17 @@ public class IdCanvas extends JPanel
         }
     }
 
-    void setHiddenFont(int i)
+    void setHiddenFont(SequenceI seq)
     {
-      Font italic = new Font(av.getFont().getName(), Font.ITALIC,
-                             av.getFont().getSize());
       Font bold = new Font(av.getFont().getName(), Font.BOLD,
                            av.getFont().getSize());
 
 
-      if (av.alignment.getSequenceAt(i)!=null
-          && av.alignment.getSequenceAt(i).getHiddenSequences() != null)
+      if (av.hiddenRepSequences!=null &&
+          av.hiddenRepSequences.containsKey(seq))
         gg.setFont(bold);
       else
-        gg.setFont(italic);
+        gg.setFont(idfont);
     }
 
     /**