feat: toText deals correctly with normalization preferences

cheminfo · May 7, 2024 · 97b26a2 · 97b26a2
1 parent 24711a2
commit 97b26a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Analysis.ts b/src/Analysis.ts
@@ -20,7 +20,7 @@ interface AnalysisOptions {
   label?: string;
   spectrumCallback?: SpectrumCallback;
 }
-interface NormalizedOptions {
+export interface NormalizedOptions {
   normalization?: NormalizedSpectrumOptions;
   selector?: SpectrumSelector;
 }

diff --git a/src/to/__tests__/toText.test.ts b/src/to/__tests__/toText.test.ts
@@ -45,4 +45,13 @@ describe('toCvs', () => {
     const result = toText(new Analysis());
     expect(result).toHaveLength(0);
   });
+
+  it('select variables with normalizaiton', () => {
+    const result = toText(analysis, {
+      selector: { xLabel: 'seconds', yLabel: 'voltage' },
+      normalization: { from: 5, to: 6 },
+    });
+    expect(result).toHaveLength(1);
+    expect(result[0]).toBe('seconds,voltage\n5,1\n6,2');
+  });
 });
diff --git a/src/to/toText.ts b/src/to/toText.ts
@@ -1,22 +1,21 @@
-import { Analysis } from '../Analysis';
+import { Analysis, NormalizedOptions } from '../Analysis';
 import type { Spectrum } from '../types/Cheminfo';
-import { SpectrumSelector } from '../types/SpectrumSelector';
 
-interface ToTextOptions {
-  selector?: SpectrumSelector;
+interface ToTextOptions extends NormalizedOptions {
   endOfLine?: string;
   fieldSeparator?: string;
 }
 
 export function toText(analysis: Analysis, options: ToTextOptions = {}) {
   // Export all the data to Csv
-  if (!options.selector) {
+  if (!options.selector && !options.normalization) {
     return exportText(analysis.spectra, options);
   }
 
   // Export selected variables
-  const spectra = analysis.getXYSpectrum(options.selector);
-  return exportText(spectra ? [spectra] : [], options);
+  const spectra = analysis.getNormalizedSpectra(options);
+  // const spectra = analysis.getXYSpectrum(options.selector);
+  return exportText(spectra, options);
 }
 
 function exportText(spectrums: Spectrum[], options: ToTextOptions) {