X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FStrucConsensusThread.java;h=cc4172f599a027aadb7c0a137351a21f0a6cbc3f;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=a7f919b9661f7cc0da0688f8b545a124df566051;hpb=f61b2748a32ef03e687abc37b97640873c2e44aa;p=jalview.git

diff --git a/src/jalview/workers/StrucConsensusThread.java b/src/jalview/workers/StrucConsensusThread.java
index a7f919b..cc4172f 100644
--- a/src/jalview/workers/StrucConsensusThread.java
+++ b/src/jalview/workers/StrucConsensusThread.java
@@ -1,7 +1,25 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 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.workers;
 
-import java.util.Hashtable;
-
 import jalview.analysis.StructureFrequency;
 import jalview.api.AlignCalcWorkerI;
 import jalview.api.AlignViewportI;
@@ -9,6 +27,9 @@ import jalview.api.AlignmentViewPanel;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
+import jalview.datamodel.SequenceI;
+
+import java.util.Hashtable;
 
 public class StrucConsensusThread extends AlignCalcWorker implements
         AlignCalcWorkerI
@@ -23,6 +44,8 @@ public class StrucConsensusThread extends AlignCalcWorker implements
 
   Hashtable[] hStrucConsensus;
 
+  private long nseq = -1;
+
   @Override
   public void run()
   {
@@ -51,6 +74,7 @@ public class StrucConsensusThread extends AlignCalcWorker implements
       if (alignViewport.isClosed())
       {
         abortAndDestroy();
+        return;
       }
       AlignmentI alignment = alignViewport.getAlignment();
 
@@ -74,7 +98,7 @@ public class StrucConsensusThread extends AlignCalcWorker implements
       // select rna struct to use for calculation
       for (int i = 0; i < aa.length; i++)
       {
-        if (aa[i].getRNAStruc() != null && aa[i].isValidStruc())
+        if (aa[i].visible && aa[i].isRNA() && aa[i].isValidStruc())
         {
           rnaStruc = aa[i];
           break;
@@ -88,10 +112,12 @@ public class StrucConsensusThread extends AlignCalcWorker implements
         return;
       }
 
-      try {
-              jalview.analysis.StructureFrequency.calculate(
-              alignment.getSequencesArray(), 0, alignment.getWidth(),
-              hStrucConsensus, true, rnaStruc);
+      try
+      {
+        final SequenceI[] arr = alignment.getSequencesArray();
+        nseq = arr.length;
+        jalview.analysis.StructureFrequency.calculate(arr, 0,
+                alignment.getWidth(), hStrucConsensus, true, rnaStruc);
       } catch (ArrayIndexOutOfBoundsException x)
       {
         calcMan.workerComplete(this);
@@ -100,11 +126,6 @@ public class StrucConsensusThread extends AlignCalcWorker implements
       alignViewport.setRnaStructureConsensusHash(hStrucConsensus);
       // TODO AlignmentAnnotation rnaStruc!!!
       updateResultAnnotation(true);
-      if (alignViewport.getGlobalColourScheme() != null)
-      {
-        alignViewport.getGlobalColourScheme().setConsensus(hStrucConsensus);
-      }
-
     } catch (OutOfMemoryError error)
     {
       calcMan.workerCannotRun(this);
@@ -140,9 +161,9 @@ public class StrucConsensusThread extends AlignCalcWorker implements
     {
       StructureFrequency.completeConsensus(strucConsensus, hStrucConsensus,
               0, hStrucConsensus.length,
-              alignViewport.getIgnoreGapsConsensus(),
-              alignViewport.isShowSequenceLogo());
+              alignViewport.isIgnoreGapsConsensus(),
+              alignViewport.isShowSequenceLogo(), nseq);
     }
   }
 
-}
\ No newline at end of file
+}