import jalview.ws.params.WsParamSetI;
import jalview.ws.params.simple.BooleanOption;
import jalview.ws.params.simple.DoubleParameter;
+import jalview.ws.params.simple.FileParameter;
import jalview.ws.params.simple.IntegerParameter;
import jalview.ws.params.simple.LogarithmicParameter;
import jalview.ws.params.simple.Option;
+import jalview.ws.params.simple.RadioChoiceParameter;
import jalview.ws.params.simple.StringParameter;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.Scanner;
/*
* 'Options'
*/
- addChoiceOfHmm(args);
-
- String names = Cache.getProperty(Preferences.HMMSEARCH_DBS);
- if (names != null && !names.isEmpty())
- {
- List<String> databases = new ArrayList<>();
- databases.add(MessageManager.getString(HMMSearch.THIS_ALIGNMENT_KEY));
- Scanner nameScanner = new Scanner(names);
-
- if (nameScanner.hasNext())
- {
- while (nameScanner.hasNext())
- {
- String next = nameScanner.next();
- if ("null".equals(next))
- {
- Cache.setProperty(Preferences.HMMSEARCH_DBS, "");
- Cache.setProperty(Preferences.HMMSEARCH_DB_PATHS, "");
- }
- else
- {
- databases.add(next);
- }
- }
- }
- nameScanner.close();
- args.add(new StringParameter(
- MessageManager.getString(HMMSearch.DATABASE_KEY),
- MessageManager.getString("label.database_for_hmmsearch"),
- true, MessageManager.getString(HMMSearch.THIS_ALIGNMENT_KEY),
- MessageManager.getString(HMMSearch.THIS_ALIGNMENT_KEY),
- databases));
- }
args.add(new BooleanOption(
MessageManager.getString(HMMSearch.AUTO_ALIGN_SEQS_KEY),
MessageManager.getString("label.auto_align_seqs_desc"), false,
- false, true, null));
+ false, false, null));
args.add(new BooleanOption(
MessageManager.getString(HMMSearch.USE_ACCESSIONS_KEY),
MessageManager.getString("label.use_accessions_desc"), false,
/*
* 'Parameters'
*/
+ addChoiceOfHmm(args);
+
+ // addChoiceOfDatabase(args);
+
+ String thisAlignment = MessageManager
+ .getString(HMMSearch.THIS_ALIGNMENT_KEY);
+ String database = MessageManager.getString("label.database");
+ args.add(new RadioChoiceParameter(
+ MessageManager.getString("action.search"), null,
+ Arrays.asList(thisAlignment,
+ database),
+ thisAlignment));
+ args.add(new FileParameter(database, "", false, "", ""));
args.add(new IntegerParameter(
MessageManager.getString(HMMSearch.NUMBER_OF_RESULTS_KEY),
MessageManager.getString("label.number_of_results_desc"), true,
100, 0, 100000));
- args.add(new StringParameter(
+ args.add(new RadioChoiceParameter(
MessageManager.getString(HMMSearch.REPORTING_CUTOFF_KEY), null,
- true, HMMSearch.CUTOFF_NONE, HMMSearch.CUTOFF_NONE,
Arrays.asList(HMMSearch.CUTOFF_NONE, HMMSearch.CUTOFF_EVALUE,
- HMMSearch.CUTOFF_SCORE)));
+ HMMSearch.CUTOFF_SCORE),
+ HMMSearch.CUTOFF_EVALUE));
args.add(new LogarithmicParameter(
MessageManager.getString(HMMSearch.SEQ_EVALUE_KEY),
MessageManager.getString("label.seq_e_value_desc"), false, 1D,
}
/**
+ * Constructs a choice parameter for database to search; always includes 'this
+ * alignment', and also includes any databases held under user preferences key
+ * "HMMSEARCH_DBS" as a comma-delimited list
+ *
+ * @param args
+ */
+ protected void addChoiceOfDatabase(List<ArgumentI> args)
+ {
+ String names = Cache.getProperty(Preferences.HMMSEARCH_DBS);
+ if (names == null || names.isEmpty())
+ {
+ return;
+ }
+
+ List<String> filePaths = new ArrayList<>();
+ List<String> fileNames = new ArrayList<>();
+
+ String thisAlignment = MessageManager.getString(HMMSearch.THIS_ALIGNMENT_KEY);
+ filePaths.add(thisAlignment);
+ fileNames.add(thisAlignment);
+
+ Scanner nameScanner = new Scanner(names);
+ nameScanner.useDelimiter(Preferences.COMMA);
+
+ while (nameScanner.hasNext())
+ {
+ String next = nameScanner.next();
+ if ("null".equals(next))
+ {
+ Cache.setProperty(Preferences.HMMSEARCH_DBS, "");
+ }
+ else
+ {
+ filePaths.add(next);
+ int pos = next.lastIndexOf(File.separator);
+ String fileName = next.substring(pos + 1);
+ fileNames.add(fileName);
+ }
+ }
+ nameScanner.close();
+ ArgumentI databasesOption = new StringParameter(
+ MessageManager.getString(HMMSearch.DATABASE_KEY),
+ MessageManager.getString("label.database_for_hmmsearch"), true,
+ thisAlignment,
+ thisAlignment,
+ filePaths, fileNames);
+ args.add(databasesOption);
+ }
+
+ /**
* Answers default parameters for hmmalign, taking into account any configured
* as user preferences
*
/**
* Adds an argument representing the choice of HMM sequences (profiles)
- * against which to perform align or search, provided more than one is found
+ * against which to perform align or search, provided at least one is found
*
* @param args
*/
protected void addChoiceOfHmm(List<ArgumentI> args)
{
List<SequenceI> hmms = viewport.getAlignment().getHmmSequences();
- if (hmms.size() > 1)
+ if (!hmms.isEmpty())
{
List<String> options = new ArrayList<>();
for (SequenceI hmmSeq : hmms)
String defseq = options.get(0);
ArgumentI arg = new StringParameter(
MessageManager.getString("label.use_hmm"), null, true, defseq,
- defseq, options);
+ defseq, options, null);
args.add(arg);
}
}
*/
if (!viewport.getAlignment().getGroups().isEmpty())
{
- Collection<String> options = new ArrayList<>();
+ List<String> options = new ArrayList<>();
options.add(MessageManager.getString("label.alignment"));
options.add(MessageManager.getString("label.groups_and_alignment"));
options.add(MessageManager.getString("label.groups"));