PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-11-04 13:13:55 +01:00
Code Releases Activity

Merge branch 'master' into QUEST2

Browse Source
This commit is contained in:
Mickaël Véril 2020-03-31 14:26:09 +02:00
commit 0dc9adaa76
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/multipledataset.html
View File

@ -422,7 +422,10 @@ draft: false
if (ex[3].Value == VertExcitationKinds.Fluorescence.Value) {
Vertkindtext = String.raw`[\mathrm{F}]`
}
$("<th/>", { scope: "rowgroup" }).text(String.raw`${LatexInline[0]}${ex[0].toLaTeX()} \rightarrow ${ex[1].toLaTeX()} ${Vertkindtext}(${ex[2].description.string}) ${LatexInline[1]}`).appendTo(tr)
if(ex[2].description.string){
desctex="("+ex[2].description.string+")"
}
$("<th/>", { scope: "rowgroup" }).text(String.raw`${LatexInline[0]}${ex[0].toLaTeX()} \rightarrow ${ex[1].toLaTeX()} ${Vertkindtext} ${desctex} ${LatexInline[1]}`).appendTo(tr)
var entries = Array.from(exdat.entries())
for (const method of sortedMethods) {
td = $("<td/>").addClass("NumberCell")

5
static/js/data.js
View File

@ -145,7 +145,7 @@ class excitationBase {
this.initial = initial;
this.final = final
this.type = new excitationType(0, new description(type,true))
if (type !== "") {
if (type) {
const tys = type.split(";")
const arrow = String.raw`\rightarrow`
for (const ty of tys) {
@ -277,6 +277,9 @@ class dataFileBase {
var end = new state(parseInt(vals[3], 10), parseInt(vals[4],10), vals[5]);
var hasType = vals.length >= 7 && isNaN(vals[6])
var type = ((vals.length >= 7 && hasType) ? vals[6] : null)
if (type==="_") {
type=null
}
if (type) {
const m = type.match(/^\(([^\)]*)\)$/)
if (m) {