feat: report peaks from XRD (#1614)

ComPlat · Nov 14, 2023 · 8203deb · 8203deb
1 parent da0074b
commit 8203deb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/app/packs/src/apps/mydb/elements/details/ViewSpectra.js b/app/packs/src/apps/mydb/elements/details/ViewSpectra.js
@@ -205,7 +205,7 @@ class ViewSpectra extends React.Component {
 
   formatPks({
     peaks, shift, layout, isAscend, decimal, body,
-    isIntensity, integration, curveSt
+    isIntensity, integration, curveSt, waveLength
   }) {
     const layoutOpsObj = SpectraOps[layout];
     if (!layoutOpsObj) {
@@ -226,6 +226,7 @@ class ViewSpectra extends React.Component {
     const { jcamp } = this.getContent();
     const { entity } = FN.buildData(jcamp);
     const { features } = entity;
+    const { temperature } = entity;
     const { observeFrequency } = Array.isArray(features)
       ? features[0]
       : (features.editPeak || features.autoPeak);
@@ -237,7 +238,16 @@ class ViewSpectra extends React.Component {
       : (features.editPeak || features.autoPeak);
     const boundary = { maxY, minY };
     const mBody = body || FN.peaksBody({
-      peaks, layout, decimal, shift, isAscend, isIntensity, boundary, integration: selectedIntegration
+      peaks,
+      layout,
+      decimal,
+      shift,
+      isAscend,
+      isIntensity,
+      boundary,
+      integration: selectedIntegration,
+      waveLength,
+      temperature
     });
 
     const { label, value, name } = selectedShift.ref;
@@ -332,7 +342,7 @@ class ViewSpectra extends React.Component {
 
   writeCommon({
     peaks, shift, scan, thres, analysis, layout, isAscend, decimal, body,
-    keepPred, isIntensity, multiplicity, integration, cyclicvoltaSt, curveSt
+    keepPred, isIntensity, multiplicity, integration, cyclicvoltaSt, curveSt, waveLength
   }, isMpy = false) {
     const { sample, handleSampleChanged } = this.props;
     const si = this.getSpcInfo();
@@ -353,7 +363,8 @@ class ViewSpectra extends React.Component {
         body,
         isIntensity,
         integration,
-        curveSt
+        curveSt,
+        waveLength
       });
     }
 
@@ -370,7 +381,7 @@ class ViewSpectra extends React.Component {
 
     const cb = () => (
       this.saveOp({
-        peaks, shift, scan, thres, analysis, keepPred, integration, multiplicity, cyclicvoltaSt, curveSt
+        peaks, shift, scan, thres, analysis, keepPred, integration, multiplicity, cyclicvoltaSt, curveSt, waveLength
       })
     );
     handleSampleChanged(sample, cb);

diff --git a/app/packs/src/utilities/quillToolbarSymbol.js b/app/packs/src/utilities/quillToolbarSymbol.js
@@ -380,6 +380,12 @@ const opsEmmissionHead = () => (
   ]
 );
 
+const opsXRDHead = () => (
+  [
+    { insert: 'XRD ' },
+  ]
+);
+
 const opsCommonHead = () => (
   []
 );
@@ -400,6 +406,7 @@ const SpectraOps = {
   Emissions: { head: opsEmmissionHead, tail: opsCommonTail },
   'DLS ACF': { head: opsCommonHead, tail: opsCommonTail },
   'DLS intensity': { head: opsDLSIntensityHead, tail: opsCommonTail },
+  'X-RAY DIFFRACTION': { head: opsXRDHead, tail: opsCommonHead }
 };
 
 const reactionAnalysesMacros = {

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "@babel/preset-react": "7.10.4",
     "@citation-js/plugin-isbn": "0.3.0",
     "@complat/chem-spectra-client": "1.0.0-rc18",
-    "@complat/react-spectra-editor": "1.0.0-rc18",
+    "@complat/react-spectra-editor": "1.0.0-rc19",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@novnc/novnc": "^1.2.0",