Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects

[jalview.git] / src / jalview / ws / datamodel / alphafold / PAEContactMatrix.java

diff --git a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
index 58a4a83..0349417 100644 (file)
--- a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
+++ b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
@@ -78,6 +78,7 @@ public class PAEContactMatrix implements ContactMatrixI
       }
     }
     maxrow=matrix.length;
+    elements = matrix;
     
   }
 
@@ -102,7 +103,11 @@ public class PAEContactMatrix implements ContactMatrixI
       Iterator<Long> scores = scoreRows.next().iterator();
       while (scores.hasNext())
       {
-        elements[row][col++] = scores.next();
+        Object d = scores.next();
+        if (d instanceof Double)
+          elements[row][col++] = ((Double) d).longValue();
+        else
+          elements[row][col++] = (float) d;
       }
       row++;
       col = 0;
@@ -167,7 +172,7 @@ public class PAEContactMatrix implements ContactMatrixI
       @Override
       public int getContactHeight()
       {
-        return maxcol - 1;
+        return maxcol-1;
       }
 
       @Override
@@ -224,4 +229,14 @@ public class PAEContactMatrix implements ContactMatrixI
   {
     return PAEMATRIX;
   }
+  @Override
+  public int getWidth()
+  {
+    return length;
+  }
+  @Override
+  public int getHeight()
+  {
+    return length;
+  }
 }