package jalview.hmmer;
+import jalview.analysis.AlignmentSorter;
+import jalview.analysis.SeqsetUtils;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
-import jalview.gui.Preferences;
import jalview.gui.SplitFrame;
import jalview.io.DataSourceType;
import jalview.io.StockholmFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.swing.JInternalFrame;
-public class HMMAlignThread implements Runnable
+public class HMMAlignThread extends HmmerCommand implements Runnable
{
+ static final String HMMALIGN = "hmmalign";
- /**
+ /*
* feature settings from view that job was associated with
*/
protected FeatureRendererSettings featureSettings = null;
- /**
- * Object containing frequently used commands.
- */
- HMMERCommands cmds = new HMMERCommands();
-
- AlignFrame af;
-
AlignmentI alignment;
AlignmentI dataset;
long barID;
- Map<Integer, SequenceI> hmmSeqs;
-
File hmmTemp = null;
File outTemp = null;
barID = System.currentTimeMillis();
af.setProgressBar(MessageManager.getString("status.running_hmmalign"),
barID);
- cmds.HMMERFOLDER = Cache.getProperty(Preferences.HMMER_PATH);
prepareAlignment();
SequenceI[][] subAlignments = msa.getVisibleContigs('-');
allOrders = new ArrayList<>();
int job = 0;
for (SequenceI[] seqs : subAlignments)
{
- cmds.uniquifySequences(seqs);
+ uniquifySequences(seqs);
try
{
createTemporaryFiles();
}
try
{
- cmds.exportData(seqs, outTemp.getAbsoluteFile(), hmm,
+ exportData(seqs, outTemp.getAbsoluteFile(), hmm,
hmmTemp.getAbsoluteFile(), null);
} catch (IOException e1)
{
displayResults(newFrame);
- af.setProgressBar(MessageManager.getString("status.running_hmmalign"),
- barID);
+ af.setProgressBar("", barID);
}
}
/**
- * Executes the hmmalign command in the command line.
+ * Executes the hmmalign command in the command line
*
* @return
* @throws IOException
*/
private boolean runCommand() throws IOException, InterruptedException
{
- File file = new File(cmds.HMMERFOLDER + "/hmmalign");
- if (!file.canExecute())
- {
- file = new File(cmds.HMMERFOLDER + "/hmmalign.exe");
- {
- if (!file.canExecute())
- {
- return false;
- }
- }
+ String binaryPath = getCommandRoot(HMMALIGN);
+ if (binaryPath == null) {
+ return false;
}
- String command = cmds.HMMERFOLDER + cmds.HMMALIGN;
+ String command = binaryPath + SPACE;
+ // todo parse version from ./hmmerbuild -h
String version = Cache.getProperty("HMMER_VERSION");
if (!"3.1b2".equals(version))
{
- command += cmds.ALLCOL;
+ // command += ALLCOL; // todo obsolete option?
}
if (args != null)
{
}
}
}
- command += " -o " + inputTemp.getAbsolutePath() + cmds.SPACE
- + hmmTemp.getAbsolutePath() + cmds.SPACE
+ command += " -o " + inputTemp.getAbsolutePath() + SPACE
+ + hmmTemp.getAbsolutePath() + SPACE
+ outTemp.getAbsolutePath();
- return cmds.runCommand(command);
+ return runCommand(command);
}
/**
DataSourceType.FILE);
SequenceI[] result = file.getSeqsAsArray();
AlignmentOrder msaorder = new AlignmentOrder(result);
- jalview.analysis.AlignmentSorter.recoverOrder(result);
- jalview.analysis.SeqsetUtils.deuniquify(cmds.hash, result);
+ AlignmentSorter.recoverOrder(result);
+ SeqsetUtils.deuniquify(hash, result);
allOrders.add(msaorder);
allResults[index] = result;
hmmTemp.delete();