feat: scale 2D phase correction traces

cheminfo · Oct 20, 2023 · 9cb5a1f · 9cb5a1f
1 parent 0eef276
commit 9cb5a1f
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 25 deletions.
diff --git a/src/component/2d/1d-tracer/HorizontalSliceChart.tsx b/src/component/2d/1d-tracer/HorizontalSliceChart.tsx
@@ -25,7 +25,7 @@ function usePath(data: NmrData1D, options: UsePathOptions) {
 
   const { x, re: y } = data;
 
-  const scaleY = getSliceYScale(y, height, mode, vericalMargin);
+  const scaleY = getSliceYScale(y, height, mode, { margin: vericalMargin });
 
   const pathBuilder = new PathBuilder();
   pathBuilder.moveTo(scaleX(x[0]), scaleY(y[0]));

diff --git a/src/component/2d/1d-tracer/VerticalSliceChart.tsx b/src/component/2d/1d-tracer/VerticalSliceChart.tsx
@@ -24,7 +24,7 @@ function usePath(data, props: usePathOptions) {
 
   const { x, re: y } = data;
 
-  const scaleY = getSliceYScale(y, width, mode, horizontalMargin);
+  const scaleY = getSliceYScale(y, width, mode, { margin: horizontalMargin });
 
   const pathBuilder = new PathBuilder();
 

diff --git a/src/component/2d/1d-tracer/phace-correction-traces/SpectrumPhaseTrace.tsx b/src/component/2d/1d-tracer/phace-correction-traces/SpectrumPhaseTrace.tsx
@@ -8,6 +8,7 @@ import {
   get2DYScale,
   getSliceYScale,
 } from '../../utilities/scale';
+import { useActivePhaseTraces } from './useActivePhaseTraces';
 
 interface SpectrumPhaseTraceProps extends React.SVGAttributes<SVGGElement> {
   data: { x: Float64Array; re: Float64Array };
@@ -19,10 +20,14 @@ interface SpectrumPhaseTraceProps extends React.SVGAttributes<SVGGElement> {
 
 function usePath(x: Float64Array, y: Float64Array, direction: TraceDirection) {
   const { width, margin, height, xDomain, yDomain, mode } = useChartData();
+  const { scaleRatio } = useActivePhaseTraces();
 
   if (direction === 'horizontal') {
     const scaleX = get2DXScale({ margin, width, xDomain, mode });
-    const scaleY = getSliceYScale(y, height, 'RTL', margin.top + margin.bottom);
+    const scaleY = getSliceYScale(y, height, 'RTL', {
+      margin: margin.top + margin.bottom,
+      scaleRatio,
+    });
 
     const pathBuilder = new PathBuilder();
     pathBuilder.moveTo(scaleX(x[0]), scaleY(y[0]));
@@ -34,7 +39,10 @@ function usePath(x: Float64Array, y: Float64Array, direction: TraceDirection) {
   }
 
   const scaleX = get2DYScale({ margin, height, yDomain });
-  const scaleY = getSliceYScale(y, width, 'RTL', margin.left + margin.right);
+  const scaleY = getSliceYScale(y, width, 'RTL', {
+    margin: margin.left + margin.right,
+    scaleRatio,
+  });
 
   const pathBuilder = new PathBuilder();
 

diff --git a/src/component/2d/Viewer2D.tsx b/src/component/2d/Viewer2D.tsx
@@ -140,14 +140,17 @@ function Viewer2D({ emptyText = undefined }: Viewer2DProps) {
   );
 
   const handleZoom: OnZoom = (event) => {
-    const { x: startX, y: startY } = event;
+    const { x: startX, y: startY, shiftKey } = event;
     const trackID = getLayoutID(DIMENSION, { startX, startY });
 
     if (trackID) {
-      if (trackID === 'CENTER_2D') {
-        dispatch({ type: 'SET_2D_LEVEL', payload: event });
-      } else {
+      if (
+        trackID !== 'CENTER_2D' ||
+        (selectedTool === 'phaseCorrectionTwoDimension' && !shiftKey)
+      ) {
         dispatch({ type: 'SET_ZOOM', payload: { event, trackID } });
+      } else {
+        dispatch({ type: 'SET_2D_LEVEL', payload: event });
       }
     }
   };

diff --git a/src/component/2d/utilities/scale.ts b/src/component/2d/utilities/scale.ts
@@ -94,15 +94,24 @@ function use1DTraceYScale(
   return get1DYScale(yDomains[SpectrumId], height, verticalMargin);
 }
 
+interface SliceYScaleOptions {
+  margin?: number;
+  scaleRatio?: number;
+}
+
 function getSliceYScale(
   data: Float64Array,
   size: number,
   mode: SpectraDirection,
-  margin = 10,
+  options: SliceYScaleOptions = {},
 ) {
+  const { margin = 10, scaleRatio = 1 } = options;
   const max = xMaxValue(data);
   size = mode === 'RTL' ? size : size / 2;
-  return scaleLinear([0, max] as number[], [size - margin, margin]);
+  return scaleLinear([0, max * scaleRatio] as number[], [
+    size - margin,
+    margin,
+  ]);
 }
 
 export {

diff --git a/src/component/reducer/Reducer.ts b/src/component/reducer/Reducer.ts
@@ -62,7 +62,13 @@ export interface SpectrumTrace {
 
 export type PhaseCorrrectionTraces = Record<
   TraceDirection,
-  { spectra: SpectrumTrace[]; ph0: number; ph1: number; pivot: Pivot | null }
+  {
+    spectra: SpectrumTrace[];
+    ph0: number;
+    ph1: number;
+    pivot: Pivot | null;
+    scaleRatio: number;
+  }
 >;
 export interface TwoDimensionPhaseCorrrection {
   traces: PhaseCorrrectionTraces;
@@ -149,12 +155,14 @@ export const getInitialState = (): State => ({
             ph1: 0,
             pivot: null,
             spectra: [],
+            scaleRatio: 1,
           },
           vertical: {
             ph0: 0,
             ph1: 0,
             pivot: null,
             spectra: [],
+            scaleRatio: 1,
           },
         },
       },

diff --git a/src/component/reducer/actions/FiltersActions.ts b/src/component/reducer/actions/FiltersActions.ts
@@ -681,7 +681,6 @@ function handleAddPhaseCorrectionTrace(
       },
     },
     data: spectra,
-    mode,
   } = draft;
 
   const tracesSpectra = traces[activeTraceDirection].spectra;
@@ -1134,7 +1133,6 @@ function handleSetTwoDimensionPhaseCorrectionPivotPoint(
         twoDimensionPhaseCorrection: { activeTraceDirection, traces },
       },
     },
-    mode,
   } = draft;
   const { x, y } = action.payload;
   const traceDirection = traces[activeTraceDirection];

diff --git a/src/component/reducer/actions/ToolsActions.ts b/src/component/reducer/actions/ToolsActions.ts
@@ -25,7 +25,9 @@ import zoomHistoryManager, {
 } from '../helper/ZoomHistoryManager';
 import { getActiveSpectra } from '../helper/getActiveSpectra';
 import { getActiveSpectrum } from '../helper/getActiveSpectrum';
+import { getTwoDimensionPhaseCorrectionOptions } from '../helper/getTwoDimensionPhaseCorrectionOptions';
 import { getVerticalAlign } from '../helper/getVerticalAlign';
+import { setIntegralsViewProperty } from '../helper/setIntegralsViewProperty';
 import { setRangesViewProperty } from '../helper/setRangesViewProperty';
 import { ActionType } from '../types/ActionType';
 
@@ -36,7 +38,6 @@ import {
   rollbackSpectrum,
 } from './FiltersActions';
 import { changeSpectrumVerticalAlignment } from './PreferencesActions';
-import { setIntegralsViewProperty } from '../helper/setIntegralsViewProperty';
 
 interface BrushBoundary {
   startX: number;
@@ -309,17 +310,25 @@ function handleZoom(draft: Draft<State>, action: ZoomAction) {
     toolOptions: { selectedTool },
   } = draft;
   const scaleRatio = toScaleRatio(event);
-
   switch (displayerMode) {
     case '2D': {
-      // change the vertical scale of 1D traces
-      const index =
-        trackID === LAYOUT.TOP_1D ? 0 : trackID === LAYOUT.LEFT_1D ? 1 : null;
-      if (index !== null) {
-        const id = getSpectrumID(draft, index);
-        if (id) {
-          const domain = yDomains[id];
-          yDomains[id] = wheelZoom(event, domain);
+      // change the vertical scale for traces in 2D phase correction
+      if (
+        selectedTool === 'phaseCorrectionTwoDimensions' &&
+        trackID === 'CENTER_2D'
+      ) {
+        const { activeTraces } = getTwoDimensionPhaseCorrectionOptions(draft);
+        activeTraces.scaleRatio *= scaleRatio;
+      } else {
+        // change the vertical scale of 1D traces
+        const index =
+          trackID === LAYOUT.TOP_1D ? 0 : trackID === LAYOUT.LEFT_1D ? 1 : null;
+        if (index !== null) {
+          const id = getSpectrumID(draft, index);
+          if (id) {
+            const domain = yDomains[id];
+            yDomains[id] = wheelZoom(event, domain);
+          }
         }
       }
 

diff --git a/src/component/reducer/helper/Zoom1DManager.ts b/src/component/reducer/helper/Zoom1DManager.ts
@@ -14,7 +14,7 @@ export const ZOOM_TYPES = {
 
 export type ZoomType = keyof typeof ZOOM_TYPES;
 
-export function toScaleRatio(event: WheelEvent, zoomOptions: ZoomOptions = {}) {
+function toScaleRatio(event: WheelEvent, zoomOptions: ZoomOptions = {}) {
   const { factor = 1, invert = false } = zoomOptions;
 
   const deltaY =
@@ -96,4 +96,4 @@ function setZoom(
   }
 }
 
-export { setZoom, wheelZoom };
+export { setZoom, wheelZoom, toScaleRatio };
diff --git a/src/component/reducer/helper/getTwoDimensionPhaseCorrectionOptions.ts b/src/component/reducer/helper/getTwoDimensionPhaseCorrectionOptions.ts
@@ -0,0 +1,20 @@
+import { Draft } from 'immer';
+
+import { State } from '../Reducer';
+
+export function getTwoDimensionPhaseCorrectionOptions(
+  state: Draft<State> | State,
+) {
+  const {
+    toolOptions: {
+      data: {
+        twoDimensionPhaseCorrection: { traces, activeTraceDirection },
+      },
+    },
+  } = state;
+  return {
+    activeTraces: traces[activeTraceDirection],
+    traces,
+    activeTraceDirection,
+  };
+}