fix: set the first FT spectrum for 2d projection if none selected

cheminfo · Nov 28, 2023 · cc0ac08 · cc0ac08
1 parent 1995e6d
commit cc0ac08
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 18 deletions.
diff --git a/src/component/hooks/useActiveSpectrumIntegralsViewState.ts b/src/component/hooks/useActiveSpectrumIntegralsViewState.ts
@@ -14,7 +14,11 @@ export function useActiveSpectrumIntegralsViewState() {
     view: { integrals },
   } = useChartData();
 
-  if (activeSpectrum?.id && integrals[activeSpectrum?.id]) {
+  if (
+    activeSpectrum?.id &&
+    activeSpectrum?.selected &&
+    integrals[activeSpectrum?.id]
+  ) {
     return integrals[activeSpectrum?.id];
   } else {
     return defaultIntegralsViewState;

diff --git a/src/component/hooks/useActiveSpectrumPeaksViewState.ts b/src/component/hooks/useActiveSpectrumPeaksViewState.ts
@@ -17,7 +17,11 @@ export function useActiveSpectrumPeaksViewState() {
     view: { peaks },
   } = useChartData();
 
-  if (activeSpectrum?.id && peaks[activeSpectrum?.id]) {
+  if (
+    activeSpectrum?.id &&
+    activeSpectrum?.selected &&
+    peaks[activeSpectrum?.id]
+  ) {
     return peaks[activeSpectrum?.id];
   } else {
     return defaultPeaksViewState;

diff --git a/src/component/hooks/useActiveSpectrumRangesViewState.ts b/src/component/hooks/useActiveSpectrumRangesViewState.ts
@@ -19,7 +19,11 @@ export function useActiveSpectrumRangesViewState() {
     view: { ranges },
   } = useChartData();
 
-  if (activeSpectrum?.id && ranges[activeSpectrum?.id]) {
+  if (
+    activeSpectrum?.id &&
+    activeSpectrum?.selected &&
+    ranges[activeSpectrum?.id]
+  ) {
     return ranges[activeSpectrum?.id];
   } else {
     return defaultRangesViewState;

diff --git a/src/component/hooks/useActiveSpectrumStyleOptions.ts b/src/component/hooks/useActiveSpectrumStyleOptions.ts
@@ -18,9 +18,15 @@ export default function useActiveSpectrumStyleOptions(
 
   return useMemo(() => {
     const index = activeSpectra?.findIndex(
-      (activeSpectrum) => activeSpectrum.id === id,
+      (activeSpectrum) => activeSpectrum?.selected && activeSpectrum.id === id,
     );
-    const isActive = !!(activeSpectra?.length === 0 || index !== -1);
+    let isNoneSelected = false;
+    isNoneSelected =
+      activeSpectra?.every((activeSpectrum) => !activeSpectrum?.selected) ||
+      false;
+
+    const isActive =
+      !!(activeSpectra?.length === 0 || index !== -1) || isNoneSelected;
     const opacity = isActive
       ? 1
       : get(preferences.current, 'general.dimmedSpectraOpacity', 0.1);

diff --git a/src/component/hooks/useActiveSpectrumZonesViewState.ts b/src/component/hooks/useActiveSpectrumZonesViewState.ts
@@ -16,7 +16,11 @@ export function useActiveSpectrumZonesViewState() {
     view: { zones },
   } = useChartData();
 
-  if (activeSpectrum?.id && zones[activeSpectrum?.id]) {
+  if (
+    activeSpectrum?.id &&
+    activeSpectrum?.selected &&
+    zones[activeSpectrum?.id]
+  ) {
     return zones[activeSpectrum?.id];
   } else {
     return defaultZonesViewState;

diff --git a/src/component/hooks/useSpectrum.ts b/src/component/hooks/useSpectrum.ts
@@ -10,7 +10,7 @@ export default function useSpectrum(defaultValue: any = null) {
   const activeSpectrum = useActiveSpectrum();
 
   return useMemo<Spectrum>(() => {
-    if (data && activeSpectrum?.id) {
+    if (data && activeSpectrum?.id && activeSpectrum?.selected) {
       const datum =
         data.find((datum) => datum.id === activeSpectrum.id) || defaultValue;
       return datum;

diff --git a/src/component/panels/SpectrumsPanel/SpectraTable.tsx b/src/component/panels/SpectrumsPanel/SpectraTable.tsx
@@ -37,7 +37,9 @@ function getActiveSpectraAsObject(activeSpectra: ActiveSpectrum[] | null) {
   const result = {};
   if (activeSpectra) {
     for (const activeSpectrum of activeSpectra) {
-      result[activeSpectrum.id] = true;
+      if (activeSpectrum?.selected) {
+        result[activeSpectrum.id] = true;
+      }
     }
   }
   return result;

diff --git a/src/component/reducer/Reducer.ts b/src/component/reducer/Reducer.ts
@@ -34,6 +34,7 @@ import { ZoomHistory } from './helper/ZoomHistoryManager';
 export interface ActiveSpectrum {
   id: string;
   index: number;
+  selected: boolean;
 }
 
 export type DisplayerMode = '1D' | '2D';

diff --git a/src/component/reducer/actions/SpectrumsActions.ts b/src/component/reducer/actions/SpectrumsActions.ts
@@ -366,6 +366,7 @@ function handleChangeActiveSpectrum(
     newActiveSpectra.push({
       id: spectrumId,
       index: spectraObj[spectrumId].index,
+      selected: true,
     });
   }
 

diff --git a/src/component/reducer/actions/ToolsActions.ts b/src/component/reducer/actions/ToolsActions.ts
@@ -505,25 +505,26 @@ function setTabActiveSpectrum(draft: Draft<State>, dataGroupByTab) {
 
     if (data.length === 1) {
       const index = draft.data.findIndex((datum) => datum.id === data[0].id);
-      tabActiveSpectrum[tabKey] = [{ id: data[0].id, index }];
+      tabActiveSpectrum[tabKey] = [{ id: data[0].id, index, selected: true }];
     } else {
       const tabSpectra = dataGroupByTab[tabKey];
       const tabSpectraLength = tabSpectra.length;
       if (tabSpectraLength >= 2) {
         const FTSpectrums = tabSpectra.filter((d) => !d.info.isFid);
-        if (
-          FTSpectrums.length > 0 &&
-          (nucleusLength === 2 ||
-            (nucleusLength === 1 && tabSpectraLength !== FTSpectrums.length))
-        ) {
+        if (FTSpectrums.length > 0) {
+          const selected =
+            nucleusLength === 2 ||
+            (nucleusLength === 1 && tabSpectraLength !== FTSpectrums.length);
           const index = draft.data.findIndex(
             (datum) => datum.id === FTSpectrums[0].id,
           );
-          tabActiveSpectrum[tabKey] = [{ id: FTSpectrums[0].id, index }];
+          tabActiveSpectrum[tabKey] = [
+            { id: FTSpectrums[0].id, index, selected },
+          ];
         } else if (tabSpectraLength - FTSpectrums > 0) {
           const id = tabSpectra[0].id;
           const index = draft.data.findIndex((datum) => datum.id === id);
-          tabActiveSpectrum[tabKey] = [{ id, index }];
+          tabActiveSpectrum[tabKey] = [{ id, index, selected: true }];
         } else {
           tabActiveSpectrum[tabKey] = null;
         }

diff --git a/src/component/reducer/helper/getActiveSpectra.ts b/src/component/reducer/helper/getActiveSpectra.ts
@@ -4,6 +4,9 @@ import { State } from '../Reducer';
 
 export function getActiveSpectra(state: Draft<State> | State) {
   const { activeSpectra, activeTab } = state.view.spectra;
+  const spectra = activeSpectra?.[activeTab]?.filter(
+    (spectrum) => spectrum?.selected,
+  );
 
-  return activeSpectra?.[activeTab] || null;
+  return Array.isArray(spectra) && spectra.length > 0 ? spectra : null;
 }
diff --git a/src/component/reducer/helper/getActiveSpectrum.ts b/src/component/reducer/helper/getActiveSpectrum.ts
@@ -6,7 +6,7 @@ export function getActiveSpectrum(state: Draft<State> | State) {
   const { activeSpectra, activeTab } = state.view.spectra;
 
   const spectra = activeSpectra[activeTab];
-  if (spectra?.length === 1) {
+  if (spectra?.length === 1 && spectra[0]?.selected) {
     return spectra[0];
   }