From 7e6c70f0e8a6a16220ab7ed288d3390607b85cd8 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Sun, 17 Dec 2017 08:18:02 +0100
Subject: [PATCH] refactoring
---
src/gui/project_view/projectwindow.cpp | 35 +++++++++-----------------
src/gui/project_view/projectwindow.h | 2 +-
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp
index 4a1896ef9..a85144445 100644
--- a/src/gui/project_view/projectwindow.cpp
+++ b/src/gui/project_view/projectwindow.cpp
@@ -205,10 +205,9 @@ void ProjectWindow::refreshGroup(IdentificationGroup * p_ident_group) {
qDebug() << "ProjectWindow::refreshGroup end";
}
-void ProjectWindow::computeFdr() {
- qDebug() << "ProjectWindow::computeFdr begin";
+void ProjectWindow::computeFdr(ValidationState state) {
+ 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;
@@ -221,25 +220,14 @@ void ProjectWindow::computeFdr() {
total_peptide += identification_group->countPeptideMassSample(state);
false_peptide += identification_group->countDecoyPeptideMassSample(state);
}
- 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)));
-
-
- state = ValidationState::grouped;
- total_prot=0;
- false_prot=0;
- total_peptide=0;
- false_peptide=0;
- for (IdentificationGroup * identification_group : _project_sp.get()->getIdentificationGroupList()) {
- total_prot += identification_group->countProteinMatch(state);
- false_prot += identification_group->countDecoyProteinMatch(state);
- //total_peptide += identification_group->countPeptideMatch(state);
- //false_peptide += identification_group->countDecoyPeptideMatch(state);
- total_peptide += identification_group->countPeptideMassSample(state);
- false_peptide += identification_group->countDecoyPeptideMassSample(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->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)));
}
catch (pappso::PappsoException exception_pappso) {
QMessageBox::warning(this,
@@ -356,7 +344,8 @@ void ProjectWindow::doFdrChanged() {
}
void ProjectWindow::refresh() {
qDebug() << "ProjectWindow::refresh begin ";
- computeFdr();
+ computeFdr(ValidationState::valid);
+ computeFdr(ValidationState::grouped);
computeMassPrecision();
qDebug() << "ProjectWindow::refresh end ";
@@ -650,7 +639,7 @@ void ProjectWindow::setProjectSp(ProjectSp project_sp) {
refresh();
this->setEnabled(true);
-
+
//doAutomaticFilterParametersChanged(params);
//doFdrChanged();
diff --git a/src/gui/project_view/projectwindow.h b/src/gui/project_view/projectwindow.h
index 713be30e4..fd057159d 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();
+ void computeFdr(ValidationState state);
void computeMassPrecision();
private :
--
GitLab