文件补交

tangxu

2025-01-13 4f7cb65b079d88d5a829688b24d26d5145c5df47

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs

@@ -51,6 +51,51 @@
            }
            if (next_step_id > 0)
            {
                if(currentStepID == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
                {
                    #region MyRegion
                    ViewModel.HdrBaseInfo hdrBaseInfo = null;
                    ViewModel.GeomBaseInfo geomBaseInfo = null;
                    string error_info = _ctrlHdrBaseInfo.GetBindingData(ref hdrBaseInfo, ref geomBaseInfo);
                    if (error_info != null)
                    {
                        MessageBox.Show(error_info);
                        return false;
                    }
                    bool isClearAll = false;
                    if (_geomBaseInfo != null)
                    {
                        if (Math.Abs(geomBaseInfo.B3 - _geomBaseInfo.B3) > 1)
                        {
                            isClearAll = true;
                        }
                        if (Math.Abs(geomBaseInfo.D3 - _geomBaseInfo.D3) > 1)
                        {
                            isClearAll = true;
                        }
                    }
                    if (isClearAll)
                    {
                        this._occDesign2dCtrl.ClearAll();
                        this._occDesign3dCtrl.ClearAll();
                    }  
                    #endregion
                }
                if (currentStepID == this._stepTreeDockPanel.Step_ID_Outflow_Type)
                {
                    var outflowType = _ctrlSetOutflowType.GetBindingData();
 
                    this._occDesign3dCtrl.SetOutflowStyle(outflowType);
                    bool isNeedRebuild = this._occDesign2dCtrl.SetOutflowStyle(outflowType);
                    if (isNeedRebuild)
                    {
                        _occDesign2dCtrl.ClearAll();
                        _occDesign3dCtrl.ClearAll();
                        this.RefreshSectShapeWhole18(this._sectionBundleInfo);
                    }
                }


                this.SetParasCtrl(next_step_id, DPumpHydr.ViewModel.eWizardStepDiretion.前进);

                //
@@ -108,13 +153,6 @@
                    return false;
                }
                _sectionBundleInfo = sectionBaseInfo;
                //_sectionBundleInfo.ResetAllParas(_hdrBaseInfo, _geomBaseInfo);
                //ViewModel.SectionShapePara _sectionShapePara = null;
                //if (_sectionShapePara == null)
                //{
                //    _sectionShapePara = new ViewModel.SectionShapePara();
                //}
                //_sectionShapePara.Initialparameters(_currentSectIndex, _sectionBaseInfo);

                return true;
            }
@@ -227,6 +265,7 @@
                    _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
                    _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
                    _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
                    _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
                }


@@ -332,8 +371,36 @@
                    _ctrlSetOutflowParas.SetSect9Posi(_sect9Posi);
                    _ctrlSetOutflowParas.SetSect10Posi(_sect10Posi);
                }
                else
                {
                    this._occDesign3dCtrl.SetOutflowStyle(_outflowType);
                    if (this._occDesign2dCtrl.SetOutflowStyle(_outflowType))
                    { 
                    }
                    if (_outflowType == ViewModel.eOutflowStyle.侧面出口_直线连接)
                    {
                        if(_ctrlSetOutflowParas.CurrentOutflowStyle != ViewModel.eOutflowStyle.侧面出口_直线连接)
                        {
                            _occDesign2dCtrl.ClearAll();
                            _occDesign3dCtrl.ClearAll();
                            this.RefreshSectShapeWhole18(this._sectionBundleInfo);
                        }
                    }
                    else
                    {
                        if (_ctrlSetOutflowParas.CurrentOutflowStyle == ViewModel.eOutflowStyle.侧面出口_直线连接)
                        {
                            _occDesign2dCtrl.ClearAll();
                            _occDesign3dCtrl.ClearAll();
                            this.RefreshSectShapeWhole18(this._sectionBundleInfo);
                        }
                    }
                    _ctrlSetOutflowParas.SetBindingData(_outflowType, _hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
                }

                _ctrlSetOutflowParas.SetOutflowStyle(_outflowType);





                _ctrlSetOutflowParas.ShowPage(step_direction);