From edfb5be5dc9037152975bd4354e95d5eff78ce2d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 18:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index fcdb49e..00d2509 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -457,7 +457,7 @@
return _checkCtrl;
}
- //鏄剧ず鏍￠獙鎺т欢
+ //鏄剧ず妫�鏌ユ帶浠�
private void ShowCheckCtrl()
{
if (_checkResult == null)
@@ -469,12 +469,12 @@
this.controlContainerBottom.Controls.Clear();
this.controlContainerBottom.Controls.Add(checkCtrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
- this.docPnlBottom.Text = "鏍￠獙缁撴灉";
+ this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
this.docPnlBottom.Height = 350;
}
- //姘村姏楠岃瘉
+ //姘村姏妫�鏌�
private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_hydroInfo == null)
@@ -1007,7 +1007,7 @@
}
- var dlg = new PumpParallelChartDlg();
+ var dlg = new PumpParallelAnalyDlg();
dlg.SetBindingData(vmList);
dlg.ReloadDataEvent += (list) =>
{
@@ -1040,7 +1040,7 @@
{
return;
}
- var dlg = new SetHydroCalcuPrefixDlg();
+ var dlg = new HStation.WinFrmUI.SetHydroCalcuPrefixDlg1();
dlg.SetBindingData(_hydroInfo);
dlg.HydroViewEvent += async (parter) =>
{
@@ -1082,10 +1082,7 @@
}
};
- if (dlg.ShowDialog() == DialogResult.Cancel)
- {
- await _bimfaceCtrl?.ClearLogicCalcuCustomLabels();
- }
+ dlg.ShowDialog();
}
#endregion
@@ -1379,7 +1376,7 @@
private List<HydroMarkSetViewModel> _allMarkList = null;
//鏄剧ず鏍囨敞绐椾綋
- private async void ShowMarkDlg()
+ private void ShowMarkDlg()
{
if (_hydroInfo == null)
{
@@ -1435,17 +1432,13 @@
}
}
var dlg = new SetHydroMarkDlg();
- dlg.InitialData(() => _hydroInfo);
- dlg.SetBindingData(_allMarkList);
+ dlg.SetBindingData(_hydroInfo, _allMarkList);
dlg.ReloadDataEvent += async (allResultList) =>
{
- var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text)).ToList();
+ var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, 100000)).ToList();
await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
};
- if (dlg.ShowDialog() != DialogResult.OK)
- {
- await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
- }
+ dlg.ShowDialog();
}
//璁剧疆鏍囨敞
@@ -1470,7 +1463,7 @@
{
return;
}
- var dlg = new SetHydroGradingModelDlg();
+ var dlg = new SetHydroGradingModelTreeDlg();
dlg.SetBindingData(_hydroInfo.ID);
dlg.ShowDialog();
}
--
Gitblit v1.9.3