Merge branch 'master' into feature/update-to-boost-1.86

ProteoWizard · Nov 25, 2024 · 2f16aa7 · 2f16aa7
2 parents 737188d + b92fa3a
commit 2f16aa7
Show file tree

Hide file tree

Showing 99 changed files with 10,329 additions and 384 deletions.
diff --git a/pwiz_aux/msrc/utility/vendor_api/thermo/RawFileTypes.h b/pwiz_aux/msrc/utility/vendor_api/thermo/RawFileTypes.h
@@ -148,6 +148,7 @@ enum MatchType
 {
     Exact,
     Contains,
+    ContainsNoSpaces,
     StartsWith,
     EndsWith,
     ExactNoSpaces
@@ -218,6 +219,8 @@ const InstrumentNameToModelMapping nameToModelMapping[] =
     {"DFS", InstrumentModelType_DFS, Exact},
     {"DSQ II", InstrumentModelType_DSQ_II, Exact},
     {"ISQ SERIES", InstrumentModelType_ISQ, Exact},
+    {"ISQEC", InstrumentModelType_ISQ, ContainsNoSpaces},
+    {"ISQEM", InstrumentModelType_ISQ, ContainsNoSpaces},
     {"MALDI LTQ XL", InstrumentModelType_MALDI_LTQ_XL, Exact},
     {"MALDI LTQ ORBITRAP", InstrumentModelType_MALDI_LTQ_Orbitrap, Exact},
     {"TSQ QUANTUM", InstrumentModelType_TSQ_Quantum, Exact},
@@ -271,6 +274,7 @@ inline InstrumentModelType parseInstrumentModelType(const std::string& instrumen
             case Exact: if (mapping.name == type) return mapping.modelType; break;
             case ExactNoSpaces: if (mapping.name == typeNoSpaces) return mapping.modelType; break;
             case Contains: if (bal::contains(type, mapping.name)) return mapping.modelType; break;
+            case ContainsNoSpaces: if (bal::contains(typeNoSpaces, mapping.name)) return mapping.modelType; break;
             case StartsWith: if (bal::starts_with(type, mapping.name)) return mapping.modelType; break;
             case EndsWith: if (bal::ends_with(type, mapping.name)) return mapping.modelType; break;
             default:

diff --git a/pwiz_tools/Shared/ProteowizardWrapper/MsDataFileImpl.cs b/pwiz_tools/Shared/ProteowizardWrapper/MsDataFileImpl.cs
@@ -1747,7 +1747,7 @@ public void Write(string path)
             MSDataFile.write(_msDataFile, path);
         }
 
-        public void Dispose()
+        public virtual void Dispose()
         {
             _lastSpectrum?.Dispose();
             _lastScanIndex = -1;

diff --git a/pwiz_tools/Skyline/Alerts/AlertsResources.designer.cs b/pwiz_tools/Skyline/Alerts/AlertsResources.designer.cs