Skip to content

Fix open issues #23

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
pjones merged 2 commits into from
Sep 14, 2026
Merged

Fix open issues #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be68462
Correctly sort array entries (fixes #22)
pjones Sep 14, 2026
3683349
Use the correct name for the wavelength spectrum entity (fixes #21)
pjones Sep 14, 2026
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
6 changes: 4 additions & 2 deletions src/data/array_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ namespace MzPeak::Data {
struct EntryCmpFn {
bool operator()(const ArrayIndex::Entry& a, const ArrayIndex::Entry& b) const
{
return a.array_name < b.array_name && a.array_type < b.array_type &&
a.data_type < b.data_type && a.buffer_priority > b.buffer_priority;
if (a.array_name != b.array_name) return a.array_name < b.array_name;
if (a.array_type != b.array_type) return a.array_type < b.array_type;
if (a.data_type != b.data_type) return a.data_type < b.data_type;
return a.buffer_priority > b.buffer_priority;
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/schema/entity_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ std::string entity_type_to_string(EntityType::Type t)
case Chromatogram:
return "chromatogram";
case WavelengthSpectrum:
return "wavelength spectrum";
return "wavelength_spectrum";
}

std::unreachable();
Expand All @@ -38,7 +38,7 @@ EntityType::value_type entity_type_from_string(std::string_view s)
return Spectrum;
} else if (s == "chromatogram") {
return Chromatogram;
} else if (s == "wavelength spectrum") {
} else if (s == "wavelength_spectrum") {
return WavelengthSpectrum;
} else {
return std::string(s);
Expand Down