From e45f9fd9150c90e0bb92cb40c5109bbcc4090aba Mon Sep 17 00:00:00 2001 From: Olivier Langella <olivier.langella@u-psud.fr> Date: Fri, 9 Feb 2018 08:26:23 +0100 Subject: [PATCH] peptide list code cleaning --- .../peptide_list_view/peptidetablemodel.cpp | 19 ------------------- src/gui/peptide_list_view/peptidetablemodel.h | 2 -- .../peptidetableproxymodel.cpp | 4 ++-- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/gui/peptide_list_view/peptidetablemodel.cpp b/src/gui/peptide_list_view/peptidetablemodel.cpp index 2da660a7..1de37aa8 100644 --- a/src/gui/peptide_list_view/peptidetablemodel.cpp +++ b/src/gui/peptide_list_view/peptidetablemodel.cpp @@ -200,25 +200,6 @@ QVariant PeptideTableModel::data(const QModelIndex &index, int role ) const { return QVariant(); } -void PeptideTableModel::onTableClicked(const QModelIndex &index) -{ - int row = index.row(); - int col = index.column(); - if (col == 0) //add a checkbox to cell(1,0) - { - if ( _p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->isChecked()) { - _p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->setChecked(false); - } - else { - _p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->setChecked(true); - } - //emit dataChanged(index, index); - } - else { - emit peptideEvidenceClicked(_p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()); - } -} - void PeptideTableModel::onPeptideDataChanged() { qDebug() << "PeptideTableModel::onPeptideDataChanged begin " << rowCount(); emit layoutAboutToBeChanged(); diff --git a/src/gui/peptide_list_view/peptidetablemodel.h b/src/gui/peptide_list_view/peptidetablemodel.h index 0070c929..84e8c050 100644 --- a/src/gui/peptide_list_view/peptidetablemodel.h +++ b/src/gui/peptide_list_view/peptidetablemodel.h @@ -75,8 +75,6 @@ signals: public slots: void onPeptideDataChanged(); -public slots: - void onTableClicked(const QModelIndex &index); private : static const QString getTitle(std::int8_t column); diff --git a/src/gui/peptide_list_view/peptidetableproxymodel.cpp b/src/gui/peptide_list_view/peptidetableproxymodel.cpp index dacab94c..9c04466e 100644 --- a/src/gui/peptide_list_view/peptidetableproxymodel.cpp +++ b/src/gui/peptide_list_view/peptidetableproxymodel.cpp @@ -171,9 +171,9 @@ void PeptideTableProxyModel::onTableClicked(const QModelIndex &index) //_protein_table_model_p->onTableClicked(this->mapToSource(index)); QModelIndex source_index(this->mapToSource(index)); int row = source_index.row(); - int col = source_index.column(); + PeptideListColumn col = (PeptideListColumn) source_index.column(); PeptideMatch * peptide_match = &_peptide_table_model_p->getProteinMatch()->getPeptideMatchList().at(row); - if (col == 0) //add a checkbox to cell(1,0) + if (col == PeptideListColumn::checked) //add a checkbox to cell(1,0) { if ( peptide_match->getPeptideEvidence()->isChecked()) { -- GitLab