import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Annotation;
-import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
+import jalview.gui.IProgressIndicator;
import jalview.workers.AlignCalcWorker;
import jalview.ws.jws2.dm.JabaWsParamSet;
import jalview.ws.jws2.jabaws2.Jws2Instance;
super(alignViewport, alignPanel);
}
+ IProgressIndicator guiProgress;
+
public JabawsAlignCalcWorker(Jws2Instance service, AlignFrame alignFrame,
WsParamSetI preset, List<Argument> paramset)
{
this(alignFrame.getCurrentView(), alignFrame.alignPanel);
+ this.guiProgress = alignFrame;
this.preset = preset;
this.arguments = paramset;
aaservice = (SequenceAnnotation) service.service;
* reconfigure and restart the AAConsClient. This method will spawn a new
* thread that will wait until any current jobs are finished, modify the
* parameters and restart the conservation calculation with the new values.
- *
+ *
* @param newpreset
* @param newarguments
*/
public void updateParameters(final WsParamSetI newpreset,
final List<Argument> newarguments)
{
- if (calcMan.isWorking(this))
+ if (false) // || calcMan.isWorking(this))
{
new Thread(new Runnable()
{
{
return;
}
+ long progressId = -1;
+
+ String rslt = "JOB NOT DEFINED";
try
{
AlignmentAnnotation[] aa = alignViewport.getAlignment()
.getAlignmentAnnotation();
-
- String rslt;
- if (preset == null)
+ if (guiProgress != null)
+ {
+ guiProgress.setProgressBar("JABA " + getServiceActionText(),
+ progressId = System.currentTimeMillis());
+ }
+ if (preset == null && arguments==null)
{
rslt = aaservice.analize(seqs);
}
{
finished = true;
}
+ if (calcMan.isPending(this) && this instanceof AAConsClient)
+ {
+ finished = true;
+ // cancel this job and yield to the new job
+ try
+ {
+ if (aaservice.cancelJob(rslt))
+ {
+ System.err.println("Cancelled AACon job: " + rslt);
+ }
+ else
+ {
+ System.err.println("FAILED TO CANCELL AACon job: " + rslt);
+ }
+
+ } catch (Exception x)
+ {
+
+ }
+
+ return;
+ }
long cpos;
ChunkHolder stats;
do
calcMan.workerCannotRun(this);
} catch (ResultNotAvailableException x)
{
- System.err.println("collection error:");
+ System.err.println("collection error:\nJob ID: " + rslt);
x.printStackTrace();
calcMan.workerCannotRun(this);
calcMan.workerComplete(this);
if (ap != null)
{
+ calcMan.workerComplete(this);
+ if (guiProgress != null && progressId!=-1)
+ {
+ guiProgress.setProgressBar("", progressId);
+ }
ap.paintAlignment(true);
}
}
}
+ @Override
public void updateAnnotation()
{
updateResultAnnotation(false);
protected boolean bySequence = false;
Map<String, SequenceI> seqNames;
-
+ boolean[] gapMap;
+ int realw;
public List<FastaSequence> getInputSequences(AlignmentI alignment)
{
-
if (alignment == null || alignment.getWidth() <= 0
|| alignment.getSequences() == null
-// || (alignedSeqs && !alignment.isAligned() && !submitGaps)
+ // || (alignedSeqs && !alignment.isAligned() && !submitGaps)
|| alignment.isNucleotide() ? !nucleotidesAllowed
: !proteinAllowed)
{
List<compbio.data.sequence.FastaSequence> seqs = new ArrayList<compbio.data.sequence.FastaSequence>();
int minlen = 10;
- int ln=-1;
+ int ln = -1;
if (bySequence)
{
seqNames = new HashMap<String, SequenceI>();
}
+ gapMap=new boolean[0];
for (SequenceI sq : ((List<SequenceI>) alignment.getSequences()))
{
-
if (sq.getEnd() - sq.getStart() > minlen - 1)
{
String newname = SeqsetUtils.unique_name(seqs.size() + 1);
seqNames.put(newname, sq);
}
FastaSequence seq;
- seqs.add(seq=new compbio.data.sequence.FastaSequence(newname,
- (submitGaps) ? sq.getSequenceAsString() : AlignSeq
+ if (submitGaps)
+ {
+ seqs.add(seq = new compbio.data.sequence.FastaSequence(newname,sq.getSequenceAsString()));
+ if (gapMap==null || gapMap.length<seq.getSequence().length())
+ {
+ boolean[] tg=gapMap;
+ gapMap=new boolean[seq.getLength()];
+ System.arraycopy(tg, 0, gapMap, 0, tg.length);
+ for (int p=tg.length;p<gapMap.length;p++)
+ {
+ gapMap[p]=false; // init as a gap
+ }
+ }
+ for (int apos:sq.gapMap()) {
+ gapMap[apos]=true; // aligned.
+ }
+ } else {
+ seqs.add(seq = new compbio.data.sequence.FastaSequence(newname,
+ AlignSeq
.extractGaps(jalview.util.Comparison.GapChars,
sq.getSequenceAsString())));
- if (seq.getSequence().length()>ln)
+ }
+ if (seq.getSequence().length() > ln)
{
ln = seq.getSequence().length();
}
}
if (alignedSeqs && submitGaps)
{
+ realw = 0;
+ for (int i=0;i<gapMap.length;i++)
+ {
+ if (gapMap[i])
+ {
+ realw++;
+ }
+ }
// try real hard to return something submittable
- // TODO: some of AAcons measures need a minimum of two or three amino acids at each position, and aacons doesn't gracefully degrade.
- for (int p=0; p<seqs.size();p++)
+ // TODO: some of AAcons measures need a minimum of two or three amino
+ // acids at each position, and aacons doesn't gracefully degrade.
+ for (int p = 0; p < seqs.size(); p++)
{
- FastaSequence sq=seqs.get(p);
- int l=sq.getSequence().length();
- if (l<ln)
+ FastaSequence sq = seqs.get(p);
+ int l = sq.getSequence().length();
+ // strip gapped columns
+ char[] padded = new char[realw],orig=sq.getSequence().toCharArray();
+ for (int i=0,pp=0;i<realw; pp++)
{
- char[] padded=new char[ln];
- System.arraycopy(sq.getSequence().toCharArray(),0,padded,0,sq.getSequence().length());
- while (l<ln)
+ if (gapMap[pp])
{
- padded[l++]='-';
+ if (orig.length>pp)
+ {
+ padded[i++]=orig[pp];
+ } else {
+ padded[i++]='-';
+ }
}
- seqs.set(p, new compbio.data.sequence.FastaSequence(sq.getId(), new String(padded)));
}
+ seqs.set(p, new compbio.data.sequence.FastaSequence(sq.getId(),
+ new String(padded)));
}
-
}
return seqs;
}
/**
* notify manager that we have started, and wait for a free calculation slot
- *
+ *
* @return true if slot is obtained and work still valid, false if another
* thread has done our work for us.
*/
boolean checkDone()
{
calcMan.notifyStart(this);
- // ap.paintAlignment(false);
+ ap.paintAlignment(false);
while (!calcMan.notifyWorking(this))
{
if (calcMan.isWorking(this))
git://source.jalview.org / jalview.git / blobdiff