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

hasType test is now irrelevent

Browse Source
This commit is contained in:
Mickaël Véril 2020-09-11 16:55:53 +02:00
parent 1ac008613c
commit 3f9f7108b3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/data.js
View File

@ -237,8 +237,7 @@ class dataFileBase {
var vals = line.match(/\([^\)]+\)|\S+/g) var vals = line.match(/\([^\)]+\)|\S+/g)
var start = new state(parseInt(vals[0], 10), parseInt(vals[1], 10), vals[2]); var start = new state(parseInt(vals[0], 10), parseInt(vals[1], 10), vals[2]);
var end = new state(parseInt(vals[3], 10), parseInt(vals[4], 10), vals[5]); 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) ? vals[6] : null)
var type = ((vals.length >= 7 && hasType) ? vals[6] : null)
if (type === "_") { if (type === "_") {
type = null type = null
} }
@ -248,10 +247,10 @@ class dataFileBase {
type = m[1] type = m[1]
} }
} }
var val = ((vals.length >= 7 + hasType) ? new stringNumber(vals[6 + hasType]) : NaN) var val = ((vals.length >= 8) ? new stringNumber(vals[7]) : NaN)
var T1 = ((vals.length >= 8 + hasType) ? new stringNumber(vals[7 + hasType]) : NaN) var T1 = ((vals.length >= 9) ? new stringNumber(vals[8]) : NaN)
var oscilatorForces = ((vals.length >= 9 + hasType) ? new stringNumber(vals[8 + hasType]) : NaN) var oscilatorForces = ((vals.length >= 10) ? new stringNumber(vals[9]) : NaN)
var isUnsafe = ((vals.length >= 10 + hasType) ? vals[9 + hasType] === true.toString() : false) var isUnsafe = ((vals.length >= 11) ? vals[10] === true.toString() : false)
var ex = new excitationValue(start, end, type, val, oscilatorForces, T1, isUnsafe); var ex = new excitationValue(start, end, type, val, oscilatorForces, T1, isUnsafe);
if (this.VertExcitationKind) { if (this.VertExcitationKind) {
ex.VertExcitationKind = this.VertExcitationKind ex.VertExcitationKind = this.VertExcitationKind