Skip to content

Enable filtering spectra on Dissociation Method #3591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 15, 2025
Merged

Enable filtering spectra on Dissociation Method #3591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fd06e6e
Enable creating spectrum filters on "Dissociation Method"
nickshulman Aug 5, 2025
fbec51c
DissociationMethodTest
nickshulman Aug 6, 2025
2cfd50a
DissociationMethodTest.zip
nickshulman Aug 6, 2025
2bccbd7
Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…
nickshulman Aug 6, 2025
454df8b
Revert unnecessary changes
nickshulman Aug 6, 2025
f17a746
Merge branch 'master' into Skyline/work/20250804_DissociationMethod
nickshulman Aug 7, 2025
40bf94a
Put CVParam into a using statement.
nickshulman Aug 7, 2025
d0e77c2
Merge branch 'Skyline/work/20250804_DissociationMethod' of https://gi…
nickshulman Aug 7, 2025
c88ce53
Add "DataFileMemoryLeakTest".
nickshulman Aug 8, 2025
bd240dc
- fixed memory leak in CVParamList and UserParamList
chambm Aug 12, 2025
ca72325
Remove unused code.
nickshulman Aug 13, 2025
602c2a8
Merge branch 'master' into Skyline/work/20250804_DissociationMethod
nickshulman Aug 17, 2025
acdae43
Merge branch 'master' into Skyline/work/20250804_DissociationMethod
chambm Aug 20, 2025
b22ecf2
Merge branch 'master' into Skyline/work/20250804_DissociationMethod
nickshulman Aug 25, 2025
dfb9d58
Merge branch 'master' into Skyline/work/20250804_DissociationMethod
nickshulman Aug 27, 2025
af91300
Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…
nickshulman Aug 28, 2025
e562342
Remove problematic delete call
chambm Sep 10, 2025
99b356a
Merge branch 'master' into Skyline/work/20250828_DissociationMethodSp…
nickshulman Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pwiz/utility/bindings/CLI/common/IterationListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ IterationListenerRegistry::IterationListenerRegistry()

IterationListenerRegistry::~IterationListenerRegistry()
{
LOG_DESTRUCT(BOOST_PP_STRINGIZE(CLIType), true);
LOG_DESTRUCT(BOOST_PP_STRINGIZE(CLIType), base_, true);
SAFEDELETE(base_);

for each (KeyValuePair<IterationListener^, KeyValuePair<IterationListenerUpdate^, System::IntPtr> > kvp in _listeners)
Expand Down
4 changes: 2 additions & 2 deletions pwiz/utility/bindings/CLI/common/IterationListener.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public delegate IterationListener::Status IterationListenerUpdate(IterationListe
public ref class IterationListenerRegistry
{
public: System::IntPtr void_base() {return (System::IntPtr) base_;} \
INTERNAL: IterationListenerRegistry(pwiz::util::IterationListenerRegistry* base) : base_(base) {LOG_CONSTRUCT(BOOST_PP_STRINGIZE(CLIType))} \
INTERNAL: IterationListenerRegistry(pwiz::util::IterationListenerRegistry* base) : base_(base) {LOG_CONSTRUCT(BOOST_PP_STRINGIZE(CLIType), base_)} \
virtual ~IterationListenerRegistry(); \
!IterationListenerRegistry() {LOG_FINALIZE(BOOST_PP_STRINGIZE(CLIType)) delete this;} \
!IterationListenerRegistry() {LOG_FINALIZE(BOOST_PP_STRINGIZE(CLIType), base_) delete this;} \
pwiz::util::IterationListenerRegistry* base_; \
pwiz::util::IterationListenerRegistry& base() {return *base_;}

Expand Down
Loading