Skip to content
Open
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
8 changes: 8 additions & 0 deletions src/component/1d/BrushTracker1D.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,14 @@ export function BrushTracker1D({ children }: Required<PropsWithChildren>) {
}
break;
}
case 'multipleSpectraAnalysis': {
dispatchPreferences({
type: 'CUT_SPECTRA_ANALYSIS',
payload: { x: xPPM, nucleus: activeTab },
});

break;
}
case 'phaseCorrection':
dispatch({
type: 'SET_ONE_DIMENSION_PIVOT_POINT',
Expand Down
16 changes: 16 additions & 0 deletions src/component/reducer/preferences/actions/analyzeSpectra.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { getMultipleSpectraAnalysisDefaultValues } from '../panelsPreferencesDef
import type {
AnalyzeSpectraAction,
ChangeAnalysisColumnValueKeyAction,
CutSpectraAnalysisAction,
DeleteAnalysisColumn,
PreferencesState,
SetSpectraAnalysisPanelPreferencesAction,
Expand Down Expand Up @@ -34,6 +35,21 @@ export function analyzeSpectra(
columnKey,
});
}
export function cutSpectraAnalysis(
draft: Draft<PreferencesState>,
action: CutSpectraAnalysisAction,
) {
const currentWorkspacePreferences = getActiveWorkspace(draft);
const panels = currentWorkspacePreferences.panels;
const { x, nucleus } = action.payload;

if (!panels.multipleSpectraAnalysis) {
panels.multipleSpectraAnalysis =
getMultipleSpectraAnalysisDefaultValues(nucleus);
}

MultipleAnalysis.cutAnalysis(panels.multipleSpectraAnalysis, nucleus, x);
}

export function changeAnalysisColumnValueKey(
draft: Draft<PreferencesState>,
Expand Down
12 changes: 11 additions & 1 deletion src/component/reducer/preferences/preferencesReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { addWorkspace } from './actions/addWorkspace.js';
import {
analyzeSpectra,
changeAnalysisColumnValueKey,
cutSpectraAnalysis,
deleteAnalysisColumn,
setSpectraAnalysisPanelsPreferences,
} from './actions/analyzeSpectra.js';
Expand Down Expand Up @@ -111,6 +112,12 @@ export type AnalyzeSpectraAction = ActionType<
'ANALYZE_SPECTRA',
{ start: number; end: number; nucleus: string; columnKey?: string }
>;

export type CutSpectraAnalysisAction = ActionType<
'CUT_SPECTRA_ANALYSIS',
{ x: number; nucleus: string }
>;

export type ChangeAnalysisColumnValueKeyAction = ActionType<
'CHANGE_ANALYSIS_COLUMN_VALUE_KEY',
{ columnKey: string; valueKey: string; nucleus: string }
Expand Down Expand Up @@ -198,7 +205,8 @@ export type PreferencesActions =
| ChangePeaksLabelPositionAction
| TogglePanelAction
| ChangeExportACSSettingsAction
| ChangeDefaultMoleculeSettingsAction;
| ChangeDefaultMoleculeSettingsAction
| CutSpectraAnalysisAction;

export type WorkspaceWithSource = Workspace & { source: WorkSpaceSource };
type WorkspacesWithSource = Record<string, WorkspaceWithSource>;
Expand Down Expand Up @@ -294,6 +302,8 @@ function innerPreferencesReducer(
return deleteAnalysisColumn(draft, action);
case 'SET_SPECTRA_ANALYSIS_PREFERENCES':
return setSpectraAnalysisPanelsPreferences(draft, action);
case 'CUT_SPECTRA_ANALYSIS':
return cutSpectraAnalysis(draft, action);
case 'SET_MATRIX_GENERATION_OPTIONS':
return setMatrixGenerationOptions(draft, action);
case 'ADD_MATRIX_GENERATION_EXCLUSION_ZONE':
Expand Down
20 changes: 20 additions & 0 deletions src/data/data1d/multipleSpectraAnalysis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,26 @@ export interface SpectraAnalysisData {
values: Array<Record<string, AnalyzeSpectraCalculateResult>>;
}

export function cutAnalysis(
spectraAnalysis: PanelsPreferences['multipleSpectraAnalysis'],
nucleus: string,
x: number,
) {
const cutColumns: Record<string, SpectraAnalysisColumn> = {};

const analysisOptions = spectraAnalysis[nucleus].analysisOptions;
for (const [columnKey, column] of Object.entries(analysisOptions.columns)) {
const { to, from } = column;
if (x > from && x < to) {
cutColumns[columnKey] = { ...column, from: x, to };
const newKey = generateChar(analysisOptions.columnIndex).toUpperCase();
cutColumns[newKey] = { ...column, from, to: x };
analysisOptions.columnIndex++;
}
}
analysisOptions.columns = { ...analysisOptions.columns, ...cutColumns };
}

function addColumnKey(
spectraAnalysis: PanelsPreferences['multipleSpectraAnalysis'],
nucleus: string,
Expand Down
Loading