Commit c3a3762d authored by Langella Olivier's avatar Langella Olivier
Browse files

xtpcpp (0.2.38-4) stretch

parent 0b1219d8
xtpcpp (0.2.38-4) stretch; urgency=medium
* scoring, pluggable scoring added
-- Olivier Langella <olivier.langella@u-psud.fr> Tue, 18 Jun 2019 13:37:52 +0200
xtpcpp (0.2.38-3) stretch; urgency=medium
* refine, maximum missed cleavage sites added
......
......@@ -56,6 +56,7 @@ new labels :
obsolete, not documented :
"refine, maximum missed cleavage sites" 3
"protein, use minimal annotations" yes no
"scoring, pluggable scoring" yes no
*/
TandemParameters::TandemParameters()
......@@ -188,7 +189,8 @@ TandemParameters::setParamLabelValue(const QString &label, const QString &value)
(label == "spectrum, use conditioning") ||
(label == "protein, homolog management") ||
(label == "protein, use minimal annotations") ||
(label == "protein, use annotations"))
(label == "protein, use annotations") ||
(label == "scoring, pluggable scoring"))
{
if((value != "yes") && (value != "no"))
{
......
......@@ -71,25 +71,34 @@ EditTandemPresetDialog::setTandemParametersFile(
const TandemParametersFile &tandem_preset_file)
{
if(tandem_preset_file.exists())
try
{
_p_tandem_preset_file = new TandemParametersFile(tandem_preset_file);
_preset_directory =
_p_tandem_preset_file->getAbsoluteDir().absolutePath();
_tandem_params = _p_tandem_preset_file->getTandemParameters();
if(tandem_preset_file.exists())
{
_p_tandem_preset_file = new TandemParametersFile(tandem_preset_file);
_preset_directory =
_p_tandem_preset_file->getAbsoluteDir().absolutePath();
_tandem_params = _p_tandem_preset_file->getTandemParameters();
}
else
{
_p_tandem_preset_file = new TandemParametersFile(
":/tandem/resources/model/QExactive_analysis_FDR_nosemi.xml");
_tandem_params = _p_tandem_preset_file->getTandemParameters();
QSettings settings;
_preset_directory =
settings.value("path/tandemrun_preset_directory", "").toString();
_p_tandem_preset_file->setDirectory(QDir(_preset_directory));
}
}
else
catch(pappso::PappsoException &error)
{
_p_tandem_preset_file = new TandemParametersFile(
":/tandem/resources/model/QExactive_analysis_FDR_nosemi.xml");
_tandem_params = _p_tandem_preset_file->getTandemParameters();
QSettings settings;
_preset_directory =
settings.value("path/tandemrun_preset_directory", "").toString();
_p_tandem_preset_file->setDirectory(QDir(_preset_directory));
qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
QMessageBox::warning(
this, tr("Error"), tr("Error :\n %1").arg(error.qwhat()));
}
fillPresetComboBox();
populate();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment