10
0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-25 13:53:48 +01:00

Change filters beaviour (one or more criteria)

This commit is contained in:
Mickaël Véril 2020-01-10 16:46:24 +01:00
parent f051f48b42
commit 5bb19399f3

View File

@ -163,7 +163,7 @@ draft: false
for (const exc of d.excitations) { for (const exc of d.excitations) {
const key2 = JSON.stringify([d.molecule, exc.initial, exc.final]) const key2 = JSON.stringify([d.molecule, exc.initial, exc.final])
const keydic = sdatdic.get(key) const keydic = sdatdic.get(key)
if ((!exc.isUnsafe || window.filterParams[0]) && ((exc.type & window.filterParams[1])==exc.type.Value)) { if ((!exc.isUnsafe || window.filterParams[0]) && ((exc.type & window.filterParams[1])!==0)) {
if (!(keydic.has(key2))) { if (!(keydic.has(key2))) {
keydic.set(key2, []) keydic.set(key2, [])
} }
@ -331,7 +331,7 @@ draft: false
const key3 = JSON.stringify(dat.method) const key3 = JSON.stringify(dat.method)
for (const ex of dat.excitations) { for (const ex of dat.excitations) {
Reflect.setPrototypeOf(ex.type,excitationType.prototype) Reflect.setPrototypeOf(ex.type,excitationType.prototype)
if ((window.filterParams[1] & ex.type)==ex.type.Value) { if ((window.filterParams[1] & ex.type)!==0) {
const key2 = JSON.stringify([ex.initial, ex.final, ex.type]) const key2 = JSON.stringify([ex.initial, ex.final, ex.type])
if (!datadic.get(key1).has(key2)) { if (!datadic.get(key1).has(key2)) {
datadic.get(key1).set(key2, new Map()) datadic.get(key1).set(key2, new Map())