fix: resolve the conflict of the analysis modal correctly (#2727)

* feat: resolve the conflict of the analysis spectra multiple analysis modal correctly the issue introduced by 8cb92df close #2726 * refactor: spectra analysis components paths
cheminfo · Oct 26, 2023 · fe6a81c · fe6a81c
1 parent 1b27799
commit fe6a81c
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 10 deletions.
diff --git a/src/component/panels/Panels.tsx b/src/component/panels/Panels.tsx
@@ -13,14 +13,14 @@ import InformationPanel from './InformationPanel';
 import IntegralPanel from './IntegralsPanel/IntegralPanel';
 import MatrixGenerationPanel from './MatrixGenerationPanel/MatrixGenerationPanel';
 import MoleculePanel from './MoleculesPanel/MoleculePanel';
-import MultipleSpectraAnalysisPanel from './MultipleSpectraAnalysisPanel/MultipleSpectraAnalysisPanel';
 import PeaksPanel from './PeaksPanel/PeaksPanel';
 import RangesPanel from './RangesPanel/RangesPanel';
 import SpectrumListPanel from './SpectrumsPanel/SpectrumListPanel';
 import SummaryPanel from './SummaryPanel/SummaryPanel';
 import ZonesPanel from './ZonesPanel/ZonesPanel';
 import DatabasePanel from './databasePanel/DatabasePanel';
 import FilterPanel from './filtersPanel/FilterPanel';
+import MultipleSpectraAnalysisPanel from './multipleAnalysisPanel/MultipleSpectraAnalysisPanel';
 import PredictionPane from './predictionPanel/PredictionPanel';
 import SpectrumSimulation from './spectrumSimulation/SpectrumSimulation';
 

diff --git a/...ipleSpectraAnalysisPanel/AlignSpectra.tsx → ...ls/multipleAnalysisPanel/AlignSpectra.tsx b/...ipleSpectraAnalysisPanel/AlignSpectra.tsx → ...ls/multipleAnalysisPanel/AlignSpectra.tsx
diff --git a/...pleSpectraAnalysisPanel/AnalysisChart.tsx → ...s/multipleAnalysisPanel/AnalysisChart.tsx b/...pleSpectraAnalysisPanel/AnalysisChart.tsx → ...s/multipleAnalysisPanel/AnalysisChart.tsx
diff --git a/...sisPanel/MultipleSpectraAnalysisPanel.tsx → ...sisPanel/MultipleSpectraAnalysisPanel.tsx b/...sisPanel/MultipleSpectraAnalysisPanel.tsx → ...sisPanel/MultipleSpectraAnalysisPanel.tsx
@@ -26,6 +26,7 @@ import DefaultPanelHeader from '../header/DefaultPanelHeader';
 import PreferencesHeader from '../header/PreferencesHeader';
 
 import AlignSpectra from './AlignSpectra';
+import AnalysisChart from './AnalysisChart';
 import MultipleSpectraAnalysisTable from './MultipleSpectraAnalysisTable';
 import MultipleSpectraAnalysisPreferences from './preferences';
 
@@ -168,11 +169,16 @@ function MultipleSpectraAnalysisPanelInner({
             onClose={() => setCalibration(false)}
           />
         ) : (
-          <MultipleSpectraAnalysisTable
-            data={spectraAnalysis}
-            resortSpectra={preferences.analysisOptions.resortSpectra}
-            activeTab={activeTab}
-          />
+          <div style={{ overflow: 'auto', maxHeight: '100%' }}>
+            {showAnalysisChart && (
+              <AnalysisChart spectraAnalysisData={spectraAnalysis} />
+            )}
+            <MultipleSpectraAnalysisTable
+              data={spectraAnalysis}
+              resortSpectra={preferences.analysisOptions.resortSpectra}
+              activeTab={activeTab}
+            />
+          </div>
         )}
       </div>
       <ClipboardFallbackModal

diff --git a/...sisPanel/MultipleSpectraAnalysisTable.tsx → ...sisPanel/MultipleSpectraAnalysisTable.tsx b/...sisPanel/MultipleSpectraAnalysisTable.tsx → ...sisPanel/MultipleSpectraAnalysisTable.tsx
diff --git a/...pectraAnalysisPanel/base/AnalysisCell.tsx → ...ltipleAnalysisPanel/base/AnalysisCell.tsx b/...pectraAnalysisPanel/base/AnalysisCell.tsx → ...ltipleAnalysisPanel/base/AnalysisCell.tsx
diff --git a/...alysisPanel/base/AnalysisColumnHeader.tsx → ...alysisPanel/base/AnalysisColumnHeader.tsx b/...alysisPanel/base/AnalysisColumnHeader.tsx → ...alysisPanel/base/AnalysisColumnHeader.tsx
diff --git a/.../preferences/AnalysisTablePreferences.tsx → .../preferences/AnalysisTablePreferences.tsx b/.../preferences/AnalysisTablePreferences.tsx → .../preferences/AnalysisTablePreferences.tsx
diff --git a/...sPanel/preferences/LegendsPreferences.tsx → ...sPanel/preferences/LegendsPreferences.tsx b/...sPanel/preferences/LegendsPreferences.tsx → ...sPanel/preferences/LegendsPreferences.tsx
diff --git a/...references/MultipleAnalysisCodeEditor.tsx → ...references/MultipleAnalysisCodeEditor.tsx b/...references/MultipleAnalysisCodeEditor.tsx → ...references/MultipleAnalysisCodeEditor.tsx
diff --git a/...pectraAnalysisPanel/preferences/index.tsx → ...ltipleAnalysisPanel/preferences/index.tsx b/...pectraAnalysisPanel/preferences/index.tsx → ...ltipleAnalysisPanel/preferences/index.tsx
diff --git a/src/data/data1d/Spectrum1D/initiateDatum1D.ts b/src/data/data1d/Spectrum1D/initiateDatum1D.ts
@@ -3,15 +3,15 @@ import { Spectrum1D } from 'nmr-load-save';
 import { BaseFilter, FiltersManager, Filters } from 'nmr-processing';
 
 import { UsedColors } from '../../../types/UsedColors';
+import { initiateFilters } from '../../initiateFilters';
+import { StateMoleculeExtended } from '../../molecules/Molecule';
 
+import { initSumOptions } from './SumManager';
 import { convertDataToFloat64Array } from './convertDataToFloat64Array';
 import { get1DColor } from './get1DColor';
 import { initiateIntegrals } from './integrals/initiateIntegrals';
 import { initiatePeaks } from './peaks/initiatePeaks';
 import { initiateRanges } from './ranges/initiateRanges';
-import { initSumOptions } from './SumManager';
-import { StateMoleculeExtended } from '../../molecules/Molecule';
-import { initiateFilters } from '../../initiateFilters';
 
 export interface InitiateDatum1DOptions {
   usedColors?: UsedColors;

diff --git a/src/data/data2d/Spectrum2D/initiateDatum2D.ts b/src/data/data2d/Spectrum2D/initiateDatum2D.ts
@@ -2,10 +2,11 @@ import { v4 } from '@lukeed/uuid';
 import { Spectrum2D } from 'nmr-load-save';
 import { FiltersManager } from 'nmr-processing';
 
+import { initiateFilters } from '../../initiateFilters';
+
 import { DEFAULT_CONTOURS_OPTIONS } from './contours';
 import { get2DColor } from './get2DColor';
 import { initiateZones } from './zones/initiateZones';
-import { initiateFilters } from '../../initiateFilters';
 
 const defaultMinMax = { z: [], minX: 0, minY: 0, maxX: 0, maxY: 0 };