JAL-3914 QMEANDiSCo quality score TFType

diff --git a/src/jalview/datamodel/annotations/QMEANDISCORowBuilder.java b/src/jalview/datamodel/annotations/QMEANDISCORowBuilder.java
new file mode 100644 (file)
index 0000000..df50c7f
--- /dev/null
+++ b/src/jalview/datamodel/annotations/QMEANDISCORowBuilder.java
@@ -0,0 +1,39 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.datamodel.annotations;
+
+import jalview.datamodel.Annotation;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.TFType;
+
+public class QMEANDISCORowBuilder extends AnnotationRowBuilder
+{
+  public static final String LABEL = "QMEANDiSCo Score";
+  
+  public QMEANDISCORowBuilder()
+  {
+    super(LABEL);
+    min = 0;
+    max = 1;
+    hasMinMax = true;
+    this.setTFType(StructureImportSettings.TFType.QMEANDISCO);
+  }
+}
\ No newline at end of file

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index 92c762b..7c45edf 100644 (file)
--- a/src/jalview/ext/jmol/JmolParser.java
+++ b/src/jalview/ext/jmol/JmolParser.java
@@ -46,6 +46,7 @@ import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.annotations.AlphaFoldAnnotationRowBuilder;
 import jalview.datamodel.annotations.AnnotationRowBuilder;
+import jalview.datamodel.annotations.QMEANDISCORowBuilder;
 import jalview.io.DataSourceType;
 import jalview.io.FileParse;
 import jalview.io.StructureFile;
@@ -264,8 +265,12 @@ public class JmolParser extends StructureFile implements JmolStatusListener
                   || getTemperatureFactorType() == StructureImportSettings.TFType.PLDDT)
           {
             builder = new AlphaFoldAnnotationRowBuilder();
+          } 
+          if (getTemperatureFactorType() == StructureImportSettings.TFType.QMEANDISCO)
+          {
+            builder = new QMEANDISCORowBuilder();
           }
-
+          
           tmpchain = new PDBChain(getId(), tmpatom.chain, builder);
           getChains().add(tmpchain);
           tmpchain.atoms.addElement(tmpatom);

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index 22ecdc7..204562b 100644 (file)
--- a/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@ -62,8 +62,8 @@ public class StructureImportSettings
 
   public static enum TFType
   {
-    DEFAULT, PLDDT;
-
+    DEFAULT, PLDDT, QMEANDISCO;
+    
     @Override
     public String toString()
     {