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.

Sign up for GitHub

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

Refactor chromatogram logic and reorganize namespaces #473

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Refactor chromatogram logic and reorganize namespaces #473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 27 additions & 45 deletions src/Common/ChartDrawing/DrawVisual/DrawVisualManualPeakModification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using CompMs.Common.Utility;
using CompMs.Graphics.Core.Base;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Media;
using System.Diagnostics;

using CompMs.Graphics.Core.Base;


namespace CompMs.Graphics.Chromatogram.ManualPeakModification
Expand Down Expand Up @@ -464,58 +464,40 @@ public void CalculateChromPeakProperties(Series series) {
SignalToNoise = chromAccessory.SignalToNoise
};

var chromBegin = false;
var chromTop = false;
var leftMinIntensity = double.MaxValue;
var rightMinIntensity = double.MaxValue;

// finding left, top, right scan IDs
for (int i = 1; i < chromPoints.Count - 1; i++) {
var left = chromPoints.LowerBound(property.RtLeft, (p, l) => p.X.CompareTo(l));
var right = chromPoints.UpperBound(property.RtRight, left, chromPoints.Count, (p, r) => p.X.CompareTo(r));
var top = chromPoints.LowerBound(property.RtTop, left, chromPoints.Count, (p, t) => p.X.CompareTo(t));
for (int i = left; i <= top; i++) {
var point = chromPoints[i];
if (leftMinIntensity >= point.Y) {
leftMinIntensity = point.Y;

if (point.X < property.RtLeft) continue;
if (point.X > property.RtRight) {

property.HeightRightFromZero = chromPoints[i - 1].Y;
property.ScanRight = i - 1;

break;
}

if (point.X >= property.RtLeft && !chromBegin) {
chromBegin = true;

property.HeightLeftFromZero = point.Y;
property.ScanLeft = i;
}

if (point.X >= property.RtTop && !chromTop) {
chromTop = true;

property.HeightFromZero = point.Y;
property.ScanTop = i;
}

if (point.X >= property.RtLeft && point.X <= property.RtTop) {
if (leftMinIntensity >= point.Y) {
leftMinIntensity = point.Y;

property.ScanMinLeft = i;
property.RtMinLeft = point.X;
property.HeightMinLeftFromZero = point.Y;
}
property.ScanMinLeft = i;
property.RtMinLeft = point.X;
property.HeightMinLeftFromZero = point.Y;
}
}

if (point.X >= property.RtTop && point.X <= property.RtRight) {
if (rightMinIntensity >= point.Y) {
rightMinIntensity = point.Y;
for (int i = top; i < right; i++) {
var point = chromPoints[i];
if (rightMinIntensity >= point.Y) {
rightMinIntensity = point.Y;

property.ScanMinRight = i;
property.RtMinRight = point.X;
property.HeightMinRightFromZero = point.Y;
}
property.ScanMinRight = i;
property.RtMinRight = point.X;
property.HeightMinRightFromZero = point.Y;
}
}
property.ScanLeft = left;
property.ScanRight = right - 1;
property.ScanTop = top;
property.HeightLeftFromZero = chromPoints[left].Y;
property.HeightRightFromZero = chromPoints[right - 1].Y;
property.HeightFromZero = chromPoints[top].Y;

var areaFromZero = 0.0;
var areaFromBaseline = 0.0;
Expand Down
Loading