yangyin
2024-10-23 7fa5235e0368153db3a9e97a1e92042177ce3075
提交
已修改13个文件
473 ■■■■ 文件已修改
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowStyle.Designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowStyle.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ViewModel/GeomBaseInfo.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlGeomBaseInfo.Designer.cs 172 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlGeomBaseInfo.cs 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.Designer.cs 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.resx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionBaseInfo.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionBaseInfo.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.Designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -5,6 +5,7 @@
using System.IO;
using System.Text;
using System.Linq;
using DPumpHydr.WinFrmUI.Volute.ViewModel;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -54,6 +55,11 @@
            return GoPrevStepCore();
        }
        ViewModel.HdrBaseInfo _hdrBaseInfo = null;
        ViewModel.GeomBaseInfo _geomBaseInfo = null;
        /// <summary>
        /// ä¸‹ä¸€æ­¥æ ¸å¿ƒ
        /// </summary>
        /// <returns></returns>
        private bool GoNextStepCore()
        {
            var next_step = (from x in _allStepNodes
@@ -71,13 +77,44 @@
                    MessageBox.Show(error_info);
                    return false;
                }
                hdrBaseInfo.CalcNs();
                _hdrBaseInfo = hdrBaseInfo;
                if(_geomBaseInfo == null)
                {
                    _geomBaseInfo = new ViewModel.GeomBaseInfo();
                }
                _geomBaseInfo.Calc(hdrBaseInfo);
            }
            if (_currentStepID == Step_ID_Geom_Base_Info)
            {
                string error_info;
                var geomBaseInfo = _ctrlGeomBaseInfo.GetBindingData(out error_info);
                if (geomBaseInfo == null)
                {
                    MessageBox.Show(error_info);
                    return false;
                }
                _geomBaseInfo = geomBaseInfo;
            }
            //if (_currentStepID == Step_ID_Section18_Base)
            //{
            //    string error_info;
            //    var geomBaseInfo = _ctrlGeomBaseInfo.GetBindingData(out error_info);
            //    if (geomBaseInfo == null)
            //    {
            //        MessageBox.Show(error_info);
            //        return false;
            //    }
            //    _geomBaseInfo = geomBaseInfo;
            //}
            SetParasCtrl(next_step.ID);
 
            return true;
        }
        /// <summary>
        /// ä¸Šä¸€æ­¥æ ¸å¿ƒ
        /// </summary>
        /// <returns></returns>
        private bool GoPrevStepCore()
        {
            if (_currentStepID == Step_ID_Hdr_Base_Info)
@@ -94,7 +131,10 @@
   
            return true;
        }
        /// <summary>
        /// ç”Ÿæˆç¬¬å‡ æ­¥æŽ§ä»¶
        /// </summary>
        /// <param name="step_id"></param>
        private void SetParasCtrl(long step_id)
        {   
            if (step_id == Step_ID_Hdr_Base_Info)
@@ -103,7 +143,9 @@
                    _ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
                this.panelParas.Controls.Clear();
                this.panelParas.Controls.Add(_ctrlHdrBaseInfo);
                _ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
            }
            if (step_id == Step_ID_Geom_Base_Info)
            {
                if (_ctrlGeomBaseInfo == null)
@@ -112,9 +154,9 @@
                    _ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo";
                    _ctrlGeomBaseInfo.Dock = DockStyle.Right;
                }
                this.panelParas.Controls.Clear();
                this.panelParas.Controls.Add(_ctrlGeomBaseInfo);
                _ctrlGeomBaseInfo.SetBindingData(_geomBaseInfo);
            }
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowStyle.Designer.cs
@@ -279,7 +279,6 @@
            mlTextBoxEdit中心距离.MaxLength = 32767;
            mlTextBoxEdit中心距离.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mlTextBoxEdit中心距离.Name = "mlTextBoxEdit中心距离";
            mlTextBoxEdit中心距离.NullValuePromptText = null;
            mlTextBoxEdit中心距离.PasswordChar = '\0';
            mlTextBoxEdit中心距离.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mlTextBoxEdit中心距离.PrefixSuffixText = "mm";
@@ -318,7 +317,6 @@
            mlTextBoxEdit扩散管长度.MaxLength = 32767;
            mlTextBoxEdit扩散管长度.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mlTextBoxEdit扩散管长度.Name = "mlTextBoxEdit扩散管长度";
            mlTextBoxEdit扩散管长度.NullValuePromptText = null;
            mlTextBoxEdit扩散管长度.PasswordChar = '\0';
            mlTextBoxEdit扩散管长度.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mlTextBoxEdit扩散管长度.PrefixSuffixText = "mm";
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowStyle.cs
@@ -35,14 +35,14 @@
        {
            error = "";
            bool isOk = true;
            if (string.IsNullOrEmpty(mlTextBoxEdit扩散管长度.Text) || mlTextBoxEdit扩散管长度.Text == "请输入扩散管长度")
            if (string.IsNullOrEmpty(mlTextBoxEdit扩散管长度.Text) || mlTextBoxEdit扩散管长度.Text == "请输入扩散管长度" || double.Parse(mlTextBoxEdit扩散管长度.Text) == 0)
            {
                error = "请输入扩散管长度!";
                isOk = false;
                mlTextBoxEdit扩散管长度.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel扩散管长度.Visible = true;
            }
            if (string.IsNullOrEmpty(mlTextBoxEdit中心距离.Text) || mlTextBoxEdit中心距离.Text == "请输入中心距离")
            if (string.IsNullOrEmpty(mlTextBoxEdit中心距离.Text) || mlTextBoxEdit中心距离.Text == "请输入中心距离" || double.Parse(mlTextBoxEdit中心距离.Text) == 0)
            {
                error = "请输入中心距离!";
                isOk = false;
@@ -116,7 +116,7 @@
        private void mlTextBoxEdit扩散长度_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mlTextBoxEdit扩散管长度.Text))
            if (string.IsNullOrEmpty(mlTextBoxEdit扩散管长度.Text) || double.Parse(mlTextBoxEdit扩散管长度.Text) == 0)
            {
                mlTextBoxEdit扩散管长度.Text = "请输入扩散管长度";
            }
@@ -134,7 +134,7 @@
        private void mlTextBoxEdit中心距离_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mlTextBoxEdit中心距离.Text))
            if (string.IsNullOrEmpty(mlTextBoxEdit中心距离.Text) || double.Parse(mlTextBoxEdit中心距离.Text) == 0)
            {
                mlTextBoxEdit中心距离.Text = "请输入中心距离";
            }
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ViewModel/GeomBaseInfo.cs
@@ -26,6 +26,10 @@
        public double K3 { get; set; }
        /// <summary>
        /// æ¯”转速
        /// </summary>
        public double ns { get; set; }
        /// <summary>
        /// è¿žæŽ¥çš„æ‚¬æŒ‚体最大处直径
        /// </summary>
        public double XgtBodyMaxDia { get; set; }
@@ -40,6 +44,7 @@
        /// <param name="base_info"></param>
        public void Calc(HdrBaseInfo base_info)
        {
            this.ns = base_info.ns;
            //计算并设置K3
            if (base_info.ns < 170)
                K3 = (69.1549 - 0.446605 * base_info.ns + 0.0014497 * base_info.ns * base_info.ns) / 100;
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlGeomBaseInfo.Designer.cs
@@ -38,19 +38,23 @@
            mTextBoxEdit基圆直径 = new RLT.Controls.MaterialTextBoxEdit();
            thunderGroupBox2 = new RLT.Controls.ThunderGroupBox();
            skyLabel基圆宽度 = new RLT.Controls.SkyLabel();
            crownLabel6 = new RLT.Controls.CrownLabel();
            crownLabel5 = new RLT.Controls.CrownLabel();
            crownLabelmax基圆宽度1 = new RLT.Controls.CrownLabel();
            crownLabelmin基圆宽度1 = new RLT.Controls.CrownLabel();
            crownLabel2 = new RLT.Controls.CrownLabel();
            metroTrackBar基圆宽度 = new RLT.Controls.MetroTrackBar();
            mTextBoxEdit基圆宽度 = new RLT.Controls.MaterialTextBoxEdit();
            crownLabel8 = new RLT.Controls.CrownLabel();
            crownLabel7 = new RLT.Controls.CrownLabel();
            crownLabelmax隔舌安放角1 = new RLT.Controls.CrownLabel();
            crownLabelmin隔舌安放角1 = new RLT.Controls.CrownLabel();
            crownLabel3 = new RLT.Controls.CrownLabel();
            metroTrackBar隔舌安放角 = new RLT.Controls.MetroTrackBar();
            mTextBoxEdit隔舌安放角 = new RLT.Controls.MaterialTextBoxEdit();
            thunderGroupBox3 = new RLT.Controls.ThunderGroupBox();
            skyLabel隔舌安放角 = new RLT.Controls.SkyLabel();
            metroToolTip第二步提示 = new RLT.Controls.MetroToolTip();
            crownLabelmin基圆宽度2 = new RLT.Controls.CrownLabel();
            crownLabelmax基圆宽度2 = new RLT.Controls.CrownLabel();
            crownLabelmin隔舌安放角2 = new RLT.Controls.CrownLabel();
            crownLabelmax隔舌安放角2 = new RLT.Controls.CrownLabel();
            thunderGroupBox1.SuspendLayout();
            thunderGroupBox2.SuspendLayout();
            thunderGroupBox3.SuspendLayout();
@@ -213,9 +217,11 @@
            thunderGroupBox2.BodyColorB = System.Drawing.Color.DarkGray;
            thunderGroupBox2.BodyColorC = System.Drawing.SystemColors.ButtonFace;
            thunderGroupBox2.BodyColorD = System.Drawing.SystemColors.ButtonFace;
            thunderGroupBox2.Controls.Add(crownLabelmax基圆宽度2);
            thunderGroupBox2.Controls.Add(crownLabelmin基圆宽度2);
            thunderGroupBox2.Controls.Add(skyLabel基圆宽度);
            thunderGroupBox2.Controls.Add(crownLabel6);
            thunderGroupBox2.Controls.Add(crownLabel5);
            thunderGroupBox2.Controls.Add(crownLabelmax基圆宽度1);
            thunderGroupBox2.Controls.Add(crownLabelmin基圆宽度1);
            thunderGroupBox2.Controls.Add(crownLabel2);
            thunderGroupBox2.Controls.Add(metroTrackBar基圆宽度);
            thunderGroupBox2.Controls.Add(mTextBoxEdit基圆宽度);
@@ -239,29 +245,29 @@
            skyLabel基圆宽度.Text = "请输入基圆宽度!";
            skyLabel基圆宽度.Visible = false;
            // 
            // crownLabel6
            // crownLabelmax基圆宽度1
            // 
            crownLabel6.AutoSize = true;
            crownLabel6.BackColor = System.Drawing.SystemColors.Control;
            crownLabel6.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabel6.ForeColor = System.Drawing.Color.Black;
            crownLabel6.Location = new System.Drawing.Point(202, 98);
            crownLabel6.Name = "crownLabel6";
            crownLabel6.Size = new System.Drawing.Size(38, 16);
            crownLabel6.TabIndex = 22;
            crownLabel6.Text = "49.00";
            crownLabelmax基圆宽度1.AutoSize = true;
            crownLabelmax基圆宽度1.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmax基圆宽度1.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmax基圆宽度1.ForeColor = System.Drawing.Color.Black;
            crownLabelmax基圆宽度1.Location = new System.Drawing.Point(202, 98);
            crownLabelmax基圆宽度1.Name = "crownLabelmax基圆宽度1";
            crownLabelmax基圆宽度1.Size = new System.Drawing.Size(38, 16);
            crownLabelmax基圆宽度1.TabIndex = 22;
            crownLabelmax基圆宽度1.Text = "49.00";
            // 
            // crownLabel5
            // crownLabelmin基圆宽度1
            // 
            crownLabel5.AutoSize = true;
            crownLabel5.BackColor = System.Drawing.SystemColors.Control;
            crownLabel5.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabel5.ForeColor = System.Drawing.Color.Black;
            crownLabel5.Location = new System.Drawing.Point(13, 98);
            crownLabel5.Name = "crownLabel5";
            crownLabel5.Size = new System.Drawing.Size(38, 16);
            crownLabel5.TabIndex = 21;
            crownLabel5.Text = "15.40";
            crownLabelmin基圆宽度1.AutoSize = true;
            crownLabelmin基圆宽度1.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmin基圆宽度1.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmin基圆宽度1.ForeColor = System.Drawing.Color.Black;
            crownLabelmin基圆宽度1.Location = new System.Drawing.Point(13, 98);
            crownLabelmin基圆宽度1.Name = "crownLabelmin基圆宽度1";
            crownLabelmin基圆宽度1.Size = new System.Drawing.Size(38, 16);
            crownLabelmin基圆宽度1.TabIndex = 21;
            crownLabelmin基圆宽度1.Text = "15.40";
            // 
            // crownLabel2
            // 
@@ -271,9 +277,9 @@
            crownLabel2.ForeColor = System.Drawing.Color.Black;
            crownLabel2.Location = new System.Drawing.Point(14, 117);
            crownLabel2.Name = "crownLabel2";
            crownLabel2.Size = new System.Drawing.Size(141, 16);
            crownLabel2.Size = new System.Drawing.Size(124, 16);
            crownLabel2.TabIndex = 19;
            crownLabel2.Text = " b3参考范围15.40到49.00";
            crownLabel2.Text = " b3参考范围               åˆ°";
            // 
            // metroTrackBar基圆宽度
            // 
@@ -337,29 +343,29 @@
            mTextBoxEdit基圆宽度.Leave += mTextBoxEdit基圆宽度_Leave;
            mTextBoxEdit基圆宽度.TextChanged += mTextBoxEdit基圆宽度_TextChanged;
            // 
            // crownLabel8
            // crownLabelmax隔舌安放角1
            // 
            crownLabel8.AutoSize = true;
            crownLabel8.BackColor = System.Drawing.SystemColors.Control;
            crownLabel8.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabel8.ForeColor = System.Drawing.Color.Black;
            crownLabel8.Location = new System.Drawing.Point(202, 98);
            crownLabel8.Name = "crownLabel8";
            crownLabel8.Size = new System.Drawing.Size(38, 16);
            crownLabel8.TabIndex = 24;
            crownLabel8.Text = "30.00";
            crownLabelmax隔舌安放角1.AutoSize = true;
            crownLabelmax隔舌安放角1.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmax隔舌安放角1.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmax隔舌安放角1.ForeColor = System.Drawing.Color.Black;
            crownLabelmax隔舌安放角1.Location = new System.Drawing.Point(202, 98);
            crownLabelmax隔舌安放角1.Name = "crownLabelmax隔舌安放角1";
            crownLabelmax隔舌安放角1.Size = new System.Drawing.Size(38, 16);
            crownLabelmax隔舌安放角1.TabIndex = 24;
            crownLabelmax隔舌安放角1.Text = "30.00";
            // 
            // crownLabel7
            // crownLabelmin隔舌安放角1
            // 
            crownLabel7.AutoSize = true;
            crownLabel7.BackColor = System.Drawing.SystemColors.Control;
            crownLabel7.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabel7.ForeColor = System.Drawing.Color.Black;
            crownLabel7.Location = new System.Drawing.Point(13, 98);
            crownLabel7.Name = "crownLabel7";
            crownLabel7.Size = new System.Drawing.Size(38, 16);
            crownLabel7.TabIndex = 23;
            crownLabel7.Text = "25.00";
            crownLabelmin隔舌安放角1.AutoSize = true;
            crownLabelmin隔舌安放角1.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmin隔舌安放角1.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmin隔舌安放角1.ForeColor = System.Drawing.Color.Black;
            crownLabelmin隔舌安放角1.Location = new System.Drawing.Point(13, 98);
            crownLabelmin隔舌安放角1.Name = "crownLabelmin隔舌安放角1";
            crownLabelmin隔舌安放角1.Size = new System.Drawing.Size(38, 16);
            crownLabelmin隔舌安放角1.TabIndex = 23;
            crownLabelmin隔舌安放角1.Text = "25.00";
            // 
            // crownLabel3
            // 
@@ -369,9 +375,9 @@
            crownLabel3.ForeColor = System.Drawing.Color.Black;
            crownLabel3.Location = new System.Drawing.Point(13, 117);
            crownLabel3.Name = "crownLabel3";
            crownLabel3.Size = new System.Drawing.Size(140, 16);
            crownLabel3.Size = new System.Drawing.Size(123, 16);
            crownLabel3.TabIndex = 20;
            crownLabel3.Text = "φ0参考范围25.00到30.00";
            crownLabel3.Text = "φ0参考范围               åˆ°";
            // 
            // metroTrackBar隔舌安放角
            // 
@@ -442,10 +448,12 @@
            thunderGroupBox3.BodyColorB = System.Drawing.Color.DarkGray;
            thunderGroupBox3.BodyColorC = System.Drawing.SystemColors.ButtonFace;
            thunderGroupBox3.BodyColorD = System.Drawing.SystemColors.ButtonFace;
            thunderGroupBox3.Controls.Add(crownLabelmax隔舌安放角2);
            thunderGroupBox3.Controls.Add(crownLabelmin隔舌安放角2);
            thunderGroupBox3.Controls.Add(skyLabel隔舌安放角);
            thunderGroupBox3.Controls.Add(crownLabel8);
            thunderGroupBox3.Controls.Add(crownLabelmax隔舌安放角1);
            thunderGroupBox3.Controls.Add(mTextBoxEdit隔舌安放角);
            thunderGroupBox3.Controls.Add(crownLabel7);
            thunderGroupBox3.Controls.Add(crownLabelmin隔舌安放角1);
            thunderGroupBox3.Controls.Add(metroTrackBar隔舌安放角);
            thunderGroupBox3.Controls.Add(crownLabel3);
            thunderGroupBox3.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
@@ -479,6 +487,54 @@
            metroToolTip第二步提示.StyleManager = null;
            metroToolTip第二步提示.ThemeAuthor = "Taiizor";
            metroToolTip第二步提示.ThemeName = "MetroLight";
            //
            // crownLabelmin基圆宽度2
            //
            crownLabelmin基圆宽度2.AutoSize = true;
            crownLabelmin基圆宽度2.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmin基圆宽度2.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmin基圆宽度2.ForeColor = System.Drawing.Color.Black;
            crownLabelmin基圆宽度2.Location = new System.Drawing.Point(82, 117);
            crownLabelmin基圆宽度2.Name = "crownLabelmin基圆宽度2";
            crownLabelmin基圆宽度2.Size = new System.Drawing.Size(38, 16);
            crownLabelmin基圆宽度2.TabIndex = 27;
            crownLabelmin基圆宽度2.Text = "15.40";
            //
            // crownLabelmax基圆宽度2
            //
            crownLabelmax基圆宽度2.AutoSize = true;
            crownLabelmax基圆宽度2.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmax基圆宽度2.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmax基圆宽度2.ForeColor = System.Drawing.Color.Black;
            crownLabelmax基圆宽度2.Location = new System.Drawing.Point(144, 117);
            crownLabelmax基圆宽度2.Name = "crownLabelmax基圆宽度2";
            crownLabelmax基圆宽度2.Size = new System.Drawing.Size(38, 16);
            crownLabelmax基圆宽度2.TabIndex = 28;
            crownLabelmax基圆宽度2.Text = "49.00";
            //
            // crownLabelmin隔舌安放角2
            //
            crownLabelmin隔舌安放角2.AutoSize = true;
            crownLabelmin隔舌安放角2.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmin隔舌安放角2.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmin隔舌安放角2.ForeColor = System.Drawing.Color.Black;
            crownLabelmin隔舌安放角2.Location = new System.Drawing.Point(81, 117);
            crownLabelmin隔舌安放角2.Name = "crownLabelmin隔舌安放角2";
            crownLabelmin隔舌安放角2.Size = new System.Drawing.Size(38, 16);
            crownLabelmin隔舌安放角2.TabIndex = 26;
            crownLabelmin隔舌安放角2.Text = "25.00";
            //
            // crownLabelmax隔舌安放角2
            //
            crownLabelmax隔舌安放角2.AutoSize = true;
            crownLabelmax隔舌安放角2.BackColor = System.Drawing.SystemColors.Control;
            crownLabelmax隔舌安放角2.Font = new System.Drawing.Font("Microsoft YaHei UI", 8F, System.Drawing.FontStyle.Bold);
            crownLabelmax隔舌安放角2.ForeColor = System.Drawing.Color.Black;
            crownLabelmax隔舌安放角2.Location = new System.Drawing.Point(144, 117);
            crownLabelmax隔舌安放角2.Name = "crownLabelmax隔舌安放角2";
            crownLabelmax隔舌安放角2.Size = new System.Drawing.Size(38, 16);
            crownLabelmax隔舌安放角2.TabIndex = 27;
            crownLabelmax隔舌安放角2.Text = "30.00";
            // 
            // ctrlGeomBaseInfo
            // 
@@ -519,15 +575,19 @@
        private RLT.Controls.CrownLabel crownLabel2;
        private RLT.Controls.MetroTrackBar metroTrackBar基圆宽度;
        private RLT.Controls.MetroTrackBar metroTrackBar隔舌安放角;
        private RLT.Controls.CrownLabel crownLabel8;
        private RLT.Controls.CrownLabel crownLabel7;
        private RLT.Controls.CrownLabel crownLabel6;
        private RLT.Controls.CrownLabel crownLabel5;
        private RLT.Controls.CrownLabel crownLabelmax隔舌安放角1;
        private RLT.Controls.CrownLabel crownLabelmin隔舌安放角1;
        private RLT.Controls.CrownLabel crownLabelmax基圆宽度1;
        private RLT.Controls.CrownLabel crownLabelmin基圆宽度1;
        private RLT.Controls.ThunderGroupBox thunderGroupBox3;
        private RLT.Controls.MetroToolTip metroToolTip第二步提示;
        private RLT.Controls.SkyLabel skyLabel速度系数;
        private RLT.Controls.SkyLabel skyLabel基圆直径;
        private RLT.Controls.SkyLabel skyLabel基圆宽度;
        private RLT.Controls.SkyLabel skyLabel隔舌安放角;
        private RLT.Controls.CrownLabel crownLabelmax基圆宽度2;
        private RLT.Controls.CrownLabel crownLabelmin基圆宽度2;
        private RLT.Controls.CrownLabel crownLabelmax隔舌安放角2;
        private RLT.Controls.CrownLabel crownLabelmin隔舌安放角2;
    }
}
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlGeomBaseInfo.cs
@@ -20,33 +20,82 @@
            BuildAllTips();
            BuildIcon();
        }
        ViewModel.GeomBaseInfo _paras = null;
        public void SetBindingData(ViewModel.GeomBaseInfo vm)
        {
            this._paras = vm;
            if (vm == null)
            {
                return;
            }
            this.crownLabel比转速.Text = vm.ns.ToString();
            this.mTextBoxEdit速度系数.Text = vm.K3.ToString();
            this.mTextBoxEdit基圆直径.Text = vm.D3.ToString();
            this.mTextBoxEdit基圆宽度.Text = vm.B3.ToString();
            this.crownLabelmin基圆宽度1.Text = vm.B3_Min.ToString();
            this.crownLabelmin基圆宽度2.Text = vm.B3_Min.ToString();
            this.crownLabelmax基圆宽度1.Text = vm.B3_Max.ToString();
            this.crownLabelmax基圆宽度2.Text = vm.B3_Max.ToString();
            this.metroTrackBar基圆宽度.Minimum = (int)(vm.B3_Min * 100);
            this.metroTrackBar基圆宽度.Maximum = (int)(vm.B3_Max * 100);
            this.metroTrackBar基圆宽度.Value = this.metroTrackBar基圆宽度.Minimum;
            this.mTextBoxEdit隔舌安放角.Text = vm.FAI0.ToString();
            this.crownLabelmin隔舌安放角1.Text = vm.FAI0_Min.ToString();
            this.crownLabelmin隔舌安放角2.Text = vm.FAI0_Min.ToString();
            this.crownLabelmax隔舌安放角1.Text = vm.FAI0_Max.ToString();
            this.crownLabelmax隔舌安放角2.Text = vm.FAI0_Max.ToString();
            //var a = vm.FAI0_Min * 100;
            //this.metroTrackBar隔舌安放角.Minimum = Convert.ToInt32(a);
            //this.metroTrackBar隔舌安放角.Maximum = Convert.ToInt32(vm.FAI0_Max * 100);
            //this.metroTrackBar隔舌安放角.Value = this.metroTrackBar隔舌安放角.Minimum;
        }
        public ViewModel.GeomBaseInfo GetBindingData(out string error)
        {
            if (!Verify(out error))
            {
                return null;
            }
            error = null;
            if (_paras == null)
            {
                _paras = new ViewModel.GeomBaseInfo();
            }
            _paras.K3 = Convert.ToDouble(this.mTextBoxEdit速度系数.Text);
            _paras.D3 = Convert.ToDouble(this.mTextBoxEdit基圆直径.Text);
            _paras.B3 = Convert.ToDouble(this.mTextBoxEdit基圆宽度.Text);
            _paras.FAI0 = Convert.ToDouble(this.mTextBoxEdit隔舌安放角.Text);
            return _paras;
        }
        public bool Verify(out string error)
        {
            error = "";
            var image = "alert-square-rounded.png";
            bool isOk = true;
            if (string.IsNullOrEmpty(mTextBoxEdit速度系数.Text) || mTextBoxEdit速度系数.Text == "请输入速度系数")
            if (string.IsNullOrEmpty(mTextBoxEdit速度系数.Text) || mTextBoxEdit速度系数.Text == "请输入速度系数" || double.Parse(mTextBoxEdit速度系数.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                mTextBoxEdit速度系数.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel速度系数.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit基圆直径.Text) || mTextBoxEdit基圆直径.Text == "请输入基圆直径")
            if (string.IsNullOrEmpty(mTextBoxEdit基圆直径.Text) || mTextBoxEdit基圆直径.Text == "请输入基圆直径" || double.Parse(mTextBoxEdit基圆直径.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                mTextBoxEdit基圆直径.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel基圆直径.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit基圆宽度.Text) || mTextBoxEdit基圆宽度.Text == "请输入基圆宽度")
            if (string.IsNullOrEmpty(mTextBoxEdit基圆宽度.Text) || mTextBoxEdit基圆宽度.Text == "请输入基圆宽度" || double.Parse(mTextBoxEdit基圆宽度.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                mTextBoxEdit基圆宽度.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel基圆宽度.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit隔舌安放角.Text) || mTextBoxEdit隔舌安放角.Text == "请输入隔舌安放角")
            if (string.IsNullOrEmpty(mTextBoxEdit隔舌安放角.Text) || mTextBoxEdit隔舌安放角.Text == "请输入隔舌安放角" || double.Parse(mTextBoxEdit隔舌安放角.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
@@ -98,7 +147,7 @@
        private void mTextBoxEdit速度系数_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit速度系数.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit速度系数.Text) || double.Parse(mTextBoxEdit速度系数.Text) == 0)
            {
                mTextBoxEdit速度系数.Text = "请输入速度系数";
            }
@@ -136,7 +185,7 @@
        private void mTextBoxEdit基圆直径_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit基圆直径.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit基圆直径.Text) || double.Parse(mTextBoxEdit基圆直径.Text) == 0)
            {
                mTextBoxEdit基圆直径.Text = "请输入基圆直径";
            }
@@ -174,7 +223,7 @@
        private void mTextBoxEdit基圆宽度_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit基圆宽度.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit基圆宽度.Text) || double.Parse(mTextBoxEdit基圆宽度.Text) == 0)
            {
                mTextBoxEdit基圆宽度.Text = "请输入基圆宽度";
            }
@@ -221,7 +270,7 @@
        private void mTextBoxEdit隔舌安放角_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit隔舌安放角.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit隔舌安放角.Text) || double.Parse(mTextBoxEdit隔舌安放角.Text) == 0)
            {
                mTextBoxEdit隔舌安放角.Text = "请输入隔舌安放角";
            }
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.Designer.cs
@@ -38,7 +38,7 @@
            skyLabel转速 = new RLT.Controls.SkyLabel();
            skyLabel总流量 = new RLT.Controls.SkyLabel();
            mTextBoxEdit扬程 = new RLT.Controls.MaterialTextBoxEdit();
            RBtn双蜗壳型参数 = new RLT.Controls.RibbonRadioButton();
            RBtn双吸泵 = new RLT.Controls.RibbonRadioButton();
            mTextBoxEdit转速 = new RLT.Controls.MaterialTextBoxEdit();
            mTextBoxEdit总流量 = new RLT.Controls.MaterialTextBoxEdit();
            thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
@@ -182,7 +182,7 @@
            thunderGroupBox2.Controls.Add(skyLabel转速);
            thunderGroupBox2.Controls.Add(skyLabel总流量);
            thunderGroupBox2.Controls.Add(mTextBoxEdit扬程);
            thunderGroupBox2.Controls.Add(RBtn双蜗壳型参数);
            thunderGroupBox2.Controls.Add(RBtn双吸泵);
            thunderGroupBox2.Controls.Add(mTextBoxEdit转速);
            thunderGroupBox2.Controls.Add(mTextBoxEdit总流量);
            thunderGroupBox2.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
@@ -266,25 +266,25 @@
            mTextBoxEdit扬程.Leave += mTextBoxEdit扬程_Leave;
            mTextBoxEdit扬程.TextChanged += mTextBoxEdit扬程_TextChanged;
            // 
            // RBtn双蜗壳型参数
            // RBtn双吸泵
            // 
            RBtn双蜗壳型参数.BackColor = System.Drawing.Color.Transparent;
            RBtn双蜗壳型参数.Checked = false;
            RBtn双蜗壳型参数.CheckedBorderColorA = System.Drawing.Color.FromArgb(203, 201, 205);
            RBtn双蜗壳型参数.CheckedBorderColorB = System.Drawing.Color.FromArgb(188, 186, 190);
            RBtn双蜗壳型参数.CheckedColor = System.Drawing.Color.FromArgb(40, 40, 40);
            RBtn双蜗壳型参数.CircleBorderColor = System.Drawing.Color.FromArgb(117, 120, 117);
            RBtn双蜗壳型参数.CircleEdgeColor = System.Drawing.Color.WhiteSmoke;
            RBtn双蜗壳型参数.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
            RBtn双蜗壳型参数.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
            RBtn双蜗壳型参数.ForeColor = System.Drawing.Color.FromArgb(40, 40, 40);
            RBtn双蜗壳型参数.Location = new System.Drawing.Point(14, 34);
            RBtn双蜗壳型参数.Name = "RBtn双蜗壳型参数";
            RBtn双蜗壳型参数.Size = new System.Drawing.Size(227, 16);
            RBtn双蜗壳型参数.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
            RBtn双蜗壳型参数.TabIndex = 4;
            RBtn双蜗壳型参数.Text = "双蜗壳型";
            RBtn双蜗壳型参数.TextRenderingType = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
            RBtn双吸泵.BackColor = System.Drawing.Color.Transparent;
            RBtn双吸泵.Checked = false;
            RBtn双吸泵.CheckedBorderColorA = System.Drawing.Color.FromArgb(203, 201, 205);
            RBtn双吸泵.CheckedBorderColorB = System.Drawing.Color.FromArgb(188, 186, 190);
            RBtn双吸泵.CheckedColor = System.Drawing.Color.FromArgb(40, 40, 40);
            RBtn双吸泵.CircleBorderColor = System.Drawing.Color.FromArgb(117, 120, 117);
            RBtn双吸泵.CircleEdgeColor = System.Drawing.Color.WhiteSmoke;
            RBtn双吸泵.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
            RBtn双吸泵.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
            RBtn双吸泵.ForeColor = System.Drawing.Color.FromArgb(40, 40, 40);
            RBtn双吸泵.Location = new System.Drawing.Point(14, 34);
            RBtn双吸泵.Name = "RBtn双吸泵";
            RBtn双吸泵.Size = new System.Drawing.Size(227, 16);
            RBtn双吸泵.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
            RBtn双吸泵.TabIndex = 4;
            RBtn双吸泵.Text = "双吸泵";
            RBtn双吸泵.TextRenderingType = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
            // 
            // mTextBoxEdit转速
            // 
@@ -344,6 +344,7 @@
            mTextBoxEdit总流量.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEdit总流量.PrefixSuffixText = "m³/h ";
            mTextBoxEdit总流量.ReadOnly = false;
            mTextBoxEdit总流量.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
            mTextBoxEdit总流量.SelectedText = "";
            mTextBoxEdit总流量.SelectionLength = 0;
            mTextBoxEdit总流量.SelectionStart = 0;
@@ -352,7 +353,7 @@
            mTextBoxEdit总流量.TabIndex = 3;
            mTextBoxEdit总流量.TabStop = false;
            mTextBoxEdit总流量.Text = "请输入总流量";
            mTextBoxEdit总流量.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
            mTextBoxEdit总流量.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
            mTextBoxEdit总流量.TrailingIcon = null;
            mTextBoxEdit总流量.UseAccent = false;
            mTextBoxEdit总流量.UseSystemPasswordChar = false;
@@ -531,7 +532,7 @@
        private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit出口宽度;
        private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit出口直径;
        private RLT.Controls.ThunderGroupBox thunderGroupBox2;
        private RLT.Controls.RibbonRadioButton RBtn双蜗壳型参数;
        private RLT.Controls.RibbonRadioButton RBtn双吸泵;
        private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit总流量;
        private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit转速;
        private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit扬程;
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.cs
@@ -35,6 +35,7 @@
            this.mTextBoxEdit转速.Text = vm.n.ToString();
            this.mTextBoxEdit出口直径.Text = vm.D2.ToString();
            this.mTextBoxEdit出口宽度.Text = vm.B2.ToString();
            this.RBtn双吸泵.Checked = vm.IsSXB;
        }
        public ViewModel.HdrBaseInfo GetBindingData(out string error)
        {
@@ -52,6 +53,7 @@
            _paras.n = Convert.ToDouble(this.mTextBoxEdit转速.Text);
            _paras.D2 = Convert.ToDouble(this.mTextBoxEdit出口直径.Text);
            _paras.B2 = Convert.ToDouble(this.mTextBoxEdit出口宽度.Text);
            _paras.IsSXB = this.RBtn双吸泵.Checked;
            return _paras;
        }
@@ -65,35 +67,35 @@
            //
          
            bool isOk = true ;
            if (string.IsNullOrEmpty(mTextBoxEdit总流量.Text) || mTextBoxEdit总流量.Text == "请输入总流量")
            if (string.IsNullOrEmpty(mTextBoxEdit总流量.Text) || mTextBoxEdit总流量.Text == "请输入总流量" || double.Parse(mTextBoxEdit总流量.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                mTextBoxEdit总流量.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel总流量.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit转速.Text) || mTextBoxEdit转速.Text == "请输入转速")
            if (string.IsNullOrEmpty(mTextBoxEdit转速.Text) || mTextBoxEdit转速.Text == "请输入转速" || double.Parse(mTextBoxEdit转速.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                    mTextBoxEdit转速.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel转速.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit扬程.Text) || mTextBoxEdit扬程.Text == "请输入扬程")
            if (string.IsNullOrEmpty(mTextBoxEdit扬程.Text) || mTextBoxEdit扬程.Text == "请输入扬程" || double.Parse(mTextBoxEdit扬程.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                    mTextBoxEdit扬程.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel扬程.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit出口直径.Text) || mTextBoxEdit出口直径.Text == "请输入出口直径")
            if (string.IsNullOrEmpty(mTextBoxEdit出口直径.Text) || mTextBoxEdit出口直径.Text == "请输入出口直径" || double.Parse(mTextBoxEdit出口直径.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
                    mTextBoxEdit出口直径.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel出口直径.Visible = true;
            }
            if (string.IsNullOrEmpty(mTextBoxEdit出口宽度.Text) || mTextBoxEdit出口宽度.Text == "请输入出口宽度")
            if (string.IsNullOrEmpty(mTextBoxEdit出口宽度.Text) || mTextBoxEdit出口宽度.Text == "请输入出口宽度" || double.Parse(mTextBoxEdit出口宽度.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
@@ -232,7 +234,7 @@
        private void mTextBoxEdit总流量_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit总流量.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit总流量.Text) || double.Parse(mTextBoxEdit总流量.Text) == 0)
            {
                mTextBoxEdit总流量.Text = "请输入总流量";
            }
@@ -250,7 +252,7 @@
        private void mTextBoxEdit转速_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit转速.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit转速.Text) || double.Parse(mTextBoxEdit转速.Text) == 0)
            {
                mTextBoxEdit转速.Text = "请输入转速";
            }
@@ -269,7 +271,7 @@
        private void mTextBoxEdit扬程_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit扬程.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit扬程.Text) || double.Parse(mTextBoxEdit扬程.Text) == 0)
            {
                mTextBoxEdit扬程.Text = "请输入扬程";
            }
@@ -288,7 +290,7 @@
        private void mTextBoxEdit出口直径D_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit出口直径.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit出口直径.Text) || double.Parse(mTextBoxEdit出口直径.Text) == 0)
            {
                mTextBoxEdit出口直径.Text = "请输入出口直径";
            }
@@ -306,7 +308,7 @@
        private void mTextBoxEdit出口宽度_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit出口宽度.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit出口宽度.Text) || double.Parse(mTextBoxEdit出口宽度.Text) == 0)
            {
                mTextBoxEdit出口宽度.Text = "请输入出口宽度";
            }
WinFrmUI/DPumpHydr.WinFrmUI.Volute/»ù±¾²ÎÊý/ctrlHdrBaseInfo.resx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema
    Version 2.0
@@ -48,7 +48,7 @@
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
WinFrmUI/DPumpHydr.WinFrmUI.Volute/¶ÏÃæÉè¼Æ/ctrlSectionBaseInfo.Designer.cs
@@ -171,7 +171,6 @@
            mTextBoxEdit蜗室平均速度.MaxLength = 32767;
            mTextBoxEdit蜗室平均速度.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEdit蜗室平均速度.Name = "mTextBoxEdit蜗室平均速度";
            mTextBoxEdit蜗室平均速度.NullValuePromptText = null;
            mTextBoxEdit蜗室平均速度.PasswordChar = '\0';
            mTextBoxEdit蜗室平均速度.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEdit蜗室平均速度.PrefixSuffixText = "m/s";
WinFrmUI/DPumpHydr.WinFrmUI.Volute/¶ÏÃæÉè¼Æ/ctrlSectionBaseInfo.cs
@@ -24,26 +24,84 @@
            BuildAllTips();
            BuildIcon();
        }
        ViewModel.SectionBaseInfo _paras = null;
        public void SetBindingData(ViewModel.SectionBaseInfo vm)
        {
            this._paras = vm;
            if (vm == null)
            {
                return;
            }
            this.mTextBoxEdit蜗室平均速度.Text = vm.V3.ToString();
            //this.skyTextBox断面VIIIy1.Text = vm.GaMa1.ToString();
            //this.skyTextBox断面VIIIy2.Text = vm.GaMa2.ToString();
            if (_paras.ShapeType == 0)
            {
                RBtn断面对称梯形.Checked = true;
                RBtn不对称梯形.Checked = false;
                RBtn矩形.Checked = false ;
            }
            if (_paras.ShapeType == 1)
            {
                RBtn断面对称梯形.Checked = false;
                RBtn不对称梯形.Checked = true;
                RBtn矩形.Checked = false;
            }
            if (_paras.ShapeType == 2)
            {
                RBtn断面对称梯形.Checked = false;
                RBtn不对称梯形.Checked = false;
                RBtn矩形.Checked = true;
            }
        }
        public ViewModel.SectionBaseInfo GetBindingData(out string error)
        {
            if (!Verify(out error))
            {
                return null;
            }
            error = null;
            if (_paras == null)
            {
                _paras = new ViewModel.SectionBaseInfo();
            }
            _paras.V3 = Convert.ToDouble(this.mTextBoxEdit蜗室平均速度.Text);
            //_paras.GaMa1 = Convert.ToDouble(this.skyTextBox断面VIIIy1.Text);
            //_paras.GaMa2 = Convert.ToDouble(this.skyTextBox断面VIIIy2.Text);
            if (RBtn断面对称梯形.Checked)
            {
                _paras.ShapeType = 0;
            }
            if (RBtn不对称梯形.Checked)
            {
                _paras.ShapeType = 1;
            }
            if (RBtn矩形.Checked)
            {
                _paras.ShapeType = 2;
            }
            return _paras;
        }
        public bool Verify(out string error)
        {
            error = "";
            bool isOk = true;
            if (string.IsNullOrEmpty(mTextBoxEdit蜗室平均速度.Text) || mTextBoxEdit蜗室平均速度.Text == "请输入")
            if (string.IsNullOrEmpty(mTextBoxEdit蜗室平均速度.Text) || mTextBoxEdit蜗室平均速度.Text == "请输入" || double.Parse(mTextBoxEdit蜗室平均速度.Text) == 0)
            {
                error = "请输入必填项!";
                isOk = false;
                mTextBoxEdit蜗室平均速度.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                skyLabel蜗室平均速度.Visible = true;
            }
            if (string.IsNullOrEmpty(skyTextBox断面VIIIy1.Text))
            if (string.IsNullOrEmpty(skyTextBox断面VIIIy1.Text) || double.Parse(skyTextBox断面VIIIy1.Text) == 0)
            {
                error = "请输入必填项!";
                isOk = false;
                skyLabel提示y2.Visible = false;
                skyLabely2.Visible = true;
            }
            if (string.IsNullOrEmpty(skyTextBox断面VIIIy2.Text))
            if (string.IsNullOrEmpty(skyTextBox断面VIIIy2.Text) || double.Parse(skyTextBox断面VIIIy2.Text) == 0)
            {
                error = "请输入必填项!";
                isOk = false;
@@ -107,7 +165,7 @@
        private void mTextBoxEdit蜗室平均速度_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEdit蜗室平均速度.Text))
            if (string.IsNullOrEmpty(mTextBoxEdit蜗室平均速度.Text) || double.Parse(mTextBoxEdit蜗室平均速度.Text) == 0)
            {
                mTextBoxEdit蜗室平均速度.Text = "请输入";
            }
@@ -181,7 +239,7 @@
        private void mlBtn更改断面角度_Click(object sender, EventArgs e)
        {
            if (!RBtn断面对称梯形.Checked && !RBtn不对称梯形.Checked && !RBtn不对称梯形.Checked)
            if (!RBtn断面对称梯形.Checked && !RBtn不对称梯形.Checked && !RBtn矩形.Checked)
            {
                MessageBox.Show("请先选择断面类型!");
                return;
WinFrmUI/DPumpHydr.WinFrmUI.Volute/¶ÏÃæÉè¼Æ/ctrlSectionShapeInfo18.Designer.cs
@@ -146,7 +146,6 @@
            mTextBoxEditW1.MaxLength = 32767;
            mTextBoxEditW1.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditW1.Name = "mTextBoxEditW1";
            mTextBoxEditW1.NullValuePromptText = null;
            mTextBoxEditW1.PasswordChar = '\0';
            mTextBoxEditW1.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditW1.PrefixSuffixText = "mm";
@@ -185,7 +184,6 @@
            mTextBoxEditu.MaxLength = 32767;
            mTextBoxEditu.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditu.Name = "mTextBoxEditu";
            mTextBoxEditu.NullValuePromptText = null;
            mTextBoxEditu.PasswordChar = '\0';
            mTextBoxEditu.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditu.PrefixSuffixText = "mm";
@@ -267,7 +265,6 @@
            mTextBoxEditv1.MaxLength = 32767;
            mTextBoxEditv1.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditv1.Name = "mTextBoxEditv1";
            mTextBoxEditv1.NullValuePromptText = null;
            mTextBoxEditv1.PasswordChar = '\0';
            mTextBoxEditv1.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditv1.PrefixSuffixText = "°";
@@ -420,7 +417,6 @@
            mTextBoxEditW4.MaxLength = 32767;
            mTextBoxEditW4.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditW4.Name = "mTextBoxEditW4";
            mTextBoxEditW4.NullValuePromptText = null;
            mTextBoxEditW4.PasswordChar = '\0';
            mTextBoxEditW4.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditW4.PrefixSuffixText = "m/s";
@@ -501,7 +497,6 @@
            mTextBoxEditv2.MaxLength = 32767;
            mTextBoxEditv2.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditv2.Name = "mTextBoxEditv2";
            mTextBoxEditv2.NullValuePromptText = null;
            mTextBoxEditv2.PasswordChar = '\0';
            mTextBoxEditv2.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditv2.PrefixSuffixText = "°";
@@ -540,7 +535,6 @@
            mTextBoxEditR1.MaxLength = 32767;
            mTextBoxEditR1.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditR1.Name = "mTextBoxEditR1";
            mTextBoxEditR1.NullValuePromptText = null;
            mTextBoxEditR1.PasswordChar = '\0';
            mTextBoxEditR1.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditR1.PrefixSuffixText = "mm";
@@ -580,7 +574,6 @@
            mTextBoxEditH.MaxLength = 32767;
            mTextBoxEditH.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditH.Name = "mTextBoxEditH";
            mTextBoxEditH.NullValuePromptText = null;
            mTextBoxEditH.PasswordChar = '\0';
            mTextBoxEditH.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditH.PrefixSuffixText = "mm";
@@ -617,7 +610,6 @@
            mTextBoxEditR2.MaxLength = 32767;
            mTextBoxEditR2.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditR2.Name = "mTextBoxEditR2";
            mTextBoxEditR2.NullValuePromptText = null;
            mTextBoxEditR2.PasswordChar = '\0';
            mTextBoxEditR2.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditR2.PrefixSuffixText = "mm";
@@ -654,7 +646,6 @@
            mTextBoxEditR4.MaxLength = 32767;
            mTextBoxEditR4.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
            mTextBoxEditR4.Name = "mTextBoxEditR4";
            mTextBoxEditR4.NullValuePromptText = null;
            mTextBoxEditR4.PasswordChar = '\0';
            mTextBoxEditR4.PrefixSuffix = RLT.Controls.MaterialTextBoxEdit.PrefixSuffixTypes.Suffix;
            mTextBoxEditR4.PrefixSuffixText = "mm";
WinFrmUI/DPumpHydr.WinFrmUI.Volute/¶ÏÃæÉè¼Æ/ctrlSectionShapeInfo18.cs
@@ -27,7 +27,7 @@
        {
            error = "";
            bool isOk = true;
            if (string.IsNullOrEmpty(mTextBoxEditR1.Text) || mTextBoxEditR1.Text == "请输入")
            if (string.IsNullOrEmpty(mTextBoxEditR1.Text) || mTextBoxEditR1.Text == "请输入" || double.Parse(mTextBoxEditR1.Text) == 0)
            {
                isOk = false;
                error = "请输入必填项!";
@@ -36,14 +36,14 @@
            }
            if (RBtnW1.Checked)
            {
                if (string.IsNullOrEmpty(mTextBoxEditW1.Text) || mTextBoxEditW1.Text == "请输入")
                if (string.IsNullOrEmpty(mTextBoxEditW1.Text) || mTextBoxEditW1.Text == "请输入" || double.Parse(mTextBoxEditW1.Text) == 0)
                {
                    isOk = false;
                    error = "请输入W1!";
                    mTextBoxEditW1.TrailingIcon = GlobalResource.GetTipTrailingIcon();
                    skyLabelW1.Visible = true;
                }
                if (string.IsNullOrEmpty(mTextBoxEditu.Text) || mTextBoxEditu.Text == "请输入")
                if (string.IsNullOrEmpty(mTextBoxEditu.Text) || mTextBoxEditu.Text == "请输入" || double.Parse(mTextBoxEditu.Text) == 0)
                {
                    isOk = false;
                    error = "请输入U!";
@@ -53,7 +53,7 @@
            }
            if (RBtnv1.Checked)
            {
                if (string.IsNullOrEmpty(mTextBoxEditv1.Text) || mTextBoxEditv1.Text == "请输入V1")
                if (string.IsNullOrEmpty(mTextBoxEditv1.Text) || mTextBoxEditv1.Text == "请输入V1" || double.Parse(mTextBoxEditv1.Text) == 0)
                {
                    isOk = false;
                    error = "请输入V1!";
@@ -63,7 +63,7 @@
            }
            if (RBtnv2.Checked)
            {
                if (string.IsNullOrEmpty(mTextBoxEditv2.Text) || mTextBoxEditv2.Text == "请输入V2")
                if (string.IsNullOrEmpty(mTextBoxEditv2.Text) || mTextBoxEditv2.Text == "请输入V2" || double.Parse(mTextBoxEditv2.Text) == 0)
                {
                    isOk = false;
                    error = "请输入V2!";
@@ -73,7 +73,7 @@
            }
            if (RBtnW4.Checked)
            {
                if (string.IsNullOrEmpty(mTextBoxEditW4.Text) || mTextBoxEditW4.Text == "请输入W4")
                if (string.IsNullOrEmpty(mTextBoxEditW4.Text) || mTextBoxEditW4.Text == "请输入W4" || double.Parse(mTextBoxEditW4.Text) == 0)
                {
                    isOk = false;
                    error = "请输入W4!";
@@ -116,7 +116,7 @@
        private void mTextBoxEditW1_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditW1.Text) && mTextBoxEditW1.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditW1.Text) || double.Parse(mTextBoxEditW1.Text) == 0) && mTextBoxEditW1.Enabled == true)
            {
                mTextBoxEditW1.Text = "请输入";
            }
@@ -176,7 +176,7 @@
        private void mTextBoxEditu_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditu.Text) && mTextBoxEditu.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditu.Text) || double.Parse(mTextBoxEditu.Text) == 0) && mTextBoxEditu.Enabled == true)
            {
                mTextBoxEditu.Text = "请输入";
            }
@@ -193,7 +193,7 @@
        private void mTextBoxEditv1_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditv1.Text) && mTextBoxEditv1.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditv1.Text) || double.Parse(mTextBoxEditv1.Text) == 0) && mTextBoxEditv1.Enabled == true)
            {
                mTextBoxEditv1.Text = "请输入V1";
            }
@@ -231,7 +231,7 @@
        private void mTextBoxEditv2_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditv2.Text) && mTextBoxEditv2.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditv2.Text) || double.Parse(mTextBoxEditv2.Text) == 0) && mTextBoxEditv2.Enabled == true)
            {
                mTextBoxEditv2.Text = "请输入V2";
            }
@@ -269,7 +269,7 @@
        private void mTextBoxEditW4_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditW4.Text) && mTextBoxEditW4.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditW4.Text) || double.Parse(mTextBoxEditW4.Text) == 0) && mTextBoxEditW4.Enabled == true)
            {
                mTextBoxEditW4.Text = "请输入W4";
            }
@@ -308,7 +308,7 @@
        private void mTextBoxEditR1_Leave(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(mTextBoxEditR1.Text) && mTextBoxEditR1.Enabled == true)
            if ((string.IsNullOrEmpty(mTextBoxEditR1.Text) || double.Parse(mTextBoxEditR1.Text) == 0) && mTextBoxEditR1.Enabled == true)
            {
                mTextBoxEditR1.Text = "请输入";
            }