profile visualizations are now logos

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 88f438e..f8ad900 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -201,7 +201,7 @@ public class Preferences extends GPreferences
     showGroupConsensus.setSelected(Cache.getDefault("SHOW_GROUP_CONSENSUS",false));
     showGroupConservation.setSelected(Cache.getDefault("SHOW_GROUP_CONSERVATION", false));
     showConsensHistogram.setSelected(Cache.getDefault("SHOW_CONSENSUS_HISTOGRAM",true));
-    showConsensProfile.setSelected(Cache.getDefault("SHOW_CONSENSUS_PROFILE",false));
+    showConsensLogo.setSelected(Cache.getDefault("SHOW_CONSENSUS_LOGO",false));
     
     padGaps.setSelected(Cache.getDefault("PAD_GAPS", false));
 
@@ -285,7 +285,7 @@ public class Preferences extends GPreferences
     Cache.applicationProperties.setProperty("SHOW_GROUP_CONSENSUS",Boolean.toString(showGroupConsensus.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_GROUP_CONSERVATION",Boolean.toString(showGroupConservation.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_CONSENSUS_HISTOGRAM",Boolean.toString(showConsensHistogram.isSelected()));
-    Cache.applicationProperties.setProperty("SHOW_CONSENSUS_PROFILE",Boolean.toString(showConsensProfile.isSelected()));
+    Cache.applicationProperties.setProperty("SHOW_CONSENSUS_LOGO",Boolean.toString(showConsensLogo.isSelected()));
     Cache.applicationProperties.setProperty("ANTI_ALIAS", Boolean
             .toString(smoothFont.isSelected()));
 
@@ -476,10 +476,10 @@ public class Preferences extends GPreferences
     conservation.setEnabled(annotations.isSelected());
     quality.setEnabled(annotations.isSelected());
     identity.setEnabled(annotations.isSelected());
-    showConsensHistogram.setEnabled(annotations.isSelected());
-    showConsensProfile.setEnabled(annotations.isSelected());
     showGroupConsensus.setEnabled(annotations.isSelected());
     showGroupConservation.setEnabled(annotations.isSelected());
+    showConsensHistogram.setEnabled(annotations.isSelected() && (identity.isSelected() || showGroupConsensus.isSelected()));
+    showConsensLogo.setEnabled(annotations.isSelected() && (identity.isSelected() || showGroupConsensus.isSelected()));
   }
 
   public void newLink_actionPerformed(ActionEvent e)