diff --git a/dist/helpers/format.js b/dist/helpers/format.js index 98d0962a..1fbc58a7 100644 --- a/dist/helpers/format.js +++ b/dist/helpers/format.js @@ -278,7 +278,7 @@ const formatedEmissions = function (peaks, maxY) { x: k, y: ordered[k] })); - return ordered.map(o => `${o.x}`).join(', '); + return `λex = ${fixedWavelength} nm; λem = ${ordered.map(o => `${o.x}`).join(', ')}`; }; const formatedDLSIntensity = function (peaks, maxY) { let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2; @@ -422,12 +422,6 @@ const peaksWrapper = function (layout, shift) { }; } const ops = spectraOps[layout]; - if (layout === _list_layout.LIST_LAYOUT.EMISSIONS) { - return { - head: `${ops.head}${solvTxt}: λex = ${fixedWavelength} nm; λem = `, - tail: ops.tail - }; - } return { head: `${ops.head}${solvTxt} = `, tail: ops.tail diff --git a/src/helpers/format.js b/src/helpers/format.js index 6b48204e..e37ce8c2 100644 --- a/src/helpers/format.js +++ b/src/helpers/format.js @@ -211,7 +211,8 @@ const formatedEmissions = ( ordered = Object.keys(ordered).sort(sortFunc) .map((k) => ({ x: k, y: ordered[k] })); - return ordered.map((o) => `${o.x}`).join(', '); + return `λex = ${fixedWavelength} nm; λem = ${ordered.map((o) => `${o.x}`) + .join(', ')}`; }; const formatedDLSIntensity = ( @@ -347,9 +348,6 @@ const peaksWrapper = (layout, shift, atIndex = 0) => { } const ops = spectraOps[layout]; - if (layout === LIST_LAYOUT.EMISSIONS) { - return { head: `${ops.head}${solvTxt}: λex = ${fixedWavelength} nm; λem = `, tail: ops.tail }; - } return { head: `${ops.head}${solvTxt} = `, tail: ops.tail }; };