+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
package jalview.ws;\r
\r
-import org.apache.axis.client.*;\r
-import javax.xml.namespace.QName;\r
import java.util.*;\r
-import jalview.datamodel.*;\r
-import jalview.gui.*;\r
+\r
import javax.swing.*;\r
-import java.util.*;\r
-import java.awt.*;\r
-import jalview.analysis.AlignSeq;\r
-import ext.vamsas.*;\r
\r
+import ext.vamsas.*;\r
+import jalview.analysis.*;\r
+import jalview.datamodel.*;\r
+import jalview.gui.*;\r
\r
public class JPredClient\r
+ extends WSClient\r
{\r
- int jobsRunning = 0;\r
- ext.vamsas.JpredSoapBindingStub server;\r
- WebserviceInfo wsInfo;\r
+ ext.vamsas.Jpred server;\r
+ String altitle = "";\r
+ java.util.Hashtable SequenceInfo = null;\r
+ public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI seq) {\r
+ wsInfo = setWebService(sh);\r
+ startJPredClient(title, seq);\r
+ }\r
+ public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI[] msa) {\r
+ wsInfo = setWebService(sh);\r
+ startJPredClient(title, msa);\r
+ }\r
+\r
+ public JPredClient(String title, SequenceI[] msf) {\r
+ startJPredClient(title, msf);\r
+ }\r
+\r
+ public JPredClient(String title, SequenceI seq) {\r
+ startJPredClient(title, seq);\r
+ }\r
\r
- public JPredClient(SequenceI[] msf)\r
+ private void startJPredClient(String title, SequenceI[] msf)\r
{\r
- wsInfo = new WebserviceInfo("JNet secondary structure prediction job",\r
- "\"Cuff J. A and Barton G.J (1999) Application of enhanced multiple sequence alignment profiles to improve protein secondary structure prediction, Proteins 40:502-511\".");\r
+ if (wsInfo==null)\r
+ wsInfo = setWebService();\r
\r
SequenceI seq = msf[0];\r
- wsInfo.setProgressText("Job details for MSA based prediction on sequence :\nName : "\r
- + seq.getName() + "\nSequence : "\r
- + AlignSeq.extractGaps("-. ",seq.getSequence()) + "\n");\r
+ altitle = "JNet prediction on " + seq.getName() +\r
+ " using alignment from " + title;\r
+\r
+ wsInfo.setProgressText("Job details for MSA based prediction (" +\r
+ title + ") on sequence :\n>" + seq.getName() + "\n" +\r
+ AlignSeq.extractGaps("-. ", seq.getSequence()) +\r
+ "\n");\r
+ SequenceI aln[] = new SequenceI[msf.length];\r
+ for (int i=0,j=msf.length; i<j;i++)\r
+ aln[i] = new jalview.datamodel.Sequence(msf[i]);\r
+ SequenceInfo = jalview.analysis.SeqsetUtils.uniquify(aln, true);\r
+\r
+ if (!locateWebService())\r
+ {\r
+ return;\r
+ }\r
\r
+ JPredThread jthread = new JPredThread(aln);\r
+ jthread.start();\r
+ }\r
\r
- JPredWSServiceLocator loc = new JPredWSServiceLocator(); // Default\r
- try {\r
- this.server = (JpredSoapBindingStub) loc.getjpred(); // JBPNote will be set from properties\r
- }\r
- catch (Exception ex) {\r
- wsInfo.setProgressText("Serious! JPred Service location failed\nfor URL :"\r
- +loc.getjpredAddress()+"\n"+ex.getMessage());\r
+ public void startJPredClient(String title, SequenceI seq)\r
+ {\r
+ if (wsInfo==null)\r
+ wsInfo = setWebService();\r
+ wsInfo.setProgressText("Job details for prediction on sequence :\n>" +\r
+ seq.getName() + "\n" +\r
+ AlignSeq.extractGaps("-. ", seq.getSequence()) +\r
+ "\n");\r
+ altitle = "JNet prediction for sequence " + seq.getName() + " from " +\r
+ title;\r
+\r
+ SequenceInfo = jalview.analysis.SeqsetUtils.SeqCharacterHash(seq);\r
+\r
+ if (!locateWebService())\r
+ {\r
+ return;\r
}\r
\r
- JPredThread jthread = new JPredThread(msf);\r
+ JPredThread jthread = new JPredThread(seq);\r
jthread.start();\r
}\r
\r
- public JPredClient(SequenceI seq)\r
+ private WebserviceInfo setWebService()\r
{\r
- wsInfo = new WebserviceInfo("JNet secondary structure prediction job",\r
- "\"Cuff J. A and Barton G.J (1999) Application of enhanced multiple sequence alignment profiles to improve protein secondary structure prediction, Proteins 40:502-511\".");\r
-\r
+ WebServiceName = "JNetWS";\r
+ WebServiceJobTitle = "JNet secondary structure prediction";\r
+ WebServiceReference =\r
+ "\"Cuff J. A and Barton G.J (1999) Application of enhanced " +\r
+ "multiple sequence alignment profiles to improve protein secondary structure prediction, " +\r
+ "Proteins 40:502-511\".";\r
+ WsURL = "http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred";\r
+\r
+ WebserviceInfo wsInfo = new WebserviceInfo(WebServiceJobTitle,\r
+ WebServiceReference);\r
+\r
+ return wsInfo;\r
+ }\r
\r
- wsInfo.setProgressText("Job details for prediction on sequence :\nName : "\r
- + seq.getName() + "\nSequence : " + AlignSeq.extractGaps("-. ",seq.getSequence()) + "\n");\r
+ private boolean locateWebService()\r
+ {\r
+ ext.vamsas.JpredServiceLocator loc = new JpredServiceLocator(); // Default\r
\r
- JPredWSServiceLocator loc = new JPredWSServiceLocator(); // Default\r
- try {\r
- this.server = (JpredSoapBindingStub) loc.getjpred(); // JBPNote will be set from properties\r
+ try\r
+ {\r
+ this.server = loc.getjpred(new java.net.URL(WsURL)); // JBPNote will be set from properties\r
+ ( (JpredSoapBindingStub)this.server).setTimeout(60000); // one minute stub\r
}\r
- catch (Exception ex) {\r
- wsInfo.setProgressText("Serious! JPred Service location failed\nfor URL :"\r
- +loc.getjpredAddress()+"\n"+ex.getMessage());\r
+ catch (Exception ex)\r
+ {\r
+ JOptionPane.showMessageDialog(Desktop.desktop,\r
+ "The Secondary Structure Prediction Service named " +\r
+ WebServiceName + " at " + WsURL +\r
+ " couldn't be located.",\r
+ "Internal Jalview Error",\r
+ JOptionPane.WARNING_MESSAGE);\r
+ wsInfo.setProgressText("Serious! " + WebServiceName +\r
+ " Service location failed\nfor URL :" + WsURL +\r
+ "\n" +\r
+ ex.getMessage());\r
+ wsInfo.setStatus(wsInfo.STATE_STOPPED_SERVERERROR);\r
+\r
+ return false;\r
}\r
\r
- JPredThread jthread = new JPredThread(seq);\r
- jthread.start();\r
+ return true;\r
}\r
\r
-\r
class JPredThread\r
extends Thread\r
{\r
String OutputHeader;\r
- ext.vamsas.JpredResult result;\r
- ext.vamsas.Sequence sequence;\r
- ext.vamsas.Msfalignment msa;\r
+ vamsas.objects.simple.JpredResult result;\r
+ vamsas.objects.simple.Sequence sequence;\r
+ vamsas.objects.simple.Msfalignment msa;\r
String jobId;\r
boolean jobComplete = false;\r
int allowedServerExceptions = 3; // thread dies if too many exceptions.\r
+\r
JPredThread(SequenceI seq)\r
{\r
OutputHeader = wsInfo.getProgressText();\r
- this.sequence = new ext.vamsas.Sequence();\r
+ this.sequence = new vamsas.objects.simple.Sequence();\r
this.sequence.setId(seq.getName());\r
- this.sequence.setSeq(AlignSeq.extractGaps("-. ",seq.getSequence()));\r
+ this.sequence.setSeq(AlignSeq.extractGaps("-. ", seq.getSequence()));\r
}\r
\r
JPredThread(SequenceI[] msf)\r
{\r
OutputHeader = wsInfo.getProgressText();\r
- this.sequence = new ext.vamsas.Sequence();\r
+ this.sequence = new vamsas.objects.simple.Sequence();\r
this.sequence.setId(msf[0].getName());\r
- this.sequence.setSeq(AlignSeq.extractGaps("-. ",msf[0].getSequence()));\r
- jalview.io.MSFfile mwrite = new jalview.io.MSFfile();\r
- this.msa = new ext.vamsas.Msfalignment();\r
+ this.sequence.setSeq(AlignSeq.extractGaps("-. ",\r
+ msf[0].getSequence()));\r
+\r
+ jalview.io.PileUpfile mwrite = new jalview.io.PileUpfile();\r
+ this.msa = new vamsas.objects.simple.Msfalignment();\r
msa.setMsf(mwrite.print(msf));\r
}\r
\r
-\r
public void run()\r
{\r
-\r
StartJob();\r
\r
while (!jobComplete && (allowedServerExceptions > 0))\r
{\r
try\r
{\r
- result = server.getresult(jobId);\r
+ if ( (result = server.getresult(jobId)) == null)\r
+ {\r
+ throw (new Exception(\r
+ "Timed out when communicating with server\nTry again later.\n"));\r
+ }\r
+ if (result.getState()==0)\r
+ jalview.bin.Jalview.log.debug("Finished "+jobId);\r
+ if (result.isRunning())\r
+ {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);\r
+ }\r
+ if (result.isQueued())\r
+ {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_QUEUING);\r
+ }\r
\r
- if( result.isRunning() )\r
- wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);\r
- else if( result.isQueued() )\r
- wsInfo.setStatus(WebserviceInfo.STATE_QUEUING);\r
+ wsInfo.setProgressText(OutputHeader + "\n" +\r
+ result.getStatus());\r
\r
if (result.isFinished())\r
{\r
+\r
parseResult();\r
jobComplete = true;\r
jobsRunning--;\r
- }\r
- else\r
- {\r
- wsInfo.setProgressText(OutputHeader + "\n" + result.getStatus());\r
+ } else {\r
+ // catch exceptions\r
if (! (result.isJobFailed() || result.isServerError()))\r
{\r
- Thread.sleep(5000);\r
+ try\r
+ {\r
+ Thread.sleep(5000);\r
+ }\r
+ catch (InterruptedException ex1)\r
+ {\r
+ }\r
+\r
// System.out.println("I'm alive "+seqid+" "+jobid);\r
- } else {\r
+ }\r
+ else\r
+ {\r
wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ jobsRunning--;\r
+ jobComplete = true;\r
}\r
}\r
}\r
catch (Exception ex)\r
{\r
allowedServerExceptions--;\r
- wsInfo.appendProgressText("\nJPredWS Server exception!\n" + ex.getMessage());\r
+ wsInfo.appendProgressText("\nJPredWS Server exception!\n" +\r
+ ex.getMessage());\r
+\r
+ try\r
+ {\r
+ if (allowedServerExceptions > 0)\r
+ {\r
+ Thread.sleep(5000);\r
+ }\r
+ }\r
+ catch (InterruptedException ex1)\r
+ {\r
+ }\r
+ }\r
+ catch (OutOfMemoryError er)\r
+ {\r
+ jobComplete = true;\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+ "Out of memory handling result!!"\r
+ +\r
+ "\nSee help files for increasing Java Virtual Machine memory."\r
+ , "Out of memory",\r
+ JOptionPane.WARNING_MESSAGE);\r
+ System.out.println("JPredClient: "+er);\r
}\r
}\r
-\r
- if (! (result.isJobFailed() || result.isServerError()))\r
- wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);\r
- else\r
- wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ if (result!=null)\r
+ if (! (result.isJobFailed() || result.isServerError()))\r
+ {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);\r
+ }\r
+ else\r
+ {\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ }\r
}\r
\r
void StartJob()\r
{\r
try\r
{\r
- if (msa!=null) {\r
+ if (msa != null)\r
+ {\r
jobId = server.predictOnMsa(msa);\r
- } else {\r
+ }\r
+ else\r
+ {\r
jobId = server.predict(sequence);\r
}\r
- System.out.println(jobId);\r
+\r
+ if (jobId != null)\r
+ {\r
+ if (jobId.startsWith("Broken"))\r
+ {\r
+ throw new Exception("Submission " + jobId);\r
+ }\r
+ else\r
+ {\r
+ System.out.println(WsURL + " Job Id '" + jobId + "'");\r
+ }\r
+ }\r
+ else\r
+ {\r
+ throw new Exception("Server timed out - try again later\n");\r
+ }\r
}\r
catch (Exception e)\r
{\r
- System.out.println("JPredWS Client: Failed to submit the prediction\n" +\r
- e.toString() + "\n");\r
- e.printStackTrace();\r
+ wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);\r
+ allowedServerExceptions = -1;\r
+ jobComplete = true;\r
+\r
+ wsInfo.setProgressText("Failed to submit the prediction. (Just close the window)\n"\r
+ + ((e.getMessage().indexOf("Exception")>-1) ? (\r
+ "It is most likely that there is a problem with the server.\n")\r
+ : e.getMessage())\r
+ +wsInfo.getProgressText());\r
+ System.err.println(\r
+ "JPredWS Client: Failed to submit the prediction (Possibly a server error - see below)\n" +\r
+ e.getMessage() + "\n");\r
+\r
+ jalview.bin.Jalview.log.debug("Failed Submission",e);\r
}\r
}\r
\r
- private void addFloatAnnotations(Alignment al, int[] gapmap, Vector values, String Symname, String Visname, float min, float max, int winLength) {\r
\r
+\r
+ private void addFloatAnnotations(Alignment al, int[] gapmap,\r
+ Vector values, String Symname,\r
+ String Visname, float min,\r
+ float max, int winLength)\r
+ {\r
Annotation[] annotations = new Annotation[al.getWidth()];\r
+\r
for (int j = 0; j < values.size(); j++)\r
{\r
float value = Float.parseFloat(values.get(j).toString());\r
- annotations[gapmap[j]] = new Annotation("", value+"",' ',value);\r
+ annotations[gapmap[j]] = new Annotation("", value + "", ' ',\r
+ value);\r
}\r
- al.addAnnotation(new AlignmentAnnotation(Symname, Visname, annotations, min, max, winLength));\r
+\r
+ al.addAnnotation(new AlignmentAnnotation(Symname, Visname,\r
+ annotations, min, max, winLength));\r
}\r
\r
void parseResult()\r
{\r
// OutputHeader = output.getText();\r
- if (result.isFailed()) {\r
- OutputHeader +="Job failed.\n";\r
+ if (result.isFailed())\r
+ {\r
+ OutputHeader += "Job failed.\n";\r
}\r
- if (result.getStatus()!=null) {\r
- OutputHeader += "\n"+result.getStatus();\r
+\r
+ if (result.getStatus() != null)\r
+ {\r
+ OutputHeader += ("\n" + result.getStatus());\r
}\r
- if (result.getPredfile()!=null) {\r
- OutputHeader += "\n"+result.getPredfile();\r
- // JBPNote The returned files from a webservice could be hidden behind icons in the monitor window that, when clicked, pop up their corresponding data\r
+\r
+ if (result.getPredfile() != null)\r
+ {\r
+ OutputHeader += ("\n" + result.getPredfile());\r
+\r
+ // JBPNote The returned files from a webservice could be hidden behind icons in the monitor window that, when clicked, pop up their corresponding data\r
}\r
- if (result.getAligfile()!=null) {\r
- OutputHeader += "\n"+result.getAligfile();\r
+\r
+ if (result.getAligfile() != null)\r
+ {\r
+ OutputHeader += ("\n" + result.getAligfile());\r
}\r
- wsInfo.setProgressText(OutputHeader);\r
- try {\r
+\r
+ wsInfo.setProgressText(OutputHeader+"Parsing...");\r
+\r
+ try\r
+ {\r
+ jalview.bin.Jalview.log.debug("Parsing output from JNet job.");\r
// JPredFile prediction = new JPredFile("C:/JalviewX/files/jpred.txt", "File");\r
- jalview.io.JPredFile prediction = new jalview.io.JPredFile(result.getPredfile(), "Paste");\r
+ jalview.io.JPredFile prediction = new jalview.io.JPredFile(result.\r
+ getPredfile(),\r
+ "Paste");\r
SequenceI[] preds = prediction.getSeqsAsArray();\r
+ jalview.bin.Jalview.log.debug("Got prediction profile.");\r
Alignment al;\r
int FirstSeq; // the position of the query sequence in Alignment al\r
boolean noMsa = true; // set if no MSA has been returned by JPred\r
\r
- if (this.msa!=null && result.getAligfile()!=null) {\r
+ if ( (this.msa != null) && (result.getAligfile() != null))\r
+ {\r
+ jalview.bin.Jalview.log.debug("Getting associated alignment.");\r
// we ignore the returned alignment if we only predicted on a single sequence\r
- String format = jalview.io.IdentifyFile.Identify(result.getAligfile(), "Paste");\r
+ String format = jalview.io.IdentifyFile.Identify(result.getAligfile(),\r
+ "Paste");\r
+\r
if (jalview.io.FormatAdapter.formats.contains(format))\r
{\r
- al = new Alignment(jalview.io.FormatAdapter.readFile(result.getAligfile(),"Paste",format));\r
+ al = new Alignment(jalview.io.FormatAdapter.readFile(\r
+ result.getAligfile(), "Paste", format));\r
+ for (int i=0, j=al.getHeight(); i<j; i++) {\r
+ SequenceI sq = al.getSequenceAt(i);\r
+ if (!jalview.analysis.SeqsetUtils.SeqCharacterUnhash(\r
+ sq, (Hashtable) SequenceInfo.get(sq.getName())))\r
+ {\r
+ throw (new Exception(\r
+ "Couldn't recover sequence properties for JNet "\r
+ +((i==0) ? "Query sequence" : "alignment sequence ("+i+")")));\r
+ }\r
+ }\r
noMsa = false;\r
FirstSeq = 0;\r
}\r
else\r
{\r
- throw (new Exception("Unknown format 'format' for file : \n" +\r
- result.getAligfile()));\r
+ throw (new Exception(\r
+ "Unknown format 'format' for file : \n" +\r
+ result.getAligfile()));\r
}\r
-\r
- } else {\r
+ }\r
+ else\r
+ {\r
al = new Alignment(preds);\r
FirstSeq = prediction.getQuerySeqPosition();\r
+ if (!jalview.analysis.SeqsetUtils.SeqCharacterUnhash(\r
+ al.getSequenceAt(FirstSeq), SequenceInfo))\r
+ {\r
+ throw (new Exception(\r
+ "Couldn't recover sequence properties for JNet Query sequence!"));\r
+ }\r
}\r
\r
+\r
AlignmentAnnotation annot;\r
- Annotation [] annotations = null;\r
+ Annotation[] annotations = null;\r
int i = 0;\r
int width = preds[0].getSequence().length();\r
\r
-\r
int[] gapmap = al.getSequenceAt(FirstSeq).gapMap();\r
- if (gapmap.length!=width) {\r
- throw (new Exception("Jpred Client Error\nNumber of residues in supposed query sequence :\n"\r
- +al.getSequenceAt(FirstSeq).getName()+"\n"\r
- +al.getSequenceAt(FirstSeq).getSequence()\r
- +"\nDiffer from number of prediction sites in \n"+result.getPredfile()+"\n"));\r
+\r
+ if (gapmap.length != width)\r
+ {\r
+ throw (new Exception(\r
+ "Jnet Client Error\nNumber of residues in supposed query sequence :\n" +\r
+ al.getSequenceAt(FirstSeq).getName() + "\n" +\r
+ al.getSequenceAt(FirstSeq).getSequence() +\r
+ "\nDiffer from number of prediction sites in \n" +\r
+ result.getPredfile() + "\n"));\r
}\r
+\r
// JBPNote Should also rename the query sequence sometime...\r
- i=0;\r
+ i = 0;\r
+\r
while (i < preds.length)\r
{\r
String id = preds[i].getName().toUpperCase();\r
- if(id.startsWith("LUPAS") || id.startsWith("JNET") || id.startsWith("JPRED"))\r
+\r
+ if (id.startsWith("LUPAS") || id.startsWith("JNET") ||\r
+ id.startsWith("JPRED"))\r
{\r
annotations = new Annotation[al.getWidth()];\r
\r
- if(id.equals("JNETPRED")\r
- || id.equals("JNETPSSM")\r
- || id.equals("JNETFREQ")\r
- || id.equals("JNETHMM")\r
- || id.equals("JNETALIGN")\r
- || id.equals("JPRED"))\r
+ if (id.equals("JNETPRED") || id.equals("JNETPSSM") ||\r
+ id.equals("JNETFREQ") || id.equals("JNETHMM") ||\r
+ id.equals("JNETALIGN") || id.equals("JPRED"))\r
{\r
for (int j = 0; j < width; j++)\r
- annotations[gapmap[j]] = new Annotation("", "", preds[i].getCharAt(j), 0);\r
+ {\r
+ annotations[gapmap[j]] = new Annotation("", "",\r
+ preds[i].getCharAt(j), 0);\r
+ }\r
}\r
- else if(id.equals("JNETCONF"))\r
+ else if (id.equals("JNETCONF"))\r
{\r
for (int j = 0; j < width; j++)\r
{\r
- float value = Float.parseFloat(preds[i].getCharAt(j)+"");\r
- annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(j)+"", "",preds[i].getCharAt(j),value);\r
+ float value = Float.parseFloat(preds[i].getCharAt(\r
+ j) + "");\r
+ annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(\r
+ j) + "", "", preds[i].getCharAt(j),\r
+ value);\r
}\r
}\r
else\r
{\r
- for (int j = 0; j < width; j++) {\r
- annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(j)+"", "", ' ', 0);\r
+ for (int j = 0; j < width; j++)\r
+ {\r
+ annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(\r
+ j) + "", "", ' ', 0);\r
}\r
}\r
\r
- if(id.equals("JNETCONF"))\r
+ if (id.equals("JNETCONF"))\r
+ {\r
annot = new AlignmentAnnotation(preds[i].getName(),\r
- "JNet Output",\r
- annotations,0f,10f,1);\r
+ "JNet Output", annotations, 0f,\r
+ 10f, 1);\r
+ }\r
+ else\r
+ {\r
+ annot = new AlignmentAnnotation(preds[i].getName(),\r
+ "JNet Output", annotations);\r
+ }\r
\r
- else annot = new AlignmentAnnotation(preds[i].getName(),\r
- "JNet Output",\r
- annotations);\r
al.addAnnotation(annot);\r
+\r
if (noMsa)\r
+ {\r
al.deleteSequence(preds[i]);\r
+ }\r
}\r
+\r
i++;\r
}\r
\r
Hashtable scores = prediction.getScores();\r
- /* addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPH"),\r
- "JnetpropH", "Jnet Helix Propensity", 0f,1f,1);\r
\r
- addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPB"),\r
- "JnetpropB", "Jnet Beta Sheet Propensity", 0f,1f,1);\r
+ /* addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPH"),\r
+ "JnetpropH", "Jnet Helix Propensity", 0f,1f,1);\r
\r
- addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPC"),\r
- "JnetpropC", "Jnet Coil Propensity", 0f,1f,1);\r
- */\r
- AlignFrame af = new AlignFrame(al);\r
+ addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPB"),\r
+ "JnetpropB", "Jnet Beta Sheet Propensity", 0f,1f,1);\r
\r
+ addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPC"),\r
+ "JnetpropC", "Jnet Coil Propensity", 0f,1f,1);\r
+ */\r
\r
- Desktop.addInternalFrame(af,\r
- "JNet Prediction for sequence ",\r
- AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
- }catch(Exception ex){ex.printStackTrace();}\r
+ wsInfo.setProgressText(OutputHeader);\r
+ jalview.bin.Jalview.log.debug("Finished parsing output.");\r
+ AlignFrame af = new AlignFrame(al);\r
\r
+ Desktop.addInternalFrame(af, altitle,\r
+ AlignFrame.NEW_WINDOW_WIDTH,\r
+ AlignFrame.NEW_WINDOW_HEIGHT);\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ jalview.bin.Jalview.log.warn("Exception whilst parsing JNet style secondary structure prediction.");\r
+ jalview.bin.Jalview.log.debug("Exception: ",ex);\r
+ }\r
}\r
-\r
}\r
}\r
-\r
git://source.jalview.org / jalview.git / blobdiff