vamsasDemo new branch

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 2922f09..f57e993 100755 (executable)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -86,6 +86,10 @@ public class AlignViewport
 \r
     boolean ignoreGapsInConsensusCalculation = false;\r
 \r
+    boolean showTranslation = false;\r
+\r
+    boolean isDataset = false;\r
+\r
     /**\r
      * Creates a new AlignViewport object.\r
      *\r
@@ -99,14 +103,7 @@ public class AlignViewport
         this.startSeq = 0;\r
         this.endSeq = al.getHeight() - 1;\r
 \r
-        updateFromPreferences();\r
-    }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public void updateFromPreferences()\r
-    {\r
       showFullId = Cache.getDefault("SHOW_FULL_ID", true);\r
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);\r
       showConservation = Cache.getDefault("SHOW_CONSERVATION", true);\r
@@ -137,9 +134,11 @@ public class AlignViewport
 \r
         // We must set conservation and consensus before setting colour,\r
         // as Blosum and Clustal require this to be done\r
-        updateConservation();\r
-\r
-        updateConsensus();\r
+        if(vconsensus==null)\r
+        {\r
+          updateConservation();\r
+          updateConsensus();\r
+        }\r
 \r
         if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)\r
         {\r
@@ -1058,4 +1057,24 @@ public class AlignViewport
     {\r
      return ignoreGapsInConsensusCalculation;\r
     }\r
+\r
+    public void showTranslation(boolean b)\r
+    {\r
+      this.showTranslation = b;\r
+    }\r
+\r
+    public boolean getShowTranslation()\r
+    {\r
+      return showTranslation;\r
+    }\r
+\r
+    public void setDataset(boolean b)\r
+    {\r
+      isDataset = b;\r
+    }\r
+\r
+    public boolean isDataset()\r
+    {\r
+      return isDataset;\r
+    }\r
 }\r