X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FAADisorderClient.java;h=a70689648c5399bb0a8df83de6d7e649b4b2634c;hb=0d9e7c05b15bfd0ac59436066e2fe805673bbef0;hp=9a2316c47b8d479e78dee9a43e2c9de1a79c8162;hpb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;p=jalview.git diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java index 9a2316c..a706896 100644 --- a/src/jalview/ws/jws2/AADisorderClient.java +++ b/src/jalview/ws/jws2/AADisorderClient.java @@ -21,7 +21,7 @@ package jalview.ws.jws2; import jalview.api.FeatureColourI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.GraphLine; import jalview.datamodel.SequenceFeature; @@ -207,11 +207,9 @@ public class AADisorderClient extends JabawsCalcWorker 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(); @@ -239,13 +237,13 @@ public class AADisorderClient extends JabawsCalcWorker if (vals.hasNext()) { val = vals.next().floatValue(); - sf = new SequenceFeature(type[0], type[1], - base + rn.from, base + rn.to, val, methodName); + sf = new SequenceFeature(type[0], type[1], base + rn.from, + base + rn.to, val, methodName); } else { - sf = new SequenceFeature(type[0], type[1], - 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 && !Float.isNaN(last)) @@ -344,8 +342,9 @@ public class AADisorderClient extends JabawsCalcWorker { // set graduated color as fading to white for minimum, and // autoscaling to values on alignment - FeatureColourI ggc = new FeatureColour(Color.white, - gc.getColour(), 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); }