界面微调 program 冲突

Shuxia Ning

2024-08-14 9407658b38b9925685e9e47c89491edf2ebdd15b

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/02-model/HydroModelMgrPage.cs

@@ -1,4 +1,8 @@
using Yw.EPAnet.Calcu;
using DevExpress.CodeParser;
using DevExpress.Utils.About;
using DevExpress.XtraEditors;
using Yw.EPAnet;
using Yw.EPAnet.Calcu;

namespace Yw.WinFrmUI
{
@@ -89,18 +93,21 @@
        /// </summary>
        protected virtual async void CalcuModel(Yw.Dto.HydroModelDto dto)
        {
            return;
            //var info = await new Yw.BLL.HydroModelInfo().GetByID(dto.ID);
            //var netWork = Yw.Hydro.ParseHelper.ToNetwork(info);
            //var list = netWork.Calc();
            var info = await new Yw.BLL.HydroModelInfo().GetByID(dto.ID);
            var netWork = Yw.Hydro.ParseHelper.ToNetwork(info);
            var list = netWork.Calcu();
            XtraMessageBox.Show(JsonHelper.Object2FormatJson(list));
        }

        /// <summary>
        /// 校验模型
        /// </summary>
        protected virtual void ValidModel(Yw.Dto.HydroModelDto dto)
        protected virtual async void ValidModel(Yw.Dto.HydroModelDto dto)
        {

            var info = await new Yw.BLL.HydroModelInfo().GetByID(dto.ID);
            var netWork = Yw.Hydro.ParseHelper.ToNetwork(info);
            var result = netWork.Check();
            XtraMessageBox.Show(JsonHelper.Object2FormatJson(result));
        }


@@ -193,6 +200,20 @@
            this.ValidModelEvent?.Invoke(vm.Dto);
        }

        //导出inp
        private async void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = GetCurrentViewModel();
            if (vm == null)
            {
                return;
            }
            var info = await new Yw.BLL.HydroModelInfo().GetByID(vm.ID);
            var netWork = Yw.Hydro.ParseHelper.ToNetwork(info);
            var result = netWork.ToInpString();
            XtraMessageBox.Show(result);
        }

        //上移
        private void barBtnUp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
@@ -216,5 +237,6 @@




    }
}