diff --git a/src/core/proteinmatch.cpp b/src/core/proteinmatch.cpp index 98b5a7ee34d56e1a2704e62188ae936c12f16ee9..013d19681129001f978fff09dc0e6d0d0b37f7b4 100644 --- a/src/core/proteinmatch.cpp +++ b/src/core/proteinmatch.cpp @@ -69,7 +69,10 @@ void ProteinMatch::updateAutomaticFilters(const AutomaticFilterParameters & auto } } - if (number_of_valid_peptides > 0) { + if (number_of_valid_peptides == 0) { + + _proxy_valid = false; + } else { if (number_of_valid_peptides < automatic_filter_parameters.getFilterMinimumPeptidePerMatch()) { } diff --git a/src/gui/protein_list_view/proteintablemodel.cpp b/src/gui/protein_list_view/proteintablemodel.cpp index 2a7dea5bb54afb14bf86dfd7a9d8cb9af871ac9c..f09913a09a80b58d2428c0b21856c8098ebe5ae6 100644 --- a/src/gui/protein_list_view/proteintablemodel.cpp +++ b/src/gui/protein_list_view/proteintablemodel.cpp @@ -54,15 +54,15 @@ void ProteinTableModel::setIdentificationGroup(IdentificationGroup * p_identific int ProteinTableModel::rowCount(const QModelIndex &parent ) const { - qDebug() << "ProteinTableModel::rowCount begin "; + //qDebug() << "ProteinTableModel::rowCount begin "; if (_p_identification_group != nullptr) { - qDebug() << "ProteinTableModel::rowCount(const QModelIndex &parent ) " << _p_identification_group->getProteinMatchList().size(); + //qDebug() << "ProteinTableModel::rowCount(const QModelIndex &parent ) " << _p_identification_group->getProteinMatchList().size(); return (int) _p_identification_group->getProteinMatchList().size(); } return 0; } int ProteinTableModel::columnCount(const QModelIndex &parent ) const { - qDebug() << "ProteinTableModel::columnCount begin "; + //qDebug() << "ProteinTableModel::columnCount begin "; if (_p_identification_group != nullptr) { return _columns.size(); } diff --git a/src/gui/protein_list_view/proteintableproxymodel.cpp b/src/gui/protein_list_view/proteintableproxymodel.cpp index 584865cc39f3520c35ad9c3d008c8a4d94add1af..e447e879fb30ef2ceb033e84dfb27f78c570a1df 100644 --- a/src/gui/protein_list_view/proteintableproxymodel.cpp +++ b/src/gui/protein_list_view/proteintableproxymodel.cpp @@ -35,9 +35,9 @@ ProteinTableProxyModel::ProteinTableProxyModel(ProteinListWindow * p_protein_lis bool ProteinTableProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { try { - qDebug() << "ProteinTableProxyModel::filterAcceptsRow begin " << source_row; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow begin " << source_row; ProteinMatch * protein_match = _protein_table_model_p->getIdentificationGroup()->getProteinMatchList().at(source_row); - qDebug() << "ProteinTableProxyModel::filterAcceptsRow protein_match " << source_row; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow protein_match " << source_row; if (!_protein_search_string.isEmpty()) { if (!protein_match->getProteinXtpSp().get()->getDescription().contains(_protein_search_string)) { @@ -45,27 +45,27 @@ bool ProteinTableProxyModel::filterAcceptsRow(int source_row, } } - qDebug() << "ProteinTableProxyModel::filterAcceptsRow valid "; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow valid "; if (_hide_not_valid) { if (! protein_match->isValid()) { return false; } } - qDebug() << "ProteinTableProxyModel::filterAcceptsRow checked "; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow checked "; if (_hide_not_checked) { if (! protein_match->isChecked()) { return false; } } - qDebug() << "ProteinTableProxyModel::filterAcceptsRow grouped "; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow grouped "; pappso::GrpProtein * p_grp_prot = protein_match->getGrpProteinSp().get(); if (_hide_not_grouped) { if (p_grp_prot == nullptr) { return false; } - qDebug() << "ProteinTableProxyModel::filterAcceptsRow grouped 2"; + //qDebug() << "ProteinTableProxyModel::filterAcceptsRow grouped 2"; if (p_grp_prot->getGroupingId().isEmpty()) { return false; } diff --git a/src/gui/protein_view/protein_detail_view.ui b/src/gui/protein_view/protein_detail_view.ui index 026af897aca9c6c9f999a56630a03b608380d435..1695aee6016325da48c0b3707603e91a8fa18164 100644 --- a/src/gui/protein_view/protein_detail_view.ui +++ b/src/gui/protein_view/protein_detail_view.ui @@ -59,9 +59,15 @@ </item> <item> <widget class="QCheckBox" name="validCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>valid</string> </property> + <property name="checkable"> + <bool>true</bool> + </property> </widget> </item> </layout> diff --git a/src/gui/protein_view/proteinwindow.cpp b/src/gui/protein_view/proteinwindow.cpp index 8da3bcb87a3639be6090dcacfdbcc57a75ab6cb2..1df413091779f0f8058790963ba1f882ed738d25 100644 --- a/src/gui/protein_view/proteinwindow.cpp +++ b/src/gui/protein_view/proteinwindow.cpp @@ -63,6 +63,7 @@ void ProteinWindow::doIdentificationGroupGrouped(IdentificationGroup * p_identif void ProteinWindow::updateDisplay() { try { + ui->validCheckBox->setCheckState(Qt::Unchecked); if (_p_protein_match->isValid()) ui->validCheckBox->setCheckState(Qt::Checked); ui->descriptionLabel->setText(_p_protein_match->getProteinXtpSp().get()->getAccession()); //ui->sequenceLabel->setText(_p_protein_match->getProteinXtpSp().get()->getSequence());