react-cheminfo 0.131.0 → 0.133.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -0
- package/lib/core.d.ts +1 -0
- package/lib/core.d.ts.map +1 -1
- package/lib/core.js +1 -0
- package/lib/core.js.map +1 -1
- package/lib/drawing/captionEditor/CaptionEditor.d.ts +3 -3
- package/lib/drawing/captionEditor/CaptionEditor.d.ts.map +1 -1
- package/lib/drawing/captionEditor/CaptionEditor.js +8 -4
- package/lib/drawing/captionEditor/CaptionEditor.js.map +1 -1
- package/lib/drawing/captionEditor/CaptionToolbar.d.ts +4 -2
- package/lib/drawing/captionEditor/CaptionToolbar.d.ts.map +1 -1
- package/lib/drawing/captionEditor/CaptionToolbar.js +6 -4
- package/lib/drawing/captionEditor/CaptionToolbar.js.map +1 -1
- package/lib/drawing/captionEditor/index.d.ts +2 -0
- package/lib/drawing/captionEditor/index.d.ts.map +1 -1
- package/lib/drawing/captionEditor/index.js +1 -0
- package/lib/drawing/captionEditor/index.js.map +1 -1
- package/lib/drawing/captionEditor/toolbarInView.d.ts +40 -0
- package/lib/drawing/captionEditor/toolbarInView.d.ts.map +1 -0
- package/lib/drawing/captionEditor/toolbarInView.js +53 -0
- package/lib/drawing/captionEditor/toolbarInView.js.map +1 -0
- package/lib/drawing/core/camera.d.ts +2 -0
- package/lib/drawing/core/camera.d.ts.map +1 -1
- package/lib/drawing/core/camera.js +2 -0
- package/lib/drawing/core/camera.js.map +1 -1
- package/lib/drawing/core/index.d.ts +1 -1
- package/lib/drawing/core/index.d.ts.map +1 -1
- package/lib/drawing/core/index.js +1 -1
- package/lib/drawing/core/index.js.map +1 -1
- package/lib/drawing/render/index.d.ts +1 -1
- package/lib/drawing/render/index.d.ts.map +1 -1
- package/lib/drawing/render/index.js +1 -1
- package/lib/drawing/render/index.js.map +1 -1
- package/lib/drawing/render/pageGrid.d.ts +16 -0
- package/lib/drawing/render/pageGrid.d.ts.map +1 -1
- package/lib/drawing/render/pageGrid.js +28 -10
- package/lib/drawing/render/pageGrid.js.map +1 -1
- package/lib/drawing/ui/PageField.d.ts +29 -0
- package/lib/drawing/ui/PageField.d.ts.map +1 -0
- package/lib/drawing/ui/PageField.js +38 -0
- package/lib/drawing/ui/PageField.js.map +1 -0
- package/lib/drawing/ui/PageGrid.d.ts +20 -0
- package/lib/drawing/ui/PageGrid.d.ts.map +1 -0
- package/lib/drawing/ui/PageGrid.js +26 -0
- package/lib/drawing/ui/PageGrid.js.map +1 -0
- package/lib/drawing/ui/PageSideInput.d.ts +28 -0
- package/lib/drawing/ui/PageSideInput.d.ts.map +1 -0
- package/lib/drawing/ui/PageSideInput.js +47 -0
- package/lib/drawing/ui/PageSideInput.js.map +1 -0
- package/lib/drawing/ui/PageToolbar.d.ts +16 -0
- package/lib/drawing/ui/PageToolbar.d.ts.map +1 -0
- package/lib/drawing/ui/PageToolbar.js +16 -0
- package/lib/drawing/ui/PageToolbar.js.map +1 -0
- package/lib/drawing/ui/PrintSheets.d.ts +32 -0
- package/lib/drawing/ui/PrintSheets.d.ts.map +1 -0
- package/lib/drawing/ui/PrintSheets.js +17 -0
- package/lib/drawing/ui/PrintSheets.js.map +1 -0
- package/lib/drawing/ui/TextToolIcon.d.ts +19 -0
- package/lib/drawing/ui/TextToolIcon.d.ts.map +1 -0
- package/lib/drawing/ui/TextToolIcon.js +21 -0
- package/lib/drawing/ui/TextToolIcon.js.map +1 -0
- package/lib/drawing/ui/ZoomControl.d.ts +25 -0
- package/lib/drawing/ui/ZoomControl.d.ts.map +1 -0
- package/lib/drawing/ui/ZoomControl.js +27 -0
- package/lib/drawing/ui/ZoomControl.js.map +1 -0
- package/lib/drawing/ui/index.d.ts +10 -0
- package/lib/drawing/ui/index.d.ts.map +1 -1
- package/lib/drawing/ui/index.js +7 -0
- package/lib/drawing/ui/index.js.map +1 -1
- package/lib/guide/ui/EmptyGuide.d.ts +5 -2
- package/lib/guide/ui/EmptyGuide.d.ts.map +1 -1
- package/lib/guide/ui/EmptyGuide.js +8 -3
- package/lib/guide/ui/EmptyGuide.js.map +1 -1
- package/lib/guide/ui/GuideFigures.d.ts +6 -0
- package/lib/guide/ui/GuideFigures.d.ts.map +1 -1
- package/lib/guide/ui/GuideFigures.js +5 -5
- package/lib/guide/ui/GuideFigures.js.map +1 -1
- package/lib/i18n/core/chromeCatalog.d.ts +1 -1
- package/lib/i18n/core/chromeCatalog.d.ts.map +1 -1
- package/lib/locales/de.json +4 -0
- package/lib/locales/en.json +4 -0
- package/lib/locales/es.json +4 -0
- package/lib/locales/fr.json +4 -0
- package/lib/locales/it.json +4 -0
- package/lib/log/core/index.d.ts +4 -0
- package/lib/log/core/index.d.ts.map +1 -0
- package/lib/log/core/index.js +3 -0
- package/lib/log/core/index.js.map +1 -0
- package/lib/log/core/logGroups.d.ts +87 -0
- package/lib/log/core/logGroups.d.ts.map +1 -0
- package/lib/log/core/logGroups.js +85 -0
- package/lib/log/core/logGroups.js.map +1 -0
- package/lib/log/core/logLines.d.ts +19 -0
- package/lib/log/core/logLines.d.ts.map +1 -0
- package/lib/log/core/logLines.js +36 -0
- package/lib/log/core/logLines.js.map +1 -0
- package/lib/log/ui/LogBadge.d.ts +39 -0
- package/lib/log/ui/LogBadge.d.ts.map +1 -0
- package/lib/log/ui/LogBadge.js +28 -0
- package/lib/log/ui/LogBadge.js.map +1 -0
- package/lib/log/ui/LogCallouts.d.ts +55 -0
- package/lib/log/ui/LogCallouts.d.ts.map +1 -0
- package/lib/log/ui/LogCallouts.js +38 -0
- package/lib/log/ui/LogCallouts.js.map +1 -0
- package/lib/log/ui/index.d.ts +7 -0
- package/lib/log/ui/index.d.ts.map +1 -0
- package/lib/log/ui/index.js +5 -0
- package/lib/log/ui/index.js.map +1 -0
- package/lib/log/ui/logIcon.d.ts +9 -0
- package/lib/log/ui/logIcon.d.ts.map +1 -0
- package/lib/log/ui/logIcon.js +17 -0
- package/lib/log/ui/logIcon.js.map +1 -0
- package/lib/log/ui/useLogEntries.d.ts +15 -0
- package/lib/log/ui/useLogEntries.d.ts.map +1 -0
- package/lib/log/ui/useLogEntries.js +47 -0
- package/lib/log/ui/useLogEntries.js.map +1 -0
- package/lib/mass/core/index.d.ts +1 -0
- package/lib/mass/core/index.d.ts.map +1 -1
- package/lib/mass/core/index.js +1 -0
- package/lib/mass/core/index.js.map +1 -1
- package/lib/mass/core/massDomain.d.ts.map +1 -1
- package/lib/mass/core/massDomain.js +9 -5
- package/lib/mass/core/massDomain.js.map +1 -1
- package/lib/mass/core/massSpectrum.d.ts +9 -0
- package/lib/mass/core/massSpectrum.d.ts.map +1 -1
- package/lib/mass/core/massSpectrum.js.map +1 -1
- package/lib/mass/core/verticalScale.d.ts +30 -0
- package/lib/mass/core/verticalScale.d.ts.map +1 -0
- package/lib/mass/core/verticalScale.js +40 -0
- package/lib/mass/core/verticalScale.js.map +1 -0
- package/lib/mass/ui/MassChart.d.ts.map +1 -1
- package/lib/mass/ui/MassChart.js +4 -38
- package/lib/mass/ui/MassChart.js.map +1 -1
- package/lib/mass/ui/massChartLayers.d.ts +31 -0
- package/lib/mass/ui/massChartLayers.d.ts.map +1 -0
- package/lib/mass/ui/massChartLayers.js +57 -0
- package/lib/mass/ui/massChartLayers.js.map +1 -0
- package/lib/structure/core/conformerMinimise.d.ts +13 -4
- package/lib/structure/core/conformerMinimise.d.ts.map +1 -1
- package/lib/structure/core/conformerMinimise.js +23 -6
- package/lib/structure/core/conformerMinimise.js.map +1 -1
- package/lib/structure/core/conformerRefine.d.ts +2 -2
- package/lib/structure/core/conformerRefine.d.ts.map +1 -1
- package/lib/structure/core/conformerRefine.js +23 -7
- package/lib/structure/core/conformerRefine.js.map +1 -1
- package/lib/structure/core/conformers.d.ts +8 -3
- package/lib/structure/core/conformers.d.ts.map +1 -1
- package/lib/structure/core/conformers.js +10 -7
- package/lib/structure/core/conformers.js.map +1 -1
- package/lib/structure/core/geometryRelaxer.d.ts +10 -3
- package/lib/structure/core/geometryRelaxer.d.ts.map +1 -1
- package/lib/structure/core/index.d.ts +1 -1
- package/lib/structure/core/index.d.ts.map +1 -1
- package/lib/structure/core/index.js.map +1 -1
- package/lib/structure/core/relaxerLogLines.d.ts +16 -0
- package/lib/structure/core/relaxerLogLines.d.ts.map +1 -0
- package/lib/structure/core/relaxerLogLines.js +33 -0
- package/lib/structure/core/relaxerLogLines.js.map +1 -0
- package/lib/structure/core/structurePicture.d.ts +32 -1
- package/lib/structure/core/structurePicture.d.ts.map +1 -1
- package/lib/structure/core/structurePicture.js +29 -2
- package/lib/structure/core/structurePicture.js.map +1 -1
- package/lib/structure/ui/StructureEditor.d.ts +2 -1
- package/lib/structure/ui/StructureEditor.d.ts.map +1 -1
- package/lib/structure/ui/StructureEditor.js +9 -3
- package/lib/structure/ui/StructureEditor.js.map +1 -1
- package/lib/structure/ui/StructureEditorGuide.d.ts +15 -0
- package/lib/structure/ui/StructureEditorGuide.d.ts.map +1 -0
- package/lib/structure/ui/StructureEditorGuide.js +26 -0
- package/lib/structure/ui/StructureEditorGuide.js.map +1 -0
- package/lib/structure/ui/structureEditorProps.d.ts +11 -1
- package/lib/structure/ui/structureEditorProps.d.ts.map +1 -1
- package/lib/structure/ui/useCanvasPress.d.ts +23 -0
- package/lib/structure/ui/useCanvasPress.d.ts.map +1 -0
- package/lib/structure/ui/useCanvasPress.js +53 -0
- package/lib/structure/ui/useCanvasPress.js.map +1 -0
- package/lib/ui.d.ts +1 -0
- package/lib/ui.d.ts.map +1 -1
- package/lib/ui.js +1 -0
- package/lib/ui.js.map +1 -1
- package/lib/xps/core/detectFormat.d.ts +6 -0
- package/lib/xps/core/detectFormat.d.ts.map +1 -1
- package/lib/xps/core/detectFormat.js +8 -0
- package/lib/xps/core/detectFormat.js.map +1 -1
- package/lib/xps/core/xpsEditorApi.d.ts +16 -0
- package/lib/xps/core/xpsEditorApi.d.ts.map +1 -1
- package/lib/xps/ui/XpsCanvas.d.ts +10 -1
- package/lib/xps/ui/XpsCanvas.d.ts.map +1 -1
- package/lib/xps/ui/XpsCanvas.js +14 -3
- package/lib/xps/ui/XpsCanvas.js.map +1 -1
- package/lib/xps/ui/XpsChart.d.ts.map +1 -1
- package/lib/xps/ui/XpsChart.js +12 -43
- package/lib/xps/ui/XpsChart.js.map +1 -1
- package/lib/xps/ui/XpsEditor.d.ts +8 -0
- package/lib/xps/ui/XpsEditor.d.ts.map +1 -1
- package/lib/xps/ui/XpsEditor.js +2 -2
- package/lib/xps/ui/XpsEditor.js.map +1 -1
- package/lib/xps/ui/XpsShell.d.ts +5 -0
- package/lib/xps/ui/XpsShell.d.ts.map +1 -1
- package/lib/xps/ui/XpsShell.js +18 -4
- package/lib/xps/ui/XpsShell.js.map +1 -1
- package/lib/xps/ui/dropEvents.d.ts +8 -1
- package/lib/xps/ui/dropEvents.d.ts.map +1 -1
- package/lib/xps/ui/dropEvents.js +15 -1
- package/lib/xps/ui/dropEvents.js.map +1 -1
- package/lib/xps/ui/useSpectrumDrop.d.ts +6 -0
- package/lib/xps/ui/useSpectrumDrop.d.ts.map +1 -1
- package/lib/xps/ui/useSpectrumDrop.js +1 -1
- package/lib/xps/ui/useSpectrumDrop.js.map +1 -1
- package/lib/xps/ui/useXpsEditorHandle.d.ts +4 -1
- package/lib/xps/ui/useXpsEditorHandle.d.ts.map +1 -1
- package/lib/xps/ui/useXpsEditorHandle.js +6 -2
- package/lib/xps/ui/useXpsEditorHandle.js.map +1 -1
- package/lib/xps/ui/useXpsReadout.d.ts +43 -0
- package/lib/xps/ui/useXpsReadout.d.ts.map +1 -0
- package/lib/xps/ui/useXpsReadout.js +59 -0
- package/lib/xps/ui/useXpsReadout.js.map +1 -0
- package/lib/xps/ui/xpsChartProps.d.ts +9 -0
- package/lib/xps/ui/xpsChartProps.d.ts.map +1 -1
- package/lib/xtb/core/taggedLogger.d.ts +11 -0
- package/lib/xtb/core/taggedLogger.d.ts.map +1 -0
- package/lib/xtb/core/taggedLogger.js +31 -0
- package/lib/xtb/core/taggedLogger.js.map +1 -0
- package/lib/xtb/core/xtbRelaxer.d.ts.map +1 -1
- package/lib/xtb/core/xtbRelaxer.js +13 -5
- package/lib/xtb/core/xtbRelaxer.js.map +1 -1
- package/package.json +4 -3
- package/src/core.ts +1 -0
- package/src/drawing/captionEditor/CaptionEditor.tsx +8 -3
- package/src/drawing/captionEditor/CaptionToolbar.tsx +18 -2
- package/src/drawing/captionEditor/index.ts +2 -0
- package/src/drawing/captionEditor/toolbarInView.ts +73 -0
- package/src/drawing/core/camera.ts +3 -0
- package/src/drawing/core/index.ts +1 -0
- package/src/drawing/render/index.ts +2 -0
- package/src/drawing/render/pageGrid.ts +29 -11
- package/src/drawing/ui/PageField.tsx +104 -0
- package/src/drawing/ui/PageGrid.tsx +48 -0
- package/src/drawing/ui/PageSideInput.tsx +81 -0
- package/src/drawing/ui/PageToolbar.tsx +45 -0
- package/src/drawing/ui/PrintSheets.tsx +57 -0
- package/src/drawing/ui/TextToolIcon.tsx +48 -0
- package/src/drawing/ui/ZoomControl.tsx +112 -0
- package/src/drawing/ui/index.ts +10 -0
- package/src/guide/ui/EmptyGuide.tsx +20 -13
- package/src/guide/ui/GuideFigures.tsx +15 -4
- package/src/locales/de.json +4 -0
- package/src/locales/en.json +4 -0
- package/src/locales/es.json +4 -0
- package/src/locales/fr.json +4 -0
- package/src/locales/it.json +4 -0
- package/src/log/core/index.ts +9 -0
- package/src/log/core/logGroups.ts +159 -0
- package/src/log/core/logLines.ts +44 -0
- package/src/log/ui/LogBadge.tsx +89 -0
- package/src/log/ui/LogCallouts.tsx +103 -0
- package/src/log/ui/index.ts +6 -0
- package/src/log/ui/logIcon.ts +21 -0
- package/src/log/ui/useLogEntries.ts +57 -0
- package/src/mass/core/index.ts +1 -0
- package/src/mass/core/massDomain.ts +9 -3
- package/src/mass/core/massSpectrum.ts +9 -0
- package/src/mass/core/verticalScale.ts +48 -0
- package/src/mass/ui/MassChart.tsx +12 -43
- package/src/mass/ui/massChartLayers.ts +66 -0
- package/src/structure/core/conformerMinimise.ts +34 -8
- package/src/structure/core/conformerRefine.ts +29 -13
- package/src/structure/core/conformers.ts +23 -12
- package/src/structure/core/geometryRelaxer.ts +11 -3
- package/src/structure/core/index.ts +1 -0
- package/src/structure/core/relaxerLogLines.ts +39 -0
- package/src/structure/core/structurePicture.ts +78 -4
- package/src/structure/ui/StructureEditor.tsx +13 -2
- package/src/structure/ui/StructureEditorGuide.tsx +35 -0
- package/src/structure/ui/structureEditorProps.ts +11 -1
- package/src/structure/ui/useCanvasPress.ts +69 -0
- package/src/ui.ts +1 -0
- package/src/xps/core/detectFormat.ts +9 -0
- package/src/xps/core/xpsEditorApi.ts +16 -0
- package/src/xps/ui/XpsCanvas.tsx +26 -3
- package/src/xps/ui/XpsChart.tsx +12 -56
- package/src/xps/ui/XpsEditor.tsx +10 -0
- package/src/xps/ui/XpsShell.tsx +37 -7
- package/src/xps/ui/dropEvents.ts +16 -1
- package/src/xps/ui/useSpectrumDrop.ts +7 -1
- package/src/xps/ui/useXpsEditorHandle.ts +12 -2
- package/src/xps/ui/useXpsReadout.ts +104 -0
- package/src/xps/ui/xpsChartProps.ts +9 -0
- package/src/xtb/core/taggedLogger.ts +35 -0
- package/src/xtb/core/xtbRelaxer.ts +15 -5
- package/styles/caption-editor.css +15 -1
- package/styles/chrome.css +164 -9
- package/styles/drawing.css +100 -0
package/lib/mass/ui/MassChart.js
CHANGED
|
@@ -12,6 +12,7 @@ import { mzDecimalsOf } from "../core/resolutionOf.js";
|
|
|
12
12
|
import { MassPointerTracker } from "./MassPointerTracker.js";
|
|
13
13
|
import { PeakLabels } from "./PeakLabels.js";
|
|
14
14
|
import { SpectrumTrace } from "./SpectrumTrace.js";
|
|
15
|
+
import { emphasisedLast, labelledSpectrum, spectrumYScales, } from "./massChartLayers.js";
|
|
15
16
|
import { useMassPointer } from "./useMassPointer.js";
|
|
16
17
|
import { useMassZoom } from "./useMassZoom.js";
|
|
17
18
|
/**
|
|
@@ -80,6 +81,8 @@ export function MassChart(props) {
|
|
|
80
81
|
});
|
|
81
82
|
const labelled = useMemo(() => labelledSpectrum(spectra, labelledId), [spectra, labelledId]);
|
|
82
83
|
const painted = useMemo(() => emphasisedLast(spectra, emphasisedId), [spectra, emphasisedId]);
|
|
84
|
+
// Built once per window: the traces memoise their paths on their scale.
|
|
85
|
+
const yScales = useMemo(() => spectrumYScales(spectra, yScale), [spectra, yScale]);
|
|
83
86
|
// The crosshair reads every drawn spectrum, so it is written to what they
|
|
84
87
|
// resolve together; the labels are of one spectrum, and written to its own.
|
|
85
88
|
const readoutDecimals = useMemo(() => askedDecimals ?? mzDecimalsOf(spectra), [askedDecimals, spectra]);
|
|
@@ -88,47 +91,10 @@ export function MassChart(props) {
|
|
|
88
91
|
// React's generated id carries the punctuation it keeps its own ids apart
|
|
89
92
|
// with, which a URL fragment is under no obligation to accept.
|
|
90
93
|
const clipId = `mass-plot-${useId().replaceAll(/\W/g, '')}`;
|
|
91
|
-
return (_jsx("div", { ref: containerRef, style: containerStyle, children: _jsxs("svg", { ref: svgRef, role: "img", "aria-label": CHART_LABEL, width: frameWidth, height: frameHeight, viewBox: `0 0 ${frameWidth} ${frameHeight}`, style: chartSurfaceStyle(pointer.position !== null), ...handlers, children: [_jsx("defs", { children: _jsx("clipPath", { id: clipId, children: _jsx("rect", { x: plot.left, y: plot.top, width: plot.width, height: plot.height }) }) }), _jsx(Axes, { plot: plot, xDomain: shown.x, yDomain: shown.y, xScale: xScale, yScale: yScale, xTitle: "m/z", yTitle: "relative intensity (%)" }), _jsxs("g", { clipPath: `url(#${clipId})`, children: [painted.map((spectrum) => (_jsx(SpectrumTrace, { spectrum: spectrum, plot: plot, xScale: xScale, yScale: yScale, strokeWidth: spectrum.id === emphasisedId ? EMPHASISED_WIDTH : undefined }, spectrum.id))), children] }), showLabels && labelled !== null ? (_jsx(PeakLabels, { spectrum: labelled, plot: plot, xScale: xScale, yScale: yScale, limit: labelLimit, showCharges: showCharges, mzDecimals: labelDecimals, ...(annotationLabels === undefined ? {} : { annotationLabels }), ...(onPeakLabelClick === undefined
|
|
94
|
+
return (_jsx("div", { ref: containerRef, style: containerStyle, children: _jsxs("svg", { ref: svgRef, role: "img", "aria-label": CHART_LABEL, width: frameWidth, height: frameHeight, viewBox: `0 0 ${frameWidth} ${frameHeight}`, style: chartSurfaceStyle(pointer.position !== null), ...handlers, children: [_jsx("defs", { children: _jsx("clipPath", { id: clipId, children: _jsx("rect", { x: plot.left, y: plot.top, width: plot.width, height: plot.height }) }) }), _jsx(Axes, { plot: plot, xDomain: shown.x, yDomain: shown.y, xScale: xScale, yScale: yScale, xTitle: "m/z", yTitle: "relative intensity (%)" }), _jsxs("g", { clipPath: `url(#${clipId})`, children: [painted.map((spectrum) => (_jsx(SpectrumTrace, { spectrum: spectrum, plot: plot, xScale: xScale, yScale: yScales.get(spectrum.id) ?? yScale, strokeWidth: spectrum.id === emphasisedId ? EMPHASISED_WIDTH : undefined }, spectrum.id))), children] }), showLabels && labelled !== null ? (_jsx(PeakLabels, { spectrum: labelled, plot: plot, xScale: xScale, yScale: yScales.get(labelled.id) ?? yScale, limit: labelLimit, showCharges: showCharges, mzDecimals: labelDecimals, ...(annotationLabels === undefined ? {} : { annotationLabels }), ...(onPeakLabelClick === undefined
|
|
92
95
|
? {}
|
|
93
96
|
: { onClick: onPeakLabelClick }), color: spectra.length > 1 ? labelled.color : undefined })) : null, _jsx(AxisGuide, { value: highlightMz, plot: plot, xScale: xScale }), _jsx(SelectionRect, { selection: selection, plot: plot }), _jsx(MassPointerTracker, { position: pointer.position, readout: pointer.readout, plot: plot, mzDecimals: readoutDecimals })] }) }));
|
|
94
97
|
}
|
|
95
|
-
/**
|
|
96
|
-
* The one spectrum whose peaks are labelled.
|
|
97
|
-
* @param spectra - What the chart draws.
|
|
98
|
-
* @param labelledId - The identity asked for, `null` for none, absent to let the
|
|
99
|
-
* chart take the first.
|
|
100
|
-
* @returns The spectrum, or `null` when none answers.
|
|
101
|
-
*/
|
|
102
|
-
function labelledSpectrum(spectra, labelledId) {
|
|
103
|
-
if (labelledId === undefined)
|
|
104
|
-
return spectra[0] ?? null;
|
|
105
|
-
if (labelledId === null)
|
|
106
|
-
return null;
|
|
107
|
-
for (const spectrum of spectra) {
|
|
108
|
-
if (spectrum.id === labelledId)
|
|
109
|
-
return spectrum;
|
|
110
|
-
}
|
|
111
|
-
return null;
|
|
112
|
-
}
|
|
113
|
-
/**
|
|
114
|
-
* The traces in painting order, with the emphasised one last — last is in
|
|
115
|
-
* front, and in front is what lets a trace crossing a dozen others be followed.
|
|
116
|
-
* @param spectra - The traces, in the order they were opened.
|
|
117
|
-
* @param emphasisedId - Identity of the one to raise, `null` for none.
|
|
118
|
-
* @returns The order to paint in — the array itself when nothing moves.
|
|
119
|
-
*/
|
|
120
|
-
function emphasisedLast(spectra, emphasisedId) {
|
|
121
|
-
if (emphasisedId === null)
|
|
122
|
-
return spectra;
|
|
123
|
-
const at = spectra.findIndex((spectrum) => spectrum.id === emphasisedId);
|
|
124
|
-
if (at === -1 || at === spectra.length - 1)
|
|
125
|
-
return spectra;
|
|
126
|
-
return [
|
|
127
|
-
...spectra.slice(0, at),
|
|
128
|
-
...spectra.slice(at + 1),
|
|
129
|
-
spectra[at],
|
|
130
|
-
];
|
|
131
|
-
}
|
|
132
98
|
/** What the chart is, and what can be done to it, for whoever cannot see it. */
|
|
133
99
|
const CHART_LABEL = 'Mass spectrum. Drag across it to zoom the m/z axis, drag below the baseline to take the intensity axis with it, turn the wheel to scale the intensity, and double click to fit everything again.';
|
|
134
100
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MassChart.js","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAyB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA8B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAkC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"MassChart.js","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which spectrum a mass chart writes its labels on, in what order it paints
|
|
3
|
+
* them, and against which intensity axis each one is drawn.
|
|
4
|
+
*/
|
|
5
|
+
import type { ChartScale } from '../../chart/core/chartScale.ts';
|
|
6
|
+
import type { MassSpectrum } from '../core/massSpectrum.ts';
|
|
7
|
+
/**
|
|
8
|
+
* The one spectrum whose peaks are labelled.
|
|
9
|
+
* @param spectra - What the chart draws.
|
|
10
|
+
* @param labelledId - The identity asked for, `null` for none, absent to let the
|
|
11
|
+
* chart take the first.
|
|
12
|
+
* @returns The spectrum, or `null` when none answers.
|
|
13
|
+
*/
|
|
14
|
+
export declare function labelledSpectrum(spectra: readonly MassSpectrum[], labelledId: string | null | undefined): MassSpectrum | null;
|
|
15
|
+
/**
|
|
16
|
+
* The traces in painting order, with the emphasised one last — last is in
|
|
17
|
+
* front, and in front is what lets a trace crossing a dozen others be followed.
|
|
18
|
+
* @param spectra - The traces, in the order they were opened.
|
|
19
|
+
* @param emphasisedId - Identity of the one to raise, `null` for none.
|
|
20
|
+
* @returns The order to paint in — the array itself when nothing moves.
|
|
21
|
+
*/
|
|
22
|
+
export declare function emphasisedLast(spectra: readonly MassSpectrum[], emphasisedId: string | null): readonly MassSpectrum[];
|
|
23
|
+
/**
|
|
24
|
+
* The intensity axis each spectrum is drawn against, by identity.
|
|
25
|
+
* @param spectra - What the chart draws.
|
|
26
|
+
* @param yScale - The chart's intensity axis as it is currently zoomed.
|
|
27
|
+
* @returns The axis of each spectrum — the chart's own for every spectrum drawn
|
|
28
|
+
* as measured.
|
|
29
|
+
*/
|
|
30
|
+
export declare function spectrumYScales(spectra: readonly MassSpectrum[], yScale: ChartScale): Map<string, ChartScale>;
|
|
31
|
+
//# sourceMappingURL=massChartLayers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"massChartLayers.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/massChartLayers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACpC,YAAY,GAAG,IAAI,CAOrB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,YAAY,EAAE,MAAM,GAAG,IAAI,GAC1B,SAAS,YAAY,EAAE,CASzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,MAAM,EAAE,UAAU,GACjB,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAMzB"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which spectrum a mass chart writes its labels on, in what order it paints
|
|
3
|
+
* them, and against which intensity axis each one is drawn.
|
|
4
|
+
*/
|
|
5
|
+
import { spectrumYScale } from "../core/verticalScale.js";
|
|
6
|
+
/**
|
|
7
|
+
* The one spectrum whose peaks are labelled.
|
|
8
|
+
* @param spectra - What the chart draws.
|
|
9
|
+
* @param labelledId - The identity asked for, `null` for none, absent to let the
|
|
10
|
+
* chart take the first.
|
|
11
|
+
* @returns The spectrum, or `null` when none answers.
|
|
12
|
+
*/
|
|
13
|
+
export function labelledSpectrum(spectra, labelledId) {
|
|
14
|
+
if (labelledId === undefined)
|
|
15
|
+
return spectra[0] ?? null;
|
|
16
|
+
if (labelledId === null)
|
|
17
|
+
return null;
|
|
18
|
+
for (const spectrum of spectra) {
|
|
19
|
+
if (spectrum.id === labelledId)
|
|
20
|
+
return spectrum;
|
|
21
|
+
}
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* The traces in painting order, with the emphasised one last — last is in
|
|
26
|
+
* front, and in front is what lets a trace crossing a dozen others be followed.
|
|
27
|
+
* @param spectra - The traces, in the order they were opened.
|
|
28
|
+
* @param emphasisedId - Identity of the one to raise, `null` for none.
|
|
29
|
+
* @returns The order to paint in — the array itself when nothing moves.
|
|
30
|
+
*/
|
|
31
|
+
export function emphasisedLast(spectra, emphasisedId) {
|
|
32
|
+
if (emphasisedId === null)
|
|
33
|
+
return spectra;
|
|
34
|
+
const at = spectra.findIndex((spectrum) => spectrum.id === emphasisedId);
|
|
35
|
+
if (at === -1 || at === spectra.length - 1)
|
|
36
|
+
return spectra;
|
|
37
|
+
return [
|
|
38
|
+
...spectra.slice(0, at),
|
|
39
|
+
...spectra.slice(at + 1),
|
|
40
|
+
spectra[at],
|
|
41
|
+
];
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* The intensity axis each spectrum is drawn against, by identity.
|
|
45
|
+
* @param spectra - What the chart draws.
|
|
46
|
+
* @param yScale - The chart's intensity axis as it is currently zoomed.
|
|
47
|
+
* @returns The axis of each spectrum — the chart's own for every spectrum drawn
|
|
48
|
+
* as measured.
|
|
49
|
+
*/
|
|
50
|
+
export function spectrumYScales(spectra, yScale) {
|
|
51
|
+
const scales = new Map();
|
|
52
|
+
for (const spectrum of spectra) {
|
|
53
|
+
scales.set(spectrum.id, spectrumYScale(yScale, spectrum));
|
|
54
|
+
}
|
|
55
|
+
return scales;
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=massChartLayers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"massChartLayers.js","sourceRoot":"","sources":["../../../src/mass/ui/massChartLayers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAgC,EAChC,UAAqC;IAErC,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IACxD,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrC,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;QAC/B,IAAI,QAAQ,CAAC,EAAE,KAAK,UAAU;YAAE,OAAO,QAAQ,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAgC,EAChC,YAA2B;IAE3B,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAC1C,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;IACzE,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC;IAC3D,OAAO;QACL,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QACvB,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;QACxB,OAAO,CAAC,EAAE,CAAiB;KAC5B,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAC7B,OAAgC,EAChC,MAAkB;IAElB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Molecule } from 'openchemlib';
|
|
2
|
+
import type { LogLine } from '../../log/core/logGroups.ts';
|
|
2
3
|
import type { ConformerOptions } from './conformerOptions.ts';
|
|
3
4
|
/**
|
|
4
5
|
* Relax one conformer in place and return its energy.
|
|
@@ -8,15 +9,23 @@ import type { ConformerOptions } from './conformerOptions.ts';
|
|
|
8
9
|
* than an exception. A non-zero return code from `minimise()` is *not* a
|
|
9
10
|
* failure: ethyne returns 2 with a perfect geometry.
|
|
10
11
|
*
|
|
11
|
-
*
|
|
12
|
-
* number never means two things — a row
|
|
12
|
+
* A warning names its conformer by the count of conformers the generator
|
|
13
|
+
* handed back, kept or not, so one number never means two things — a row
|
|
14
|
+
* number would, once one is dropped.
|
|
13
15
|
* @param conformer - The conformer to relax. Mutated.
|
|
14
16
|
* @param options - Force field and iteration budget.
|
|
15
17
|
* @param produced - 1-based position of the conformer in the generator's output.
|
|
16
|
-
* @param
|
|
18
|
+
* @param logs - Receives one warning when the energy is unknown.
|
|
17
19
|
* @returns Total energy in kcal/mol, or `null` when none was computed.
|
|
18
20
|
*/
|
|
19
|
-
export declare function minimiseConformer(conformer: Molecule, options: ConformerOptions, produced: number,
|
|
21
|
+
export declare function minimiseConformer(conformer: Molecule, options: ConformerOptions, produced: number, logs: LogLine[]): number | null;
|
|
22
|
+
/**
|
|
23
|
+
* The label of a conformer as the generator handed it back, which a message
|
|
24
|
+
* about it is shown under.
|
|
25
|
+
* @param produced - 1-based position of the conformer in the generator's output.
|
|
26
|
+
* @returns E.g. `3rd conformer produced`.
|
|
27
|
+
*/
|
|
28
|
+
export declare function producedSource(produced: number): string;
|
|
20
29
|
/** What {@link rankByEnergy} reads and rewrites on a conformer. */
|
|
21
30
|
export interface RankedConformer {
|
|
22
31
|
id: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformerMinimise.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformerMinimise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"conformerMinimise.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformerMinimise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,EAAE,GACd,MAAM,GAAG,IAAI,CA2Bf;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AAUD,mEAAmE;AACnE,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,EACpD,UAAU,EAAE,SAAS,CAAC,EAAE,GACvB,CAAC,EAAE,CAKL"}
|
|
@@ -8,15 +8,16 @@ import { ordinal } from "../../format/core/words.js";
|
|
|
8
8
|
* than an exception. A non-zero return code from `minimise()` is *not* a
|
|
9
9
|
* failure: ethyne returns 2 with a perfect geometry.
|
|
10
10
|
*
|
|
11
|
-
*
|
|
12
|
-
* number never means two things — a row
|
|
11
|
+
* A warning names its conformer by the count of conformers the generator
|
|
12
|
+
* handed back, kept or not, so one number never means two things — a row
|
|
13
|
+
* number would, once one is dropped.
|
|
13
14
|
* @param conformer - The conformer to relax. Mutated.
|
|
14
15
|
* @param options - Force field and iteration budget.
|
|
15
16
|
* @param produced - 1-based position of the conformer in the generator's output.
|
|
16
|
-
* @param
|
|
17
|
+
* @param logs - Receives one warning when the energy is unknown.
|
|
17
18
|
* @returns Total energy in kcal/mol, or `null` when none was computed.
|
|
18
19
|
*/
|
|
19
|
-
export function minimiseConformer(conformer, options, produced,
|
|
20
|
+
export function minimiseConformer(conformer, options, produced, logs) {
|
|
20
21
|
const algorithm = options.minimisation;
|
|
21
22
|
if (algorithm === 'none')
|
|
22
23
|
return null;
|
|
@@ -27,15 +28,31 @@ export function minimiseConformer(conformer, options, produced, warnings) {
|
|
|
27
28
|
energy = forceField.getTotalEnergy();
|
|
28
29
|
}
|
|
29
30
|
catch (error) {
|
|
30
|
-
|
|
31
|
+
logs.push(producedWarning(produced, `It could not be minimised with ${algorithm} (${readable(error)}), so its energy is unknown.`));
|
|
31
32
|
return null;
|
|
32
33
|
}
|
|
33
34
|
if (!Number.isFinite(energy)) {
|
|
34
|
-
|
|
35
|
+
logs.push(producedWarning(produced, `It minimised to a non-finite ${algorithm} energy, so its energy is unknown.`));
|
|
35
36
|
return null;
|
|
36
37
|
}
|
|
37
38
|
return energy;
|
|
38
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* The label of a conformer as the generator handed it back, which a message
|
|
42
|
+
* about it is shown under.
|
|
43
|
+
* @param produced - 1-based position of the conformer in the generator's output.
|
|
44
|
+
* @returns E.g. `3rd conformer produced`.
|
|
45
|
+
*/
|
|
46
|
+
export function producedSource(produced) {
|
|
47
|
+
return `${ordinal(produced)} conformer produced`;
|
|
48
|
+
}
|
|
49
|
+
function producedWarning(produced, message) {
|
|
50
|
+
return {
|
|
51
|
+
levelLabel: 'warn',
|
|
52
|
+
message,
|
|
53
|
+
meta: { source: producedSource(produced) },
|
|
54
|
+
};
|
|
55
|
+
}
|
|
39
56
|
/**
|
|
40
57
|
* Order a set from the most stable conformer down, number it from one in that
|
|
41
58
|
* order, and measure every known energy from the lowest.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformerMinimise.js","sourceRoot":"","sources":["../../../src/structure/core/conformerMinimise.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"conformerMinimise.js","sourceRoot":"","sources":["../../../src/structure/core/conformerMinimise.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,8 +47,8 @@ export interface ConformerSetRefinement {
|
|
|
47
47
|
*/
|
|
48
48
|
reordered: number;
|
|
49
49
|
}
|
|
50
|
-
/** How a refinement
|
|
51
|
-
export interface RefineConformersOptions extends RelaxerOptions {
|
|
50
|
+
/** How a refinement is tuned and watched; what it logs is kept on the set. */
|
|
51
|
+
export interface RefineConformersOptions extends Omit<RelaxerOptions, 'logger'> {
|
|
52
52
|
/**
|
|
53
53
|
* Name of the method, for the label the UI shows.
|
|
54
54
|
* @default 'GFN2-xTB'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformerRefine.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformerRefine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conformerRefine.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformerRefine.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EACV,eAAe,EAEf,cAAc,EACf,MAAM,sBAAsB,CAAC;AAS9B,+EAA+E;AAC/E,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,kEAAkE;AAClE,MAAM,WAAW,sBAAsB;IACrC,+DAA+D;IAC/D,MAAM,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CACnD,cAAc,EACd,QAAQ,CACT;IACC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,SAAO,CAAC;AAElD,4EAA4E;AAC5E,eAAO,MAAM,eAAe,YAAY,CAAC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,eAAe,EACtB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA+GvB"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import { Molecule } from 'openchemlib';
|
|
2
3
|
import { ordinal } from "../../format/core/words.js";
|
|
3
4
|
import { isRefinedDuplicate, rankByRefinedEnergy, } from "./conformerRefineRank.js";
|
|
4
5
|
import { conformerShape } from "./conformerShape.js";
|
|
5
6
|
import { centredRmsd, readRelaxableGeometry, writeRelaxedCoordinates, } from "./moleculeCoordinates.js";
|
|
6
7
|
import { toMolfileExport } from "./molfileExport.js";
|
|
8
|
+
import { relaxerLogLines } from "./relaxerLogLines.js";
|
|
7
9
|
/**
|
|
8
10
|
* Energy gap in kcal/mol under which two relaxed conformers can be one minimum.
|
|
9
11
|
*
|
|
@@ -62,15 +64,19 @@ export async function refineConformers(set, relax, options = {}) {
|
|
|
62
64
|
geometry: readRelaxableGeometry(molecule),
|
|
63
65
|
});
|
|
64
66
|
}
|
|
67
|
+
const relaxerLog = new FifoLogger({ level: 'info' });
|
|
65
68
|
const relaxed = await relax(prepared.map((entry) => entry.geometry), {
|
|
66
69
|
onSettled: options.onSettled,
|
|
67
70
|
signal: options.signal,
|
|
71
|
+
logger: relaxerLog,
|
|
68
72
|
});
|
|
69
73
|
if (relaxed.length !== set.conformers.length) {
|
|
70
74
|
throw new Error(`The relaxer answered with ${relaxed.length} geometries for ${set.conformers.length} conformers.`);
|
|
71
75
|
}
|
|
72
76
|
const tolerance = options.sameEnergyTolerance ?? REFINED_SAME_ENERGY_TOLERANCE;
|
|
73
|
-
const
|
|
77
|
+
const own = [];
|
|
78
|
+
// Each structure's label, `null` for one merged away with its messages.
|
|
79
|
+
const sources = new Array(prepared.length).fill(null);
|
|
74
80
|
const kept = [];
|
|
75
81
|
const minima = [];
|
|
76
82
|
let merged = 0;
|
|
@@ -88,11 +94,14 @@ export async function refineConformers(set, relax, options = {}) {
|
|
|
88
94
|
merged++;
|
|
89
95
|
continue;
|
|
90
96
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
}
|
|
97
|
+
const source = `${ordinal(conformer.id)} conformer`;
|
|
98
|
+
sources[index] = source;
|
|
94
99
|
if (!result.converged) {
|
|
95
|
-
|
|
100
|
+
own.push({
|
|
101
|
+
levelLabel: 'warn',
|
|
102
|
+
message: `It did not reach a ${method} minimum in ${result.cycles} cycles, so its refined energy is an upper bound.`,
|
|
103
|
+
meta: { source },
|
|
104
|
+
});
|
|
96
105
|
}
|
|
97
106
|
kept.push({
|
|
98
107
|
...conformer,
|
|
@@ -111,13 +120,20 @@ export async function refineConformers(set, relax, options = {}) {
|
|
|
111
120
|
minima.push(candidate);
|
|
112
121
|
}
|
|
113
122
|
if (merged > 0) {
|
|
114
|
-
|
|
123
|
+
own.push({
|
|
124
|
+
levelLabel: 'info',
|
|
125
|
+
message: `${merged} conformer(s) relaxed into a ${method} minimum the set already held, so they were dropped.`,
|
|
126
|
+
});
|
|
115
127
|
}
|
|
116
128
|
const ranked = rankByRefinedEnergy(kept);
|
|
117
129
|
return {
|
|
118
130
|
...set,
|
|
119
131
|
conformers: ranked.conformers,
|
|
120
|
-
|
|
132
|
+
logs: [
|
|
133
|
+
...set.logs,
|
|
134
|
+
...relaxerLogLines(relaxerLog.getLogs(), sources),
|
|
135
|
+
...own,
|
|
136
|
+
],
|
|
121
137
|
rankedBy: REFINED_RANKING,
|
|
122
138
|
refinement: {
|
|
123
139
|
method,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformerRefine.js","sourceRoot":"","sources":["../../../src/structure/core/conformerRefine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"conformerRefine.js","sourceRoot":"","sources":["../../../src/structure/core/conformerRefine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Molecule } from 'openchemlib';
|
|
2
|
+
import type { LogLine } from '../../log/core/logGroups.ts';
|
|
2
3
|
import type { ConformerOptions, MinimisationAlgorithm } from './conformerOptions.ts';
|
|
3
4
|
import type { ConformerRefinement, ConformerSetRefinement } from './conformerRefine.ts';
|
|
4
5
|
import type { MolfileExport } from './molfileExport.ts';
|
|
@@ -37,8 +38,12 @@ export interface ConformerSet {
|
|
|
37
38
|
stoppedBy: StopReason;
|
|
38
39
|
/** Wall-clock duration of the run, initialisation and continuations included. */
|
|
39
40
|
elapsedMilliseconds: number;
|
|
40
|
-
/**
|
|
41
|
-
|
|
41
|
+
/**
|
|
42
|
+
* What the run has to say: conformers dropped (`error`), left without an
|
|
43
|
+
* energy (`warn`), merged by a refinement (`info`). Plain, so the set can be
|
|
44
|
+
* posted from a worker and saved in a figure with them.
|
|
45
|
+
*/
|
|
46
|
+
logs: LogLine[];
|
|
42
47
|
/** The force field that was asked for, echoed so a reader knows what the energies mean. */
|
|
43
48
|
minimisation: MinimisationAlgorithm;
|
|
44
49
|
/** Conformers the generator handed back, dropped ones included: where a continuation resumes. */
|
|
@@ -79,7 +84,7 @@ export type ConformerLimits = Pick<ConformerOptions, 'maxConformers' | 'timeoutS
|
|
|
79
84
|
* @param molecule - Structure to embed. Not mutated.
|
|
80
85
|
* @param options - Strategy, limits, seed and force field.
|
|
81
86
|
* @param now - Clock used for the time budget, injectable for tests.
|
|
82
|
-
* @returns Every conformer kept, most stable first, with relative energies and
|
|
87
|
+
* @returns Every conformer kept, most stable first, with relative energies and what the run logged.
|
|
83
88
|
* @throws {Error} When the structure is empty or OpenChemLib refuses to initialise it.
|
|
84
89
|
*/
|
|
85
90
|
export declare function generateConformers(molecule: Molecule, options: ConformerOptions, now?: () => number): ConformerSet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformers.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"conformers.d.ts","sourceRoot":"","sources":["../../../src/structure/core/conformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAQ3D,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,4EAA4E;AAC5E,MAAM,WAAW,SAAS;IACxB,2DAA2D;IAC3D,EAAE,EAAE,MAAM,CAAC;IACX,2DAA2D;IAC3D,OAAO,EAAE,aAAa,CAAC;IACvB,6EAA6E;IAC7E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8EAA8E;IAC9E,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG,SAAS,CAAC;AAEzD,yEAAyE;AACzE,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3D,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,oGAAoG;IACpG,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,iFAAiF;IACjF,uBAAuB,EAAE,MAAM,CAAC;IAChC,+CAA+C;IAC/C,SAAS,EAAE,UAAU,CAAC;IACtB,iFAAiF;IACjF,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;OAIG;IACH,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,2FAA2F;IAC3F,YAAY,EAAE,qBAAqB,CAAC;IACpC,iGAAiG;IACjG,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,OAAO,EAAE,gBAAgB,CAAC;IAC1B,+EAA+E;IAC/E,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;;OAGG;IACH,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC3C;AAED,qFAAqF;AACrF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,gBAAgB,EAChB,eAAe,GAAG,gBAAgB,CACnC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,GAAG,GAAE,MAAM,MAAqB,GAC/B,YAAY,CAEd;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,eAAe,EACvB,GAAG,GAAE,MAAM,MAAqB,GAC/B,YAAY,CAOd"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { minimiseConformer, rankByEnergy } from "./conformerMinimise.js";
|
|
1
|
+
import { minimiseConformer, producedSource, rankByEnergy, } from "./conformerMinimise.js";
|
|
3
2
|
import { isKeptMinimum, minimisedShapes } from "./conformerMinimum.js";
|
|
4
3
|
import { keepConformerSession, openConformerSession, readPotentialCount, } from "./conformerSession.js";
|
|
5
4
|
import { conformerShape, hasFiniteCoordinates } from "./conformerShape.js";
|
|
@@ -29,7 +28,7 @@ export { strategyConstant } from "./conformerSession.js";
|
|
|
29
28
|
* @param molecule - Structure to embed. Not mutated.
|
|
30
29
|
* @param options - Strategy, limits, seed and force field.
|
|
31
30
|
* @param now - Clock used for the time budget, injectable for tests.
|
|
32
|
-
* @returns Every conformer kept, most stable first, with relative energies and
|
|
31
|
+
* @returns Every conformer kept, most stable first, with relative energies and what the run logged.
|
|
33
32
|
* @throws {Error} When the structure is empty or OpenChemLib refuses to initialise it.
|
|
34
33
|
*/
|
|
35
34
|
export function generateConformers(molecule, options, now = defaultClock) {
|
|
@@ -84,7 +83,7 @@ function runConformers(molecule, options, previous, now) {
|
|
|
84
83
|
const into = {
|
|
85
84
|
conformers,
|
|
86
85
|
shapes: minimisedShapes(conformers),
|
|
87
|
-
|
|
86
|
+
logs: previous === null ? [] : [...previous.logs],
|
|
88
87
|
};
|
|
89
88
|
const budget = Math.max(options.timeoutSeconds * 1000, 0);
|
|
90
89
|
const stoppedBy = collect(session, options, into.conformers.length + options.maxConformers, () => now() - start >= budget, into);
|
|
@@ -94,7 +93,7 @@ function runConformers(molecule, options, previous, now) {
|
|
|
94
93
|
potentialConformerCount,
|
|
95
94
|
stoppedBy,
|
|
96
95
|
elapsedMilliseconds: (previous?.elapsedMilliseconds ?? 0) + now() - start,
|
|
97
|
-
|
|
96
|
+
logs: into.logs,
|
|
98
97
|
minimisation: options.minimisation,
|
|
99
98
|
produced: session.produced,
|
|
100
99
|
options,
|
|
@@ -120,10 +119,14 @@ function collect(session, options, target, spent, into) {
|
|
|
120
119
|
}
|
|
121
120
|
session.produced++;
|
|
122
121
|
if (!hasFiniteCoordinates(conformer)) {
|
|
123
|
-
into.
|
|
122
|
+
into.logs.push({
|
|
123
|
+
levelLabel: 'error',
|
|
124
|
+
message: 'It was dropped: the generator placed some of its atoms at non-finite coordinates.',
|
|
125
|
+
meta: { source: producedSource(session.produced) },
|
|
126
|
+
});
|
|
124
127
|
continue;
|
|
125
128
|
}
|
|
126
|
-
const energy = minimiseConformer(conformer, options, session.produced, into.
|
|
129
|
+
const energy = minimiseConformer(conformer, options, session.produced, into.logs);
|
|
127
130
|
const shape = energy === null ? null : conformerShape(conformer);
|
|
128
131
|
if (energy !== null &&
|
|
129
132
|
shape !== null &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conformers.js","sourceRoot":"","sources":["../../../src/structure/core/conformers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conformers.js","sourceRoot":"","sources":["../../../src/structure/core/conformers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LightLogger } from 'cheminfo-types';
|
|
1
2
|
/**
|
|
2
3
|
* A geometry a relaxer is handed: element symbols plus flat Cartesian
|
|
3
4
|
* coordinates in ångström, `x,y,z` per atom.
|
|
@@ -32,11 +33,17 @@ export interface RelaxedGeometry {
|
|
|
32
33
|
cycles: number;
|
|
33
34
|
/** Whether the optimizer met its convergence criteria. */
|
|
34
35
|
converged: boolean;
|
|
35
|
-
/** Plain sentences about anything the caller should know. */
|
|
36
|
-
warnings: string[];
|
|
37
36
|
}
|
|
38
|
-
/** How a relaxation run is watched and
|
|
37
|
+
/** How a relaxation run is watched, cancelled and heard from. */
|
|
39
38
|
export interface RelaxerOptions {
|
|
39
|
+
/**
|
|
40
|
+
* Receives what the relaxer has to say: `error` for something dropped while
|
|
41
|
+
* the rest went on, `warn` for what changes how a result must be read, `info`
|
|
42
|
+
* for context. An entry about one structure carries `structure`, its index
|
|
43
|
+
* in the batch; one without it is about the whole batch.
|
|
44
|
+
* @default nothing is reported
|
|
45
|
+
*/
|
|
46
|
+
logger?: LightLogger;
|
|
40
47
|
/**
|
|
41
48
|
* Called as each structure finishes, so a caller can show progress over a
|
|
42
49
|
* batch that runs for seconds.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geometryRelaxer.d.ts","sourceRoot":"","sources":["../../../src/structure/core/geometryRelaxer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,uEAAuE;IACvE,WAAW,EAAE,YAAY,CAAC;CAC3B;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,mEAAmE;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,SAAS,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"geometryRelaxer.d.ts","sourceRoot":"","sources":["../../../src/structure/core/geometryRelaxer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,uEAAuE;IACvE,WAAW,EAAE,YAAY,CAAC;CAC3B;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,mEAAmE;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,iEAAiE;AACjE,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,eAAe,GAAG,CAC5B,UAAU,EAAE,SAAS,iBAAiB,EAAE,EACxC,OAAO,CAAC,EAAE,cAAc,KACrB,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC"}
|
|
@@ -27,7 +27,7 @@ export type { ReadStructureResult, StructureKind } from './readStructure.ts';
|
|
|
27
27
|
export { looksLikeSmarts, readStructure } from './readStructure.ts';
|
|
28
28
|
export type { StructureError } from './structureError.ts';
|
|
29
29
|
export { structureError } from './structureError.ts';
|
|
30
|
-
export type { StructurePicture, StructurePictureOptions, } from './structurePicture.ts';
|
|
30
|
+
export type { StructureDepictorOptions, StructurePicture, StructurePictureOptions, } from './structurePicture.ts';
|
|
31
31
|
export { STRUCTURE_BOND_LENGTH, structurePicture } from './structurePicture.ts';
|
|
32
32
|
export type { StructureSearchExample, StructureSearchMode, StructureSearchQuery, } from './structureSearch.ts';
|
|
33
33
|
export { SIMILARITY_THRESHOLDS, STRUCTURE_SEARCH_MODES, similarityThresholds, } from './structureSearch.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/structure/core/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/structure/core/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/structure/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EACL,sBAAsB,EACtB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAOtE,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/structure/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EACL,sBAAsB,EACtB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAOtE,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,YAAY,GACb,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAMhF,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKvD,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC"}
|