From 141010164e91e9e5dbae910ca6519bed80188bfe Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 12 十二月 2024 17:19:46 +0800
Subject: [PATCH] 匹配
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 171 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 103 insertions(+), 68 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 67f21d2..72ad3b7 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
@@ -30,24 +30,26 @@
/// 鏂板宸ュ喌浜嬩欢
/// </summary>
public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
/// <summary>
/// 淇濆瓨妯″瀷浜嬩欢
/// </summary>
public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;
+
/// <summary>
/// 鍒锋柊妯″瀷浜嬩欢
/// </summary>
public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;
+
/// <summary>
/// 鏇存柊鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> UpdateSchemeEvent;
+
/// <summary>
/// 绉婚櫎鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> RemoveSchemeEvent;
-
-
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -138,7 +140,7 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- #endregion
+ #endregion BIM鎺т欢
#region Q3d鎺т欢
@@ -175,7 +177,7 @@
this.tabPageQ3d.Controls.Add(q3dCtrl);
}
- #endregion
+ #endregion Q3d鎺т欢
#region 灞炴�ф帶浠�
@@ -266,7 +268,6 @@
var flowEffectHelper = await GetFlowEffectHelper();
flowEffectHelper.Set(visual);
};
-
}
return _propertyCtrl;
}
@@ -321,7 +322,7 @@
_propertyCtrl?.UpdateRows();
}
- #endregion
+ #endregion 灞炴�ф帶浠�
#region 閫夋嫨鏋勪欢
@@ -341,12 +342,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Bimface:
{
this.barBtnSetMonitor.Enabled = visual != null;
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Q3d:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -354,12 +357,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Property:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
this.barBtnSetMonitor.Enabled = visual != null;
}
break;
+
case eSimulationVisualSource.List:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -367,6 +372,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Set:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -374,6 +380,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Search:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -381,6 +388,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Monitor:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -388,6 +396,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Check:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -395,6 +404,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Calcu:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -402,6 +412,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Warning:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -409,6 +420,7 @@
SetPropertyCtrl(visual);
}
break;
+
default: break;
}
}
@@ -420,7 +432,7 @@
SelectVisual(visual, source);
}
- #endregion
+ #endregion 閫夋嫨鏋勪欢
#region 鏋勪欢鏄庣粏
@@ -469,7 +481,7 @@
return helper.GetSourceList();
}
- #endregion
+ #endregion 鍙鍒楄〃
#region 瑙嗗浘鍒楄〃
@@ -499,7 +511,7 @@
return helper.GetVisualList();
}
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 鏄庣粏鎺т欢
@@ -599,7 +611,7 @@
ShowVisualListCtrl();
}
- #endregion
+ #endregion 鏄庣粏鎺т欢
#region 鏋勪欢鏄剧ず
@@ -648,9 +660,9 @@
SetVisualVisible();
}
- #endregion
+ #endregion 鏋勪欢鏄剧ず
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 涓�閿樉闅�
@@ -674,7 +686,9 @@
SetDecoratorVisible(this.barCkDecorator.Checked);
}
- #endregion
+ #endregion 涓�閿樉闅�
+
+
#region 淇濆瓨淇℃伅
@@ -699,16 +713,15 @@
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
-
//Stopwatch sw = new Stopwatch();
//sw.Start();
- //鑰楁椂宸ㄥぇ鐨勪唬鐮�
+ //鑰楁椂宸ㄥぇ鐨勪唬鐮�
//sw.Stop();
//TimeSpan ts2 = sw.Elapsed;
//Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
}
- #endregion
+ #endregion 淇濆瓨淇℃伅
#region 鎵归噺閰嶇疆
@@ -1006,7 +1019,6 @@
};
}
-
//鏄剧ずRadialMenu
private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -1210,11 +1222,9 @@
{
this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
}
-
-
}
- #endregion
+ #endregion 鎵归噺閰嶇疆
#region 鏋勪欢鏌ヨ
@@ -1305,7 +1315,7 @@
ShowSearchDlg();
}
- #endregion
+ #endregion 鏋勪欢鏌ヨ
#region 妯″瀷鏍囨敞
@@ -1357,7 +1367,7 @@
markHelper.Set();
}
- #endregion
+ #endregion 妯″瀷鏍囨敞
#region 棰滆壊鍒嗙骇
@@ -1439,7 +1449,7 @@
gradingHelper.Set();
}
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 浜哄伐鍒锋柊
@@ -1452,7 +1462,6 @@
}
if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
-
var hydroInfo = await this.RefreshModelEvent.Invoke();
if (hydroInfo == null)
{
@@ -1467,7 +1476,7 @@
}
}
- #endregion
+ #endregion 浜哄伐鍒锋柊
#region 姘存祦鍔ㄧ敾
@@ -1500,7 +1509,7 @@
flowEffectHelper.Set();
}
- #endregion
+ #endregion 姘存祦鍔ㄧ敾
#region 鐩戞祴鍒楄〃
@@ -1567,7 +1576,7 @@
SetMonitorList(_visual);
}
- #endregion
+ #endregion 鐩戞祴鐐�
#region 鐩戞祴鍊�
@@ -1596,10 +1605,9 @@
var helper = GetMonitorValueHelper();
helper.Reset(working.MonitorInfo);
}
-
}
- #endregion
+ #endregion 鐩戞祴鍊�
#region 鐩戞祴鍊兼帶浠�
@@ -1665,7 +1673,7 @@
ShowMonitorValueListCtrl();
}
- #endregion
+ #endregion 鐩戞祴鍊兼帶浠�
#region 鐩戞祴鐐规爣璁�
@@ -1692,9 +1700,9 @@
monitorMarkerHelper.Set();
}
- #endregion
+ #endregion 鐩戞祴鐐规爣璁�
- #endregion
+ #endregion 鐩戞祴鍒楄〃
#region 妯″瀷妫�鏌�
@@ -1778,7 +1786,7 @@
ShowCheckCtrl(checkResult);
}
- #endregion
+ #endregion 妯″瀷妫�鏌�
#region 妯″瀷璁＄畻
@@ -1798,7 +1806,7 @@
return _calcuResultHelper;
}
- #endregion
+ #endregion 璁＄畻缁撴灉
#region 璁＄畻澶辫触
@@ -1862,7 +1870,7 @@
calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
}
- #endregion
+ #endregion 璁＄畻澶辫触
#region 璁＄畻璀﹀憡
@@ -1934,7 +1942,7 @@
calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
}
- #endregion
+ #endregion 璁＄畻璀﹀憡
#region 璁＄畻鏍囩
@@ -1961,9 +1969,9 @@
calcuResultLabelHelper.Set();
}
- #endregion
+ #endregion 璁＄畻鏍囩
- #endregion
+ #endregion 妯″瀷璁＄畻
#region 绠＄綉淇
@@ -2028,7 +2036,7 @@
Repair();
}
- #endregion
+ #endregion 绠＄綉淇
#region 瀵煎嚭INP
@@ -2050,7 +2058,7 @@
TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
}
- #endregion
+ #endregion 瀵煎嚭INP
#region 姘存车鍒楄〃
@@ -2125,11 +2133,10 @@
//骞惰仈妯℃嫙
private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
-
PumpParallel();
}
- #endregion
+ #endregion 姘存车鍒楄〃
#region 姘村姏璁＄畻
@@ -2161,7 +2168,11 @@
working.ModelID = vm.ModelID;
working.Name = vm.Name;
working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo);
- working.MonitorInfo = JsonHelper.Object2Json(vm.MonitorInfo);
+ var useWorkingMonitorInfo = vm.MonitorInfo?.Where(x => x.PropValue.HasValue).ToList();
+ if (useWorkingMonitorInfo != null && useWorkingMonitorInfo.Count > 0)
+ {
+ working.MonitorInfo = JsonHelper.Object2Json(useWorkingMonitorInfo);
+ }
working.SortCode = vm.SortCode;
working.Description = vm.Description;
@@ -2202,38 +2213,35 @@
var visualVmListHelper = GetVisualVmListHelper();
visualVmListHelper.UpdateCalcuProperty(calcuResult);
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 褰撳墠鏋勪欢
SelectVisual(_visual, eSimulationVisualSource.Calcu);
- #endregion
+ #endregion 褰撳墠鏋勪欢
#region 鏋勪欢鏄庣粏
UpdateVisualListCtrl();
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 棰滆壊鍒嗙骇
var gradingHelper = await GetGradingHelper();
gradingHelper.Set();
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 璁＄畻鏍囩
var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
calcuResultLabelHelper.Set();
- #endregion
-
+ #endregion 璁＄畻鏍囩
};
-
dlg.ShowDialog();
-
}
//姘村姏璁＄畻
@@ -2242,25 +2250,49 @@
Calcu();
}
- #endregion
+ #endregion 姘村姏璁＄畻
#region 瀵煎嚭鎶ュ憡
- private void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var fileName = FileDialogHelper.SaveWordDoc("瀵煎嚭Word鎶ュ憡");
- if (string.IsNullOrEmpty(fileName))
+ if (_visual == null)
{
- return;
+ SelectInputSource();
+ if (_visual == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+ return;
+ }
}
- var vm = new ReportViewModel();
- vm.ProjectName = _project.Name;
- vm.Description = _project.Description;
- SimulationWordReport word = new SimulationWordReport();
- word.Create(fileName, vm);
+ HydroVisualInfo visual = _visual;
+ if (_visual is HydroLinkInfo linkInfo)
+ {
+ var visualListHelper = GetVisualListHelper();
+ visual = visualListHelper.GetVisual(linkInfo.StartCode);
+ }
+
+ var allMonitorList = await GetMonitorList();
+ var working = GetWorking();
+ var calcuResult = GetCalcuResult();
+
+ var dlg = new SimulationWorkingReportDlg();
+ dlg.ReloadDataEvent += (vm) =>
+ {
+ var fileName = FileDialogHelper.SaveWordDoc("瀵煎嚭Word鎶ュ憡");
+ if (string.IsNullOrEmpty(fileName))
+ {
+ return;
+ }
+ var reportHelper = new SimulationWorkingReportHelper();
+ reportHelper.Create(fileName, vm);
+ TipFormHelper.ShowInfo("瀵煎嚭鎴愬姛锛�");
+ };
+ dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual);
+ dlg.ShowDialog();
}
- #endregion
+ #endregion 瀵煎嚭鎶ュ憡
#region 褰撳墠宸ュ喌
@@ -2325,7 +2357,7 @@
AddWorking();
}
- #endregion
+ #endregion 褰撳墠宸ュ喌
#region 閫夋嫨宸ュ喌
@@ -2372,8 +2404,7 @@
helper.Remove(working);
}
-
- #endregion
+ #endregion 閫夋嫨宸ュ喌
#region 宸ュ喌鍒嗘瀽
@@ -2471,7 +2502,6 @@
}
else
{
-
var dlg = new SimulationMultiWorkingEnergyDlg();
dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
dlg.ShowDialog();
@@ -2599,7 +2629,7 @@
}
}
- #endregion
+ #endregion 宸ュ喌鍒嗘瀽
#region 鏂规绠＄悊
@@ -2636,6 +2666,11 @@
//鍒犻櫎鏂规
private async void DeleteScheme()
{
+ var bol = XtraMessageBox.Show("璇烽棶鏄惁鍒犻櫎褰撳墠鏂规锛�", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes;
+ if (!bol)
+ {
+ return;
+ }
if (_scheme == null)
{
return;
@@ -2669,6 +2704,6 @@
DeleteScheme();
}
- #endregion
+ #endregion 鏂规绠＄悊
}
}
\ No newline at end of file
--
Gitblit v1.9.3