import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.ArrayList;
import java.util.List;
import javax.swing.*;
import jalview.gui.*;
import compbio.data.msa.MsaWS;
import compbio.metadata.Argument;
+import compbio.metadata.Option;
import compbio.metadata.Preset;
import compbio.metadata.PresetManager;
import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
+import jalview.ws.jws2.dm.JabaWsParamSet;
+import jalview.ws.params.WsParamSetI;
/**
* DOCUMENT ME!
* server is a WSDL2Java generated stub for an archetypal MsaWSI service.
*/
MsaWS server;
+
AlignFrame alignFrame;
+
private Preset preset;
- private List<Argument> paramset;
+ private List<Argument> paramset;
public MsaWSClient(Jws2Discoverer.Jws2Instance sh, String altitle,
jalview.datamodel.AlignmentView msa, boolean submitGaps,
boolean preserveOrder, Alignment seqdataset,
AlignFrame _alignFrame)
{
- this(sh, null, null, altitle, msa, submitGaps, preserveOrder, seqdataset, _alignFrame);
+ this(sh, null, null, false, altitle, msa, submitGaps, preserveOrder,
+ seqdataset, _alignFrame);
// TODO Auto-generated constructor stub
}
- public MsaWSClient(Jws2Discoverer.Jws2Instance sh, Preset preset, String altitle,
- jalview.datamodel.AlignmentView msa, boolean submitGaps,
- boolean preserveOrder, Alignment seqdataset,
+ public MsaWSClient(Jws2Discoverer.Jws2Instance sh, WsParamSetI preset,
+ String altitle, jalview.datamodel.AlignmentView msa,
+ boolean submitGaps, boolean preserveOrder, Alignment seqdataset,
AlignFrame _alignFrame)
{
- this(sh, preset, null, altitle, msa, submitGaps, preserveOrder, seqdataset, _alignFrame);
+ this(sh, preset, null, false, altitle, msa, submitGaps, preserveOrder,
+ seqdataset, _alignFrame);
// TODO Auto-generated constructor stub
}
+
/**
* Creates a new MsaWSClient object that uses a service given by an externally
* retrieved ServiceHandle
* DOCUMENT ME!
*/
- public MsaWSClient(Jws2Discoverer.Jws2Instance sh, Preset preset, List<Argument> arguments, String altitle,
+ public MsaWSClient(Jws2Discoverer.Jws2Instance sh, WsParamSetI preset,
+ List<Argument> arguments, boolean editParams, String altitle,
jalview.datamodel.AlignmentView msa, boolean submitGaps,
boolean preserveOrder, Alignment seqdataset,
- AlignFrame _alignFrame) {
+ AlignFrame _alignFrame)
+ {
super();
alignFrame = _alignFrame;
if (!(sh.service instanceof MsaWS))
return;
}
server = sh.service;
- this.preset = preset;
- this.paramset = arguments;
+ if (preset != null)
+ {
+ if (preset instanceof JabaPreset)
+ {
+ this.preset = ((JabaPreset) preset).p;
+ }
+ else if (preset instanceof JabaWsParamSet)
+ {
+ List<Argument> newargs = new ArrayList<Argument>();
+ JabaWsParamSet pset = ((JabaWsParamSet) preset);
+ for (Option opt : pset.getjabaArguments())
+ {
+ newargs.add(opt);
+ }
+ if (arguments != null && arguments.size() > 0)
+ {
+ // merge arguments with preset's own arguments.
+ for (Argument opt : arguments)
+ {
+ newargs.add(opt);
+ }
+ }
+ paramset = newargs;
+ }
+ else
+ {
+ throw new Error(
+ "Implementation error: Can only instantiate Jaba parameter sets.");
+ }
+ }
+ else
+ {
+ // just provided with a bunch of arguments
+ this.paramset = arguments;
+ }
+ if (editParams)
+ {
+ if (sh.paramStore == null)
+ {
+ sh.paramStore = new JabaParamStore(sh, Desktop.getUserParameterStore());
+ }
+ WsJobParameters jobParams = new WsJobParameters(sh, preset);
+ if (!jobParams.showRunDialog())
+ {
+ return;
+ }
+ WsParamSetI prset = jobParams.getPreset();
+ if (prset == null)
+ {
+ paramset = JabaParamStore.getJabafromJwsArgs(jobParams
+ .getJobParams());
+ }
+ else
+ {
+ this.preset = ((JabaPreset) prset).p;
+ paramset = null; // no user supplied parameters.
+ }
+ }
+
if ((wsInfo = setWebService(sh, false)) == null)
{
JOptionPane.showMessageDialog(Desktop.desktop,
private void startMsaWSClient(String altitle, AlignmentView msa,
boolean submitGaps, boolean preserveOrder, Alignment seqdataset)
{
- //if (!locateWebService())
- // {
- // return;
- // }
+ // if (!locateWebService())
+ // {
+ // return;
+ // }
wsInfo.setProgressText(((submitGaps) ? "Re-alignment" : "Alignment")
+ " of " + altitle + "\nJob details\n");
+ "alignment of " + altitle;
}
- MsaWSThread msathread = new MsaWSThread(server, preset, paramset, WsURL, wsInfo,
- alignFrame, WebServiceName, jobtitle, msa, submitGaps,
- preserveOrder, seqdataset);
+ MsaWSThread msathread = new MsaWSThread(server, preset, paramset,
+ WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa,
+ submitGaps, preserveOrder, seqdataset);
wsInfo.setthisService(msathread);
msathread.start();
}
return (WebServiceName.indexOf("lustal") > -1); // cheat!
}
- public void attachWSMenuEntry(JMenu msawsmenu,
+ public void attachWSMenuEntry(JMenu rmsawsmenu,
final Jws2Instance service, final AlignFrame alignFrame)
{
setWebService(service, true); // headless
- JMenuItem method = new JMenuItem(WebServiceName);
- method.setToolTipText(WsURL);
- method.addActionListener(new ActionListener()
+ boolean finished = true, submitGaps = false;
+ JMenu msawsmenu = rmsawsmenu;
+ String svcname = WebServiceName;
+ if (svcname.endsWith("WS"))
{
- public void actionPerformed(ActionEvent e)
- {
- AlignmentView msa = alignFrame.gatherSequencesForAlignment();
- new MsaWSClient(service, alignFrame.getTitle(),
- msa, false, true, alignFrame.getViewport().getAlignment()
- .getDataset(), alignFrame);
+ svcname = svcname.substring(0, svcname.length() - 2);
+ }
+ String calcName = svcname + " ";
+ if (canSubmitGaps())
+ {
+ msawsmenu = new JMenu(svcname);
+ rmsawsmenu.add(msawsmenu);
+ calcName = "";
+ }
+ do
+ {
+ if (submitGaps == true)
+ {
+ msawsmenu = new JMenu("profile " + svcname);
+ rmsawsmenu.add(msawsmenu);
}
+ final boolean withGaps = submitGaps;
+ JMenuItem method = new JMenuItem(calcName + "Defaults");
+ method.setToolTipText("Align with default settings");
- });
- msawsmenu.add(method);
- if (canSubmitGaps())
- {
- // We know that ClustalWS can accept partial alignments for refinement.
- final JMenuItem methodR = new JMenuItem(WebServiceName
- + " (With Gaps)");
- methodR.setToolTipText(WsURL);
- methodR.addActionListener(new ActionListener()
+ method.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
AlignmentView msa = alignFrame.gatherSequencesForAlignment();
- new MsaWSClient(service, alignFrame.getTitle(),
- msa, true, true, alignFrame.getViewport().getAlignment()
+ new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps,
+ true, alignFrame.getViewport().getAlignment()
.getDataset(), alignFrame);
}
-
});
- msawsmenu.add(methodR);
+ msawsmenu.add(method);
+ method = new JMenuItem(calcName + "Edit and run ...");
+ method.setToolTipText("View and change the parameters before alignment.");
- }
- PresetManager presets = service.getPresets();
- if (presets!=null && presets.getPresets().size()>0)
- {
- JMenu presetlist = new JMenu("Presets for "+WebServiceName+"(Without gaps)");
-
- for (final Preset preset : (List<Preset>) presets.getPresets())
+ method.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ AlignmentView msa = alignFrame.gatherSequencesForAlignment();
+ new MsaWSClient(service, null, null, true, alignFrame.getTitle(),
+ msa, withGaps, true, alignFrame.getViewport()
+ .getAlignment().getDataset(), alignFrame);
+
+ }
+ });
+ msawsmenu.add(method);
+ List<WsParamSetI> presets = service.getParamStore().getPresets();
+ if (presets != null && presets.size() > 0)
{
- final JMenuItem methodR = new JMenuItem(preset.getName());
- methodR.setToolTipText(preset.getDescription());
- methodR.addActionListener(new ActionListener()
+ JMenu presetlist = new JMenu(calcName + "Presets");
+
+ for (final WsParamSetI preset : presets)
{
- public void actionPerformed(ActionEvent e)
+ final JMenuItem methodR = new JMenuItem(preset.getName());
+ methodR.setToolTipText("<html><p><strong>"
+ + (preset.isModifiable() ? "User Preset"
+ : "Service Preset") + "</strong><br/>"
+ + preset.getDescription() + "</p></html>");
+ methodR.addActionListener(new ActionListener()
{
- AlignmentView msa = alignFrame.gatherSequencesForAlignment();
- new MsaWSClient(service, preset, alignFrame.getTitle(),
- msa, false, true, alignFrame.getViewport().getAlignment()
- .getDataset(), alignFrame);
+ public void actionPerformed(ActionEvent e)
+ {
+ AlignmentView msa = alignFrame.gatherSequencesForAlignment();
+ new MsaWSClient(service, preset, alignFrame.getTitle(), msa,
+ false, true, alignFrame.getViewport().getAlignment()
+ .getDataset(), alignFrame);
- }
+ }
- });
- presetlist.add(methodR);
+ });
+ presetlist.add(methodR);
+ }
+ msawsmenu.add(presetlist);
}
- msawsmenu.add(presetlist);
- }
-
+ if (!submitGaps && canSubmitGaps())
+ {
+ submitGaps = true;
+ finished = false;
+ }
+ else
+ {
+ finished = true;
+ }
+ } while (!finished);
}
-
}
git://source.jalview.org / jalview.git / blobdiff