tooltips

[jalview.git] / src / jalview / gui / IdCanvas.java

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