X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FStructureFrequency.java;h=dc0212e9f255e20f47519d000c1ac4050921eb35;hb=f73031db2e38bfe6e3f1cd42f91b0f9b0130071a;hp=9ebbe516a4d97e4b0579fc24e5dce22119a892c4;hpb=21d6c27e237d77ae258755562aa8abdc6b5320b8;p=jalview.git diff --git a/src/jalview/analysis/StructureFrequency.java b/src/jalview/analysis/StructureFrequency.java index 9ebbe51..dc0212e 100644 --- a/src/jalview/analysis/StructureFrequency.java +++ b/src/jalview/analysis/StructureFrequency.java @@ -1,21 +1,23 @@ /* - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * * 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. + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ - package jalview.analysis; import java.util.*; @@ -345,18 +347,19 @@ public class StructureFrequency // initialised properly return; } - String fmtstr="%3.1f"; - int precision=2; - while (nseq>100) { + String fmtstr = "%3.1f"; + int precision = 2; + while (nseq > 100) + { precision++; - nseq/=10; + nseq /= 10; } - if (precision>2) + if (precision > 2) { - fmtstr = "%"+(2+precision)+"."+precision+"f"; + fmtstr = "%" + (2 + precision) + "." + precision + "f"; } Format fmt = new Format(fmtstr); - + for (int i = iStart; i < width; i++) { Hashtable hci; @@ -433,7 +436,8 @@ public class StructureFrequency tval = (vl[c] * 100f / profile[1][ignoreGapsInConsensusCalculation ? 1 : 0]); mouseOver += ((p == 0) ? "" : "; ") + (char) ((int[]) ca[c])[0] - + (char) ((int[]) ca[c])[1] + " " + fmt.form(tval) + "%"; + + (char) ((int[]) ca[c])[1] + " " + fmt.form(tval) + + "%"; p++; }