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 7647f8155031c58a9a97042e9904389f9561fb46..38eb327b8f4a036dcb1a71d875f466230c52e0c9 100644 --- a/src/input/xtandemsaxhandler.cpp +++ b/src/input/xtandemsaxhandler.cpp @@ -348,6 +348,11 @@ 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 _p_protein_match->getProteinXtpSp().get()->setAccession(QString("%1%2").arg(_p_protein_match->getProteinXtpSp().get()->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")); + } } else {