From 4446901f8ecde9b6e593d871465e89662ad58965 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 10:06:58 +0800
Subject: [PATCH] 修改单独匹配命名
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 14
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreelinkSingleMatchingCtrl.cs | 10
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 8
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingViewModel.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs | 28 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs | 3
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingViewModel.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreelinkSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AssetsTankSeriesViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.Designer.cs | 8
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs | 51 +++-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 22 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs | 11
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.cs | 10
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.Designer.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.cs | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 60 ++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/TankCoefficientViewModel.cs | 35 ++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs | 0
/dev/null | 120 ----------
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.Designer.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs | 37 ++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.resx | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.cs | 0
127 files changed, 293 insertions(+), 336 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
index e418d3a..6c552c2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs
@@ -74,6 +74,8 @@
colCaliber = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colMaterial = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colMinorLoss = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
@@ -111,10 +113,12 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(selectFlagsPopupCtrl1);
layoutControl1.Controls.Add(popupContainerControl1);
layoutControl1.Controls.Add(TextEditType);
layoutControl1.Controls.Add(BtnOk);
@@ -141,7 +145,7 @@
popupContainerControl1.Location = new Point(20, 214);
popupContainerControl1.Name = "popupContainerControl1";
popupContainerControl1.Size = new Size(200, 100);
- popupContainerControl1.TabIndex = 12;
+ popupContainerControl1.TabIndex = 1;
//
// treeList1
//
@@ -213,7 +217,7 @@
BtnOk.Name = "BtnOk";
BtnOk.Size = new Size(76, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 10;
+ BtnOk.TabIndex = 11;
BtnOk.Text = "纭畾";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -226,7 +230,7 @@
simpleButton1.Name = "simpleButton1";
simpleButton1.Size = new Size(80, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 11;
+ simpleButton1.TabIndex = 12;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
@@ -239,11 +243,11 @@
//
// TextEditDescription
//
- TextEditDescription.Location = new Point(20, 212);
+ TextEditDescription.Location = new Point(20, 239);
TextEditDescription.Name = "TextEditDescription";
- TextEditDescription.Size = new Size(641, 224);
+ TextEditDescription.Size = new Size(641, 197);
TextEditDescription.StyleController = layoutControl1;
- TextEditDescription.TabIndex = 9;
+ TextEditDescription.TabIndex = 10;
//
// TextEditCaliber
//
@@ -271,7 +275,7 @@
TextEditKeyWord.Name = "TextEditKeyWord";
TextEditKeyWord.Size = new Size(594, 20);
TextEditKeyWord.StyleController = layoutControl1;
- TextEditKeyWord.TabIndex = 5;
+ TextEditKeyWord.TabIndex = 6;
//
// TextEditValveSetting
//
@@ -281,7 +285,7 @@
TextEditValveSetting.StyleController = layoutControl1;
TextEditValveSetting.TabIndex = 7;
//
- // TextEditMinorLoss
+ // TextEditCoefficient
//
TextEditCoefficient.Location = new Point(79, 104);
TextEditCoefficient.Name = "TextEditCoefficient";
@@ -290,7 +294,7 @@
TextEditCoefficient.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
TextEditCoefficient.Size = new Size(594, 20);
TextEditCoefficient.StyleController = layoutControl1;
- TextEditCoefficient.TabIndex = 4;
+ TextEditCoefficient.TabIndex = 5;
//
// Root
//
@@ -298,7 +302,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem7, layoutControlItem3, layoutControlItem2, layoutControlItem9, layoutControlItem10, layoutControlItem6 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem7, layoutControlItem3, layoutControlItem2, layoutControlItem9, layoutControlItem10, layoutControlItem6, layoutControlItem11 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -332,10 +336,10 @@
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 168);
+ tabbedControlGroup1.Location = new Point(0, 195);
tabbedControlGroup1.Name = "tabbedControlGroup1";
tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(669, 276);
+ tabbedControlGroup1.Size = new Size(669, 249);
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
@@ -344,7 +348,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(645, 228);
+ layoutControlGroup1.Size = new Size(645, 201);
layoutControlGroup1.Text = "璇存槑";
//
// layoutControlItem5
@@ -352,7 +356,7 @@
layoutControlItem5.Control = TextEditDescription;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 228);
+ layoutControlItem5.Size = new Size(645, 201);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -525,6 +529,22 @@
colMinorLoss.Visible = true;
colMinorLoss.VisibleIndex = 3;
//
+ // selectFlagsPopupCtrl1
+ //
+ selectFlagsPopupCtrl1.Location = new Point(79, 176);
+ selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
+ selectFlagsPopupCtrl1.Size = new Size(594, 23);
+ selectFlagsPopupCtrl1.TabIndex = 8;
+ //
+ // layoutControlItem11
+ //
+ layoutControlItem11.Control = selectFlagsPopupCtrl1;
+ layoutControlItem11.Location = new Point(0, 168);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(669, 27);
+ layoutControlItem11.Text = "鏍囩鍒楄〃:";
+ layoutControlItem11.TextSize = new Size(59, 14);
+ //
// AddAssetsValveMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -571,6 +591,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
ResumeLayout(false);
}
@@ -625,5 +646,7 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn colCaliber1;
private DevExpress.XtraTreeList.Columns.TreeListColumn colMaterial1;
private DevExpress.XtraTreeList.Columns.TreeListColumn colMinorLoss1;
+ private SelectFlagsPopupCtrl selectFlagsPopupCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
index e2f08b6..8bb4994 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs
@@ -45,6 +45,7 @@
}
TextEditCaliber.SelectedIndex = 0;
TextEditMaterial.SelectedIndex = 0;
+ this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>();
}
public event Func<Vmo.AssetsValveMainVmo, Task<bool>> ReloadDataEvent = null;
@@ -101,6 +102,7 @@
}
_AssetsValveMain.KeyWord = this.TextEditKeyWord.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
_AssetsValveMain.ValveSetting = this.TextEditValveSetting.Text.Trim();
+ _AssetsValveMain.Flags = this.selectFlagsPopupCtrl1.SelectedFlags;
if (await this.ReloadDataEvent.Invoke(_AssetsValveMain))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!");
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
index c8b8736..4e3ac15 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs
@@ -70,6 +70,8 @@
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
@@ -107,10 +109,12 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(selectFlagsPopupCtrl1);
layoutControl1.Controls.Add(popupContainerControl1);
layoutControl1.Controls.Add(TextEditType);
layoutControl1.Controls.Add(TextEditKeyWord);
@@ -242,9 +246,9 @@
//
// TextEditDescription
//
- TextEditDescription.Location = new Point(20, 212);
+ TextEditDescription.Location = new Point(20, 237);
TextEditDescription.Name = "TextEditDescription";
- TextEditDescription.Size = new Size(641, 224);
+ TextEditDescription.Size = new Size(641, 199);
TextEditDescription.StyleController = layoutControl1;
TextEditDescription.TabIndex = 9;
//
@@ -293,7 +297,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem3, layoutControlItem7, layoutControlItem2, layoutControlItem9, layoutControlItem10, layoutControlItem11 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem3, layoutControlItem7, layoutControlItem2, layoutControlItem9, layoutControlItem10, layoutControlItem11, layoutControlItem6 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -327,10 +331,10 @@
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 168);
+ tabbedControlGroup1.Location = new Point(0, 193);
tabbedControlGroup1.Name = "tabbedControlGroup1";
tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(669, 276);
+ tabbedControlGroup1.Size = new Size(669, 251);
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
@@ -339,7 +343,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(645, 228);
+ layoutControlGroup1.Size = new Size(645, 203);
layoutControlGroup1.Text = "璇存槑";
//
// layoutControlItem5
@@ -347,7 +351,7 @@
layoutControlItem5.Control = TextEditDescription;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 228);
+ layoutControlItem5.Size = new Size(645, 203);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -492,6 +496,22 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
+ // selectFlagsPopupCtrl1
+ //
+ selectFlagsPopupCtrl1.Location = new Point(79, 176);
+ selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
+ selectFlagsPopupCtrl1.Size = new Size(594, 21);
+ selectFlagsPopupCtrl1.TabIndex = 14;
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = selectFlagsPopupCtrl1;
+ layoutControlItem6.Location = new Point(0, 168);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(669, 25);
+ layoutControlItem6.Text = "鏍囩鍒楄〃:";
+ layoutControlItem6.TextSize = new Size(59, 14);
+ //
// EditAssetsValveMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -538,6 +558,7 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
ResumeLayout(false);
}
@@ -588,5 +609,7 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn colMaterial1;
private DevExpress.XtraTreeList.Columns.TreeListColumn colMinorLoss1;
private BindingSource valveCoefficientViewModelBindingSource;
+ private SelectFlagsPopupCtrl selectFlagsPopupCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
index 24aa8b9..92e9048 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs
@@ -64,6 +64,7 @@
this.TextEditValveSetting.Text = _AssetsValveMain.ValveSetting;
this.TextEditType.Properties.AddEnum(typeof(HStation.Assets.eValveType));
this.TextEditType.EditValue = _AssetsValveMain.ValveType;
+ this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>(_AssetsValveMain.Flags);
}
public event Func<Vmo.AssetsValveMainVmo, Task<bool>> ReloadDataEvent = null;
@@ -120,6 +121,7 @@
}
_AssetsValveMain.KeyWord = this.TextEditKeyWord.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
_AssetsValveMain.ValveSetting = this.TextEditValveSetting.Text.Trim();
+ _AssetsValveMain.Flags = this.selectFlagsPopupCtrl1.SelectedFlags;
if (await this.ReloadDataEvent.Invoke(_AssetsValveMain))
{
TipFormHelper.ShowSucceed("淇敼鎴愬姛!");
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs
index 44cb2cf..8854fde 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs
@@ -60,10 +60,10 @@
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.Dock = DockStyle.Fill;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(164, 101);
- xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1);
+ xtrPerform2dChart1.Location = new Point(0, 101);
+ xtrPerform2dChart1.Margin = new Padding(1);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(578, 411);
+ xtrPerform2dChart1.Size = new Size(742, 411);
xtrPerform2dChart1.TabIndex = 1;
//
// sidePanel2
@@ -71,9 +71,9 @@
sidePanel2.Controls.Add(xhsValveMainPhartListCtrl1);
sidePanel2.Dock = DockStyle.Fill;
sidePanel2.Location = new Point(0, 0);
- sidePanel2.Margin = new Padding(2, 2, 2, 2);
+ sidePanel2.Margin = new Padding(2);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(163, 388);
+ sidePanel2.Size = new Size(234, 388);
sidePanel2.TabIndex = 4;
sidePanel2.Text = "sidePanel2";
//
@@ -84,7 +84,7 @@
xhsValveMainPhartListCtrl1.Dock = DockStyle.Fill;
xhsValveMainPhartListCtrl1.Location = new Point(0, 0);
xhsValveMainPhartListCtrl1.Name = "xhsValveMainPhartListCtrl1";
- xhsValveMainPhartListCtrl1.Size = new Size(163, 388);
+ xhsValveMainPhartListCtrl1.Size = new Size(234, 388);
xhsValveMainPhartListCtrl1.TabIndex = 0;
//
// ribbonControl1
@@ -175,7 +175,7 @@
//
dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
+ dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
//
@@ -184,20 +184,23 @@
dockPanel1.Controls.Add(dockPanel1_Container);
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("202c2203-fb3a-4b47-a9cb-083c698bd2ac");
- dockPanel1.Location = new Point(0, 101);
- dockPanel1.Margin = new Padding(2, 2, 2, 2);
+ dockPanel1.Location = new Point(0, 0);
+ dockPanel1.Margin = new Padding(2);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(235, 200);
- dockPanel1.Size = new Size(164, 411);
+ dockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left;
+ dockPanel1.SavedIndex = 0;
+ dockPanel1.Size = new Size(235, 411);
dockPanel1.Text = "鏇茬嚎鍒楄〃";
+ dockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(sidePanel2);
dockPanel1_Container.Location = new Point(0, 23);
- dockPanel1_Container.Margin = new Padding(2, 2, 2, 2);
+ dockPanel1_Container.Margin = new Padding(2);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(163, 388);
+ dockPanel1_Container.Size = new Size(234, 388);
dockPanel1_Container.TabIndex = 0;
//
// XhsValveMainPhartMinorLossPanel
@@ -207,7 +210,6 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(xtrPerform2dChart1);
- Controls.Add(dockPanel1);
Controls.Add(ribbonControl1);
Margin = new Padding(4, 5, 4, 5);
Name = "XhsValveMainPhartMinorLossPanel";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
index 91eee32..b44e69e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using NetTaste;
namespace HStation.WinFrmUI.PhartRelation
{
@@ -19,7 +20,7 @@
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialDataSource(long valve_main_id)
+ public async void InitialDataSource(long valve_main_id)
{
_valve_main_id = valve_main_id;
if (_valve_main_id < 1)
@@ -27,7 +28,13 @@
this.xhsValveMainPhartListCtrl1.Clear();
return;
}
- this.xhsValveMainPhartListCtrl1.SetBindingData(valve_main_id);
+ //this.xhsValveMainPhartListCtrl1.SetBindingData(valve_main_id);
+ var chart = await new BLL.AssetsValveCoefficient().GetByMainID(valve_main_id);
+ if (chart.Count > 0)
+ {
+ _xhs_phart_diagram_ex_std_dto = chart.First();
+ this.xtrPerform2dChart1.SetBindingData(_xhs_phart_diagram_ex_std_dto.MinorLossCurve);
+ }
this.xtrPerform2dChart1.SetAxisTitle("闃�闂ㄥ紑搴�", "鎹熷け绯绘暟");
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsTankSeriesDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AssetsBluntheadSeriesViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AssetsTankSeriesViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AssetsBluntheadSeriesViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AssetsTankSeriesViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.resx
deleted file mode 100644
index d438392..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsBluntheadSeriesDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/AddAssetsBluntheadSeriesDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/EditAssetsTankSeriesDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/BluntheadTreeListCtrl.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/01-series/TankTreeListCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsSprinklerMainDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsBluntheadMainDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.cs
similarity index 95%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.cs
index fb9b99a..1e9717e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.cs
@@ -34,7 +34,7 @@
var allList = new List<Vmo.AssetsTankCoefficientVmo>();
foreach (var item in _allBindingList)
{
- allList.Add(new Vmo.AssetsTankCoefficientVmo { ID = item.ID, Name = item.Name, Caliber = item.Caliber, Material = item.Material, MinorLoss = item.MinorLoss });
+ allList.Add(new Vmo.AssetsTankCoefficientVmo { ID = item.ID, Name = item.Name, MinorLoss = item.MinorLoss });
}
if (await _bll.DeleteAll())
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetBluntheadCoefficientDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/SetTankCoefficientDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/BluntheadCoefficientViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/TankCoefficientViewModel.cs
similarity index 60%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/BluntheadCoefficientViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/TankCoefficientViewModel.cs
index 9562a46..d347ac6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/BluntheadCoefficientViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/03-coefficient/TankCoefficientViewModel.cs
@@ -11,8 +11,6 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
- this.Caliber = rhs.Caliber;
- this.Material = rhs.Material;
this.MinorLoss = rhs.MinorLoss;
}
@@ -29,18 +27,39 @@
public string Name { get; set; }
/// <summary>
- /// 鍙ｅ緞
+ /// 鏈�浣庢按浣�
/// </summary>
- [DisplayName("鍙ｅ緞")]
+ [DisplayName("鏈�浣庢按浣�")]
[Browsable(true)]
- public double? Caliber { get; set; }
+ public double MinLevel { get; set; }
/// <summary>
- /// 鏉愭枡
+ /// 鏈�楂樻按浣�
/// </summary>
- [DisplayName("鏉愭枡")]
+ [DisplayName("鏈�楂樻按浣�")]
[Browsable(true)]
- public string Material { get; set; }
+ public double MaxLevel { get; set; }
+
+ /// <summary>
+ /// 鍏О鐩村緞
+ /// </summary>
+ [DisplayName("鍏О鐩村緞")]
+ [Browsable(true)]
+ public double DN { get; set; }
+
+ /// <summary>
+ /// 鏈�灏忓绉�
+ /// </summary>
+ [DisplayName("鏈�灏忓绉�")]
+ [Browsable(true)]
+ public double MinVol { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏佽婧㈡祦
+ /// </summary>
+ [DisplayName("鏄惁鍏佽婧㈡祦")]
+ [Browsable(true)]
+ public bool OverFlow { get; set; }
/// <summary>
/// 鍠峰皠绯绘暟
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadManageMainPage.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index fbf8101..6186082 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -223,25 +223,25 @@
<Compile Update="15-meter\BluntheadManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="14-tank\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="14-tank\01-series\BluntheadTreeListCtrl.cs">
+ <Compile Update="14-tank\01-series\TankTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="14-tank\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="14-tank\02-main\AddAssetsSprinklerMainDlg.cs">
+ <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="14-tank\02-main\EditAssetsBluntheadMainDlg.cs">
+ <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="14-tank\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <Compile Update="14-tank\03-coefficient\SetTankCoefficientDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="14-tank\BluntheadManageMainPage.cs">
+ <Compile Update="14-tank\TankManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs">
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 24280a3..669f7cb 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
@@ -121,7 +121,7 @@
{
var tankViewModel = vm as HydroTankViewModel;
var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
- var dlg = new TankSingleMatchingDlg();
+ var dlg = new SimulationTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
@@ -136,7 +136,7 @@
{
var tankViewModel = vm as HydroTankViewModel;
var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
- var dlg = new TankSingleMatchingDlg();
+ var dlg = new SimulationTankSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
@@ -156,7 +156,7 @@
{
var elbowViewModel = vm as HydroElbowViewModel;
var input = HydroMatchingHelper.Create(elbowViewModel.Vmo, elbowViewModel.HydroInfo);
- var dlg = new ElbowSingMatchingDlg();
+ var dlg = new SimulationElbowSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(elbowViewModel.HydroInfo, elbowViewModel.Vmo, output);
@@ -211,7 +211,7 @@
{
var pumpViewModel = vm as HydroPumpViewModel;
var input = HydroMatchingHelper.Create(pumpViewModel.Vmo, pumpViewModel.HydroInfo);
- var dlg = new PumpSingleMatchingDlg();
+ var dlg = new SimulationPumpSingleMatchingDlg();
dlg.ReloadDataEvent += (output) =>
{
HydroMatchingHelper.Apply(pumpViewModel.HydroInfo, pumpViewModel.Vmo, output);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
index 6fb45e8..bd614cb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.cs
@@ -249,7 +249,7 @@
if (e.Column == this.colSelect)
{
var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null);
- var dlg = new PipeSingMatchingDlg();
+ var dlg = new SimulationPipeSingleMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (output) =>
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
index 13354de..e4b7fdd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class PumpSingleMatchingDlg
+ partial class SimulationPumpSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -148,7 +148,7 @@
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
- // PumpSingleMatchingDlg
+ // SimulationPumpSingleMatchingDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
similarity index 88%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
index b319ade..5671f13 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class PumpSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationPumpSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public PumpSingleMatchingDlg()
+ public SimulationPumpSingleMatchingDlg()
{
InitializeComponent();
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.Designer.cs
index 7e51b3c..d9d11b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ValveSingleMatchingDlg
+ partial class SimulationValveSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.cs
similarity index 91%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.cs
index 7288c88..8f95008 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ValveSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationValveSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public ValveSingleMatchingDlg()
+ public SimulationValveSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/SimulationValveSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
index f269a17..fd23e53 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
@@ -135,11 +135,10 @@
_currentCurvePoint.Clear();
if (vm == null)
return;
- var vmo = await _bll_ex.Value.GetByID(vm.ID);
+ var vmo = await _bll_ex.Value.GetByMainID(vm.ID);
if (vmo != null)
{
_pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
-
_pumpMatchingViewModel.MatchingCurveQL = _currentCurvePoint;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.Designer.cs
index e9e6633..bf81d15 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class PipeSingleMatchingForm
+ partial class PipeSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.cs
index eef4d56..00fd008 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class PipeSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class PipeSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public PipeSingleMatchingForm()
+ public PipeSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.Designer.cs
index 8223d3f..b2c93ed 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class PipeSingMatchingDlg
+ partial class SimulationPipeSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- pipeLineSingleMatchingForm1 = new PipeSingleMatchingForm();
+ pipeLineSingleMatchingForm1 = new PipeSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -146,7 +146,7 @@
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
//
- // PipeSingMatchingDlg
+ // SimulationPipeSingleMatchingDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private PipeSingleMatchingForm pipeLineSingleMatchingForm1;
+ private PipeSingleMatchingCtrl pipeLineSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.cs
similarity index 84%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.cs
index 933f2de..693ddfe 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class PipeSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationPipeSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public PipeSingMatchingDlg()
+ public SimulationPipeSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/SimulationPipeSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.Designer.cs
index 35e220f..a18d4ef 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ElbowSingleMatchingForm
+ partial class ElbowSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.cs
index af358f2..cc9ee9a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ElbowSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class ElbowSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public ElbowSingleMatchingForm()
+ public ElbowSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.Designer.cs
index 89c5322..e5ad417 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ElbowSingMatchingDlg
+ partial class SimulationElbowSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- elbowSingleMatchingForm1 = new ElbowSingleMatchingForm();
+ elbowSingleMatchingForm1 = new ElbowSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private ElbowSingleMatchingForm elbowSingleMatchingForm1;
+ private ElbowSingleMatchingCtrl elbowSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.cs
index 10ed4b5..a78ae85 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ElbowSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationElbowSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public ElbowSingMatchingDlg()
+ public SimulationElbowSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/SimulationElbowSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.Designer.cs
index 51cfaa1..b0729d8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ThreeLinkSingMatchingDlg
+ partial class SimulationThreelinkSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- ThreeLinkSingleMatchingForm1 = new ThreeLinkSingleMatchingForm();
+ ThreeLinkSingleMatchingForm1 = new ThreelinkSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private ThreeLinkSingleMatchingForm ThreeLinkSingleMatchingForm1;
+ private ThreelinkSingleMatchingCtrl ThreeLinkSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreeLinkSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreelinkSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreelinkSingleMatchingDlg.cs
index 01fcbf7..0c0dcb3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/SimulationThreelinkSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ThreeLinkSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationThreelinkSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public ThreeLinkSingMatchingDlg()
+ public SimulationThreelinkSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.Designer.cs
index 8ddc2f6..302e924 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ThreeLinkSingleMatchingForm
+ partial class ThreelinkSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
@@ -137,7 +137,7 @@
//
// threeLinkSingleMatchingViewModelBindingSource
//
- threeLinkSingleMatchingViewModelBindingSource.DataSource = typeof(ThreeLinkSingleMatchingViewModel);
+ threeLinkSingleMatchingViewModelBindingSource.DataSource = typeof(ThreelinkSingleMatchingViewModel);
//
// colModelType
//
@@ -167,7 +167,7 @@
colMinorLoss.Visible = true;
colMinorLoss.VisibleIndex = 3;
//
- // ThreeLinkSingleMatchingForm
+ // ThreelinkSingleMatchingCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingViewModel.cs
index 8fbac12..7c4b91e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingViewModel.cs
@@ -1,12 +1,12 @@
锘縩amespace HStation.WinFrmUI
{
- public class ThreeLinkSingleMatchingViewModel
+ public class ThreelinkSingleMatchingViewModel
{
- public ThreeLinkSingleMatchingViewModel()
+ public ThreelinkSingleMatchingViewModel()
{
}
- public ThreeLinkSingleMatchingViewModel(Vmo.AssetsThreelinkMainVmo rhs)
+ public ThreelinkSingleMatchingViewModel(Vmo.AssetsThreelinkMainVmo rhs)
{
this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreelinkSingleMatchingCtrl.cs
similarity index 84%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreelinkSingleMatchingCtrl.cs
index 52048a3..385e86c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreeLinkSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/06-threelink/01-threelinksinglematching/ThreelinkSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ThreeLinkSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class ThreelinkSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public ThreeLinkSingleMatchingForm()
+ public ThreelinkSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
@@ -10,17 +10,17 @@
private HydroThreelinkMatchingViewModel _pipeMatchingViewModel;
private BLL.AssetsThreelinkMain _ThreeLinkBll;
- private List<ThreeLinkSingleMatchingViewModel> _allBindingList;
+ private List<ThreelinkSingleMatchingViewModel> _allBindingList;
public async void SetBindingData(HydroThreelinkMatchingViewModel PipeMatchingViewModel)
{
_pipeMatchingViewModel = PipeMatchingViewModel;
- _allBindingList = new List<ThreeLinkSingleMatchingViewModel>();
+ _allBindingList = new List<ThreelinkSingleMatchingViewModel>();
_ThreeLinkBll = new BLL.AssetsThreelinkMain();
var allAssetsThreelinkMain = await _ThreeLinkBll.GetAll();
foreach (var Main in allAssetsThreelinkMain)
{
- _allBindingList.Add(new ThreeLinkSingleMatchingViewModel(Main));
+ _allBindingList.Add(new ThreelinkSingleMatchingViewModel(Main));
}
this.threeLinkSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
this.threeLinkSingleMatchingViewModelBindingSource.ResetBindings(false);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingViewModel.cs
index 27666b2..b375293 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingViewModel.cs
@@ -1,12 +1,12 @@
锘縩amespace HStation.WinFrmUI
{
- public class FourLinkSingleMatchingViewModel
+ public class FourlinkSingleMatchingViewModel
{
- public FourLinkSingleMatchingViewModel()
+ public FourlinkSingleMatchingViewModel()
{
}
- public FourLinkSingleMatchingViewModel(Vmo.AssetsFourlinkMainVmo rhs)
+ public FourlinkSingleMatchingViewModel(Vmo.AssetsFourlinkMainVmo rhs)
{
this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.Designer.cs
index d76ff70..8f11963 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class FourLinkSingleMatchingForm
+ partial class FourlinkSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
@@ -137,7 +137,7 @@
//
// fourLinkSingleMatchingViewModelBindingSource
//
- fourLinkSingleMatchingViewModelBindingSource.DataSource = typeof(FourLinkSingleMatchingViewModel);
+ fourLinkSingleMatchingViewModelBindingSource.DataSource = typeof(FourlinkSingleMatchingViewModel);
//
// colModelType
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.cs
similarity index 84%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.cs
index 7a9d095..b3ad792 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class FourLinkSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class FourlinkSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public FourLinkSingleMatchingForm()
+ public FourlinkSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
@@ -10,17 +10,17 @@
private HydroFourlinkMatchingViewModel _FourlinkMatchingViewModel;
private BLL.AssetsFourlinkMain _FourLinkBll;
- private List<FourLinkSingleMatchingViewModel> _allBindingList;
+ private List<FourlinkSingleMatchingViewModel> _allBindingList;
public async void SetBindingData(HydroFourlinkMatchingViewModel FourlinkMatchingViewModel)
{
_FourlinkMatchingViewModel = FourlinkMatchingViewModel;
- _allBindingList = new List<FourLinkSingleMatchingViewModel>();
+ _allBindingList = new List<FourlinkSingleMatchingViewModel>();
_FourLinkBll = new BLL.AssetsFourlinkMain();
var allAssetsFourlinkMain = await _FourLinkBll.GetAll();
foreach (var Main in allAssetsFourlinkMain)
{
- _allBindingList.Add(new FourLinkSingleMatchingViewModel(Main));
+ _allBindingList.Add(new FourlinkSingleMatchingViewModel(Main));
}
this.fourLinkSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
this.fourLinkSingleMatchingViewModelBindingSource.ResetBindings(false);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourlinkSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.Designer.cs
index 360e289..ea3c3d3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class FourLinkSingMatchingDlg
+ partial class SimulationFourlinkSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- FourlinkSingleMatchingForm1 = new FourLinkSingleMatchingForm();
+ FourlinkSingleMatchingForm1 = new FourlinkSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private FourLinkSingleMatchingForm FourlinkSingleMatchingForm1;
+ private FourlinkSingleMatchingCtrl FourlinkSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.cs
index dfe1652..7ece879 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class FourLinkSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationFourlinkSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public FourLinkSingMatchingDlg()
+ public SimulationFourlinkSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/FourLinkSingMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/07-fourlink/01-fourlinksinglematching/SimulationFourlinkSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.Designer.cs
index 3f05269..7ff6379 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class TankSingleMatchingDlg
+ partial class SimulationTankSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.cs
similarity index 89%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.cs
index e3cf5d2..9589410 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class TankSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationTankSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public TankSingleMatchingDlg()
+ public SimulationTankSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
index cf23955..3a48aa2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class MeterSingleMatchingForm
+ partial class MeterSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.cs
index e2ee107..a0e6c26 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class MeterSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class MeterSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public MeterSingleMatchingForm()
+ public MeterSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.Designer.cs
index ada532a..43197b9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class MeterSingMatchingDlg
+ partial class SimulationMeterSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- MeterSingleMatchingForm1 = new MeterSingleMatchingForm();
+ MeterSingleMatchingForm1 = new MeterSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private MeterSingleMatchingForm MeterSingleMatchingForm1;
+ private MeterSingleMatchingCtrl MeterSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.cs
index d8683fb..7b59e16 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class MeterSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationMeterSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public MeterSingMatchingDlg()
+ public SimulationMeterSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/SimulationMeterSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.Designer.cs
index 6e8c15b..437979e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class FlowmeterSingleMatchingForm
+ partial class FlowmeterSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.cs
index 56af15f..568ebd2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class FlowmeterSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class FlowmeterSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public FlowmeterSingleMatchingForm()
+ public FlowmeterSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.Designer.cs
index 07aa66f..4a3485f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class FlowmeterSingMatchingDlg
+ partial class SimulationFlowmeterSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- FlowmeterSingleMatchingForm1 = new FlowmeterSingleMatchingForm();
+ FlowmeterSingleMatchingForm1 = new FlowmeterSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private FlowmeterSingleMatchingForm FlowmeterSingleMatchingForm1;
+ private FlowmeterSingleMatchingCtrl FlowmeterSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.cs
index ee655dd..5229168 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class FlowmeterSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationFlowmeterSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public FlowmeterSingMatchingDlg()
+ public SimulationFlowmeterSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/SimulationFlowmeterSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.Designer.cs
index e8786a9..11ff053 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class HydrantSingleMatchingForm
+ partial class HydrantSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.cs
index 828a91e..98f7364 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class HydrantSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class HydrantSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public HydrantSingleMatchingForm()
+ public HydrantSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.Designer.cs
index 4ab5bed..37449a1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class HydrantSingMatchingDlg
+ partial class SimulationHydrantSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- HydrantSingleMatchingForm1 = new HydrantSingleMatchingForm();
+ HydrantSingleMatchingForm1 = new HydrantSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private HydrantSingleMatchingForm HydrantSingleMatchingForm1;
+ private HydrantSingleMatchingCtrl HydrantSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.cs
index d0bb7d5..6db67a5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-Hydrant/HydrantSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class HydrantSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationHydrantSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public HydrantSingMatchingDlg()
+ public SimulationHydrantSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/SimulationHydrantSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.Designer.cs
index 2e16bb2..c24af1f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class PressmeterSingleMatchingForm
+ partial class PressmeterSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.cs
index fe10727..26b326c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class PressmeterSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class PressmeterSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public PressmeterSingleMatchingForm()
+ public PressmeterSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.Designer.cs
index db02735..089e19b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class PressmeterSingMatchingDlg
+ partial class SimulationPressmeterSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- PressmeterSingleMatchingForm1 = new PressmeterSingleMatchingForm();
+ PressmeterSingleMatchingForm1 = new PressmeterSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private PressmeterSingleMatchingForm PressmeterSingleMatchingForm1;
+ private PressmeterSingleMatchingCtrl PressmeterSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.cs
index e325fca..b7c564e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class PressmeterSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationPressmeterSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public PressmeterSingMatchingDlg()
+ public SimulationPressmeterSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/SimulationPressmeterSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.Designer.cs
index c61297b..a35d892 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class BluntheadSingMatchingDlg
+ partial class SimulationBluntheadSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -146,7 +146,7 @@
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
//
- // BluntheadSingMatchingDlg
+ // SimulationBluntheadSingleMatchingDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.cs
index 848ee32..67c674d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class BluntheadSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationBluntheadSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public BluntheadSingMatchingDlg()
+ public SimulationBluntheadSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-blunthead/SimulationBluntheadSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.Designer.cs
index 6a708d4..984b607 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class TranslationSingMatchingDlg
+ partial class SimulationTranslationSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- TranslationSingleMatchingForm1 = new TranslationSingleMatchingForm();
+ TranslationSingleMatchingForm1 = new TranslationSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private TranslationSingleMatchingForm TranslationSingleMatchingForm1;
+ private TranslationSingleMatchingCtrl TranslationSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.cs
index 16f77dc..80558eb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class TranslationSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationTranslationSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public TranslationSingMatchingDlg()
+ public SimulationTranslationSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/SimulationTranslationSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
index 6336b13..75059a4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class TranslationSingleMatchingForm
+ partial class TranslationSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.cs
index 7a1c280..b089f5a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class TranslationSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class TranslationSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public TranslationSingleMatchingForm()
+ public TranslationSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.Designer.cs
index adc9581..c2932eb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class SprinklerSingMatchingDlg
+ partial class SimulationSprinklerSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- sprinklerSingleMatchingForm1 = new SprinklerSingleMatchingForm();
+ sprinklerSingleMatchingForm1 = new SprinklerSingleMatchingCtrl();
btnComplete = new SimpleButton();
btnCancel = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -173,7 +173,7 @@
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private SprinklerSingleMatchingForm sprinklerSingleMatchingForm1;
+ private SprinklerSingleMatchingCtrl sprinklerSingleMatchingForm1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.cs
index a48a774..30ef8bd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class SprinklerSingMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationSprinklerSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public SprinklerSingMatchingDlg()
+ public SimulationSprinklerSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SimulationSprinklerSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/sprinklerSingleMatchingForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/sprinklerSingleMatchingForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.Designer.cs
index 0ffd5d2..2f7c15e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/sprinklerSingleMatchingForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class SprinklerSingleMatchingForm
+ partial class SprinklerSingleMatchingCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingForm.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.cs
index a1167f3..804f81f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class SprinklerSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+ public partial class SprinklerSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public SprinklerSingleMatchingForm()
+ public SprinklerSingleMatchingCtrl()
{
InitializeComponent();
this.gridView3.SetNormalView();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/sprinklerSingleMatchingForm.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/sprinklerSingleMatchingForm.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.Designer.cs
index e7bd040..63c9b8a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class CompressorSingleMatchingDlg
+ partial class SimulationCompressorSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.cs
similarity index 89%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.cs
index 93e249d..d3f53db 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class CompressorSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationCompressorSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public CompressorSingleMatchingDlg()
+ public SimulationCompressorSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorChartShowDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/CompressorSingleMatchingCtrl.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.Designer.cs
index e2b26b6..18ca6b0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI
{
- partial class ExchangerSingleMatchingDlg
+ partial class SimulationExchangerSingleMatchingDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.cs
similarity index 89%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.cs
index ff381fc..462e6f1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI
{
- public partial class ExchangerSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SimulationExchangerSingleMatchingDlg : DevExpress.XtraEditors.XtraForm
{
- public ExchangerSingleMatchingDlg()
+ public SimulationExchangerSingleMatchingDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/TankSingleMatchingDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 1284980..e566b8d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -183,87 +183,87 @@
<Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\09-Tank\TankChartShowDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\09-Tank\TankSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\09-Tank\TankSingleMatchingCtrl.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\15-Translation\TranslationSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\15-Translation\TranslationSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\13-Pressmeter\PressmeterSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\13-Pressmeter\PressmeterSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\12-Hydrant\HydrantSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\12-Hydrant\HydrantSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\11-Flowmeter\FlowmeterSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\11-Flowmeter\FlowmeterSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\10-Meter\MeterSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\10-Meter\MeterSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\14-Blunthead\BluntheadSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\14-Blunthead\BluntheadSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\SimulationPumpSingleMatchingDlg.cs" />
<Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
<Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
<Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
<Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
<Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
<Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\TankSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\CompressorChartShowDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\CompressorSingleMatchingCtrl.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\TankSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index 1c18d9f..26f2310 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -106,40 +106,40 @@
<Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\SimulationPumpSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveChartShowDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreelinkSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\SimulationThreelinkSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl.cs">
--
Gitblit v1.9.3