git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'releases/Release_2_10_Branch' into develop
[jalview.git]
/
src
/
jalview
/
workers
/
ConservationThread.java
diff --git
a/src/jalview/workers/ConservationThread.java
b/src/jalview/workers/ConservationThread.java
index
58510e5
..
11ec521
100644
(file)
--- a/
src/jalview/workers/ConservationThread.java
+++ b/
src/jalview/workers/ConservationThread.java
@@
-1,34
+1,35
@@
/*
/*
- * 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-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
*
* 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.
*
*
* 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/>.
+ * 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;
*/
package jalview.workers;
-import java.util.ArrayList;
-import java.util.List;
-
import jalview.analysis.Conservation;
import jalview.analysis.Conservation;
-import jalview.api.AlignCalcWorkerI;
-import jalview.api.AlignmentViewPanel;
import jalview.api.AlignViewportI;
import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
-public class ConservationThread extends AlignCalcWorker implements
- AlignCalcWorkerI
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConservationThread extends AlignCalcWorker
{
private int ConsPercGaps = 25; // JBPNote : This should be a configurable
{
private int ConsPercGaps = 25; // JBPNote : This should be a configurable
@@
-71,6
+72,7
@@
public class ConservationThread extends AlignCalcWorker implements
if (alignViewport.isClosed())
{
abortAndDestroy();
if (alignViewport.isClosed())
{
abortAndDestroy();
+ return;
}
List<AlignmentAnnotation> ourAnnot = new ArrayList<AlignmentAnnotation>();
AlignmentI alignment = alignViewport.getAlignment();
}
List<AlignmentAnnotation> ourAnnot = new ArrayList<AlignmentAnnotation>();
AlignmentI alignment = alignViewport.getAlignment();
@@
-79,7
+81,7
@@
public class ConservationThread extends AlignCalcWorker implements
ourAnnot.add(conservation);
ourAnnot.add(quality);
ourAnnots = ourAnnot;
ourAnnot.add(conservation);
ourAnnot.add(quality);
ourAnnots = ourAnnot;
-
+ ConsPercGaps = alignViewport.getConsPercGaps();
// AlignViewport.UPDATING_CONSERVATION = true;
if (alignment == null || (alWidth = alignment.getWidth()) < 0)
// AlignViewport.UPDATING_CONSERVATION = true;
if (alignment == null || (alWidth = alignment.getWidth()) < 0)
@@
-92,8
+94,7
@@
public class ConservationThread extends AlignCalcWorker implements
}
try
{
}
try
{
- cons = Conservation.calculateConservation("All",
- jalview.schemes.ResidueProperties.propHash, 3,
+ cons = Conservation.calculateConservation("All", 3,
alignment.getSequences(), 0, alWidth - 1, false,
ConsPercGaps, quality != null);
} catch (IndexOutOfBoundsException x)
alignment.getSequences(), 0, alWidth - 1, false,
ConsPercGaps, quality != null);
} catch (IndexOutOfBoundsException x)
@@
-106,7
+107,7
@@
public class ConservationThread extends AlignCalcWorker implements
} catch (OutOfMemoryError error)
{
ap.raiseOOMWarning("calculating conservation", error);
} catch (OutOfMemoryError error)
{
ap.raiseOOMWarning("calculating conservation", error);
- calcMan.workerCannotRun(this);
+ calcMan.disableWorker(this);
// alignViewport.conservation = null;
// this.alignViewport.quality = null;
// alignViewport.conservation = null;
// this.alignViewport.quality = null;
@@
-124,7
+125,10
@@
public class ConservationThread extends AlignCalcWorker implements
{
if (b || !calcMan.isWorking(this) && cons != null
&& conservation != null && quality != null)
{
if (b || !calcMan.isWorking(this) && cons != null
&& conservation != null && quality != null)
+ {
+ alignViewport.setConservation(cons);
cons.completeAnnotations(conservation, quality, 0, alWidth);
cons.completeAnnotations(conservation, quality, 0, alWidth);
+ }
}
@Override
}
@Override