Skip to content
Snippets Groups Projects
Commit 6df01ab3 authored by Langella Olivier's avatar Langella Olivier
Browse files

new trick to find a suitable msrun file

parent 5e4a2d8e
No related branches found
No related tags found
No related merge requests found
...@@ -89,13 +89,6 @@ MsRun::findMsRunFile() ...@@ -89,13 +89,6 @@ MsRun::findMsRunFile()
{ {
QFileInfo file(this->getFilename()); QFileInfo file(this->getFilename());
bool file_ok = false;
if(file.exists())
{
file_ok = true;
}
QString basename = file.baseName(); QString basename = file.baseName();
QString onlyfilename = file.fileName(); QString onlyfilename = file.fileName();
QSettings settings; QSettings settings;
...@@ -116,25 +109,36 @@ MsRun::findMsRunFile() ...@@ -116,25 +109,36 @@ MsRun::findMsRunFile()
if(onlyfilename == file.fileName()) if(onlyfilename == file.fileName())
{ {
this->setFilename(file.absoluteFilePath()); this->setFilename(file.absoluteFilePath());
file_ok = true; if(_msrun_reader_sp == nullptr)
{
_msrun_reader_sp = pappso::MsRunReaderFactory::getInstance()
.buildPwizMsRunReaderSp(*this);
return true;
}
} }
if(file.fileName().contains(onlyfilename)) if(file.fileName().contains(onlyfilename))
{ {
this->setFilename(file.absoluteFilePath()); try
file_ok = true; {
this->setFilename(file.absoluteFilePath());
if(_msrun_reader_sp == nullptr)
{
_msrun_reader_sp =
pappso::MsRunReaderFactory::getInstance()
.buildPwizMsRunReaderSp(*this);
return true;
}
}
catch(pappso::PappsoException &error)
{
_msrun_reader_sp = nullptr;
}
} }
} }
} }
if(file_ok) return false;
{
if(_msrun_reader_sp == nullptr)
{
_msrun_reader_sp =
pappso::MsRunReaderFactory::getInstance().buildPwizMsRunReaderSp(
*this);
}
}
return file_ok;
} }
void void
......
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