fix: wrong behavior in integration of the assigned signal (#1224)

* fix: wrong behavior in integration calculation * chore: fix prettier
cheminfo · Sep 1, 2021 · b720846 · b720846
1 parent 177baef
commit b720846
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentsColumn.tsx b/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentsColumn.tsx
@@ -42,7 +42,7 @@ function ZoneAssignmentColumn({
       {...{ onClick: (e) => onClick(e, assignment, axis) }}
     >
       {lodashGet(rowData, `${axis}.pubIntegral`, 0) > 0 ? (
-        lodashGet(rowData, `${axis}.diaIDs`, []).length > 0 ? (
+        lodashGet(rowData, `${axis}.diaIDs`, 0).length > 0 ? (
           <div
             onMouseEnter={() => setShowUnlinkButton(true)}
             onMouseLeave={() => setShowUnlinkButton(false)}
@@ -60,7 +60,7 @@ function ZoneAssignmentColumn({
                   : { color: 'black', fontWeight: 'normal' }
               }
             >
-              {lodashGet(rowData, `${axis}.diaIDs`, []).length}
+              {lodashGet(rowData, `${axis}.nbAtoms`, 0)}
             </span>
             {`)`}{' '}
             <sup>

diff --git a/src/data/utilities/RangeUtilities.ts b/src/data/utilities/RangeUtilities.ts
@@ -13,7 +13,10 @@ export function getPubIntegral(range) {
   return (
     range.nbAtoms ||
     (range.signals
-      ? range.signals.reduce((sum, signal) => signal.nbAtoms + sum, 0)
+      ? range.signals.reduce(
+          (sum, signal) => (signal.nbAtoms ? signal.nbAtoms + sum : sum),
+          0,
+        )
       : 0)
   );
 }

diff --git a/src/data/utilities/ZoneUtilities.ts b/src/data/utilities/ZoneUtilities.ts
@@ -13,7 +13,11 @@ export function getPubIntegral(zone, axis) {
   return (
     zone.nbAtoms ||
     (zone.signals
-      ? zone.signals.reduce((sum, signal) => sum + signal[axis].nbAtoms, 0)
+      ? zone.signals.reduce(
+          (sum, signal) =>
+            signal[axis].nbAtoms ? sum + signal[axis].nbAtoms : sum,
+          0,
+        )
       : 0)
   );
 }