Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

tx

2025-04-11 e8260697137f503aa0170b7a36170fd7168e9b80

Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs

@@ -83,6 +83,7 @@
        private System.Windows.Forms.RibbonCheckBox RbtnChk参数面板;

        private System.Windows.Forms.RibbonCheckBox RbtnChk截面18;
        private System.Windows.Forms.RibbonCheckBox RbtnChk标注;

        private System.Windows.Forms.RibbonButton Rbtn数据导出XML;
        private System.Windows.Forms.RibbonButton Rbtn数据导入XML;
@@ -931,6 +932,21 @@
                }
            };

            RbtnChk标注 = new System.Windows.Forms.RibbonCheckBox();
            RbtnChk标注.Checked = false;
            RbtnChk标注.Name = "RbtnChk标注";
            RbtnChk标注.Text = "2D标注隐藏";
            RbtnChk标注.Visible = false;
            RbtnChk标注.CheckBoxCheckChanged += (sender, e) => {
                if (!RbtnChk标注.Checked)
                {
                    this._occDesign2dCtrl.SetDimVisible(true);
                }
                else
                {
                    this._occDesign2dCtrl.SetDimVisible(false);
                }
            };

            #endregion

@@ -995,6 +1011,7 @@
            ribbonPanel数据导入.Items.Add(Rbtn数据导入XML);

            ribbonPanel组件显示.Items.Add(RbtnChk截面18);
            ribbonPanel组件显示.Items.Add(RbtnChk标注);

            RGroup下拉框.Items.Add(RBox图层);
            RGroup小图标.Items.Add(Rbtn所有实体);

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs

@@ -65,6 +65,7 @@
        private bool ChangeStep(long current_step_id, long next_step_id)
        {
            RbtnChk截面18.Visible = false;
            RbtnChk标注.Visible = false;
            if (current_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
            {
                if (!SaveParaStep1())
@@ -134,6 +135,7 @@
            else if (next_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
            {
                RbtnChk截面18.Visible = true;
                RbtnChk标注.Visible = true;

                this.RBtn后退.Enabled = true;
                this.Rbtn前进.Enabled = true;

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_³ö¿Ú_Ë®Ìå.cs

@@ -161,7 +161,7 @@
            double R2 = outflowParas.R2;
            dRadConnerAngle = dRadConnerAngle * HydrDisplayEngineBridge.PI / 180.0;

            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                if (m_theWaterBodyOuterParam == null || !(m_theWaterBodyOuterParam is HydrEngineCSharp.WaterBodyOuterArcParam))
                m_theWaterBodyOuterParam = HydrDisplayEngineBridge.CreateWaterBodyOuter(WaterBodyOuterType.EWaterBodyOuterArc);
@@ -173,7 +173,7 @@
            }

            // HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurve = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurveArc = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
                pHydrGeomCurveArc.SetOuterOffset(dOuterOffset);
@@ -208,20 +208,20 @@
        {
            if (outflowParas == null)
                return false;
            if (outflowParas.LinkStyle != ViewModel.eOutflowLinkStyle.直线圆弧 || outflowParas.ShapeStyle == ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            if (outflowParas.LinkStyle != ViewModel.eOutflowLinkStyle.直线圆弧 || outflowParas.ShapeStyle == ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                if (outflowParas.Tangent_Top_Right <= 0 || outflowParas.Tangent_Btm_Right <= 0 ||
                               outflowParas.Tangent_Top_Left <= 0 || outflowParas.Tangent_Btm_Left <= 0)
                    return false;
            }
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                if (outflowParas.R1 <= 0 || outflowParas.R2 <= 0)
                    return false;
            }

            RefreshOuterParam(outflowParas); //WaterBodyOuterParam
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurveArc = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
                this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurveArc);
@@ -279,7 +279,7 @@
            {
                if (_isHaveCreateWaterBody3d == true)
                {
                    if(_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
                    if(_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
                    {
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {
@@ -307,7 +307,7 @@
                else
                {
                    _isHaveCreateWaterBody3d = true;
                    if (_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
                    if (_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面对齐出口)
                    {
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesign2DCtrl.cs

@@ -28,7 +28,19 @@
        }


        public override void SetDimVisible(bool isVisible)
        {
            if (isVisible)
            {
                this.pDisplayView.ShowTopoShape(TopoTypeDisplay.E2DMidCurveMark);
            }
            else
            {
                this.pDisplayView.HideTopoShape(TopoTypeDisplay.E2DMidCurveMark);
            }
        }

 


    }
}

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs

@@ -41,7 +41,10 @@
        }


        public virtual void SetDimVisible(bool isVisible)
        {

        }


        protected void OnMouseDown(object sender, MouseEventArgs e)

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ViewModel/OutflowStyleHelper.cs

@@ -20,7 +20,7 @@
            {
                return  0; 
            }
            else if (style == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口_直线连接  )
            else if (style == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面对齐出口  )
            {
                return 0;
            }

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ViewModel/eOutflowStyle.cs

@@ -11,7 +11,7 @@
        æœªçŸ¥=-1,
        ä¸­å¿ƒå‡ºå£ = 0,
        ä¾§é¢å‡ºå£ = 1,
        ä¾§é¢å‡ºå£_直线连接 = 2
        ä¾§é¢å¯¹é½å‡ºå£ = 2
    }
    public enum eOutflowLinkStyle
    { 

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowParas.Designer.cs

@@ -33,6 +33,7 @@
            comboBoxType = new System.Windows.Forms.ComboBox();
            metroToolTip第六步提示 = new DPumpHydr.WinFrmUI.RLT.Controls.MetroToolTip();
            ribbonGroupBox1 = new DPumpHydr.WinFrmUI.RLT.Controls.RibbonGroupBox();
            checkBox曲线 = new System.Windows.Forms.CheckBox();
            checkBox圆弧连接 = new System.Windows.Forms.CheckBox();
            btnNextStep = new DPumpHydr.WinFrmUI.RLT.Controls.ForeverButtonSticky();
            dungeonTabPage1 = new DPumpHydr.WinFrmUI.RLT.Controls.DungeonTabPage();
@@ -92,7 +93,7 @@
            // comboBoxType
            // 
            comboBoxType.FormattingEnabled = true;
            comboBoxType.Items.AddRange(new object[] { "中心出口", "侧面出口", "侧面出口（直线链接）" });
            comboBoxType.Items.AddRange(new object[] { "中心出口", "侧面出口" });
            comboBoxType.Location = new System.Drawing.Point(29, 0);
            comboBoxType.Name = "comboBoxType";
            comboBoxType.Size = new System.Drawing.Size(236, 23);
@@ -120,6 +121,7 @@
            ribbonGroupBox1.BorderColorB = System.Drawing.Color.FromArgb(174, 178, 172);
            ribbonGroupBox1.BorderColorC = System.Drawing.Color.FromArgb(194, 192, 200);
            ribbonGroupBox1.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
            ribbonGroupBox1.Controls.Add(checkBox曲线);
            ribbonGroupBox1.Controls.Add(checkBox圆弧连接);
            ribbonGroupBox1.Controls.Add(btnNextStep);
            ribbonGroupBox1.Controls.Add(dungeonTabPage1);
@@ -138,16 +140,28 @@
            ribbonGroupBox1.Text = "扩散管参数";
            ribbonGroupBox1.TitleHeight = 30;
            // 
            // checkBox曲线
            // 
            checkBox曲线.AutoSize = true;
            checkBox曲线.Checked = true;
            checkBox曲线.CheckState = System.Windows.Forms.CheckState.Checked;
            checkBox曲线.Location = new System.Drawing.Point(72, 31);
            checkBox曲线.Name = "checkBox曲线";
            checkBox曲线.Size = new System.Drawing.Size(87, 21);
            checkBox曲线.TabIndex = 76;
            checkBox曲线.Text = "曲线连接";
            checkBox曲线.UseVisualStyleBackColor = true;
            checkBox曲线.CheckedChanged += checkBox曲线_CheckedChanged;
            // 
            // checkBox圆弧连接
            // 
            checkBox圆弧连接.AutoSize = true;
            checkBox圆弧连接.Location = new System.Drawing.Point(225, 31);
            checkBox圆弧连接.Location = new System.Drawing.Point(165, 31);
            checkBox圆弧连接.Name = "checkBox圆弧连接";
            checkBox圆弧连接.Size = new System.Drawing.Size(87, 21);
            checkBox圆弧连接.Size = new System.Drawing.Size(117, 21);
            checkBox圆弧连接.TabIndex = 75;
            checkBox圆弧连接.Text = "圆弧连接";
            checkBox圆弧连接.Text = "直线圆弧连接";
            checkBox圆弧连接.UseVisualStyleBackColor = true;
            checkBox圆弧连接.Visible = false;
            checkBox圆弧连接.CheckedChanged += checkBox圆弧连接_CheckedChanged;
            // 
            // btnNextStep
@@ -156,7 +170,7 @@
            btnNextStep.BackColor = System.Drawing.Color.Transparent;
            btnNextStep.BaseColor = System.Drawing.Color.FromArgb(128, 128, 255);
            btnNextStep.Font = new System.Drawing.Font("Segoe UI", 9F);
            btnNextStep.Location = new System.Drawing.Point(225, 5);
            btnNextStep.Location = new System.Drawing.Point(232, 5);
            btnNextStep.Name = "btnNextStep";
            btnNextStep.Rounded = false;
            btnNextStep.Size = new System.Drawing.Size(90, 20);
@@ -182,7 +196,7 @@
            dungeonTabPage1.PageEdgeBorderColor = System.Drawing.Color.FromArgb(201, 198, 195);
            dungeonTabPage1.PageEdgeColor = System.Drawing.Color.FromArgb(247, 246, 246);
            dungeonTabPage1.SelectedIndex = 0;
            dungeonTabPage1.Size = new System.Drawing.Size(326, 493);
            dungeonTabPage1.Size = new System.Drawing.Size(333, 476);
            dungeonTabPage1.TabIndex = 73;
            // 
            // tabPage1
@@ -191,7 +205,7 @@
            tabPage1.Location = new System.Drawing.Point(4, 28);
            tabPage1.Name = "tabPage1";
            tabPage1.Padding = new System.Windows.Forms.Padding(3);
            tabPage1.Size = new System.Drawing.Size(318, 461);
            tabPage1.Size = new System.Drawing.Size(325, 444);
            tabPage1.TabIndex = 0;
            tabPage1.Text = "出口参数";
            // 
@@ -202,7 +216,7 @@
            tabPage2.Location = new System.Drawing.Point(4, 28);
            tabPage2.Name = "tabPage2";
            tabPage2.Padding = new System.Windows.Forms.Padding(3);
            tabPage2.Size = new System.Drawing.Size(318, 461);
            tabPage2.Size = new System.Drawing.Size(325, 444);
            tabPage2.TabIndex = 1;
            tabPage2.Text = "9,10断面";
            // 
@@ -213,7 +227,7 @@
            ctrlSection910Posi1.Location = new System.Drawing.Point(3, 3);
            ctrlSection910Posi1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
            ctrlSection910Posi1.Name = "ctrlSection910Posi1";
            ctrlSection910Posi1.Size = new System.Drawing.Size(312, 455);
            ctrlSection910Posi1.Size = new System.Drawing.Size(319, 438);
            ctrlSection910Posi1.TabIndex = 0;
            // 
            // mBtn更新模型
@@ -222,7 +236,7 @@
            mBtn更新模型.BackColor = System.Drawing.Color.Transparent;
            mBtn更新模型.BaseColor = System.Drawing.Color.FromArgb(35, 168, 109);
            mBtn更新模型.Font = new System.Drawing.Font("Segoe UI", 9F);
            mBtn更新模型.Location = new System.Drawing.Point(15, 5);
            mBtn更新模型.Location = new System.Drawing.Point(22, 5);
            mBtn更新模型.Name = "mBtn更新模型";
            mBtn更新模型.Rounded = false;
            mBtn更新模型.Size = new System.Drawing.Size(90, 20);
@@ -262,5 +276,6 @@
        private System.Windows.Forms.ComboBox comboBoxType;
        private RLT.Controls.ForeverButtonSticky btnNextStep;
        private System.Windows.Forms.CheckBox checkBox圆弧连接;
        private System.Windows.Forms.CheckBox checkBox曲线;
    }
}

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowParas.cs

@@ -120,8 +120,8 @@

            tabPage1.Controls.Clear();

            if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面出口_直线连接)
            {
            if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面对齐出口)
            { 
                if (_sharp_type == eOutflowShapeStyle.中心出口)
                {
                    metroTile出口图片.BackgroundImage = GlobalResource.BuildImage("Central-exit.png", 878, 238);
@@ -139,7 +139,7 @@
            }
            switch (_sharp_type)
            {
                case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.中心出口:
                case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.中心出口: 
                    metroTile出口图片.BackgroundImage = GlobalResource.BuildImage("Central-exit.png", 878, 238);
                    _parasControlCenter.SetA_state(false);
                    tabPage1.Controls.Add(_parasControlCenter);
@@ -149,7 +149,7 @@
                    _parasControlCurve.SetA_state(true);
                    tabPage1.Controls.Add(_parasControlCurve);
                    return;
                case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口_直线连接:
                case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面对齐出口:
                    metroTile出口图片.BackgroundImage = GlobalResource.BuildImage("Side-exit-straight-line.png", 878, 238);
                    tabPage1.Controls.Add(_parasControlLine);
                    return;
@@ -165,17 +165,21 @@
            ViewModel.HdrBaseInfo hdrBaseInfo,
            ViewModel.GeomBaseInfo geomBaseInfo,
            ViewModel.SectionBundleInfo sectionBundleInfo,
            ViewModel.OutflowParas  outflowParas)
            ViewModel.OutflowParas outflowParas)
        {
            if (IsSameBaseParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo))
            {//判断是否修改了
                if (_isxml)
                {
                    _isxml = false;
                }
                return 0;//0表示没有变化
            }
            this._hdrBaseInfo = hdrBaseInfo;
            this._geomBaseInfo = geomBaseInfo;
            this._sectionBundleInfo = sectionBundleInfo;

            if(outflowParas != null)
            if (outflowParas != null)
            {
                _sharp_type = outflowParas.ShapeStyle;
                _link_type = outflowParas.LinkStyle;
@@ -183,8 +187,8 @@
            //
            InitialCtrlDefaultParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo, outflowParas);

     
            if(_link_type == eOutflowLinkStyle.曲线)

            if (_link_type == eOutflowLinkStyle.曲线)
            {
                checkBox圆弧连接.Checked = false;
            }
@@ -200,10 +204,23 @@
            }
            else
            {
                if(_link_type == eOutflowLinkStyle.直线圆弧 )
                {
                    comboBoxType.Items.Clear();
                    comboBoxType.Items.AddRange(new string[] { "中心出口", "侧面出口" });
                    checkBox圆弧连接.Checked = true;
                    checkBox曲线.Checked = false;
                }else if(_link_type == eOutflowLinkStyle.曲线)
                {
                    comboBoxType.Items.Clear();
                    comboBoxType.Items.AddRange(new string[] { "中心出口", "侧面出口", "侧面对齐出口" });
                    checkBox圆弧连接.Checked = false;
                    checkBox曲线.Checked = true;
                }
                comboBoxType.SelectedIndex = (int)_sharp_type;
                InitialOutflowStyle();
                RefreshModel();
                

            }
            if (_isxml)
            {
@@ -222,7 +239,7 @@
            double outer_dia = 4.5 * Math.Pow(hdrBaseInfo.Q / 3600 / hdrBaseInfo.n, 1 / 3.0) * 1000;
            //侧面曲线
            OutflowParas outflowParas侧面曲线 = null;
            if(outflowParas != null && outflowParas.ShapeStyle == eOutflowShapeStyle.侧面出口)
            if (outflowParas != null && outflowParas.ShapeStyle == eOutflowShapeStyle.侧面出口)
            {
                outflowParas侧面曲线 = outflowParas;
            }
@@ -264,29 +281,29 @@
            _parasControlCenter.IsInvokeRefreshShapeAble = true;

            //侧面直线
            OutflowParas outflowParas侧面直线 = null;
            if (outflowParas != null && outflowParas.ShapeStyle == eOutflowShapeStyle.侧面出口_直线连接 && outflowParas.LinkStyle == eOutflowLinkStyle.曲线)
            OutflowParas outflowParas侧面对齐 = null;
            if (outflowParas != null && outflowParas.ShapeStyle == eOutflowShapeStyle.侧面对齐出口 )
            {
                outflowParas侧面直线 = outflowParas;
                outflowParas侧面对齐 = outflowParas;
            }
            else
            {
                outflowParas侧面直线 = new OutflowParas();
                outflowParas侧面直线.Offset = (int)((geomBaseInfo.D3 + sectionBundleInfo.H[8]) / 2 + 0.5);
                outflowParas侧面直线.H1 = 5;
                outflowParas侧面直线.H2 = 5;
                outflowParas侧面直线.Dia = GetStdDia(outer_dia);
                double height2 = 5 * (int)(((outflowParas侧面直线.Dia - Math.Sqrt(4 * sectionBundleInfo.Area[8] / Math.PI)) / (2 * Math.Tan(4 * Math.PI / 180))) / 5 + 0.5);
                outflowParas侧面对齐 = new OutflowParas();
                outflowParas侧面对齐.Offset = (int)((geomBaseInfo.D3 + sectionBundleInfo.H[8]) / 2 + 0.5);
                outflowParas侧面对齐.H1 = 5;
                outflowParas侧面对齐.H2 = 5;
                outflowParas侧面对齐.Dia = GetStdDia(outer_dia);
                double height2 = 5 * (int)(((outflowParas侧面对齐.Dia - Math.Sqrt(4 * sectionBundleInfo.Area[8] / Math.PI)) / (2 * Math.Tan(4 * Math.PI / 180))) / 5 + 0.5);
                if (height2 < geomBaseInfo.D3 / 2)
                {
                    height2 = geomBaseInfo.D3 * 0.75;
                }
                outflowParas侧面直线.Heigh = height2;
                outflowParas侧面直线.Septalradius = 3;
                outflowParas侧面对齐.Heigh = height2;
                outflowParas侧面对齐.Septalradius = 3;
            }
            _parasControlLine.InitialParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo);
            _parasControlLine.IsInvokeRefreshShapeAble = false;
            _parasControlLine.SetBindingData(outflowParas侧面直线);
            _parasControlLine.SetBindingData(outflowParas侧面对齐);
            _parasControlLine.IsInvokeRefreshShapeAble = true;

            //圆弧中心
@@ -440,7 +457,7 @@
        {
            error = "";
            ViewModel.OutflowParas _outflowParas = null;
            if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面出口_直线连接)
            if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面对齐出口)
            {
                if (_sharp_type == eOutflowShapeStyle.中心出口)
                {
@@ -467,7 +484,7 @@
                    case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口:
                        _outflowParas = _parasControlCurve.GetBindingData(out error);
                        break;
                    case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口_直线连接:
                    case DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面对齐出口:
                        _outflowParas = _parasControlLine.GetBindingData(out error);
                        break;
                    default:
@@ -524,11 +541,11 @@
            {
                comboBoxType.SelectedIndex = 1;
            }
            else if (_sharp_type == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
            else if (_sharp_type == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面对齐出口)
            {
                comboBoxType.SelectedIndex = 2;
            }
            if(_link_type == eOutflowLinkStyle.直线圆弧)
            if (_link_type == eOutflowLinkStyle.直线圆弧)
            {
                checkBox圆弧连接.Checked = true;
            }
@@ -580,14 +597,14 @@
        private void RefreshModel()
        {
            string error;
            if(OnRefreshShape3D == null)
            if (OnRefreshShape3D == null)
            {
                return;
            }
            var resp = OnRefreshShape3D(GetBindingData(out error));
            if (resp != null)
            {
                if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面出口_直线连接)
                if (_link_type == eOutflowLinkStyle.直线圆弧 && _sharp_type != eOutflowShapeStyle.侧面对齐出口)
                {
                    if (_sharp_type == eOutflowShapeStyle.中心出口)
                    {
@@ -597,11 +614,11 @@
                    {
                        _parasControlArcSide.SetBindingData(resp);
                    }
                    

                }
                else
                {
                    if (_sharp_type == eOutflowShapeStyle.侧面出口_直线连接)
                    if (_sharp_type == eOutflowShapeStyle.侧面对齐出口)
                    {
                        _parasControlLine.SetBindingData(resp);
                    }
@@ -628,11 +645,11 @@

        private void comboBoxType_SelectedIndexChanged(object sender, EventArgs e)
        {
            if (comboBoxType.SelectedIndex == 0)
            if (comboBoxType.SelectedItem.ToString() == "中心出口")
            {
                _sharp_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.中心出口;
                checkBox圆弧连接.Enabled = true;
                checkBox圆弧连接.Visible = true;
                //checkBox圆弧连接.Enabled = true;
                //checkBox圆弧连接.Visible = true;
                if (checkBox圆弧连接.Checked)
                {
                    _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.直线圆弧;
@@ -642,11 +659,11 @@
                    _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
                }
            }
            else if (comboBoxType.SelectedIndex == 1)
            else if (comboBoxType.SelectedItem.ToString() == "侧面出口")
            {
                _sharp_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口;
                checkBox圆弧连接.Enabled = true;
                checkBox圆弧连接.Visible = true;
                //checkBox圆弧连接.Enabled = true;
                //checkBox圆弧连接.Visible = true;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
                if (checkBox圆弧连接.Checked)
                {
@@ -657,11 +674,11 @@
                    _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
                }
            }
            else if (comboBoxType.SelectedIndex == 2)
            else if (comboBoxType.SelectedItem.ToString() == "侧面对齐出口")
            {
                _sharp_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面出口_直线连接;
                checkBox圆弧连接.Enabled = false;
                checkBox圆弧连接.Visible = false;
                _sharp_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.侧面对齐出口;
                //checkBox圆弧连接.Enabled = false;
                //checkBox圆弧连接.Visible = false;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
            }
            if (_isxml)
@@ -671,7 +688,7 @@
            }
            InitialOutflowStyle();

                RefreshModel();
            RefreshModel();
        }

        private void btnNextStep_Click(object sender, EventArgs e)
@@ -683,11 +700,24 @@
        {
            if (!checkBox圆弧连接.Checked)
            {
                checkBox曲线.Checked = true;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
                comboBoxType.Items.Clear();
                comboBoxType.Items.AddRange(new string[] { "中心出口", "侧面出口", "侧面对齐出口" });
                
            }
            else
            {
                checkBox曲线.Checked = false;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.直线圆弧;
                comboBoxType.Items.Clear();
                comboBoxType.Items.AddRange(new string[] { "中心出口", "侧面出口" });
                if (comboBoxType.Text == "侧面对齐出口")
                {
                    comboBoxType.SelectedIndex = 0;
                    InitialOutflowStyle();
                    return;
                }
            }
            if (_isxml)
            {
@@ -699,5 +729,19 @@

            RefreshModel();
        }

        private void checkBox曲线_CheckedChanged(object sender, EventArgs e)
        {
            if (!checkBox曲线.Checked)
            {
                checkBox圆弧连接.Checked = true;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.直线圆弧;
            }
            else
            {
                checkBox圆弧连接.Checked = false;
                _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.曲线;
            }
        }
    }
}