Merge pull request #2066 from Mailaender/abstract-integrated-area

Move peak integrated area to abstract chromatogram
eclipse-chemclipse · Jan 29, 2025 · 756db23 · 756db23
2 parents 4a47e14 + 2e8e79b
commit 756db23
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 48 deletions.
diff --git a/...emclipse.csd.model/src/org/eclipse/chemclipse/csd/model/core/AbstractChromatogramCSD.java b/...emclipse.csd.model/src/org/eclipse/chemclipse/csd/model/core/AbstractChromatogramCSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2024 Lablicate GmbH.
+ * Copyright (c) 2012, 2025 Lablicate GmbH.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -68,16 +68,6 @@ public void fireUpdate(IChromatogramSelection<?, ?> chromatogramSelection) {
 		}
 	}
 
-	@Override
-	public double getPeakIntegratedArea() {
-
-		double integratedArea = 0.0d;
-		for(IChromatogramPeakCSD peak : getPeaks()) {
-			integratedArea += peak.getIntegratedArea();
-		}
-		return integratedArea;
-	}
-
 	@Override
 	public <ResultType extends IMeasurementResult<?>> ResultType getMeasurementResult(Class<ResultType> type) {
 
@@ -106,4 +96,4 @@ private String getNoiseCalculatorId() {
 			return PreferenceSupplier.getSelectedNoiseCalculatorId();
 		}
 	}
-}
+}
diff --git a/....eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java b/....eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/core/AbstractChromatogram.java
@@ -767,6 +767,16 @@ public void setIntegratorDescription(String integratorDescription) {
 		}
 	}
 
+	@Override
+	public double getPeakIntegratedArea() {
+
+		double integratedArea = 0.0d;
+		for(IPeak peak : getPeaks()) {
+			integratedArea += peak.getIntegratedArea();
+		}
+		return integratedArea;
+	}
+
 	@Override
 	public double getChromatogramIntegratedArea() {
 

diff --git a/...emclipse.msd.model/src/org/eclipse/chemclipse/msd/model/core/AbstractChromatogramMSD.java b/...emclipse.msd.model/src/org/eclipse/chemclipse/msd/model/core/AbstractChromatogramMSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2024 Lablicate GmbH.
+ * Copyright (c) 2008, 2025 Lablicate GmbH.
  * 
  * All rights reserved.
  * This program and the accompanying materials are made available under the
@@ -252,16 +252,6 @@ public double getStopIon() {
 		return highestIon;
 	}
 
-	@Override
-	public double getPeakIntegratedArea() {
-
-		double integratedArea = 0.0d;
-		for(IChromatogramPeakMSD peak : getPeaks()) {
-			integratedArea += peak.getIntegratedArea();
-		}
-		return integratedArea;
-	}
-
 	@Override
 	public IIonTransitionSettings getIonTransitionSettings() {
 
@@ -298,4 +288,4 @@ private String getNoiseCalculatorId() {
 			return PreferenceSupplier.getSelectedNoiseCalculatorId();
 		}
 	}
-}
+}
diff --git a/...emclipse.vsd.model/src/org/eclipse/chemclipse/vsd/model/core/AbstractChromatogramVSD.java b/...emclipse.vsd.model/src/org/eclipse/chemclipse/vsd/model/core/AbstractChromatogramVSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023, 2024 Lablicate GmbH.
+ * Copyright (c) 2023, 2025 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -25,16 +25,6 @@ public void updateNoiseFactor() {
 		// TODO - Noise Calculation
 	}
 
-	@Override
-	public double getPeakIntegratedArea() {
-
-		double integratedArea = 0.0d;
-		for(IChromatogramPeakVSD peak : getPeaks()) {
-			integratedArea += peak.getIntegratedArea();
-		}
-		return integratedArea;
-	}
-
 	@Override
 	public void fireUpdate(IChromatogramSelection<?, ?> chromatogramSelection) {
 
@@ -45,4 +35,4 @@ public void fireUpdate(IChromatogramSelection<?, ?> chromatogramSelection) {
 			chromatogramSelectionISD.update(true);
 		}
 	}
-}
+}
diff --git a/...emclipse.wsd.model/src/org/eclipse/chemclipse/wsd/model/core/AbstractChromatogramWSD.java b/...emclipse.wsd.model/src/org/eclipse/chemclipse/wsd/model/core/AbstractChromatogramWSD.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 Lablicate GmbH.
+ * Copyright (c) 2013, 2025 Lablicate GmbH.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -89,16 +89,6 @@ public void fireUpdate(IChromatogramSelection<?, ?> chromatogramSelection) {
 		}
 	}
 
-	@Override
-	public double getPeakIntegratedArea() {
-
-		double integratedArea = 0.0d;
-		for(IChromatogramPeakWSD peak : getPeaks()) {
-			integratedArea += peak.getIntegratedArea();
-		}
-		return integratedArea;
-	}
-
 	@Override
 	public IBaselineModel getBaselineModel(double wavelength) {
 
@@ -152,4 +142,4 @@ private String getNoiseCalculatorId() {
 			return PreferenceSupplier.getSelectedNoiseCalculatorId();
 		}
 	}
-}
+}