Skip to content
Snippets Groups Projects
Commit e526db12 authored by Olivier Langella's avatar Olivier Langella
Browse files

signal problem fixed

parent 695fdf4e
No related branches found
No related tags found
No related merge requests found
......@@ -98,7 +98,7 @@ PeptideWindow::PeptideWindow(ProjectWindow *parent):
connect (_p_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));
connect (this, SIGNAL(loadSpectrumSp(PeptideMatch *)), worker,SLOT(doLoadSpectrumSp(PeptideMatch *)));
connect (worker, SIGNAL(spectrumSpReady(pappso::SpectrumSp, QString)), this,SLOT(doSpectrumSpReady(pappso::SpectrumSp, QString)));
connect (worker, SIGNAL(spectrumSpReady(pappso::SpectrumSp, QString, QString)), this,SLOT(doSpectrumSpReady(pappso::SpectrumSp, QString, QString)));
connect (_p_spectrum_overlay,SIGNAL(mzChanged(double)), this, SLOT(setMz(double)));
//connect(_protein_table_model_p, SIGNAL(layoutChanged()), this, SLOT(updateStatusBar()));
#endif
......@@ -191,6 +191,17 @@ void PeptideWindow::openInPeptideViewer() {
void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QString fatal_error) {
qDebug() << "PeptideWindow::doSpectrumSpReady begin error=" << error << " fatal_error=" << fatal_error;
_p_spectrum_overlay->hideLoadingMessage();
if ((error.isEmpty()) && (fatal_error.isEmpty())) {
ui->statusbar->showMessage(tr(""));
pappso::QualifiedSpectrum spectrum_copy;
spectrum_copy.setPrecursorCharge(_p_peptide_match->getCharge());
spectrum_copy.setOriginalSpectrumSp(spectrum_sp);
ui->spectrumWidget->setQualifiedSpectrum(spectrum_copy);
ui->file_not_found->setVisible(false);
ui->spectrumWidget->setVisible(true);
_spectrum_is_ready = true;
}
if (!error.isEmpty()) {
//not found
......@@ -204,7 +215,7 @@ void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QSt
ui->spectrumWidget->setVisible(false);
_spectrum_is_ready = false;
}
else if (!fatal_error.isEmpty()) {
if (!fatal_error.isEmpty()) {
//fatal_error
QMessageBox::warning(this,
......@@ -219,17 +230,6 @@ void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QSt
ui->spectrumWidget->setVisible(false);
_spectrum_is_ready = false;
}
else {
ui->statusbar->showMessage(tr(""));
pappso::QualifiedSpectrum spectrum_copy;
spectrum_copy.setPrecursorCharge(_p_peptide_match->getCharge());
spectrum_copy.setOriginalSpectrumSp(spectrum_sp);
ui->spectrumWidget->setQualifiedSpectrum(spectrum_copy);
ui->file_not_found->setVisible(false);
ui->spectrumWidget->setVisible(true);
_spectrum_is_ready = true;
}
qDebug() << "PeptideWindow::doSpectrumSpReady end";
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment