getSequencesArray

[jalview.git] / src / jalview / appletgui / AlignViewport.java

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index bef5e1a..152966e 100755 (executable)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -36,6 +36,9 @@ public class AlignViewport
   int startSeq;\r
   int endSeq;\r
 \r
+\r
+  boolean cursorMode = false;\r
+\r
   boolean showJVSuffix = true;\r
   boolean showText = true;\r
   boolean showColourText = false;\r
@@ -60,6 +63,7 @@ public class AlignViewport
   int wrappedWidth;\r
 \r
   Font font = new Font("SansSerif", Font.PLAIN, 10);\r
+  boolean validCharWidth = true;\r
   AlignmentI alignment;\r
 \r
   ColumnSelection colSel = new ColumnSelection();\r
@@ -75,7 +79,7 @@ public class AlignViewport
 \r
   // The following vector holds the features which are\r
  // currently visible, in the correct order or rendering\r
-  Hashtable featuresDisplayed = null;\r
+  Hashtable featuresDisplayed;\r
 \r
 \r
   public Vector vconsensus;\r
@@ -83,6 +87,8 @@ public class AlignViewport
   AlignmentAnnotation conservation;\r
   AlignmentAnnotation quality;\r
 \r
+  boolean autocalculateConsensus = true;\r
+\r
   public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!\r
 \r
   private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(this);\r
@@ -417,12 +423,17 @@ public class AlignViewport
     return endSeq;\r
   }\r
 \r
+  java.awt.Frame nullFrame;\r
   public void setFont(Font f)\r
   {\r
     font = f;\r
-    java.awt.Frame temp = new java.awt.Frame();\r
-    temp.addNotify();\r
-    java.awt.FontMetrics fm = temp.getGraphics().getFontMetrics(font);\r
+    if(nullFrame == null)\r
+    {\r
+      nullFrame = new java.awt.Frame();\r
+      nullFrame.addNotify();\r
+    }\r
+\r
+    java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font);\r
     setCharHeight(fm.getHeight());\r
     setCharWidth(fm.charWidth('M'));\r
   }\r