Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/component/panels/Panels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/data/data1d/Spectrum1D/initiateDatum1D.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/data/data2d/Spectrum2D/initiateDatum2D.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 };

Expand Down
Loading