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
JAL-3594 New Jalview Test logos and .icns/.ico creation helper script
[jalview.git]
/
src
/
jalview
/
workers
/
ConsensusThread.java
diff --git
a/src/jalview/workers/ConsensusThread.java
b/src/jalview/workers/ConsensusThread.java
index
1cce3ff
..
1a5aaa4
100644
(file)
--- a/
src/jalview/workers/ConsensusThread.java
+++ b/
src/jalview/workers/ConsensusThread.java
@@
-28,7
+28,7
@@
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.ProfilesI;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Annotation;
import jalview.datamodel.ProfilesI;
import jalview.datamodel.SequenceI;
-import jalview.schemes.ColourSchemeI;
+import jalview.renderer.ResidueShaderI;
public class ConsensusThread extends AlignCalcWorker
{
public class ConsensusThread extends AlignCalcWorker
{
@@
-46,7
+46,7
@@
public class ConsensusThread extends AlignCalcWorker
return;
}
calcMan.notifyStart(this);
return;
}
calcMan.notifyStart(this);
- long started = System.currentTimeMillis();
+ // long started = System.currentTimeMillis();
try
{
AlignmentAnnotation consensus = getConsensusAnnotation();
try
{
AlignmentAnnotation consensus = getConsensusAnnotation();
@@
-58,12
+58,13
@@
public class ConsensusThread extends AlignCalcWorker
}
while (!calcMan.notifyWorking(this))
{
}
while (!calcMan.notifyWorking(this))
{
- // System.err.println("Thread (Consensus"+Thread.currentThread().getName()+") Waiting around.");
+ // System.err.println("Thread
+ // (Consensus"+Thread.currentThread().getName()+") Waiting around.");
try
{
if (ap != null)
{
try
{
if (ap != null)
{
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
}
Thread.sleep(200);
} catch (Exception ex)
}
Thread.sleep(200);
} catch (Exception ex)
@@
-92,7
+93,7
@@
public class ConsensusThread extends AlignCalcWorker
if (ap != null)
{
if (ap != null)
{
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
}
} catch (OutOfMemoryError error)
{
}
} catch (OutOfMemoryError error)
{
@@
-117,7
+118,10
@@
public class ConsensusThread extends AlignCalcWorker
protected void eraseConsensus(int aWidth)
{
AlignmentAnnotation consensus = getConsensusAnnotation();
protected void eraseConsensus(int aWidth)
{
AlignmentAnnotation consensus = getConsensusAnnotation();
- consensus.annotations = new Annotation[aWidth];
+ if (consensus != null)
+ {
+ consensus.annotations = new Annotation[aWidth];
+ }
AlignmentAnnotation gap = getGapAnnotation();
if (gap != null)
{
AlignmentAnnotation gap = getGapAnnotation();
if (gap != null)
{
@@
-153,11
+157,10
@@
public class ConsensusThread extends AlignCalcWorker
*/
protected void setColourSchemeConsensus(ProfilesI hconsensus)
{
*/
protected void setColourSchemeConsensus(ProfilesI hconsensus)
{
- ColourSchemeI globalColourScheme = alignViewport
- .getGlobalColourScheme();
- if (globalColourScheme != null)
+ ResidueShaderI cs = alignViewport.getResidueShading();
+ if (cs != null)
{
{
- globalColourScheme.setConsensus(hconsensus);
+ cs.setConsensus(hconsensus);
}
}
}
}