idwidth is calculated in alignpanel, not idcanvas

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

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 11d99d8..a526fb1 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -10,7 +10,6 @@ public class IdCanvas extends JPanel
 {\r
   protected AlignViewport av;\r
 \r
-  public boolean paintFlag   = false;\r
   protected boolean showScores  = true;\r
 \r
   protected int     maxIdLength = -1;\r
@@ -23,29 +22,35 @@ public class IdCanvas extends JPanel
     PaintRefresher.Register(this);\r
   }\r
 \r
-  public void drawIdString(Graphics gg,SequenceI ds,int i, int starty, int ypos) {\r
+  public void drawIdString(Graphics gg,SequenceI s,int i, int starty, int ypos) {\r
       int charHeight = av.getCharHeight();\r
 \r
-      if (av.getSelection().contains(ds)) {\r
+\r
+      if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(s)) {\r
          gg.setColor(Color.lightGray);\r
          gg.fillRect(0,AlignmentUtil.getPixelHeight(starty,i,charHeight)+ ypos,getWidth(),charHeight);\r
          gg.setColor(Color.white);\r
       } else {\r
-         gg.setColor(ds.getColor());\r
+         gg.setColor(s.getColor());\r
          gg.fillRect(0,AlignmentUtil.getPixelHeight(starty,i,charHeight)+ ypos,getWidth(),charHeight);\r
          gg.setColor(Color.black);\r
       }\r
 \r
-      String string = ds.getName() + "/" + ds.getStart() + "-" + ds.getEnd();\r
+      String string = s.getName();\r
+      if(av.getShowFullId())\r
+        string = s.getDisplayId();\r
 \r
       gg.drawString(string,0,AlignmentUtil.getPixelHeight(starty,i,charHeight) + ypos + charHeight-   (charHeight/5));\r
 \r
   }\r
 \r
   public void paintComponent(Graphics gg) {\r
-    AlignmentI da         = av.getAlignment();\r
-    int        charHeight = av.getCharHeight();\r
-    gg.setFont(av.getFont());\r
+    AlignmentI al         = av.alignment;\r
+    int        charHeight = av.charHeight;\r
+    Font italic = new Font(av.getFont().getName(), Font.ITALIC, av.getFont().getSize());\r
+\r
+    gg.setFont(italic);\r
+\r
 \r
     //Fill in the background\r
     gg.setColor(Color.white);\r
@@ -56,20 +61,20 @@ public class IdCanvas extends JPanel
 \r
     //Which ids are we printing\r
     int starty = av.getStartSeq();\r
-    int endy   = da.getHeight();\r
+    int endy   = av.endSeq;\r
 \r
     if (av.getWrapAlignment())\r
     {\r
           // Draw the rest of the panels\r
-          int chunkHeight =  (da.getHeight() + 2)*av.charHeight;\r
+          int chunkHeight =  (al.getHeight() + 2)*av.charHeight;\r
           int row = av.getStartRes() / av.chunkWidth ;\r
           for(int ypos=2*av.charHeight;\r
-              ypos <= getHeight() && row*av.chunkWidth<da.getWidth();\r
+              ypos <= getHeight() && row*av.chunkWidth<al.getWidth();\r
               ypos += chunkHeight, row++ )\r
           {\r
-            for (int i = starty; i < endy; i++)\r
+            for (int i = starty; i < av.alignment.getHeight(); i++)\r
             {\r
-              SequenceI s = da.getSequenceAt(i);\r
+              SequenceI s = al.getSequenceAt(i);\r
               drawIdString(gg, s, i, 0, ypos);\r
             }\r
           }\r
@@ -82,14 +87,16 @@ public class IdCanvas extends JPanel
       for (int i = starty; i < endy; i++)\r
       {\r
         // Selected sequence colours\r
-        if (av.getSelection().contains(da.getSequenceAt(i)))\r
+\r
+        if (av.getSelectionGroup()!= null && av.getSelectionGroup().sequences.contains(al.getSequenceAt(i)))\r
         {\r
+       //   if(av.alignment.findGroup(al.getSequenceAt(i)).getEndRes()==\r
           currentColor = Color.lightGray;\r
           currentTextColor = Color.black;\r
         }\r
         else\r
         {\r
-          currentColor = da.getSequenceAt(i).getColor();\r
+          currentColor = al.getSequenceAt(i).getColor();\r
           currentTextColor = Color.black;\r
         }\r
 \r
@@ -101,7 +108,9 @@ public class IdCanvas extends JPanel
                     charHeight);\r
 \r
         gg.setColor(currentTextColor);\r
-        String string = da.getSequenceAt(i).getDisplayId();\r
+        String string = al.getSequenceAt(i).getName();\r
+        if(av.getShowFullId())\r
+          string = al.getSequenceAt(i).getDisplayId();\r
         gg.drawString(string, 0,\r
                       AlignmentUtil.getPixelHeight(starty, i, charHeight) +\r
                       charHeight - (charHeight / 5));\r
@@ -109,35 +118,4 @@ public class IdCanvas extends JPanel
     }\r
 \r
   }\r
-\r
-\r
-  public Dimension getLabelWidth()\r
-  {\r
-    if(getGraphics()==null)\r
-      return null;\r
-\r
-   FontMetrics fm = this.getGraphics().getFontMetrics(av.font);\r
-   AlignmentI al = av.getAlignment();\r
-\r
-   int i   = 0;\r
-   int idWidth = 0;\r
-\r
-   while (i < al.getHeight() && al.getSequenceAt(i) != null)\r
-   {\r
-     SequenceI s   = al.getSequenceAt(i);\r
-     String str   = s.getDisplayId();\r
-     if (fm.stringWidth(str) > idWidth)\r
-       idWidth = fm.stringWidth(str);\r
-     i++;\r
-   }\r
-\r
-   return new Dimension(idWidth + 10,getHeight());\r
- }\r
-\r
- public Dimension getPreferredSize()\r
- {\r
-   return getLabelWidth();\r
- }\r
-\r
-\r
 }\r