From 38753ef7e86b5bff6c8c3a69e1bcaadbe6ca6314 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Thu, 21 Sep 2017 21:17:09 +0200
Subject: [PATCH] load preset from combo box ok
---
src/gui/tandem_run_dialog/tandemrundialog.cpp | 26 ++++++++++++-------
src/gui/tandem_run_dialog/tandemrundialog.h | 1 +
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/gui/tandem_run_dialog/tandemrundialog.cpp b/src/gui/tandem_run_dialog/tandemrundialog.cpp
index 5d4f0aa6..50302ebb 100644
--- a/src/gui/tandem_run_dialog/tandemrundialog.cpp
+++ b/src/gui/tandem_run_dialog/tandemrundialog.cpp
@@ -68,15 +68,23 @@ TandemRunDialog::~TandemRunDialog()
delete _p_mz_file_list;
}
void TandemRunDialog::setPresetName(QString preset_name) {
- QSettings settings;
- settings.setValue("tandem/preset_name", preset_name);
-
-
- //get presets :
- TandemParametersFile param_file(ui->preset_combobox->itemData(ui->preset_combobox->currentIndex()).value<QString>());
-
- ui->thread_spin_box->setValue(param_file.getTandemParameters().getValue("spectrum, threads").toInt());
-
+ qDebug() << "TandemRunDialog::setPresetName begin";
+ if (!preset_name.isEmpty() && !preset_name.isNull()) {
+
+ qDebug() << "TandemRunDialog::setPresetName not null";
+ QSettings settings;
+ settings.setValue("tandem/preset_name", preset_name);
+
+
+ //get presets :
+ TandemParametersFile param_file(ui->preset_combobox->itemData(ui->preset_combobox->currentIndex()).value<QString>());
+ if (_previous_preset_file != param_file.getAbsoluteFilePath()) {
+ _previous_preset_file = param_file.getAbsoluteFilePath();
+ ui->thread_spin_box->setValue(param_file.getTandemParameters().getValue("spectrum, threads").toInt());
+ }
+ }
+
+ qDebug() << "TandemRunDialog::setPresetName end";
}
void TandemRunDialog::fillPresetComboBox() {
ui->preset_combobox->clear();
diff --git a/src/gui/tandem_run_dialog/tandemrundialog.h b/src/gui/tandem_run_dialog/tandemrundialog.h
index dc45222f..f2601144 100644
--- a/src/gui/tandem_run_dialog/tandemrundialog.h
+++ b/src/gui/tandem_run_dialog/tandemrundialog.h
@@ -63,6 +63,7 @@ private:
Ui::TandemRunDialog *ui;
QStringListModel * _p_fasta_file_list;
QStringListModel * _p_mz_file_list;
+ QString _previous_preset_file;
};
--
GitLab