diff --git a/src/core/tandem_run/tandemcondorprocess.cpp b/src/core/tandem_run/tandemcondorprocess.cpp index 67708b38d9a030f403825537af1f5cc8293a6961..f7fb0630f8f6fd92d6a5fabb889ba9d3272c17e6 100644 --- a/src/core/tandem_run/tandemcondorprocess.cpp +++ b/src/core/tandem_run/tandemcondorprocess.cpp @@ -329,6 +329,11 @@ void TandemCondorProcess::getCondorJobState() { arguments << "-xml" << QString("%1").arg(_condor_cluster_number); QProcess condor_q_process; + //QProcess::error(QProcess::ProcessError) + //finished(int,QProcess::ExitStatus) + //connect(&condor_q_process, &QProcess::finished, this, &TandemCondorProcess::receivedCondorQueueProcessCompleted); + //connect(&condor_q_process, &QProcess::error, this, &TandemCondorProcess::receivedCondorQueueProcessError); + //hk_process->setWorkingDirectory(QFileInfo(_hardklor_exe).absolutePath()); qDebug() << "TandemCondorProcess::getCondorJobState command " << _condor_q_command << " " << arguments.join(" "); condor_q_process.start(_condor_q_command, arguments); diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp index 2b5767403bce92b74a0c834c5d1576b4241ea69f..ae2680806bf9d47d02cdae50898b522d32600055 100644 --- a/src/gui/project_view/projectwindow.cpp +++ b/src/gui/project_view/projectwindow.cpp @@ -155,6 +155,7 @@ void ProjectWindow::connectNewPtmIslandListWindow() { void ProjectWindow::connectNewProteinListWindow() { qDebug() << "ProjectWindow::connectNewProteinListWindow begin"; _p_current_protein_list_window = new ProteinListWindow(this); + _protein_list_window_collection.push_back(_p_current_protein_list_window); qDebug() << "ProjectWindow::connectNewProteinListWindow end"; @@ -572,8 +573,8 @@ void ProjectWindow::doViewProteinList(IdentificationGroup* p_identification_grou _p_current_protein_list_window->show(); - //_p_current_protein_list_window->raise(); - //_p_current_protein_list_window->activateWindow(); + _p_current_protein_list_window->raise(); + _p_current_protein_list_window->activateWindow(); qDebug() << "ProjectWindow::doViewProteinList end " << p_identification_group; _p_current_protein_list_window->setIdentificationGroup(p_identification_group); diff --git a/src/input/xtandemsaxhandler.cpp b/src/input/xtandemsaxhandler.cpp index dbe4010e35bd7d6be24b25308db76622e9a227a1..f075a4ea050a816acc9198c0c0ddfc9026d2715a 100644 --- a/src/input/xtandemsaxhandler.cpp +++ b/src/input/xtandemsaxhandler.cpp @@ -157,6 +157,26 @@ bool XtandemSaxHandler::startElement_note(QXmlAttributes attributes) { return is_ok; } +bool XtandemSaxHandler::startElement_protein(QXmlAttributes attributes) { +//<protein expect="-704.6" id="1976.1" uid="195701" label="GRMZM2G083841_P01 P04711 Phosphoenolpyruvate carboxylase 1 (PEPCase 1)(PEPC 1)(EC..." sumI="9.36" > + bool is_ok = true; + //qDebug() << "startElement_protein begin"; + QString accession = attributes.value("label").simplified().split(" ", QString::SkipEmptyParts).at(0); + //qDebug() << "startElement_protein accession" << accession; + _p_protein_match = _p_identification_group->getProteinMatchInstance(accession); + + //qDebug() << "startElement_protein p_protein_match 1 " << _p_protein_match; + _current_protein.setAccession(accession); + _p_protein_match->setChecked(false); + //qDebug() << "startElement_protein p_protein_match 3 " << _p_protein_match; + ProteinXtpSp sp_xtp_protein = _current_protein.makeProteinXtpSp(); + _p_protein_match->setProteinXtpSp(_p_project->getProteinStore().getInstance(sp_xtp_protein)); + _p_protein_match->setChecked(true); + + //qDebug() << "startElement_protein end" ; + return is_ok; +} + bool XtandemSaxHandler::startElement_file(QXmlAttributes attributes) { bool is_ok = true; @@ -317,14 +337,14 @@ bool XtandemSaxHandler::endElement_domain() { _current_peptide_sp = _p_project->getPeptideStore().getInstance(_current_peptide_sp); _p_peptide_evidence->setPeptideXtpSp(_current_peptide_sp); - + _current_peptide_match.setPeptideEvidenceSp(_p_peptide_evidence->getIdentificationDataSource()->getPeptideEvidenceStore().getInstance(_p_peptide_evidence)); if (_p_protein_match == nullptr) { throw pappso::PappsoException("ERROR in XtandemSaxHandler::endElement_domain : _p_protein_match == nullptr"); } _p_protein_match->addPeptideMatch(_current_peptide_match); - + delete _p_peptide_evidence; return is_ok; } @@ -353,9 +373,13 @@ bool XtandemSaxHandler::endElement_note() { //to fit most cases, just check that the :reversed chars added by X!Tandem are not in the description. if so, then add it too in the accession _current_protein.setAccession(QString("%1%2").arg(_current_protein.getAccession()).arg(":reversed")); } + //for older versions < 2013.09.01.1 + if (!_p_protein_match->getProteinXtpSp().get()->getAccession().endsWith("|reversed") && _p_protein_match->getProteinXtpSp().get()->getDescription().endsWith("|reversed")) { + //to fit most cases, just check that the :reversed chars added by X!Tandem are not in the description. if so, then add it too in the accession + _p_protein_match->getProteinXtpSp().get()->setAccession(QString("%1%2").arg(_p_protein_match->getProteinXtpSp().get()->getAccession()).arg("|reversed")); + } - - //qDebug() << "startElement_protein accession" << accession; + //qDebug() << "startElement_protein accession" << accession; _p_protein_match = _p_identification_group->getProteinMatchInstance(_current_protein.getAccession()); _p_protein_match->setChecked(false); @@ -363,6 +387,7 @@ bool XtandemSaxHandler::endElement_note() { ProteinXtpSp sp_xtp_protein = _current_protein.makeProteinXtpSp(); _p_protein_match->setProteinXtpSp(_p_project->getProteinStore().getInstance(sp_xtp_protein)); _p_protein_match->setChecked(true); + } else {