diff --git a/src/gui/mcqr_run_view/mcqr_sds_xic_widget/mcqrsdsxicwidget.cpp b/src/gui/mcqr_run_view/mcqr_sds_xic_widget/mcqrsdsxicwidget.cpp index 17ef00549f157a511471bff939c5af397b435aa4..9c3af355ee5f0cc4df549a3635453ed3fb651812 100644 --- a/src/gui/mcqr_run_view/mcqr_sds_xic_widget/mcqrsdsxicwidget.cpp +++ b/src/gui/mcqr_run_view/mcqr_sds_xic_widget/mcqrsdsxicwidget.cpp @@ -305,6 +305,7 @@ McqrSdsXicWidget::changeStepAfterEndTag(QString end_name) void McqrSdsXicWidget::runQualityCheckingXic() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::quality_xic; QStringList factors_color; @@ -356,11 +357,13 @@ McqrSdsXicWidget::runQualityCheckingXic() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); } + qDebug(); } void McqrSdsXicWidget::runFilteringDubiousData() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::filtering_data; QStringList levels; @@ -390,11 +393,13 @@ McqrSdsXicWidget::runFilteringDubiousData() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runReconstitutingTracks() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::reconstituting_tracks; QStringList factors_color; @@ -447,11 +452,13 @@ McqrSdsXicWidget::runReconstitutingTracks() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); } + qDebug(); } void McqrSdsXicWidget::runNormaliseIntensities() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::normalise; QStringList factors_color; @@ -504,11 +511,13 @@ McqrSdsXicWidget::runNormaliseIntensities() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); } + qDebug(); } void McqrSdsXicWidget::runFilteringSharedPeptides() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::filtering_shared; QStringList factors_list; @@ -543,11 +552,13 @@ McqrSdsXicWidget::runFilteringSharedPeptides() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); } + qDebug(); } void McqrSdsXicWidget::runFilteringUncorrelatedPeptides() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::filtering_uncorrelated; QStringList factors_list; @@ -579,11 +590,13 @@ McqrSdsXicWidget::runFilteringUncorrelatedPeptides() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); } + qDebug(); } void McqrSdsXicWidget::runImputingPeptidesProteins() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::imputing; QStringList factors_list; @@ -607,11 +620,13 @@ McqrSdsXicWidget::runImputingPeptidesProteins() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runHeatMapProteinAbundance() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::heatmap; QStringList factors_list; @@ -642,11 +657,13 @@ McqrSdsXicWidget::runHeatMapProteinAbundance() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runProteinClustering() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::protein_clustering; QStringList factors_list; @@ -668,11 +685,13 @@ McqrSdsXicWidget::runProteinClustering() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runProteinAnova() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::anova; QStringList factors_list; @@ -697,11 +716,13 @@ McqrSdsXicWidget::runProteinAnova() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runProteinAbundance() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::protein_abundance; QStringList factors_list; @@ -735,11 +756,13 @@ McqrSdsXicWidget::runProteinAbundance() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::runProteinFcAbundance() { + qDebug(); m_ongoingMcqrStep = SdsXicAnalysisStep::protein_fc_abundance; Grantlee::Context grantlee_context; @@ -751,11 +774,13 @@ McqrSdsXicWidget::runProteinFcAbundance() getMcqrRunParentView()->getRProcessRunning()->write( msp_rscriptTemplate->render(&grantlee_context).toUtf8()); + qDebug(); } void McqrSdsXicWidget::configureFilteringTab() { + qDebug(); mp_factorLevelsToRemove = new QStandardItemModel(ui->levels_remove_view); // Configure combobox to store the list of factors for(QString factor : getMcqrExperimentSpLoaded().get()->getmetadataColumns()) @@ -775,11 +800,13 @@ McqrSdsXicWidget::configureFilteringTab() ui->toolBox->setItemEnabled(1, true); ui->toolBox->setCurrentIndex(1); ui->toolBox->update(); + qDebug(); } void McqrSdsXicWidget::configureReconstitutingTab() { + qDebug(); QStringList levels; for(McqrMetadata *metadata : getMcqrExperimentSpLoaded().get()->getmetadataInfoVector()) @@ -795,11 +822,13 @@ McqrSdsXicWidget::configureReconstitutingTab() ui->toolBox->setItemEnabled(2, true); ui->toolBox->setCurrentIndex(2); ui->toolBox->update(); + qDebug(); } void McqrSdsXicWidget::configureNormaliseTab() { + qDebug(); QStringList levels; for(McqrMetadata *metadata : getMcqrExperimentSpLoaded().get()->getmetadataInfoVector()) @@ -821,15 +850,18 @@ McqrSdsXicWidget::configureNormaliseTab() ui->toolBox->setItemEnabled(3, true); ui->toolBox->setCurrentIndex(3); ui->toolBox->update(); + qDebug(); } void McqrSdsXicWidget::configureFcFactorList() { + qDebug(); for(QString factor : getMcqrExperimentSpLoaded().get()->getmetadataColumns()) { ui->factor_combobox->addItem(factor); } + qDebug(); } void @@ -871,11 +903,13 @@ McqrSdsXicWidget::updateLevelToRemoveList(QString factor) i++; } // ui->levels_remove_view->setModel(mp_factorLevelsToRemove); + qDebug(); } void McqrSdsXicWidget::updateNumeratorAndDenominatorComboboxFc(QString factor) { + qDebug(); ui->numerator_combobox->clear(); ui->denominator_combobox->clear(); QStringList factors_list; @@ -892,4 +926,5 @@ McqrSdsXicWidget::updateNumeratorAndDenominatorComboboxFc(QString factor) ui->denominator_combobox->addItem(factor_value); ui->numerator_combobox->addItem(factor_value); } + qDebug(); } diff --git a/src/gui/mcqr_run_view/mcqrrunview.cpp b/src/gui/mcqr_run_view/mcqrrunview.cpp index 1b4d338bc6ab959ed28a323438af2db4fff70ed1..d1104987783186e8da05f117e3c79ae409c08679 100644 --- a/src/gui/mcqr_run_view/mcqrrunview.cpp +++ b/src/gui/mcqr_run_view/mcqrrunview.cpp @@ -147,6 +147,8 @@ McqrRunView::checkLibrariesInstalled() void McqrRunView::endRProcess() { + qDebug(); + mp_rProcess->write(QString("quit( save = \"no\")").toUtf8()); mp_rProcess->waitForFinished(); QProcess::ExitStatus Status = mp_rProcess->exitStatus(); qDebug() << Status; @@ -158,6 +160,7 @@ McqrRunView::endRProcess() throw pappso::PappsoException( QObject::tr("error executing R Status != 0 ")); } + qDebug(); } void @@ -237,11 +240,12 @@ McqrRunView::handleMcqrMessages() else if(mcqr_error_regex.exactMatch(message)) { handleMcqrErrors(mcqr_message); - - if(mp_rProcess->state() == QProcess::NotRunning) - { - startRProcess(); - } + /* + if(mp_rProcess->state() == QProcess::NotRunning) + { + startRProcess(); + } + */ } else // Other messages {