From 3875ebe988f250e19361ec834ab4112aa8e744c9 Mon Sep 17 00:00:00 2001 From: vagisha Date: Mon, 18 Nov 2024 11:44:28 -0800 Subject: [PATCH] Added constructor for ChromatogramGroupId that takes both qcTraceName and spectrumFilter. --- .../labkey/targetedms/parser/ChromatogramGroupId.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/targetedms/parser/ChromatogramGroupId.java b/src/org/labkey/targetedms/parser/ChromatogramGroupId.java index 158fccf58..74a03a513 100644 --- a/src/org/labkey/targetedms/parser/ChromatogramGroupId.java +++ b/src/org/labkey/targetedms/parser/ChromatogramGroupId.java @@ -31,16 +31,16 @@ public class ChromatogramGroupId private ChromatogramGroupId() { } - public ChromatogramGroupId(Target target, SpectrumFilter spectrumFilter) + public ChromatogramGroupId(Target target, String qcTraceName, SpectrumFilter spectrumFilter) { _target = target; + _qcTraceName = StringUtils.isEmpty(qcTraceName) ? null : qcTraceName; _spectrumFilter = spectrumFilter; } - public ChromatogramGroupId(Target target, String qcTraceName) + public ChromatogramGroupId(Target target, SpectrumFilter spectrumFilter) { - _target = target; - _qcTraceName = StringUtils.isEmpty(qcTraceName) ? null : qcTraceName; + this(target, null, spectrumFilter); } public Target getTarget() @@ -87,7 +87,7 @@ public static List fromProtos(ChromatogramGroupDataOuterCla SpectrumFilter spectrumFilter = SpectrumFilter.fromFilterClauses( chromatogramGroupId.getFilterIndexesList().stream() .map(filterClauses::get).collect(Collectors.toList())).orElse(null); - list.add(new ChromatogramGroupId(targets.get(chromatogramGroupId.getTargetIndex()), spectrumFilter)); + list.add(new ChromatogramGroupId(targets.get(chromatogramGroupId.getTargetIndex()), chromatogramGroupId.getQcTraceName(), spectrumFilter)); } return list; }