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.Designer.cs |  176 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 105 insertions(+), 71 deletions(-)

diff --git a/ErrorAnalysis.UI/FrmMain.Designer.cs b/ErrorAnalysis.UI/FrmMain.Designer.cs
index 4c8a397..56f6c77 100644
--- a/ErrorAnalysis.UI/FrmMain.Designer.cs
+++ b/ErrorAnalysis.UI/FrmMain.Designer.cs
@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
             btnAnalysis = new Button();
             label9 = new Label();
             label3 = new Label();
@@ -49,9 +50,9 @@
             rdoLockPass = new RadioButton();
             gbResult = new GroupBox();
             tableLayoutPanel1 = new TableLayoutPanel();
+            txtAnalysisResult = new RichTextBox();
             pnlCOPic = new Panel();
             pnlErrorRatioPic = new Panel();
-            txtAnalysisResult = new TextBox();
             btnReport = new Button();
             label24 = new Label();
             txtDataPath = new TextBox();
@@ -119,17 +120,19 @@
             cmbLithology = new ComboBox();
             label16 = new Label();
             tpPlan = new TabPage();
+            label7 = new Label();
             cmbTargetLoggingIntervalUnit = new ComboBox();
             label5 = new Label();
             chkAlphaProcessing = new CheckBox();
+            nudYieldCounting = new NumericUpDown();
             nudAlphaProcessingWin = new NumericUpDown();
             nudDepth = new NumericUpDown();
             nudTargetLoggingInterval = new NumericUpDown();
             label54 = new Label();
-            txtToolType = new TextBox();
             label53 = new Label();
             label52 = new Label();
             pbLoadDB = new ProgressBar();
+            cmbToolType = new ComboBox();
             ((System.ComponentModel.ISupportInitialize)nudSoPrecisionRequired).BeginInit();
             pnlLockPass.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)nudPass).BeginInit();
@@ -156,6 +159,7 @@
             ((System.ComponentModel.ISupportInitialize)nudSw).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudPorosity).BeginInit();
             tpPlan.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)nudYieldCounting).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudAlphaProcessingWin).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudDepth).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudTargetLoggingInterval).BeginInit();
@@ -167,7 +171,7 @@
             btnAnalysis.Location = new Point(716, 580);
             btnAnalysis.Name = "btnAnalysis";
             btnAnalysis.Size = new Size(75, 23);
-            btnAnalysis.TabIndex = 0;
+            btnAnalysis.TabIndex = 37;
             btnAnalysis.Text = "Analysis";
             btnAnalysis.UseVisualStyleBackColor = true;
             btnAnalysis.Click += btnAnalysis_Click;
@@ -228,12 +232,12 @@
             // 
             // nudSoPrecisionRequired
             // 
-            nudSoPrecisionRequired.DecimalPlaces = 1;
+            nudSoPrecisionRequired.DecimalPlaces = 2;
             nudSoPrecisionRequired.Increment = new decimal(new int[] { 2, 0, 0, 0 });
             nudSoPrecisionRequired.Location = new Point(185, 43);
             nudSoPrecisionRequired.Name = "nudSoPrecisionRequired";
             nudSoPrecisionRequired.Size = new Size(54, 23);
-            nudSoPrecisionRequired.TabIndex = 13;
+            nudSoPrecisionRequired.TabIndex = 25;
             // 
             // label21
             // 
@@ -259,7 +263,7 @@
             nudPass.Location = new Point(45, 16);
             nudPass.Name = "nudPass";
             nudPass.Size = new Size(72, 23);
-            nudPass.TabIndex = 14;
+            nudPass.TabIndex = 36;
             // 
             // label23
             // 
@@ -288,17 +292,17 @@
             cmbSpeedUnit.Location = new Point(132, 16);
             cmbSpeedUnit.Name = "cmbSpeedUnit";
             cmbSpeedUnit.Size = new Size(87, 25);
-            cmbSpeedUnit.TabIndex = 13;
+            cmbSpeedUnit.TabIndex = 35;
             // 
             // nudSpeed
             // 
-            nudSpeed.DecimalPlaces = 1;
+            nudSpeed.DecimalPlaces = 2;
             nudSpeed.Increment = new decimal(new int[] { 1, 0, 0, 65536 });
             nudSpeed.Location = new Point(54, 16);
             nudSpeed.Maximum = new decimal(new int[] { 9999999, 0, 0, 0 });
             nudSpeed.Name = "nudSpeed";
             nudSpeed.Size = new Size(72, 23);
-            nudSpeed.TabIndex = 12;
+            nudSpeed.TabIndex = 34;
             // 
             // label20
             // 
@@ -325,7 +329,7 @@
             rdoLockSpeed.Location = new Point(3, 3);
             rdoLockSpeed.Name = "rdoLockSpeed";
             rdoLockSpeed.Size = new Size(94, 21);
-            rdoLockSpeed.TabIndex = 7;
+            rdoLockSpeed.TabIndex = 32;
             rdoLockSpeed.TabStop = true;
             rdoLockSpeed.Text = "Lock Speed";
             rdoLockSpeed.UseVisualStyleBackColor = true;
@@ -337,7 +341,7 @@
             rdoLockPass.Location = new Point(103, 4);
             rdoLockPass.Name = "rdoLockPass";
             rdoLockPass.Size = new Size(83, 21);
-            rdoLockPass.TabIndex = 8;
+            rdoLockPass.TabIndex = 33;
             rdoLockPass.Text = "Lock Pass";
             rdoLockPass.UseVisualStyleBackColor = true;
             rdoLockPass.CheckedChanged += rdoMode_CheckedChanged;
@@ -346,7 +350,6 @@
             // 
             gbResult.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             gbResult.Controls.Add(tableLayoutPanel1);
-            gbResult.Controls.Add(txtAnalysisResult);
             gbResult.Location = new Point(17, 364);
             gbResult.Name = "gbResult";
             gbResult.Size = new Size(851, 210);
@@ -357,43 +360,47 @@
             // tableLayoutPanel1
             // 
             tableLayoutPanel1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            tableLayoutPanel1.ColumnCount = 2;
+            tableLayoutPanel1.ColumnCount = 3;
             tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
             tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
+            tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 300F));
+            tableLayoutPanel1.Controls.Add(txtAnalysisResult, 2, 0);
             tableLayoutPanel1.Controls.Add(pnlCOPic, 0, 0);
             tableLayoutPanel1.Controls.Add(pnlErrorRatioPic, 1, 0);
             tableLayoutPanel1.Location = new Point(4, 22);
             tableLayoutPanel1.Name = "tableLayoutPanel1";
             tableLayoutPanel1.RowCount = 1;
-            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
-            tableLayoutPanel1.Size = new Size(519, 182);
+            tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+            tableLayoutPanel1.Size = new Size(841, 182);
             tableLayoutPanel1.TabIndex = 2;
+            // 
+            // txtAnalysisResult
+            // 
+            txtAnalysisResult.BackColor = SystemColors.Control;
+            txtAnalysisResult.BorderStyle = BorderStyle.FixedSingle;
+            txtAnalysisResult.Dock = DockStyle.Fill;
+            txtAnalysisResult.Location = new Point(543, 3);
+            txtAnalysisResult.Name = "txtAnalysisResult";
+            txtAnalysisResult.ReadOnly = true;
+            txtAnalysisResult.Size = new Size(295, 176);
+            txtAnalysisResult.TabIndex = 3;
+            txtAnalysisResult.Text = "";
             // 
             // pnlCOPic
             // 
             pnlCOPic.Dock = DockStyle.Fill;
             pnlCOPic.Location = new Point(3, 3);
             pnlCOPic.Name = "pnlCOPic";
-            pnlCOPic.Size = new Size(253, 176);
+            pnlCOPic.Size = new Size(264, 176);
             pnlCOPic.TabIndex = 2;
             // 
             // pnlErrorRatioPic
             // 
             pnlErrorRatioPic.Dock = DockStyle.Fill;
-            pnlErrorRatioPic.Location = new Point(262, 3);
+            pnlErrorRatioPic.Location = new Point(273, 3);
             pnlErrorRatioPic.Name = "pnlErrorRatioPic";
-            pnlErrorRatioPic.Size = new Size(254, 176);
+            pnlErrorRatioPic.Size = new Size(264, 176);
             pnlErrorRatioPic.TabIndex = 3;
-            // 
-            // txtAnalysisResult
-            // 
-            txtAnalysisResult.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Right;
-            txtAnalysisResult.Location = new Point(529, 22);
-            txtAnalysisResult.Multiline = true;
-            txtAnalysisResult.Name = "txtAnalysisResult";
-            txtAnalysisResult.ReadOnly = true;
-            txtAnalysisResult.Size = new Size(317, 182);
-            txtAnalysisResult.TabIndex = 1;
             // 
             // btnReport
             // 
@@ -401,7 +408,7 @@
             btnReport.Location = new Point(797, 580);
             btnReport.Name = "btnReport";
             btnReport.Size = new Size(75, 23);
-            btnReport.TabIndex = 4;
+            btnReport.TabIndex = 38;
             btnReport.Text = "Report";
             btnReport.UseVisualStyleBackColor = true;
             btnReport.Click += btnReport_Click;
@@ -497,7 +504,7 @@
             nudTubeHoldUp.Location = new Point(449, 87);
             nudTubeHoldUp.Name = "nudTubeHoldUp";
             nudTubeHoldUp.Size = new Size(44, 23);
-            nudTubeHoldUp.TabIndex = 26;
+            nudTubeHoldUp.TabIndex = 18;
             // 
             // label10
             // 
@@ -524,7 +531,7 @@
             nudScreenHoldUp.Location = new Point(449, 57);
             nudScreenHoldUp.Name = "nudScreenHoldUp";
             nudScreenHoldUp.Size = new Size(44, 23);
-            nudScreenHoldUp.TabIndex = 26;
+            nudScreenHoldUp.TabIndex = 16;
             // 
             // nudBHSalinity
             // 
@@ -534,7 +541,7 @@
             nudBHSalinity.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudBHSalinity.Name = "nudBHSalinity";
             nudBHSalinity.Size = new Size(55, 23);
-            nudBHSalinity.TabIndex = 16;
+            nudBHSalinity.TabIndex = 10;
             // 
             // label49
             // 
@@ -561,7 +568,7 @@
             nudCasingHoldUp.Location = new Point(449, 26);
             nudCasingHoldUp.Name = "nudCasingHoldUp";
             nudCasingHoldUp.Size = new Size(44, 23);
-            nudCasingHoldUp.TabIndex = 26;
+            nudCasingHoldUp.TabIndex = 14;
             // 
             // label50
             // 
@@ -607,7 +614,7 @@
             nudOilDensity.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudOilDensity.Name = "nudOilDensity";
             nudOilDensity.Size = new Size(56, 23);
-            nudOilDensity.TabIndex = 16;
+            nudOilDensity.TabIndex = 11;
             // 
             // nudGasDensity
             // 
@@ -617,7 +624,7 @@
             nudGasDensity.Maximum = new decimal(new int[] { 9999999, 0, 0, 0 });
             nudGasDensity.Name = "nudGasDensity";
             nudGasDensity.Size = new Size(56, 23);
-            nudGasDensity.TabIndex = 16;
+            nudGasDensity.TabIndex = 12;
             // 
             // label48
             // 
@@ -636,7 +643,7 @@
             cmbScreenHoldUp.Location = new Point(384, 56);
             cmbScreenHoldUp.Name = "cmbScreenHoldUp";
             cmbScreenHoldUp.Size = new Size(59, 25);
-            cmbScreenHoldUp.TabIndex = 1;
+            cmbScreenHoldUp.TabIndex = 15;
             cmbScreenHoldUp.Tag = "ScreenFluid";
             cmbScreenHoldUp.SelectedIndexChanged += holdUp_cmb_SelectedIndexChanged;
             // 
@@ -657,7 +664,7 @@
             cmbTubeHoldUp.Location = new Point(384, 85);
             cmbTubeHoldUp.Name = "cmbTubeHoldUp";
             cmbTubeHoldUp.Size = new Size(59, 25);
-            cmbTubeHoldUp.TabIndex = 1;
+            cmbTubeHoldUp.TabIndex = 17;
             cmbTubeHoldUp.Tag = "TubeFluid";
             cmbTubeHoldUp.SelectedIndexChanged += holdUp_cmb_SelectedIndexChanged;
             // 
@@ -669,7 +676,7 @@
             cmbCasingHoldUp.Location = new Point(385, 25);
             cmbCasingHoldUp.Name = "cmbCasingHoldUp";
             cmbCasingHoldUp.Size = new Size(58, 25);
-            cmbCasingHoldUp.TabIndex = 1;
+            cmbCasingHoldUp.TabIndex = 13;
             cmbCasingHoldUp.Tag = "CasingFluid";
             cmbCasingHoldUp.SelectedIndexChanged += holdUp_cmb_SelectedIndexChanged;
             // 
@@ -746,7 +753,7 @@
             cmbCasingOD.Location = new Point(143, 43);
             cmbCasingOD.Name = "cmbCasingOD";
             cmbCasingOD.Size = new Size(55, 25);
-            cmbCasingOD.TabIndex = 1;
+            cmbCasingOD.TabIndex = 2;
             cmbCasingOD.Tag = "CasingOD";
             cmbCasingOD.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -766,7 +773,7 @@
             cmbScreenOD.Location = new Point(143, 70);
             cmbScreenOD.Name = "cmbScreenOD";
             cmbScreenOD.Size = new Size(55, 25);
-            cmbScreenOD.TabIndex = 1;
+            cmbScreenOD.TabIndex = 4;
             cmbScreenOD.Tag = "ScreenOD";
             cmbScreenOD.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -777,7 +784,7 @@
             cmbScreenID.Location = new Point(388, 72);
             cmbScreenID.Name = "cmbScreenID";
             cmbScreenID.Size = new Size(55, 25);
-            cmbScreenID.TabIndex = 1;
+            cmbScreenID.TabIndex = 5;
             cmbScreenID.Tag = "ScreenID";
             cmbScreenID.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -804,7 +811,7 @@
             nudGravelFIllPercent.Location = new Point(143, 124);
             nudGravelFIllPercent.Name = "nudGravelFIllPercent";
             nudGravelFIllPercent.Size = new Size(55, 23);
-            nudGravelFIllPercent.TabIndex = 26;
+            nudGravelFIllPercent.TabIndex = 8;
             // 
             // cmbTubeID
             // 
@@ -813,7 +820,7 @@
             cmbTubeID.Location = new Point(388, 98);
             cmbTubeID.Name = "cmbTubeID";
             cmbTubeID.Size = new Size(55, 25);
-            cmbTubeID.TabIndex = 1;
+            cmbTubeID.TabIndex = 7;
             cmbTubeID.Tag = "TubeID";
             cmbTubeID.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -842,7 +849,7 @@
             cmbCasingID.Location = new Point(388, 46);
             cmbCasingID.Name = "cmbCasingID";
             cmbCasingID.Size = new Size(55, 25);
-            cmbCasingID.TabIndex = 1;
+            cmbCasingID.TabIndex = 3;
             cmbCasingID.Tag = "CasingID";
             cmbCasingID.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -878,7 +885,7 @@
             nudCementBond.Location = new Point(388, 124);
             nudCementBond.Name = "nudCementBond";
             nudCementBond.Size = new Size(55, 23);
-            nudCementBond.TabIndex = 26;
+            nudCementBond.TabIndex = 9;
             nudCementBond.Value = new decimal(new int[] { 100, 0, 0, 0 });
             // 
             // cmbTubeOD
@@ -888,7 +895,7 @@
             cmbTubeOD.Location = new Point(143, 97);
             cmbTubeOD.Name = "cmbTubeOD";
             cmbTubeOD.Size = new Size(55, 25);
-            cmbTubeOD.TabIndex = 1;
+            cmbTubeOD.TabIndex = 6;
             cmbTubeOD.Tag = "TubeOD";
             cmbTubeOD.SelectedIndexChanged += borehole_cmb_SelectedIndexChanged;
             // 
@@ -968,7 +975,7 @@
             nudReservoirSalinity.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudReservoirSalinity.Name = "nudReservoirSalinity";
             nudReservoirSalinity.Size = new Size(71, 23);
-            nudReservoirSalinity.TabIndex = 34;
+            nudReservoirSalinity.TabIndex = 22;
             // 
             // label40
             // 
@@ -1013,7 +1020,7 @@
             nudVSH.Location = new Point(145, 148);
             nudVSH.Name = "nudVSH";
             nudVSH.Size = new Size(72, 23);
-            nudVSH.TabIndex = 29;
+            nudVSH.TabIndex = 23;
             // 
             // label42
             // 
@@ -1031,7 +1038,7 @@
             nudSw.Location = new Point(146, 88);
             nudSw.Name = "nudSw";
             nudSw.Size = new Size(72, 23);
-            nudSw.TabIndex = 29;
+            nudSw.TabIndex = 21;
             // 
             // label18
             // 
@@ -1049,7 +1056,7 @@
             nudPorosity.Location = new Point(146, 58);
             nudPorosity.Name = "nudPorosity";
             nudPorosity.Size = new Size(72, 23);
-            nudPorosity.TabIndex = 26;
+            nudPorosity.TabIndex = 20;
             // 
             // label17
             // 
@@ -1077,7 +1084,7 @@
             cmbLithology.Location = new Point(146, 26);
             cmbLithology.Name = "cmbLithology";
             cmbLithology.Size = new Size(119, 25);
-            cmbLithology.TabIndex = 25;
+            cmbLithology.TabIndex = 19;
             cmbLithology.Tag = "Lithology";
             cmbLithology.SelectedIndexChanged += cmbLithology_SelectedIndexChanged;
             // 
@@ -1092,17 +1099,19 @@
             // 
             // tpPlan
             // 
+            tpPlan.Controls.Add(cmbToolType);
+            tpPlan.Controls.Add(label7);
             tpPlan.Controls.Add(cmbTargetLoggingIntervalUnit);
             tpPlan.Controls.Add(label5);
             tpPlan.Controls.Add(chkAlphaProcessing);
             tpPlan.Controls.Add(label22);
+            tpPlan.Controls.Add(nudYieldCounting);
             tpPlan.Controls.Add(nudAlphaProcessingWin);
             tpPlan.Controls.Add(pnlLockPass);
             tpPlan.Controls.Add(nudDepth);
             tpPlan.Controls.Add(nudTargetLoggingInterval);
             tpPlan.Controls.Add(nudSoPrecisionRequired);
             tpPlan.Controls.Add(label54);
-            tpPlan.Controls.Add(txtToolType);
             tpPlan.Controls.Add(label53);
             tpPlan.Controls.Add(label52);
             tpPlan.Controls.Add(label21);
@@ -1115,6 +1124,15 @@
             tpPlan.Text = "Plan";
             tpPlan.UseVisualStyleBackColor = true;
             // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new Point(457, 102);
+            label7.Name = "label7";
+            label7.Size = new Size(90, 17);
+            label7.TabIndex = 17;
+            label7.Text = "Yield counting";
+            // 
             // cmbTargetLoggingIntervalUnit
             // 
             cmbTargetLoggingIntervalUnit.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -1123,7 +1141,7 @@
             cmbTargetLoggingIntervalUnit.Location = new Point(243, 98);
             cmbTargetLoggingIntervalUnit.Name = "cmbTargetLoggingIntervalUnit";
             cmbTargetLoggingIntervalUnit.Size = new Size(46, 25);
-            cmbTargetLoggingIntervalUnit.TabIndex = 13;
+            cmbTargetLoggingIntervalUnit.TabIndex = 28;
             // 
             // label5
             // 
@@ -1137,20 +1155,30 @@
             // chkAlphaProcessing
             // 
             chkAlphaProcessing.AutoSize = true;
-            chkAlphaProcessing.Location = new Point(421, 69);
+            chkAlphaProcessing.Location = new Point(419, 43);
             chkAlphaProcessing.Name = "chkAlphaProcessing";
             chkAlphaProcessing.Size = new Size(128, 21);
-            chkAlphaProcessing.TabIndex = 15;
+            chkAlphaProcessing.TabIndex = 29;
             chkAlphaProcessing.Text = "Alpha processing";
             chkAlphaProcessing.UseVisualStyleBackColor = true;
             // 
+            // nudYieldCounting
+            // 
+            nudYieldCounting.DecimalPlaces = 2;
+            nudYieldCounting.Increment = new decimal(new int[] { 100, 0, 0, 0 });
+            nudYieldCounting.Location = new Point(565, 100);
+            nudYieldCounting.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
+            nudYieldCounting.Name = "nudYieldCounting";
+            nudYieldCounting.Size = new Size(82, 23);
+            nudYieldCounting.TabIndex = 31;
+            // 
             // nudAlphaProcessingWin
             // 
-            nudAlphaProcessingWin.Location = new Point(555, 98);
+            nudAlphaProcessingWin.Location = new Point(565, 70);
             nudAlphaProcessingWin.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudAlphaProcessingWin.Name = "nudAlphaProcessingWin";
             nudAlphaProcessingWin.Size = new Size(47, 23);
-            nudAlphaProcessingWin.TabIndex = 13;
+            nudAlphaProcessingWin.TabIndex = 30;
             // 
             // nudDepth
             // 
@@ -1158,7 +1186,8 @@
             nudDepth.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudDepth.Name = "nudDepth";
             nudDepth.Size = new Size(54, 23);
-            nudDepth.TabIndex = 13;
+            nudDepth.TabIndex = 26;
+            nudDepth.Value = new decimal(new int[] { 11, 0, 0, 0 });
             // 
             // nudTargetLoggingInterval
             // 
@@ -1167,24 +1196,16 @@
             nudTargetLoggingInterval.Maximum = new decimal(new int[] { 99999999, 0, 0, 0 });
             nudTargetLoggingInterval.Name = "nudTargetLoggingInterval";
             nudTargetLoggingInterval.Size = new Size(54, 23);
-            nudTargetLoggingInterval.TabIndex = 13;
+            nudTargetLoggingInterval.TabIndex = 27;
             // 
             // label54
             // 
             label54.AutoSize = true;
-            label54.Location = new Point(391, 100);
+            label54.Location = new Point(389, 72);
             label54.Name = "label54";
             label54.Size = new Size(158, 17);
             label54.TabIndex = 12;
             label54.Text = "Alpha-processing window";
-            // 
-            // txtToolType
-            // 
-            txtToolType.Location = new Point(185, 15);
-            txtToolType.Name = "txtToolType";
-            txtToolType.ReadOnly = true;
-            txtToolType.Size = new Size(88, 23);
-            txtToolType.TabIndex = 6;
             // 
             // label53
             // 
@@ -1213,6 +1234,16 @@
             pbLoadDB.TabIndex = 8;
             pbLoadDB.Visible = false;
             // 
+            // cmbToolType
+            // 
+            cmbToolType.DropDownStyle = ComboBoxStyle.DropDownList;
+            cmbToolType.FormattingEnabled = true;
+            cmbToolType.Items.AddRange(new object[] { "RET", "SMRT" });
+            cmbToolType.Location = new Point(183, 12);
+            cmbToolType.Name = "cmbToolType";
+            cmbToolType.Size = new Size(104, 25);
+            cmbToolType.TabIndex = 32;
+            // 
             // FrmMain
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
@@ -1226,6 +1257,7 @@
             Controls.Add(btnReport);
             Controls.Add(gbResult);
             Controls.Add(btnAnalysis);
+            Icon = (Icon)resources.GetObject("$this.Icon");
             Name = "FrmMain";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "Job Planner";
@@ -1240,7 +1272,6 @@
             panel1.ResumeLayout(false);
             panel1.PerformLayout();
             gbResult.ResumeLayout(false);
-            gbResult.PerformLayout();
             tableLayoutPanel1.ResumeLayout(false);
             tabEditInfo.ResumeLayout(false);
             tpBorehole.ResumeLayout(false);
@@ -1264,6 +1295,7 @@
             ((System.ComponentModel.ISupportInitialize)nudPorosity).EndInit();
             tpPlan.ResumeLayout(false);
             tpPlan.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)nudYieldCounting).EndInit();
             ((System.ComponentModel.ISupportInitialize)nudAlphaProcessingWin).EndInit();
             ((System.ComponentModel.ISupportInitialize)nudDepth).EndInit();
             ((System.ComponentModel.ISupportInitialize)nudTargetLoggingInterval).EndInit();
@@ -1358,7 +1390,6 @@
         private NumericUpDown nudGasDensity;
         private Label label51;
         private Label label50;
-        private TextBox txtToolType;
         private Label label52;
         private NumericUpDown nudDepth;
         private Label label53;
@@ -1370,10 +1401,13 @@
         private Label label5;
         private ComboBox cmbTargetLoggingIntervalUnit;
         private NumericUpDown nudTargetLoggingInterval;
-        private TextBox txtAnalysisResult;
         private Panel pnlErrorRatioPic;
         private Panel pnlCOPic;
         private TableLayoutPanel tableLayoutPanel1;
         private ProgressBar pbLoadDB;
+        private RichTextBox txtAnalysisResult;
+        private Label label7;
+        private NumericUpDown nudYieldCounting;
+        private ComboBox cmbToolType;
     }
 }

--
Gitblit v1.9.3