Skip to content
Snippets Groups Projects
Commit 490c6ada authored by Renne Thomas's avatar Renne Thomas
Browse files

Correct TDF folder loading issue : Identification didn't work with the folder

parent f5c97f08
No related branches found
No related tags found
1 merge request!33Multiples Corrections and features implementations
......@@ -263,7 +263,14 @@ TandemBatchProcess::writeXmlInputFile(QXmlStreamWriter *p_out,
p_out->writeStartElement("note");
p_out->writeAttribute("type", "input");
p_out->writeAttribute("label", "spectrum, path");
p_out->writeCharacters(mz_file);
if(mz_file_info.isDir())
{
p_out->writeCharacters(mz_file + "/analysis.tdf");
}
else
{
p_out->writeCharacters(mz_file);
}
p_out->writeEndElement();
//<note type="heading">Protein general</note>
......@@ -292,8 +299,18 @@ TandemBatchProcess::writeXmlInputFile(QXmlStreamWriter *p_out,
p_out->writeAttribute("label", "output, path");
if(mz_file_info.completeSuffix() == "tdf")
{
QString output_name =
QFileInfo(mz_file_info.absoluteDir().dirName()).baseName();
qDebug() << output_name;
p_out->writeCharacters(QString("%1/%2.xml")
.arg(_tandem_run_batch._output_directory)
.arg(output_name));
}
else if(mz_file_info.isDir())
{
QString output_name = QFileInfo(mz_file_info).baseName();
qDebug() << output_name;
p_out->writeCharacters(QString("%1/%2.xml")
.arg(_tandem_run_batch._output_directory)
.arg(output_name));
......@@ -316,8 +333,6 @@ TandemBatchProcess::writeXmlInputFile(QXmlStreamWriter *p_out,
void
TandemBatchProcess::runOne(const QString &mz_file)
{
QTemporaryFile xml_input_file;
xml_input_file.setAutoRemove(true);
if(xml_input_file.open())
......
......@@ -405,9 +405,10 @@ TandemRunDialog::selectTdfFolder()
{
QSettings settings;
QString default_tdf_location =
settings.value("path/tandemrun_tdf_directory", "").toString();
settings.value("path/tandemrun_tdf_directory", "/").toString();
QFileDialog directories_dialog;
directories_dialog.setOption(QFileDialog::ShowDirsOnly, true);
directories_dialog.setDirectory(default_tdf_location);
directories_dialog.setFileMode(QFileDialog::DirectoryOnly);
directories_dialog.setOption(QFileDialog::DontUseNativeDialog, true);
directories_dialog.setWindowTitle("Select the timsTOF folders");
QListView *lView = directories_dialog.findChild<QListView *>("listView");
......@@ -424,13 +425,15 @@ TandemRunDialog::selectTdfFolder()
directories_names = directories_dialog.selectedFiles();
}
if(directories_names.size() > 0)
if(directories_names.size() > 1)
{
settings.setValue("path/tandemrun_tdf_directory",
QFileInfo(directories_names[0]).absolutePath());
directories_names.pop_front();
}
for(QString directory_name : directories_names)
{
// qDebug() << directory_name+"/analysis.tdf";
if(!QFileInfo(directory_name + "/analysis.tdf").exists())
{
throw pappso::PappsoException(
......@@ -444,7 +447,6 @@ TandemRunDialog::selectTdfFolder()
QStringList file_list = _p_mz_file_list->stringList();
file_list.append(directories_names);
_p_mz_file_list->setStringList(file_list);
}
catch(pappso::PappsoException &error)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment