From 0b108f56b2d0c35d01ee361dc593119ac52a14e1 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期五, 05 九月 2025 16:39:13 +0800
Subject: [PATCH] update
---
ErrorAnalysis.UI/FrmMain.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ErrorAnalysis.UI/FrmMain.cs b/ErrorAnalysis.UI/FrmMain.cs
index 5b0a9e4..ce31e28 100644
--- a/ErrorAnalysis.UI/FrmMain.cs
+++ b/ErrorAnalysis.UI/FrmMain.cs
@@ -162,6 +162,7 @@
if (cmbTargetLoggingIntervalUnit.Text == "ft")
targetLoggingInterval = UnitConvert.Ft2M(targetLoggingInterval);
txtAnalysisResult.Clear();
+ ProcessingDataModel processingData;
if (rdoLockSpeed.Checked)
{
if (!double.TryParse(nudSpeed.Value.ToString(), out double speed) || nudSpeed.Value <= 0)
@@ -171,7 +172,8 @@
}
var calcSpeed = cmbSpeedUnit.Text == "ft/hr" ? UnitConvert.FtHr2MS(speed) : UnitConvert.MHR2MS(speed);
- var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, true, calcSpeed, yieldCounting, targetErrorRatio / 100, out _);
+ var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, true, calcSpeed, yieldCounting, targetErrorRatio / 100, out _, out processingData);
+
Plot(result);
double totalTime = Math.Round((targetLoggingInterval / calcSpeed / 60 / 60), 2);
@@ -195,7 +197,7 @@
return;
}
double speed;
- var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, false, 0, yieldCounting, targetErrorRatio / 100, out speed, pass);
+ var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, false, 0, yieldCounting, targetErrorRatio / 100, out speed, out processingData, pass);
Plot(result);
double totalTime = Math.Round((targetLoggingInterval / speed / 60 / 60), 2);
@@ -213,6 +215,8 @@
_reportModel = CreateReportModel(totalTime.ToString(), result.ErrorRatios.Count.ToString(), speedFr.ToString(), errorRate.ToString());
}
+ if (chkProcessing.Checked)
+ new ProcessingData(processingData).Show();
}
@@ -405,6 +409,9 @@
var property = control.Tag.ToString();
var filterVal = control.Text == "water" ? "0" : control.Text == "oil" ? "100" : control.Text == "gas" ? "200" : "999";
+ if (_filters == null)
+ return;
+
if (_filters.ContainsKey(property))
_filters[property] = filterVal;
else
@@ -601,7 +608,9 @@
TubeID = cmbTubeID.Text,
TubeOD = cmbTubeOD.Text,
VSH = nudVSH.Value.ToString(),
- WaterSaturation = nudSw.Value.ToString()
+ WaterSaturation = nudSw.Value.ToString(),
+ NearYieldCounting = nudYieldCounting.Value.ToString(),
+ FarYieldCounting = Math.Round(nudYieldCounting.Value / 2.2m, 2).ToString(),
};
}
--
Gitblit v1.9.3