From d14cffb5d815c675dd4b8b11ae55ad2952e65520 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Fri, 9 Nov 2018 14:47:38 +0100
Subject: [PATCH] xtpcpp (0.2.26-1) stretch
---
CMakeLists.txt | 2 +-
debian/changelog | 6 ++
src/gui/tandem_run_dialog/tandemrundialog.cpp | 67 ++++++++++++++++++-
src/gui/tandem_run_dialog/tandemrundialog.h | 3 +-
4 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e584d096c..bee5aefa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ SET(SOFTWARE_NAME "X!TandemPipeline")
SET(XTPCPP_VERSION_MAJOR "0")
SET(XTPCPP_VERSION_MINOR "2")
-SET(XTPCPP_VERSION_PATCH "25")
+SET(XTPCPP_VERSION_PATCH "26")
SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
# Set the CMAKE_PREFIX_PATH for the find_library fonction when using non
diff --git a/debian/changelog b/debian/changelog
index 37c720cfc..1a144fce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xtpcpp (0.2.26-1) stretch; urgency=medium
+
+ * display distinctively the FDR on peptides and on PSM
+
+ -- Olivier Langella <olivier.langella@u-psud.fr> Fri, 09 Nov 2018 10:50:11 +0100
+
xtpcpp (0.2.25-2) stretch; urgency=medium
* new version number 0.2.25
diff --git a/src/gui/tandem_run_dialog/tandemrundialog.cpp b/src/gui/tandem_run_dialog/tandemrundialog.cpp
index 28d710be3..ac96c8915 100644
--- a/src/gui/tandem_run_dialog/tandemrundialog.cpp
+++ b/src/gui/tandem_run_dialog/tandemrundialog.cpp
@@ -444,7 +444,14 @@ TandemRunDialog::done(int r)
settings.setValue("tandem/condor_request_memory",
ui->request_memory_edit->text());
- QDialog::done(r);
+ if(checkXtandemBin())
+ {
+ QDialog::done(r);
+ }
+ else
+ {
+ QDialog::reject();
+ }
return;
}
else // cancel, close or exc was pressed
@@ -501,3 +508,61 @@ TandemRunDialog::fillTandemBinPath(const QString &tandem_bin_path_in,
{
}
}
+
+
+bool
+TandemRunDialog::checkXtandemBin()
+{
+ QString tandem_bin_path = ui->tandem_bin_label->text();
+ QString tandem_install_text =
+ "Please check that X!Tandem is "
+ "installed on your computer.\nIt is available at "
+ ":\nhttps://www.thegpm.org/tandem/\nOnce it is installed, "
+ "please "
+ "set the correct path to the tandem.exe file";
+ if(tandem_bin_path.isEmpty())
+ {
+ QMessageBox::warning(
+ this,
+ tr("Wrong X!Tandem configuration"),
+ tr("X!Tandem .exe file is not set.\n%1").arg(tandem_install_text));
+
+ QDesktopServices::openUrl(QUrl("https://www.thegpm.org/tandem/"));
+ }
+ else
+ {
+ QFileInfo tandem_bin(tandem_bin_path);
+ if(tandem_bin.isExecutable())
+ {
+ try
+ {
+ Utils::checkXtandemVersion(tandem_bin_path);
+
+ return true;
+ }
+
+ catch(pappso::PappsoException &error)
+ {
+ QMessageBox::warning(
+ this,
+ tr("Wrong X!Tandem exe file"),
+ tr("%1 does not seem to be a valid X!Tandem version.\n%2")
+ .arg(tandem_bin.absoluteFilePath())
+ .arg(tandem_install_text));
+
+ QDesktopServices::openUrl(QUrl("https://www.thegpm.org/tandem/"));
+ }
+ }
+ else
+ {
+ QMessageBox::warning(this,
+ tr("Wrong X!Tandem exe file"),
+ tr("%1 is not executable.\n%2")
+ .arg(tandem_bin_path)
+ .arg(tandem_install_text));
+ }
+ }
+
+
+ return false;
+}
diff --git a/src/gui/tandem_run_dialog/tandemrundialog.h b/src/gui/tandem_run_dialog/tandemrundialog.h
index 3f0095a1f..45e234b8d 100644
--- a/src/gui/tandem_run_dialog/tandemrundialog.h
+++ b/src/gui/tandem_run_dialog/tandemrundialog.h
@@ -68,7 +68,8 @@ class TandemRunDialog : public QDialog
private:
void fillPresetComboBox();
- void fillTandemBinPath(const QString & tandem_bin_path, bool popup_firefox);
+ void fillTandemBinPath(const QString &tandem_bin_path, bool popup_firefox);
+ bool checkXtandemBin();
private:
Ui::TandemRunDialog *ui;
--
GitLab