From 8c97e2d02d41ad043e17b016bff52457a5377aa0 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Wed, 20 Dec 2017 09:36:00 +0100
Subject: [PATCH] no more FDR on grouped peptides
---
src/gui/project_view/projectwindow.cpp | 17 ++++++-----------
src/gui/project_view/projectwindow.h | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp
index bcbfed308..fa37c592c 100644
--- a/src/gui/project_view/projectwindow.cpp
+++ b/src/gui/project_view/projectwindow.cpp
@@ -205,9 +205,10 @@ void ProjectWindow::refreshGroup(IdentificationGroup * p_ident_group) {
qDebug() << "ProjectWindow::refreshGroup end";
}
-void ProjectWindow::computeFdr(ValidationState state) {
+void ProjectWindow::computeFdr() {
qDebug() << "ProjectWindow::computeFdr begin ";
try {
+ ValidationState state = ValidationState::valid;
pappso::pappso_double total_prot=0;
pappso::pappso_double false_prot=0;
pappso::pappso_double total_peptide=0;
@@ -218,14 +219,9 @@ void ProjectWindow::computeFdr(ValidationState state) {
total_peptide += identification_group->countPeptideEvidence(state);
false_peptide += identification_group->countDecoyPeptideEvidence(state);
}
- if (state == ValidationState::grouped) {
- ui->grouped_protein_fdr_label->setText(QString("%1 %").arg(QString::number((false_prot/total_prot)*100.0,'f',2)));
- ui->grouped_peptide_fdr_label->setText(QString("%1 %").arg(QString::number((false_peptide/total_peptide)*100.0,'f',2)));
- }
- else {
- ui->protein_fdr_label->setText(QString("%1 %").arg(QString::number((false_prot/total_prot)*100.0,'f',2)));
- ui->peptide_fdr_label->setText(QString("%1 %").arg(QString::number((false_peptide/total_peptide)*100.0,'f',2)));
- }
+ ui->protein_fdr_label->setText(QString("%1 %").arg(QString::number((false_prot/total_prot)*100.0,'f',2)));
+ ui->peptide_fdr_label->setText(QString("%1 %").arg(QString::number((false_peptide/total_peptide)*100.0,'f',2)));
+
}
catch (pappso::PappsoException exception_pappso) {
QMessageBox::warning(this,
@@ -342,8 +338,7 @@ void ProjectWindow::doFdrChanged() {
}
void ProjectWindow::refresh() {
qDebug() << "ProjectWindow::refresh begin ";
- computeFdr(ValidationState::valid);
- computeFdr(ValidationState::grouped);
+ computeFdr();
computeMassPrecision();
qDebug() << "ProjectWindow::refresh end ";
diff --git a/src/gui/project_view/projectwindow.h b/src/gui/project_view/projectwindow.h
index fd057159d..713be30e4 100644
--- a/src/gui/project_view/projectwindow.h
+++ b/src/gui/project_view/projectwindow.h
@@ -91,7 +91,7 @@ protected :
void doViewPeptideList(IdentificationGroup * p_ident_group, ProteinMatch * protein_match);
void doViewProteinDetail(ProteinMatch * protein_match);
void doIdentificationGroupEdited(IdentificationGroup* p_identification_group);
- void computeFdr(ValidationState state);
+ void computeFdr();
void computeMassPrecision();
private :
--
GitLab