From e5a570db2036a6b155c2ddc289b42bd050b9ad3c Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期一, 24 十一月 2025 13:49:16 +0800
Subject: [PATCH] update 1.4
---
ErrorAnalysis.UI/FrmMain.cs | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/ErrorAnalysis.UI/FrmMain.cs b/ErrorAnalysis.UI/FrmMain.cs
index 00ae909..fd0bb63 100644
--- a/ErrorAnalysis.UI/FrmMain.cs
+++ b/ErrorAnalysis.UI/FrmMain.cs
@@ -9,6 +9,7 @@
using OxyPlot.Series;
using OxyPlot.WindowsForms;
using System.ComponentModel.DataAnnotations;
+using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Menu;
@@ -17,12 +18,14 @@
{
public partial class FrmMain : Form
{
+ [DllImport("user32.dll")]
+ private static extern short GetAsyncKeyState(Keys vKey);
+
private string? _connectionString;
private List<COModelTable> _models;
private Dictionary<string, string> _filters;
private COModelTable _model;
private ReportModel _reportModel;
-
public FrmMain()
{
InitializeComponent();
@@ -30,6 +33,7 @@
private void FrmMain_Load(object sender, EventArgs e)
{
cmbSpeedUnit.SelectedIndex = 0;
+ cmbToolType.SelectedIndex = 0;
cmbTargetLoggingIntervalUnit.SelectedIndex = 0;
}
private void InitInputControl()
@@ -58,7 +62,7 @@
pbLoadDB.Show();
pbLoadDB.Value = 0;
txtDataPath.Text = fileDlg.FileName;
- txtToolType.Text = fileDlg.SafeFileName.Substring(0, fileDlg.SafeFileName.IndexOf("Mcnp"));
+ //txtToolType.Text = fileDlg.SafeFileName.Substring(0, fileDlg.SafeFileName.IndexOf("Mcnp"));
_connectionString = $"Data Source={fileDlg.FileName};";
RepositoryInstance.Instance.ReLoad(_connectionString);
@@ -138,7 +142,13 @@
if (!decimal.TryParse(nudOilDensity.Value.ToString(), out decimal oilDensity) || nudOilDensity.Value <= 0)
{
- MessageBox.Show("Please enter a oil density");
+ MessageBox.Show("Please enter a reasonable oil density");
+ return;
+ }
+
+ if (!double.TryParse(nudYieldCounting.Value.ToString(), out double yieldCounting) || nudYieldCounting.Value <= 0)
+ {
+ MessageBox.Show("Please enter a reasonable yield counting");
return;
}
@@ -156,6 +166,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)
@@ -163,12 +174,13 @@
MessageBox.Show("Please enter a reasonable speed");
return;
}
- var calcSpeed = cmbSpeedUnit.Text == "ft/hr" ? UnitConvert.FtHr2MMin(speed) : UnitConvert.MHR2MMin(speed);
+ var calcSpeed = cmbSpeedUnit.Text == "ft/hr" ? UnitConvert.FtHr2MS(speed) : UnitConvert.MHR2MS(speed);
- var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, true, calcSpeed, targetErrorRatio / 100, out _);
+ var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, true, calcSpeed, yieldCounting, targetErrorRatio / 100, cmbToolType.Text, out _, out processingData);
+
Plot(result);
- double totalTime = Math.Round((targetLoggingInterval / calcSpeed / 60), 2);
+ double totalTime = Math.Round((targetLoggingInterval / calcSpeed / 60 / 60), 2);
var errorRate = Math.Round(result.ErrorRatios.Min(r => r.ErrorRatioValue) * 100, 2);
txtAnalysisResult.AppendText("A total of ");
AppendText(txtAnalysisResult, result.ErrorRatios.Count.ToString(), ColorTranslator.FromHtml("#8B0000"));
@@ -176,10 +188,10 @@
AppendText(txtAnalysisResult, $"{errorRate}%", ColorTranslator.FromHtml("#8B0000"));
txtAnalysisResult.AppendText(" error rate. With the tool operating at ");
AppendText(txtAnalysisResult, $"{speed} {cmbSpeedUnit.Text}", ColorTranslator.FromHtml("#8B0000"));
- txtAnalysisResult.AppendText(" the estimated total job duration is ");
+ txtAnalysisResult.AppendText(" the estimated one pass duration is ");
AppendText(txtAnalysisResult, $"{totalTime} hours.", ColorTranslator.FromHtml("#8B0000"));
- _reportModel = CreateReportModel(totalTime.ToString(), result.ErrorRatios.Count.ToString(), Math.Round(UnitConvert.MMin2FtHr(calcSpeed), 2).ToString(), errorRate.ToString());
+ _reportModel = CreateReportModel(totalTime.ToString(), result.ErrorRatios.Count.ToString(), Math.Round(UnitConvert.MS2FtHr(calcSpeed), 2).ToString(), errorRate.ToString());
}
else
{
@@ -189,12 +201,12 @@
return;
}
double speed;
- var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, false, 0, targetErrorRatio / 100, out speed, pass);
+ var result = ErrorRatioCalc.GetErrorRatioResult(_model.ModelID, porosity, sw, depth, false, 0, yieldCounting, targetErrorRatio / 100,cmbToolType.Text, out speed, out processingData, pass);
Plot(result);
- double totalTime = Math.Round((targetLoggingInterval / speed / 60), 2);
+ double totalTime = Math.Round((targetLoggingInterval / speed / 60 / 60), 2);
var errorRate = Math.Round(result.ErrorRatios.Min(r => r.ErrorRatioValue) * 100, 2);
- var speedFr = Math.Round(UnitConvert.MMin2FtHr(speed), 2);
+ var speedFr = Math.Round(UnitConvert.MS2FtHr(speed), 2);
txtAnalysisResult.AppendText("A total of ");
AppendText(txtAnalysisResult, result.ErrorRatios.Count.ToString(), ColorTranslator.FromHtml("#8B0000"));
@@ -207,8 +219,8 @@
_reportModel = CreateReportModel(totalTime.ToString(), result.ErrorRatios.Count.ToString(), speedFr.ToString(), errorRate.ToString());
}
-
-
+ if ((Control.ModifierKeys & Keys.Control) == Keys.Control && (GetAsyncKeyState(Keys.D) & 0x8000) != 0)
+ new ProcessingData(processingData).Show();
}
private void btnReport_Click(object sender, EventArgs e)
{
@@ -307,9 +319,9 @@
if (curModels.Count == 0)
return;
- var casingFulids = curModels.Select(x => x.CasingFluid == "0" ? "water" : x.CasingFluid == "100" ? "oil" : x.CasingFluid == "200" ? "gas" : "none").Distinct().ToArray();
+ var casingFulids = curModels.Select(x => x.CasingFluid == "999" ? "none" : x.CasingFluid == "100" ? "oil" : x.CasingFluid == "200" ? "gas" : "water").Distinct().ToArray();
- if (casingFulids.Length == 1 && casingFulids[0] == "999")
+ if (casingFulids.Length == 1 && casingFulids[0] == "none")
{
cmbCasingHoldUp.Enabled = false;
nudCasingHoldUp.Enabled = false;
@@ -322,7 +334,7 @@
cmbCasingHoldUp.Items.AddRange(casingFulids);
}
- var screenFulids = curModels.Select(x => x.ScreenFluid == "0" ? "water" : x.ScreenFluid == "100" ? "oil" : x.ScreenFluid == "200" ? "gas" : "none").Distinct().ToArray();
+ var screenFulids = curModels.Select(x => x.ScreenFluid == "999" ? "none" : x.ScreenFluid == "100" ? "oil" : x.ScreenFluid == "200" ? "gas" : "water").Distinct().ToArray();
if (screenFulids.Length == 1 && screenFulids[0] == "none")
{
@@ -336,7 +348,7 @@
cmbScreenHoldUp.Items.AddRange(screenFulids);
}
- var tubeFluids = curModels.Select(x => x.TubeFluid == "0" ? "water" : x.TubeFluid == "100" ? "oil" : x.TubeFluid == "200" ? "gas" : "none").Distinct().ToArray();
+ var tubeFluids = curModels.Select(x => x.TubeFluid == "999" ? "none" : x.TubeFluid == "100" ? "oil" : x.TubeFluid == "200" ? "gas" : "water").Distinct().ToArray();
if (tubeFluids.Length == 1 && tubeFluids[0] == "none")
{
cmbTubeHoldUp.Enabled = false;
@@ -399,6 +411,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
@@ -487,6 +502,7 @@
}
}
#endregion
+
private List<COModelTable> GetFilterResult()
{
var type = typeof(COModelTable);
@@ -594,7 +610,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