X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FAADisorderClient.java;h=3c19dc52f0e9eb7ff07e0c1150359fe81c1e6815;hb=d83db1c05bf39e076ce0cd53635bedf7e89afed1;hp=ef6752fd9be2400dd2505aff8d7da185915c47f7;hpb=af563e083b2a94e50f23d317f260fb734c52c266;p=jalview.git
diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java
index ef6752f..3c19dc5 100644
--- a/src/jalview/ws/jws2/AADisorderClient.java
+++ b/src/jalview/ws/jws2/AADisorderClient.java
@@ -1,9 +1,26 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ */
package jalview.ws.jws2;
import jalview.api.AlignCalcWorkerI;
-import jalview.bin.Cache;
import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.GraphLine;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
@@ -23,12 +40,13 @@ import compbio.data.sequence.Range;
import compbio.data.sequence.Score;
import compbio.data.sequence.ScoreManager.ScoreHolder;
import compbio.metadata.Argument;
-import compbio.ws.client.Services;
public class AADisorderClient extends JabawsAlignCalcWorker implements
AlignCalcWorkerI
{
+ private static final String THRESHOLD = "THRESHOLD";
+
String typeName;
String methodName;
@@ -63,8 +81,12 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
private static Map>> annotMap;
private static String DONTCOMBINE = "DONTCOMBINE";
+
+ private static String INVISIBLE = "INVISIBLE";
static
{
+ // TODO: turn this into some kind of configuration file that's a bit easier
+ // to edit
featureMap = new HashMap>();
Map fmap;
featureMap.put(compbio.ws.client.Services.IUPredWS.toString(),
@@ -93,9 +115,37 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
amap = new HashMap>());
amap.put("Dydx", new HashMap());
amap.get("Dydx").put(DONTCOMBINE, DONTCOMBINE);
+ amap.get("Dydx").put(THRESHOLD, new double[]
+ { 1, 0 });
+ 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.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("HOTLOOPS").put(THRESHOLD, new double[]
+ { 1, 0.6 });
+ amap.get("REM465").put(THRESHOLD, new double[]
+ { 1, 0.1204 });
+
+ annotMap.put(compbio.ws.client.Services.IUPredWS.toString(),
+ 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("Short").put(THRESHOLD, new double[]
+ { 1, 0.5 });
+ annotMap.put(compbio.ws.client.Services.JronnWS.toString(),
+ amap = new HashMap>());
+ amap.put("JRonn", new HashMap());
+ amap.get("JRonn").put(THRESHOLD, new double[]
+ { 1, 0.5 });
}
@Override
@@ -114,7 +164,7 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
/**
* grouping for any annotation rows created
*/
- int graphGroup = 1, iGraphGroup = 1;
+ int graphGroup = 1;
if (alignViewport.getAlignment().getAlignmentAnnotation() != null)
{
for (AlignmentAnnotation ala : alignViewport.getAlignment()
@@ -141,76 +191,102 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
ScoreHolder scores = scoremanager.getAnnotationForSequence(seqId);
float last = Float.NaN, val = Float.NaN;
int lastAnnot = ourAnnot.size();
- for (Score scr : scores.scores)
- {
-
- if (scr.getRanges() != null && scr.getRanges().size() > 0)
+ if (scores!=null && scores.scores!=null) {
+ for (Score scr : scores.scores)
{
- Iterator vals = scr.getScores().iterator();
- // make features on sequence
- for (Range rn : scr.getRanges())
- {
- SequenceFeature sf;
- String[] type = featureTypeMap.get(scr.getMethod());
- if (type == null)
+ if (scr.getRanges() != null && scr.getRanges().size() > 0)
+ {
+ Iterator vals = scr.getScores().iterator();
+ // make features on sequence
+ for (Range rn : scr.getRanges())
{
- // create a default type for this feature
- type = new String[]
- { typeName + " (" + scr.getMethod() + ")",
- service.getActionText() };
+
+ SequenceFeature sf;
+ String[] type = featureTypeMap.get(scr.getMethod());
+ if (type == null)
+ {
+ // create a default type for this feature
+ 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);
+ }
+ else
+ {
+ sf = new SequenceFeature(type[0], type[1], null, base
+ + rn.from, base + rn.to, methodName);
+ }
+ dseq.addSequenceFeature(sf);
+ if (last != val && last != Float.NaN)
+ {
+ fc.put(sf.getType(), sf);
+ }
+ last = val;
+ dispFeatures = true;
}
- if (vals.hasNext())
+ }
+ else
+ {
+ if (scr.getScores().size() == 0)
{
- sf = new SequenceFeature(type[0], type[1], base + rn.from,
- base + rn.to, val = vals.next().floatValue(),
- methodName);
+ continue;
}
- else
+ AlignmentAnnotation annot = createAnnotationRowsForScores(
+ ourAnnot,
+ service.serviceType + " (" + scr.getMethod() + ")",
+ service.getServiceTypeURI() + "/" + scr.getMethod(),
+ aseq, base + 1, scr);
+ annot.graph = AlignmentAnnotation.LINE_GRAPH;
+ annot.visible = (annotTypeMap == null
+ || annotTypeMap.get(scr.getMethod()) == null || annotTypeMap
+ .get(scr.getMethod()).get(INVISIBLE) == null);
+ double[] thrsh = (annotTypeMap == null || annotTypeMap
+ .get(scr.getMethod()) == null) ? null
+ : (double[]) annotTypeMap.get(scr.getMethod()).get(
+ THRESHOLD);
+ if (annotTypeMap == null
+ || annotTypeMap.get(scr.getMethod()) == null
+ || annotTypeMap.get(scr.getMethod()).get(DONTCOMBINE) == null)
{
- sf = new SequenceFeature(type[0], type[1], null, base
- + rn.from, base + rn.to, methodName);
+ {
+ if (!sameGroup)
+ {
+ graphGroup++;
+ sameGroup = true;
+ }
+
+ annot.graphGroup = graphGroup;
+ }
}
- dseq.addSequenceFeature(sf);
- if (last != val && last != Float.NaN)
+
+ annot.description = "" + service.getActionText()
+ + " - raw scores";
+ if (thrsh != null)
{
- fc.put(sf.getType(), sf);
+ String threshNote = (thrsh[0] > 0 ? "Above " : "Below ")
+ + thrsh[1] + " indicates disorder";
+ annot.threshold = new GraphLine((float) thrsh[1],
+ threshNote, Color.red);
+ annot.description += "
" + threshNote;
}
- last = val;
- dispFeatures = true;
- }
- }
- else
- {
-
- AlignmentAnnotation annot = createAnnotationRowsForScores(
- ourAnnot, service.serviceType + " (" + scr.getMethod()
- + ")", service.getServiceTypeURI()+"/"+ scr.getMethod(), aseq,
- base, scr);
- annot.graph = AlignmentAnnotation.LINE_GRAPH;
- if (annotTypeMap==null || annotTypeMap.get(scr.getMethod())==null || annotTypeMap.get(scr.getMethod()).get(DONTCOMBINE) == null)
- {
+ annot.description += "";
+ Color col = new UserColourScheme(typeName)
+ .createColourFromName(typeName + scr.getMethod());
+ for (int p = 0, ps = annot.annotations.length; p < ps; p++)
{
- if (!sameGroup)
+ if (annot.annotations[p] != null)
{
- graphGroup++;
- sameGroup = true;
+ annot.annotations[p].colour = col;
}
-
- annot.graphGroup = graphGroup;
- }
- }
- annot.description = service.getActionText() + " - raw scores";
- Color col = new UserColourScheme(typeName)
- .createColourFromName(typeName + scr.getMethod());
- for (int p = 0, ps = annot.annotations.length; p < ps; p++)
- {
- if (annot.annotations[p] != null)
- {
- annot.annotations[p].colour = col;
}
+ annot._linecolour = col;
}
- annot._linecolour=col;
}
}
if (lastAnnot + 1 == ourAnnot.size())
@@ -237,13 +313,14 @@ public class AADisorderClient extends JabawsAlignCalcWorker implements
fr.setColour(ft, ggc);
}
}
- // TODO: JAL-1150 - create sequence feature settings API for defining styles and enabling/disabling feature overlay on alignment panel
+ // TODO: JAL-1150 - create sequence feature settings API for defining
+ // styles and enabling/disabling feature overlay on alignment panel
((jalview.gui.AlignmentPanel) ap).updateFeatureRendererFrom(fr);
- if (af.alignPanel==ap)
+ if (af.alignPanel == ap)
{
// only do this if the alignFrame is currently showing this view.
af.setShowSeqFeatures(true);
- }
+ }
ap.paintAlignment(true);
}
if (ourAnnot.size() > 0)