diff --git a/src/gui/xic_view/xic_box/xicbox.cpp b/src/gui/xic_view/xic_box/xicbox.cpp index 3c3c1b08eec85269eef16862fd505372782e5b83..a8d84916cfff88acd1329340259822259521c9e9 100644 --- a/src/gui/xic_view/xic_box/xicbox.cpp +++ b/src/gui/xic_view/xic_box/xicbox.cpp @@ -670,13 +670,17 @@ XicBox::setIsotopeMassList( { _natural_isotope_list.clear(); + MasschroqFileParametersSp params = _p_xic_window->getProjectWindow() + ->getProjectSP() + .get() + ->getMasschroqFileParametersSp(); pappso::XicCoordSPtr xic_coord_ref = _msrun_sp.get() ->getMsRunReaderSPtr() .get() ->newXicCoordSPtrFromSpectrumIndex( _p_peptide_evidence->getSpectrumIndexByScanNumber(), - _p_xic_window->getXicExtractPrecision()); + params.get()->xic_extraction_range); std::vector<pappso::XicCoordSPtr> mass_list; for(pappso::PeptideNaturalIsotopeAverageSp &natural_isotope_average : @@ -687,7 +691,7 @@ XicBox::setIsotopeMassList( xic_coord_ref.get()->initializeAndClone(); xic_coord.get()->mzRange = pappso::MzRange(natural_isotope_average.get()->getMz(), - _p_xic_window->getXicExtractPrecision()); + params.get()->xic_extraction_range); mass_list.push_back(xic_coord); _natural_isotope_list.push_back({xic_coord.get()->xicSptr, @@ -785,13 +789,18 @@ XicBox::reExtractXic() qDebug(); ui->xic_widget->clear(); + MasschroqFileParametersSp params = _p_xic_window->getProjectWindow() + ->getProjectSP() + .get() + ->getMasschroqFileParametersSp(); + pappso::XicCoordSPtr xic_coord_ref = _msrun_sp.get() ->getMsRunReaderSPtr() .get() ->newXicCoordSPtrFromSpectrumIndex( _p_peptide_evidence->getSpectrumIndex(), - _p_xic_window->getXicExtractPrecision()); + params.get()->xic_extraction_range); std::vector<pappso::XicCoordSPtr> mass_list; for(XicBoxNaturalIsotope &xic_isotope : _natural_isotope_list) @@ -800,7 +809,7 @@ XicBox::reExtractXic() xic_coord_ref.get()->initializeAndClone(); xic_coord.get()->mzRange = pappso::MzRange(xic_isotope.peptide_natural_isotope_sp.get()->getMz(), - _p_xic_window->getXicExtractPrecision()); + params.get()->xic_extraction_range); mass_list.push_back(xic_coord); xic_isotope.xic_sp = xic_coord.get()->xicSptr; } diff --git a/src/gui/xic_view/xicwindow.cpp b/src/gui/xic_view/xicwindow.cpp index d24ca8deaa1e4928dc74a2f3d92b66aad531b4ec..8ef2715a643d41ef79e320495a0cf0eb4db68578 100644 --- a/src/gui/xic_view/xicwindow.cpp +++ b/src/gui/xic_view/xicwindow.cpp @@ -148,6 +148,11 @@ void XicWindow::xicPrecisionChanged(pappso::PrecisionPtr precision [[maybe_unused]]) { qDebug(); + _project_window->getProjectSP() + .get() + ->getMasschroqFileParametersSp() + .get() + ->xic_extraction_range = precision; emit reExtractXicNeeded(); qDebug(); } @@ -200,6 +205,12 @@ void XicWindow::doXicExtractionMethodChanged(pappso::XicExtractMethod xic_method [[maybe_unused]]) { + + _project_window->getProjectSP() + .get() + ->getMasschroqFileParametersSp() + .get() + ->xic_extraction_method = xic_method; emit reExtractXicNeeded(); }