update

lx

2025-09-05 0b108f56b2d0c35d01ee361dc593119ac52a14e1

 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,9 +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)
            if (_filters == null)
                return;
            

            if (_filters.ContainsKey(property))
                _filters[property] = filterVal;
            else
@@ -604,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(),
            };
        }