10
0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-10-02 22:40:59 +02:00

Fix bug when CopyExcitationsTypeFrom(TBE)

This commit is contained in:
Mickaël Véril 2020-02-16 11:48:55 +01:00
parent daa62495fa
commit 488a4a3fb6

View File

@ -121,14 +121,20 @@ draft: false
proms.push(getFluoFilesName().map((f) => VertDataFile.loadAsync(f, VertExcitationKinds.Fluorescence))) proms.push(getFluoFilesName().map((f) => VertDataFile.loadAsync(f, VertExcitationKinds.Fluorescence)))
window.defaultDats = [] window.defaultDats = []
for (const subproms of proms) { for (const subproms of proms) {
var sub = await Promise.all(subproms) const sub = await Promise.all(subproms)
for (mol of uniq(sub.map(d => d.molecule))) { for (const doi of uniq(sub.map(d => d.DOI.string))) {
submol = sub.filter(d => d.molecule == mol) const subdoi = sub.filter(d => d.DOI.string === doi)
TBE = sub.find((d) => d.method.isTBE) for (mol of uniq(subdoi.map(d => d.molecule))) {
const submol = subdoi.filter(d => d.molecule === mol)
const TBE = submol.find((d) => d.method.isTBE)
if (TBE !== undefined) {
for (dat of submol.filter((d) => d !== TBE)) { for (dat of submol.filter((d) => d !== TBE)) {
dat.CopyExcitationsTypeFrom(TBE) dat.CopyExcitationsTypeFrom(TBE)
} }
} }
}
}
window.defaultDats = window.defaultDats.concat(sub) window.defaultDats = window.defaultDats.concat(sub)
} }
processingIndicator.isActive = false processingIndicator.isActive = false
@ -486,7 +492,10 @@ draft: false
<li>Fluorescence</li> <li>Fluorescence</li>
</ul> </ul>
<li>Choose each parameter (of course you can select multiples values for each) you can use the the <buttongit <li>Choose each parameter (of course you can select multiples values for each) you can use the the <buttongit
disabled>Select all</button> button to select all items <span hidden data-needbrowser='{"Engine":["WebKit","Blink"],"Platform":["desktop"]}'>or use the <kbd data-needbrowser='{"OS":["MacOS"]}'>CMD</kbd><kbd data-neednotbrowser='{"OS":["MacOS"]}'>Ctrl</kbd>+<kbd>A</kbd> shortcut key</span></li> disabled>Select all</button> button to select all items <span hidden
data-needbrowser='{"Engine":["WebKit","Blink"],"Platform":["desktop"]}'>or use the <kbd
data-needbrowser='{"OS":["MacOS"]}'>CMD</kbd><kbd
data-neednotbrowser='{"OS":["MacOS"]}'>Ctrl</kbd>+<kbd>A</kbd> shortcut key</span></li>
<ul id="SelectList"></ul> <ul id="SelectList"></ul>
<li>Choose filters:</li> <li>Choose filters:</li>
<ul> <ul>