X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FAADisorderClient.java;h=a70689648c5399bb0a8df83de6d7e649b4b2634c;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=c5fbf499785352c0db19900f93dc2a495f73513e;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java index c5fbf49..a706896 100644 --- a/src/jalview/ws/jws2/AADisorderClient.java +++ b/src/jalview/ws/jws2/AADisorderClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,15 +20,15 @@ */ package jalview.ws.jws2; -import jalview.api.AlignCalcWorkerI; -import jalview.bin.Cache; +import jalview.api.FeatureColourI; +import jalview.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.GraphLine; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; -import jalview.schemes.GraduatedColor; -import jalview.schemes.UserColourScheme; +import jalview.schemes.FeatureColour; +import jalview.util.ColorUtils; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.WsParamSetI; @@ -40,16 +40,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import compbio.data.sequence.FastaSequence; import compbio.data.sequence.Range; import compbio.data.sequence.Score; import compbio.data.sequence.ScoreManager.ScoreHolder; import compbio.metadata.Argument; -public class AADisorderClient extends JabawsCalcWorker implements - AlignCalcWorkerI +public class AADisorderClient extends JabawsCalcWorker { private static final String THRESHOLD = "THRESHOLD"; + private static final String RANGE = "RANGE"; String typeName; @@ -61,9 +62,9 @@ public class AADisorderClient extends JabawsCalcWorker implements AlignFrame af; public AADisorderClient(Jws2Instance sh, AlignFrame alignFrame, - WsParamSetI preset, List paramset) + WsParamSetI thePreset, List paramset) { - super(sh, alignFrame, preset, paramset); + super(sh, alignFrame, thePreset, paramset); af = alignFrame; typeName = sh.action; methodName = sh.serviceType; @@ -81,6 +82,12 @@ public class AADisorderClient extends JabawsCalcWorker implements return "Submitting amino acid sequences for disorder prediction."; } + @Override + boolean checkValidInputSeqs(boolean dynamic, List seqs) + { + return (seqs.size() > 0); + } + private static Map> featureMap; private static Map>> annotMap; @@ -92,82 +99,67 @@ public class AADisorderClient extends JabawsCalcWorker implements { // TODO: turn this into some kind of configuration file that's a bit easier // to edit - featureMap = new HashMap>(); + featureMap = new HashMap<>(); Map fmap; featureMap.put(compbio.ws.client.Services.IUPredWS.toString(), - fmap = new HashMap()); - fmap.put("Glob", new String[] - { "Globular Domain", "Predicted globular domain" }); + fmap = new HashMap<>()); + fmap.put("Glob", + new String[] + { "Globular Domain", "Predicted globular domain" }); featureMap.put(compbio.ws.client.Services.JronnWS.toString(), - fmap = new HashMap()); + fmap = new HashMap<>()); featureMap.put(compbio.ws.client.Services.DisemblWS.toString(), - fmap = new HashMap()); - fmap.put("REM465", new String[] - { "REM465", "Missing density" }); - fmap.put("HOTLOOPS", new String[] - { "HOTLOOPS", "Flexible loops" }); - fmap.put("COILS", new String[] - { "COILS", "Random coil" }); + fmap = new HashMap<>()); + fmap.put("REM465", new String[] { "REM465", "Missing density" }); + fmap.put("HOTLOOPS", new String[] { "HOTLOOPS", "Flexible loops" }); + fmap.put("COILS", new String[] { "COILS", "Random coil" }); featureMap.put(compbio.ws.client.Services.GlobPlotWS.toString(), - fmap = new HashMap()); - fmap.put("GlobDoms", new String[] - { "Globular Domain", "Predicted globular domain" }); - fmap.put("Disorder", new String[] - { "Protein Disorder", "Probable unstructured peptide region" }); + fmap = new HashMap<>()); + fmap.put("GlobDoms", + new String[] + { "Globular Domain", "Predicted globular domain" }); + fmap.put("Disorder", + new String[] + { "Protein Disorder", "Probable unstructured peptide region" }); Map> amap; - annotMap = new HashMap>>(); + annotMap = new HashMap<>(); annotMap.put(compbio.ws.client.Services.GlobPlotWS.toString(), - amap = new HashMap>()); + amap = new HashMap<>()); amap.put("Dydx", new HashMap()); amap.get("Dydx").put(DONTCOMBINE, DONTCOMBINE); - amap.get("Dydx").put(THRESHOLD, new double[] - { 1, 0 }); - amap.get("Dydx").put(RANGE, new float[] - { -1, +1 }); + amap.get("Dydx").put(THRESHOLD, new double[] { 1, 0 }); + amap.get("Dydx").put(RANGE, new float[] { -1, +1 }); amap.put("SmoothedScore", new HashMap()); amap.get("SmoothedScore").put(INVISIBLE, INVISIBLE); amap.put("RawScore", new HashMap()); amap.get("RawScore").put(INVISIBLE, INVISIBLE); annotMap.put(compbio.ws.client.Services.DisemblWS.toString(), - amap = new HashMap>()); + amap = new HashMap<>()); amap.put("COILS", new HashMap()); amap.put("HOTLOOPS", new HashMap()); amap.put("REM465", new HashMap()); - amap.get("COILS").put(THRESHOLD, new double[] - { 1, 0.516 }); - amap.get("COILS").put(RANGE, new float[] - { 0, 1 }); - - amap.get("HOTLOOPS").put(THRESHOLD, new double[] - { 1, 0.6 }); - amap.get("HOTLOOPS").put(RANGE, new float[] - { 0, 1 }); - amap.get("REM465").put(THRESHOLD, new double[] - { 1, 0.1204 }); - amap.get("REM465").put(RANGE, new float[] - { 0, 1 }); + amap.get("COILS").put(THRESHOLD, new double[] { 1, 0.516 }); + amap.get("COILS").put(RANGE, new float[] { 0, 1 }); + amap.get("HOTLOOPS").put(THRESHOLD, new double[] { 1, 0.6 }); + amap.get("HOTLOOPS").put(RANGE, new float[] { 0, 1 }); + amap.get("REM465").put(THRESHOLD, new double[] { 1, 0.1204 }); + amap.get("REM465").put(RANGE, new float[] { 0, 1 }); annotMap.put(compbio.ws.client.Services.IUPredWS.toString(), - amap = new HashMap>()); + amap = new HashMap<>()); amap.put("Long", new HashMap()); amap.put("Short", new HashMap()); - amap.get("Long").put(THRESHOLD, new double[] - { 1, 0.5 }); - amap.get("Long").put(RANGE, new float[] - { 0, 1 }); - amap.get("Short").put(THRESHOLD, new double[] - { 1, 0.5 }); - amap.get("Short").put(RANGE, new float[] - { 0, 1 }); + amap.get("Long").put(THRESHOLD, new double[] { 1, 0.5 }); + amap.get("Long").put(RANGE, new float[] { 0, 1 }); + amap.get("Short").put(THRESHOLD, new double[] { 1, 0.5 }); + amap.get("Short").put(RANGE, new float[] { 0, 1 }); annotMap.put(compbio.ws.client.Services.JronnWS.toString(), - amap = new HashMap>()); + amap = new HashMap<>()); amap.put("JRonn", new HashMap()); - amap.get("JRonn").put(THRESHOLD, new double[] - { 1, 0.5 }); - amap.get("JRonn").put(RANGE, new float[] - { 0, 1 }); + amap.get("JRonn").put(THRESHOLD, new double[] { 1, 0.5 }); + amap.get("JRonn").put(RANGE, new float[] { 0, 1 }); } @Override @@ -181,8 +173,8 @@ public class AADisorderClient extends JabawsCalcWorker implements Map> annotTypeMap = annotMap .get(service.serviceType); boolean dispFeatures = false; - Map fc = new Hashtable(); - List ourAnnot = new ArrayList(); + Map fc = new Hashtable<>(); + List ourAnnot = new ArrayList<>(); /** * grouping for any annotation rows created */ @@ -203,27 +195,26 @@ public class AADisorderClient extends JabawsCalcWorker implements { boolean sameGroup = false; SequenceI dseq, aseq, seq = seqNames.get(seqId); - int base = seq.findPosition(start)-1; + int base = seq.findPosition(start) - 1; aseq = seq; while ((dseq = seq).getDatasetSequence() != null) { seq = seq.getDatasetSequence(); } ScoreHolder scores = null; - try { + try + { scores = scoremanager.getAnnotationForSequence(seqId); } catch (Exception q) { - Cache.log - .info("Couldn't recover disorder prediction for sequence " - + seq.getName() - + "(Prediction name was " - + seqId+")" - + "\nSee http://issues.jalview.org/browse/JAL-1319 for one possible reason why disorder predictions might fail."); + Console.info("Couldn't recover disorder prediction for sequence " + + seq.getName() + "(Prediction name was " + seqId + ")" + + "\nSee http://issues.jalview.org/browse/JAL-1319 for one possible reason why disorder predictions might fail."); } float last = Float.NaN, val = Float.NaN; int lastAnnot = ourAnnot.size(); - if (scores!=null && scores.scores!=null) { + if (scores != null && scores.scores != null) + { for (Score scr : scores.scores) { @@ -239,23 +230,23 @@ public class AADisorderClient extends JabawsCalcWorker implements if (type == null) { // create a default type for this feature - type = new String[] - { typeName + " (" + scr.getMethod() + ")", + type = new String[] { + typeName + " (" + scr.getMethod() + ")", service.getActionText() }; } if (vals.hasNext()) { - sf = new SequenceFeature(type[0], type[1], - base + rn.from, base + rn.to, val = vals.next() - .floatValue(), methodName); + val = vals.next().floatValue(); + sf = new SequenceFeature(type[0], type[1], base + rn.from, + base + rn.to, val, methodName); } else { - sf = new SequenceFeature(type[0], type[1], null, base - + rn.from, base + rn.to, methodName); + sf = new SequenceFeature(type[0], type[1], base + rn.from, + base + rn.to, methodName); } dseq.addSequenceFeature(sf); - if (last != val && last != Float.NaN) + if (last != val && !Float.isNaN(last)) { fc.put(sf.getType(), sf); } @@ -269,27 +260,31 @@ public class AADisorderClient extends JabawsCalcWorker implements { continue; } + String typename, calcName; AlignmentAnnotation annot = createAnnotationRowsForScores( ourAnnot, - service.serviceType + " (" + scr.getMethod() + ")", - service.getServiceTypeURI() + "/" + scr.getMethod(), + typename = service.serviceType + " (" + + scr.getMethod() + ")", + calcName = service.getServiceTypeURI() + "/" + + scr.getMethod(), aseq, base + 1, scr); annot.graph = AlignmentAnnotation.LINE_GRAPH; - - Map styleMap = (annotTypeMap == null) ? null : annotTypeMap.get(scr.getMethod()); - - annot.visible = (styleMap == null || styleMap.get(INVISIBLE) == null); - double[] thrsh = (styleMap==null) ? null - : (double[]) styleMap.get( - THRESHOLD); - float[] range = (styleMap==null) ? null : (float[]) styleMap.get( - RANGE); - if (range!=null) + + Map styleMap = (annotTypeMap == null) ? null + : annotTypeMap.get(scr.getMethod()); + + annot.visible = (styleMap == null + || styleMap.get(INVISIBLE) == null); + double[] thrsh = (styleMap == null) ? null + : (double[]) styleMap.get(THRESHOLD); + float[] range = (styleMap == null) ? null + : (float[]) styleMap.get(RANGE); + if (range != null) { annot.graphMin = range[0]; annot.graphMax = range[1]; } - if (styleMap==null || styleMap.get(DONTCOMBINE) == null) + if (styleMap == null || styleMap.get(DONTCOMBINE) == null) { { if (!sameGroup) @@ -313,7 +308,7 @@ public class AADisorderClient extends JabawsCalcWorker implements annot.description += "
" + threshNote; } annot.description += ""; - Color col = new UserColourScheme(typeName) + Color col = ColorUtils .createColourFromName(typeName + scr.getMethod()); for (int p = 0, ps = annot.annotations.length; p < ps; p++) { @@ -323,6 +318,9 @@ public class AADisorderClient extends JabawsCalcWorker implements } } annot._linecolour = col; + // finally, update any dataset annotation + replaceAnnotationOnAlignmentWith(annot, typename, calcName, + aseq); } } } @@ -335,17 +333,18 @@ public class AADisorderClient extends JabawsCalcWorker implements { if (dispFeatures) { - jalview.gui.FeatureRenderer fr = ((jalview.gui.AlignmentPanel) ap) + jalview.api.FeatureRenderer fr = ((jalview.gui.AlignmentPanel) ap) .cloneFeatureRenderer(); for (String ft : fc.keySet()) { - Object gc = fr.getFeatureStyle(ft); - if (gc instanceof Color) + FeatureColourI gc = fr.getFeatureStyle(ft); + if (gc.isSimpleColour()) { // set graduated color as fading to white for minimum, and // autoscaling to values on alignment - GraduatedColor ggc = new GraduatedColor(Color.white, - (Color) gc, Float.MIN_VALUE, Float.MAX_VALUE); + FeatureColourI ggc = new FeatureColour(gc.getColour(), + Color.white, gc.getColour(), Color.white, + Float.MIN_VALUE, Float.MAX_VALUE); ggc.setAutoScaled(true); fr.setColour(ft, ggc); } @@ -358,7 +357,6 @@ public class AADisorderClient extends JabawsCalcWorker implements // only do this if the alignFrame is currently showing this view. af.setShowSeqFeatures(true); } - ap.paintAlignment(true); } if (ourAnnot.size() > 0) { @@ -366,9 +364,17 @@ public class AADisorderClient extends JabawsCalcWorker implements // new alignment annotation rows created. updateOurAnnots(ourAnnot); ap.adjustAnnotationHeight(); + ap.paintAlignment(true, true); } } } } + @Override + public String getCalcId() + { + // Disorder predictions are not dynamically updated so we return null + return null; + } + }