SeqColoursReady boolean added

diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java
index d6247f4..346ae1e 100755 (executable)
--- a/src/MCview/AppletPDBCanvas.java
+++ b/src/MCview/AppletPDBCanvas.java
@@ -76,6 +76,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion
     boolean pdbAction = false;\r
     Bond highlightBond1, highlightBond2;\r
     boolean errorLoading = false;\r
+    boolean seqColoursReady = false;\r
 \r
     public AppletPDBCanvas(jalview.appletgui.SeqCanvas seqcanvas, Sequence seq)\r
     {\r
@@ -186,6 +187,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion
     Vector visiblebonds;\r
     void setupBonds()\r
     {\r
+      seqColoursReady = false;\r
       // Sort the bonds by z coord\r
       visiblebonds = new Vector();\r
 \r
@@ -202,6 +204,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion
         }\r
       }\r
       updateSeqColours();\r
+      seqColoursReady = true;\r
       redrawneeded = true;\r
       repaint();\r
     }\r
@@ -360,7 +363,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion
         g.drawString("Error loading PDB data!!", 50, getSize().height/2);\r
         return;\r
       }\r
-      else if(visiblebonds==null)\r
+      else if( !seqColoursReady )\r
       {\r
         g.setColor(Color.black);\r
         g.setFont(new Font("Verdana", Font.BOLD, 14));\r

diff --git a/src/MCview/PDBCanvas.java b/src/MCview/PDBCanvas.java
index 17db1a0..d5af60f 100755 (executable)
--- a/src/MCview/PDBCanvas.java
+++ b/src/MCview/PDBCanvas.java
@@ -72,6 +72,7 @@ public class PDBCanvas extends JPanel implements MouseListener, MouseMotionListe
     PDBChain mainchain;\r
     Vector highlightRes;\r
     boolean pdbAction = false;\r
+    boolean seqColoursReady = false;\r
 \r
     public PDBCanvas(jalview.gui.SeqCanvas seqcanvas, Sequence seq)\r
     {\r
@@ -198,6 +199,7 @@ public class PDBCanvas extends JPanel implements MouseListener, MouseMotionListe
     Vector visiblebonds;\r
     void setupBonds()\r
     {\r
+      seqColoursReady = false;\r
       // Sort the bonds by z coord\r
       visiblebonds = new Vector();\r
 \r
@@ -215,6 +217,7 @@ public class PDBCanvas extends JPanel implements MouseListener, MouseMotionListe
       }\r
 \r
       updateSeqColours();\r
+      seqColoursReady = true;\r
       redrawneeded = true;\r
       repaint();\r
     }\r
@@ -369,7 +372,7 @@ public class PDBCanvas extends JPanel implements MouseListener, MouseMotionListe
     {\r
       super.paintComponent(g);\r
 \r
-      if(visiblebonds==null)\r
+      if(!seqColoursReady)\r
       {\r
         g.setColor(Color.black);\r
         g.setFont(new Font("Verdana", Font.BOLD, 14));\r