JAL-974 set GlobPlot raw/smooth score annotation rows to be hidden by default

diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java
index ef6752f..c5d0bc0 100644 (file)
--- a/src/jalview/ws/jws2/AADisorderClient.java
+++ b/src/jalview/ws/jws2/AADisorderClient.java
@@ -63,6 +63,7 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
   private static Map<String, Map<String, Map<String, Object>>> annotMap;
 
   private static String DONTCOMBINE = "DONTCOMBINE";
+  private static String INVISIBLE = "INVISIBLE";
   static
   {
     featureMap = new HashMap<String, Map<String, String[]>>();
@@ -93,6 +94,10 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
             amap = new HashMap<String, Map<String, Object>>());
     amap.put("Dydx", new HashMap<String, Object>());
     amap.get("Dydx").put(DONTCOMBINE, DONTCOMBINE);
+    amap.put("SmoothedScore", new HashMap<String, Object>());
+    amap.get("SmoothedScore").put(INVISIBLE,INVISIBLE);
+    amap.put("RawScore", new HashMap<String, Object>());
+    amap.get("RawScore").put(INVISIBLE,INVISIBLE);
     annotMap.put(compbio.ws.client.Services.DisemblWS.toString(),
             amap = new HashMap<String, Map<String, Object>>());
     
@@ -188,6 +193,8 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
                             + ")", service.getServiceTypeURI()+"/"+ scr.getMethod(), aseq,
                     base, scr);
             annot.graph = AlignmentAnnotation.LINE_GRAPH;
+            annot.visible = (annotTypeMap==null || annotTypeMap.get(scr.getMethod())==null || annotTypeMap.get(scr.getMethod()).get(INVISIBLE) == null);
+
             if (annotTypeMap==null || annotTypeMap.get(scr.getMethod())==null || annotTypeMap.get(scr.getMethod()).get(DONTCOMBINE) == null)
             {
               {
@@ -200,6 +207,7 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
                 annot.graphGroup = graphGroup;
               }
             }
+            
             annot.description = service.getActionText() + " - raw scores";
             Color col = new UserColourScheme(typeName)
                     .createColourFromName(typeName + scr.getMethod());