lixiaojun
2024-08-23 66415f6b054fdc10bac89bce9b2db0b1a6256341
计算调试
已修改3个文件
98 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsProjectSimulationPropertyCtrl.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -228,8 +228,8 @@
                return true;
            }
            var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传
            //var bimfaceId = 10000872887098; //测试用例
            //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传
            var bimfaceId = 10000872887098; //测试用例
            if (bimfaceId < 1)
            {
                feedBackMsg?.Invoke("Revit模型文件上传失败!!!");
@@ -302,8 +302,8 @@
            #region 第十步 发起bimface转换(进度 80%)
            feedBackMsg?.Invoke("正在进行Bimface模型轻量化...");
            var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//发起转换
            //var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//测试代码
            //var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//发起转换
            var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//测试代码
            feedBackProgress?.Invoke(100, 60);
            if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success)
            {
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsProjectSimulationPropertyCtrl.cs
@@ -87,6 +87,7 @@
                return;
            }
            var vm = Yw.WinFrmUI.HydroParterPropertyViewModelBuilder.CreateViewModel(parter, allParterList);
            this.hydroParterPropertyCtrl1.SelectedObject = vm;
        }
@@ -103,7 +104,6 @@
            vm.UpdateCalcuProperty(rhs);
            this.hydroParterPropertyCtrl1.UpdateRows();
        }
        //属性发生改变
        private void HydroParterPropertyCtrl1_PropertyValueChangedEvent(HydroParterPropertyViewModel obj)
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/XhsSchemeHydraulicSimulationPage.cs
@@ -1,5 +1,8 @@
using DevExpress.XtraEditors;
using DevExpress.Xpo.Helpers;
using DevExpress.XtraEditors;
using Yw.DAL.Basic;
using Yw.EPAnet;
using Yw.WinFrmUI.Q3d;
namespace HStation.WinFrmUI
{
@@ -16,6 +19,8 @@
        private long _projectId;
        private Yw.Model.HydroModelInfo _hydro = null;
        private Yw.Model.HydroParterInfo _parter = null;
        private List<CalcuParter> _allCalcuParterList = null;
        /// <summary>
@@ -53,9 +58,47 @@
        {
            if (_hydro == null)
            {
                _parter = null;
                return;
            }
            this.xhsProjectSimulationPropertyCtrl1.SelectParter(objectId);
            var allParterList = _hydro.GetAllParters();
            _parter = allParterList.Find(x => x.Code == objectId);
            this.xhsProjectSimulationPropertyCtrl1.SelectParter(_parter, allParterList);
            if (_parter != null)
            {
                if (_allCalcuParterList != null && _allCalcuParterList.Count > 0)
                {
                    var calcuParter = _allCalcuParterList.Find(x => x.Id == _parter.Code);
                    if (calcuParter != null)
                    {
                        IHydroCalcuProperty calcuProperty = null;
                        if (calcuParter is CalcuNode calcuNode)
                        {
                            var calcuNodeProperty = new Yw.WinFrmUI.HydroCalcuNodeProperty();
                            calcuNodeProperty.ID = _parter.ID;
                            calcuNodeProperty.CalcuPress = calcuNode.Press;
                            calcuNodeProperty.CalcuDemand = calcuNode.Demand;
                            calcuNodeProperty.CalcuHead = calcuNode.Head;
                            calcuProperty = calcuNodeProperty;
                        }
                        else if (calcuParter is CalcuLink calcuLink)
                        {
                            var calcuLinkProperty = new Yw.WinFrmUI.HydroCalcuLinkProperty();
                            calcuLinkProperty.ID = _parter.ID;
                            calcuLinkProperty.CalcuHeadLoss = calcuLink.Headloss;
                            calcuLinkProperty.CalcuFlow = calcuLink.Flow;
                            calcuLinkProperty.CalcuVelocity = calcuLink.Velocity;
                            calcuProperty = calcuLinkProperty;
                        }
                        if (calcuProperty != null)
                        {
                            this.xhsProjectSimulationPropertyCtrl1.UpdateCalcuProperty(calcuProperty);
                        }
                    }
                }
            }
        }
        private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -76,8 +119,45 @@
                return;
            }
            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydro);
            var list = netWork.Calcu();
            XtraMessageBox.Show(JsonHelper.Object2FormatJson(list));
            var result = netWork.Calcu();
            if (!result.Succeed)
            {
                XtraMessageBox.Show(JsonHelper.Object2FormatJson(result));
                return;
            }
            _allCalcuParterList = result.GetParterList();
            TipFormHelper.ShowSucceed("计算成功");
            if (_parter != null)
            {
                var calcuParter = _allCalcuParterList.Find(x => x.Id == _parter.Code);
                if (calcuParter != null)
                {
                    IHydroCalcuProperty calcuProperty = null;
                    if (calcuParter is CalcuNode calcuNode)
                    {
                        var calcuNodeProperty = new Yw.WinFrmUI.HydroCalcuNodeProperty();
                        calcuNodeProperty.ID = _parter.ID;
                        calcuNodeProperty.CalcuPress = calcuNode.Press;
                        calcuNodeProperty.CalcuDemand = calcuNode.Demand;
                        calcuNodeProperty.CalcuHead = calcuNode.Head;
                        calcuProperty = calcuNodeProperty;
                    }
                    else if (calcuParter is CalcuLink calcuLink)
                    {
                        var calcuLinkProperty = new Yw.WinFrmUI.HydroCalcuLinkProperty();
                        calcuLinkProperty.ID = _parter.ID;
                        calcuLinkProperty.CalcuHeadLoss = calcuLink.Headloss;
                        calcuLinkProperty.CalcuFlow = calcuLink.Flow;
                        calcuLinkProperty.CalcuVelocity = calcuLink.Velocity;
                        calcuProperty = calcuLinkProperty;
                    }
                    if (calcuProperty != null)
                    {
                        this.xhsProjectSimulationPropertyCtrl1.UpdateCalcuProperty(calcuProperty);
                    }
                }
            }
        }
        private void barBtnParter_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)