git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1819 use Float.isNaN() to check for NaNs!
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
AADisorderClient.java
diff --git
a/src/jalview/ws/jws2/AADisorderClient.java
b/src/jalview/ws/jws2/AADisorderClient.java
index
83eebdf
..
91be2e6
100644
(file)
--- 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.
*
*
* This file is part of Jalview.
*
@@
-265,7
+265,7
@@
public class AADisorderClient extends JabawsCalcWorker implements
+ rn.from, base + rn.to, methodName);
}
dseq.addSequenceFeature(sf);
+ 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);
}
{
fc.put(sf.getType(), sf);
}
@@
-279,10
+279,13
@@
public class AADisorderClient extends JabawsCalcWorker implements
{
continue;
}
{
continue;
}
+ String typename, calcName;
AlignmentAnnotation annot = createAnnotationRowsForScores(
ourAnnot,
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;
aseq, base + 1, scr);
annot.graph = AlignmentAnnotation.LINE_GRAPH;
@@
-333,6
+336,9
@@
public class AADisorderClient extends JabawsCalcWorker implements
}
}
annot._linecolour = col;
}
}
annot._linecolour = col;
+ // finally, update any dataset annotation
+ replaceAnnotationOnAlignmentWith(annot, typename, calcName,
+ aseq);
}
}
}
}
}
}
@@
-345,7
+351,7
@@
public class AADisorderClient extends JabawsCalcWorker implements
{
if (dispFeatures)
{
{
if (dispFeatures)
{
- jalview.gui.FeatureRenderer fr = ((jalview.gui.AlignmentPanel) ap)
+ jalview.api.FeatureRenderer fr = ((jalview.gui.AlignmentPanel) ap)
.cloneFeatureRenderer();
for (String ft : fc.keySet())
{
.cloneFeatureRenderer();
for (String ft : fc.keySet())
{