From ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 13:14:49 +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/01-property/SimulationPropertyCtrl.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
index cba2e61..9b9d012 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
@@ -63,6 +63,15 @@
#region 灞炴�ц祴鍊�
/// <summary>
+ /// 鍏佽缂栬緫
+ /// </summary>
+ public bool AllowEdit
+ {
+ get { return this.hydroVisualPropertyCtrl1.AllowEdit; }
+ set { this.hydroVisualPropertyCtrl1.AllowEdit = value; }
+ }
+
+ /// <summary>
/// 閫夋嫨瀵硅薄
/// </summary>
public HydroVisualViewModel SelectedObject
@@ -224,7 +233,7 @@
{
var meterViewModel = vm as HydroMeterViewModel;
var input = HydroMatchingHelper.Create(meterViewModel);
- var dlg = new SimulationMeterSingleMatchingDlg();
+ var dlg = new AssetsMeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(meterViewModel, output);
@@ -241,7 +250,7 @@
{
var flowmeterViewModel = vm as HydroFlowmeterViewModel;
var input = HydroMatchingHelper.Create(flowmeterViewModel);
- var dlg = new SimulationFlowmeterSingleMatchingDlg();
+ var dlg = new AssetsFlowmeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(flowmeterViewModel, output);
@@ -258,7 +267,7 @@
{
var pressmeterViewModel = vm as HydroPressmeterViewModel;
var input = HydroMatchingHelper.Create(pressmeterViewModel);
- var dlg = new SimulationPressmeterSingleMatchingDlg();
+ var dlg = new AssetsPressmeterSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(pressmeterViewModel, output);
@@ -359,7 +368,7 @@
{
var exchangerViewModel = vm as HydroExchangerViewModel;
var input = HydroMatchingHelper.Create(exchangerViewModel);
- var dlg = new SimulationExchangerSingleMatchingDlg();
+ var dlg = new AssetsExchangerSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(exchangerViewModel, output);
@@ -376,7 +385,7 @@
{
var compressorViewModel = vm as HydroCompressorViewModel;
var input = HydroMatchingHelper.Create(compressorViewModel);
- var dlg = new SimulationCompressorSingleMatchingDlg();
+ var dlg = new AssetsCompressorSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(compressorViewModel, output);
@@ -446,8 +455,8 @@
if (long.TryParse(vm.DbId, out long longDbId))
{
var exchangerViewModel = vm as HydroExchangerViewModel;
- var dlg = new ExchangerChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsExchangerCurveQLViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
@@ -458,8 +467,8 @@
if (long.TryParse(vm.DbId, out long longDbId))
{
var compressorViewModel = vm as HydroCompressorViewModel;
- var dlg = new CompressorChartShowDlg();
- dlg.SetBingingData(longDbId);
+ var dlg = new AssetsCompressorCurveQLViewDlg();
+ dlg.SetBindingData(longDbId);
dlg.ShowDialog();
}
}
--
Gitblit v1.9.3