From 7e5fcbee07c65bed3333eb295d0d5117df46b939 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 22:50:28 +0800
Subject: [PATCH] 修改阀门单独匹配
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs | 13 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs | 16 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs | 21 ---
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs | 96 ++++++++--------
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/02-main/EditExchangerMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs | 136 +++++++---------------
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs | 2
15 files changed, 124 insertions(+), 182 deletions(-)
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 f9bfc57..9787ec7 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
@@ -51,7 +51,7 @@
TextEditMaterial.Properties.Items.Add(imageItem);
}
}
- if (_AssetsValveMain.Material == null)
+ if (_AssetsValveMain.Material == null|| _AssetsValveMain.Material==string.Empty)
{
this.TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
index 545b963..dd2258c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
@@ -46,10 +46,17 @@
{
TextEditCaliber.EditValue = _PipeLineVmo.Caliber.ToString();
}
- this.TextEditName.Text = _PipeLineVmo.Name;
+ if (_PipeLineVmo.Material == null || _PipeLineVmo.Material == string.Empty)
+ {
+ TextEditMaterial.EditValue = "榛樿";
+ }
+ else
+ {
+ TextEditMaterial.EditValue = _PipeLineVmo.Material.ToString();
+ }
+ this.TextEditName.Text = _PipeLineVmo.Name;
this.DescriptionTextEdit.Text = _PipeLineVmo.Description;
- this.TextEditMaterial.EditValue = _PipeLineVmo.Material;
- this.TextEditKeyWorld.Text = string.Join(",", _PipeLineVmo.KeyWord);
+ this.TextEditKeyWorld.Text = string.Join(",", _PipeLineVmo.KeyWord);
this.textEditMinorLoss.Text = _PipeLineVmo.MinorLoss.ToString();
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
index 8f81ee6..f047f3f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
@@ -49,7 +49,7 @@
{
TextEditCaliber.EditValue = _ElbowVmo.Caliber.ToString();
}
- if (_ElbowVmo.Material == null)
+ if (_ElbowVmo.Material == null|| _ElbowVmo.Material==string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.cs
index bfb780b..26ce2a7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditThreeLinkMainDlg.cs
@@ -49,7 +49,7 @@
{
TextEditCaliber.EditValue = _ThreeLinkVmo.Caliber.ToString();
}
- if (_ThreeLinkVmo.Material == null)
+ if (_ThreeLinkVmo.Material == null || _ThreeLinkVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.cs
index 07853bb..5cb47b4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditFourLinkMainDlg.cs
@@ -49,7 +49,7 @@
{
TextEditCaliber.EditValue = _FourLinkVmo.Caliber.ToString();
}
- if (_FourLinkVmo.Material == null)
+ if (_FourLinkVmo.Material == null || _FourLinkVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.cs
index ae72cb4..d5f740d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.cs
@@ -50,7 +50,7 @@
{
TextEditCaliber.EditValue = _SprinklerVmo.Caliber.ToString();
}
- if (_SprinklerVmo.Material == null)
+ if (_SprinklerVmo.Material == null || _SprinklerVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.cs
index 7333c1e..53adeeb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.cs
@@ -33,7 +33,7 @@
TextEditMaterial.Properties.Items.Add(imageItem);
}
}
- if (_ExchangerVmo.Material == null)
+ if (_ExchangerVmo.Material == null || _ExchangerVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/02-main/EditExchangerMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/02-main/EditExchangerMainDlg.cs
index 87e07fd..4f79a59 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/02-main/EditExchangerMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/02-main/EditExchangerMainDlg.cs
@@ -32,7 +32,7 @@
TextEditMaterial.Properties.Items.Add(imageItem);
}
}
- if (_CompressorVmo.Material == null)
+ if (_CompressorVmo.Material == null || _CompressorVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.cs
index cdbb62e..c051fbe 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.cs
@@ -50,7 +50,7 @@
{
TextEditCaliber.EditValue = _BluntheadVmo.Caliber.ToString();
}
- if (_BluntheadVmo.Material == null)
+ if (_BluntheadVmo.Material == null || _BluntheadVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
index 631057b..bc37257 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
@@ -43,29 +43,27 @@
simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
TextEditName = new DevExpress.XtraEditors.TextEdit();
DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
- TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
- TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
TextEditMinorLoss = new DevExpress.XtraEditors.PopupContainerEdit();
textEditDN = new DevExpress.XtraEditors.TextEdit();
textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
textEditMinVol = new DevExpress.XtraEditors.TextEdit();
textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
+ textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,8 +75,6 @@
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
toolTipController1 = new DevExpress.Utils.ToolTipController(components);
- textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
- layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
@@ -87,29 +83,27 @@
((System.ComponentModel.ISupportInitialize)TankCoefficientViewModelBindingSource).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
@@ -120,8 +114,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -132,8 +124,6 @@
layoutControl1.Controls.Add(simpleButton1);
layoutControl1.Controls.Add(TextEditName);
layoutControl1.Controls.Add(DescriptionTextEdit);
- layoutControl1.Controls.Add(TextEditCaliber);
- layoutControl1.Controls.Add(TextEditMaterial);
layoutControl1.Controls.Add(TextEditKeyWord);
layoutControl1.Controls.Add(TextEditMinorLoss);
layoutControl1.Controls.Add(textEditDN);
@@ -152,7 +142,7 @@
//
// selectFlagsPopupCtrl1
//
- selectFlagsPopupCtrl1.Location = new Point(72, 80);
+ selectFlagsPopupCtrl1.Location = new Point(72, 56);
selectFlagsPopupCtrl1.Name = "selectFlagsPopupCtrl1";
selectFlagsPopupCtrl1.Size = new Size(264, 20);
selectFlagsPopupCtrl1.TabIndex = 7;
@@ -254,31 +244,11 @@
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(20, 185);
+ DescriptionTextEdit.Location = new Point(20, 161);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(637, 257);
+ DescriptionTextEdit.Size = new Size(637, 281);
DescriptionTextEdit.StyleController = layoutControl1;
DescriptionTextEdit.TabIndex = 12;
- //
- // TextEditCaliber
- //
- TextEditCaliber.Location = new Point(72, 32);
- TextEditCaliber.Name = "TextEditCaliber";
- TextEditCaliber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditCaliber.Size = new Size(264, 20);
- TextEditCaliber.StyleController = layoutControl1;
- TextEditCaliber.TabIndex = 3;
- TextEditCaliber.SelectedIndexChanged += TextEditCaliber_SelectedIndexChanged;
- //
- // TextEditMaterial
- //
- TextEditMaterial.Location = new Point(404, 32);
- TextEditMaterial.Name = "TextEditMaterial";
- TextEditMaterial.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditMaterial.Size = new Size(265, 20);
- TextEditMaterial.StyleController = layoutControl1;
- TextEditMaterial.TabIndex = 4;
- TextEditMaterial.SelectedIndexChanged += TextEditMaterial_SelectedIndexChanged;
//
// TextEditKeyWord
//
@@ -290,7 +260,7 @@
//
// TextEditMinorLoss
//
- TextEditMinorLoss.Location = new Point(72, 56);
+ TextEditMinorLoss.Location = new Point(72, 32);
TextEditMinorLoss.Name = "TextEditMinorLoss";
TextEditMinorLoss.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
TextEditMinorLoss.Properties.PopupControl = popupContainerControl1;
@@ -301,7 +271,7 @@
//
// textEditDN
//
- textEditDN.Location = new Point(404, 56);
+ textEditDN.Location = new Point(404, 32);
textEditDN.Name = "textEditDN";
textEditDN.Size = new Size(265, 20);
textEditDN.StyleController = layoutControl1;
@@ -309,7 +279,7 @@
//
// textEditMinLevel
//
- textEditMinLevel.Location = new Point(404, 80);
+ textEditMinLevel.Location = new Point(404, 56);
textEditMinLevel.Name = "textEditMinLevel";
textEditMinLevel.Size = new Size(265, 20);
textEditMinLevel.StyleController = layoutControl1;
@@ -317,7 +287,7 @@
//
// textEditMinVol
//
- textEditMinVol.Location = new Point(72, 104);
+ textEditMinVol.Location = new Point(72, 80);
textEditMinVol.Name = "textEditMinVol";
textEditMinVol.Size = new Size(264, 20);
textEditMinVol.StyleController = layoutControl1;
@@ -326,7 +296,7 @@
// textEditVoerFlow
//
textEditVoerFlow.EditValue = null;
- textEditVoerFlow.Location = new Point(8, 128);
+ textEditVoerFlow.Location = new Point(8, 104);
textEditVoerFlow.Name = "textEditVoerFlow";
textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
@@ -334,13 +304,21 @@
textEditVoerFlow.StyleController = layoutControl1;
textEditVoerFlow.TabIndex = 11;
//
+ // textEditMaxLevel
+ //
+ textEditMaxLevel.Location = new Point(404, 80);
+ textEditMaxLevel.Name = "textEditMaxLevel";
+ textEditMaxLevel.Size = new Size(265, 20);
+ textEditMaxLevel.StyleController = layoutControl1;
+ textEditMaxLevel.TabIndex = 10;
+ //
// Root
//
Root.AppearanceItemCaption.Options.UseTextOptions = true;
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, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem7, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem14, layoutControlItem17, layoutControlItem16 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlGroup5, layoutControlItem2, layoutControlItem7, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem14, layoutControlItem17, layoutControlItem16 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(677, 488);
@@ -382,23 +360,14 @@
layoutControlItem1.Text = "<color=red>*</color>鍨嬪彿:";
layoutControlItem1.TextSize = new Size(52, 14);
//
- // layoutControlItem12
- //
- layoutControlItem12.Control = TextEditMaterial;
- layoutControlItem12.Location = new Point(332, 24);
- layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(333, 24);
- layoutControlItem12.Text = "鏉愭枡:";
- layoutControlItem12.TextSize = new Size(52, 14);
- //
// layoutControlGroup5
//
layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup5.Location = new Point(0, 144);
+ layoutControlGroup5.Location = new Point(0, 120);
layoutControlGroup5.Name = "layoutControlGroup5";
- layoutControlGroup5.Size = new Size(665, 306);
+ layoutControlGroup5.Size = new Size(665, 330);
layoutControlGroup5.Text = "璇存槑";
//
// layoutControlItem5
@@ -406,21 +375,12 @@
layoutControlItem5.Control = DescriptionTextEdit;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(641, 261);
+ layoutControlItem5.Size = new Size(641, 285);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextToControlDistance = 0;
layoutControlItem5.TextVisible = false;
- //
- // layoutControlItem9
- //
- layoutControlItem9.Control = TextEditCaliber;
- layoutControlItem9.Location = new Point(0, 24);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(332, 24);
- layoutControlItem9.Text = "鍙ｅ緞:";
- layoutControlItem9.TextSize = new Size(52, 14);
//
// layoutControlItem2
//
@@ -434,7 +394,7 @@
// layoutControlItem7
//
layoutControlItem7.Control = TextEditMinorLoss;
- layoutControlItem7.Location = new Point(0, 48);
+ layoutControlItem7.Location = new Point(0, 24);
layoutControlItem7.Name = "layoutControlItem7";
layoutControlItem7.Size = new Size(332, 24);
layoutControlItem7.Text = "灞�闃荤郴鏁�:";
@@ -443,7 +403,7 @@
// layoutControlItem3
//
layoutControlItem3.Control = selectFlagsPopupCtrl1;
- layoutControlItem3.Location = new Point(0, 72);
+ layoutControlItem3.Location = new Point(0, 48);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Size = new Size(332, 24);
layoutControlItem3.Text = "鏍囩鍒楄〃:";
@@ -452,7 +412,7 @@
// layoutControlItem10
//
layoutControlItem10.Control = textEditDN;
- layoutControlItem10.Location = new Point(332, 48);
+ layoutControlItem10.Location = new Point(332, 24);
layoutControlItem10.Name = "layoutControlItem10";
layoutControlItem10.Size = new Size(333, 24);
layoutControlItem10.Text = "鍏О鐩村緞:";
@@ -461,7 +421,7 @@
// layoutControlItem11
//
layoutControlItem11.Control = textEditMinLevel;
- layoutControlItem11.Location = new Point(332, 72);
+ layoutControlItem11.Location = new Point(332, 48);
layoutControlItem11.Name = "layoutControlItem11";
layoutControlItem11.Size = new Size(333, 24);
layoutControlItem11.Text = "鏈�浣庢按浣�:";
@@ -470,16 +430,25 @@
// layoutControlItem14
//
layoutControlItem14.Control = textEditMinVol;
- layoutControlItem14.Location = new Point(0, 96);
+ layoutControlItem14.Location = new Point(0, 72);
layoutControlItem14.Name = "layoutControlItem14";
layoutControlItem14.Size = new Size(332, 24);
layoutControlItem14.Text = "鏈�灏忓绉�:";
layoutControlItem14.TextSize = new Size(52, 14);
//
+ // layoutControlItem17
+ //
+ layoutControlItem17.Control = textEditMaxLevel;
+ layoutControlItem17.Location = new Point(332, 72);
+ layoutControlItem17.Name = "layoutControlItem17";
+ layoutControlItem17.Size = new Size(333, 24);
+ layoutControlItem17.Text = "鏈�澶ф按浣�:";
+ layoutControlItem17.TextSize = new Size(52, 14);
+ //
// layoutControlItem16
//
layoutControlItem16.Control = textEditVoerFlow;
- layoutControlItem16.Location = new Point(0, 120);
+ layoutControlItem16.Location = new Point(0, 96);
layoutControlItem16.Name = "layoutControlItem16";
layoutControlItem16.Size = new Size(665, 24);
layoutControlItem16.Text = "鏄惁鍏佽婧㈡祦:";
@@ -556,23 +525,6 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // textEditMaxLevel
- //
- textEditMaxLevel.Location = new Point(404, 104);
- textEditMaxLevel.Name = "textEditMaxLevel";
- textEditMaxLevel.Size = new Size(265, 20);
- textEditMaxLevel.StyleController = layoutControl1;
- textEditMaxLevel.TabIndex = 10;
- //
- // layoutControlItem17
- //
- layoutControlItem17.Control = textEditMaxLevel;
- layoutControlItem17.Location = new Point(332, 96);
- layoutControlItem17.Name = "layoutControlItem17";
- layoutControlItem17.Size = new Size(333, 24);
- layoutControlItem17.Text = "鏈�澶ф按浣�:";
- layoutControlItem17.TextSize = new Size(52, 14);
- //
// AddAssetsTankMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -581,7 +533,7 @@
Controls.Add(layoutControl1);
Name = "AddAssetsTankMainDlg";
StartPosition = FormStartPosition.CenterScreen;
- Text = "娣诲姞鍠峰ご";
+ Text = "娣诲姞姘存睜";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)popupContainerControl1).EndInit();
@@ -590,29 +542,27 @@
((System.ComponentModel.ISupportInitialize)TankCoefficientViewModelBindingSource).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
@@ -623,8 +573,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
index f5e76f3..9716024 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
@@ -30,6 +30,7 @@
{
components = new System.ComponentModel.Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
textEditDN = new DevExpress.XtraEditors.TextEdit();
textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
textEditMinVol = new DevExpress.XtraEditors.TextEdit();
@@ -63,10 +64,11 @@
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -79,10 +81,9 @@
toolTipController1 = new DevExpress.Utils.ToolTipController(components);
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
- layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
@@ -109,10 +110,11 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -124,8 +126,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -153,6 +153,14 @@
layoutControl1.Size = new Size(681, 482);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
+ //
+ // textEditMaxLevel
+ //
+ textEditMaxLevel.Location = new Point(406, 104);
+ textEditMaxLevel.Name = "textEditMaxLevel";
+ textEditMaxLevel.Size = new Size(267, 20);
+ textEditMaxLevel.StyleController = layoutControl1;
+ textEditMaxLevel.TabIndex = 10;
//
// textEditDN
//
@@ -451,24 +459,6 @@
layoutControlItem6.Text = "鏍囩鍒楄〃:";
layoutControlItem6.TextSize = new Size(52, 14);
//
- // layoutControlItem14
- //
- layoutControlItem14.Control = textEditMinVol;
- layoutControlItem14.Location = new Point(0, 96);
- layoutControlItem14.Name = "layoutControlItem14";
- layoutControlItem14.Size = new Size(334, 24);
- layoutControlItem14.Text = "鏈�灏忓绉�:";
- layoutControlItem14.TextSize = new Size(52, 14);
- //
- // layoutControlItem10
- //
- layoutControlItem10.Control = textEditVoerFlow;
- layoutControlItem10.Location = new Point(0, 120);
- layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(669, 24);
- layoutControlItem10.TextSize = new Size(0, 0);
- layoutControlItem10.TextVisible = false;
- //
// layoutControlItem16
//
layoutControlItem16.Control = textEditMinLevel;
@@ -486,6 +476,33 @@
layoutControlItem17.Size = new Size(335, 24);
layoutControlItem17.Text = "鍏О鐩村緞:";
layoutControlItem17.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem18
+ //
+ layoutControlItem18.Control = textEditMaxLevel;
+ layoutControlItem18.Location = new Point(334, 96);
+ layoutControlItem18.Name = "layoutControlItem18";
+ layoutControlItem18.Size = new Size(335, 24);
+ layoutControlItem18.Text = "鏈�澶ф按浣�:";
+ layoutControlItem18.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.Control = textEditVoerFlow;
+ layoutControlItem10.Location = new Point(0, 120);
+ layoutControlItem10.Name = "layoutControlItem10";
+ layoutControlItem10.Size = new Size(669, 24);
+ layoutControlItem10.TextSize = new Size(0, 0);
+ layoutControlItem10.TextVisible = false;
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.Control = textEditMinVol;
+ layoutControlItem14.Location = new Point(0, 96);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(334, 24);
+ layoutControlItem14.Text = "鏈�灏忓绉�:";
+ layoutControlItem14.TextSize = new Size(52, 14);
//
// dxErrorProvider1
//
@@ -573,23 +590,6 @@
layoutControlItem3.Text = "鎹熷け绯绘暟:";
layoutControlItem3.TextSize = new Size(52, 14);
//
- // textEditMaxLevel
- //
- textEditMaxLevel.Location = new Point(406, 104);
- textEditMaxLevel.Name = "textEditMaxLevel";
- textEditMaxLevel.Size = new Size(267, 20);
- textEditMaxLevel.StyleController = layoutControl1;
- textEditMaxLevel.TabIndex = 10;
- //
- // layoutControlItem18
- //
- layoutControlItem18.Control = textEditMaxLevel;
- layoutControlItem18.Location = new Point(334, 96);
- layoutControlItem18.Name = "layoutControlItem18";
- layoutControlItem18.Size = new Size(335, 24);
- layoutControlItem18.Text = "鏈�澶ф按浣�:";
- layoutControlItem18.TextSize = new Size(52, 14);
- //
// EditAssetsTankMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -598,9 +598,10 @@
Controls.Add(layoutControl1);
Name = "EditAssetsTankMainDlg";
StartPosition = FormStartPosition.CenterScreen;
- Text = "缂栬緫鍠峰ご";
+ Text = "缂栬緫姘存睜";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
@@ -627,10 +628,11 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -642,8 +644,6 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
index 35207d9..e7b07d3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
@@ -24,26 +24,7 @@
this.TankCoefficientViewModelBindingSource.DataSource = _AssetsTankCoefficient;
_TankVmo = TankVmo;
- var allCaliber = await new Yw.BLL.SysDictData().GetByTypeCode("1");
- if (allCaliber != null)
- {
- foreach (var item in allCaliber)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.Name);
- TextEditCaliber.Properties.Items.Add(imageItem);
- }
- }
- var allMaterial = await new Yw.BLL.SysDictData().GetByTypeCode("3");
- if (allMaterial != null)
- {
- foreach (var item in allMaterial)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.Name);
- TextEditMaterial.Properties.Items.Add(imageItem);
- }
- }
-
- this.TextEditName.Text = _TankVmo.Name;
+ this.TextEditName.Text = _TankVmo.Name;
this.DescriptionTextEdit.Text = _TankVmo.Description;
this.TextEditKeyWord.Text = string.Join(",", _TankVmo.KeyWord);
this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>(_TankVmo.Flags);
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
index 0678d82..6541786 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
@@ -36,7 +36,7 @@
_xhs_phart_diagram_ex_std_dto = chart.First();
this.xtrPerform2dChart1.SetBindingData(_xhs_phart_diagram_ex_std_dto.MinorLossCurve);
}
- this.xtrPerform2dChart1.SetAxisTitle("闃�闂ㄥ紑搴�", "鎹熷け绯绘暟");
+ this.xtrPerform2dChart1.SetAxisTitle("娴侀噺", "鎹熷け绯绘暟");
}
//閫夋嫨鏇茬嚎鍙樻崲浜嬩欢
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs
index 8e8eff3..56aa5aa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs
@@ -20,14 +20,14 @@
{
if (curveList != null && curveList.Count > 0)
{
- InitChart(curveList.First().MinorLossCurve);
+ InitChart(curveList.First().MinorLossCurve, false);
}
}
else if (model.ValveType == HStation.Assets.eValveType.TCV)
{
if (curveList != null && curveList.Count > 0)
{
- InitChart(curveList.First().OpenLossCurve);
+ InitChart(curveList.First().OpenLossCurve, true);
}
}
}
@@ -87,11 +87,17 @@
}
//鍒濆鍖栧浘琛ㄦ暟鎹�
- public void InitChart(string curveStr)
+ public void InitChart(string curveStr, bool isopen)
{
this.xtrPerform2dchart1.SetBindingData(curveStr, null);
-
- this.xtrPerform2dchart1.SetAxisTitle("闃�闂ㄥ紑搴�", "鎹熷け绯绘暟");
+ if (isopen)
+ {
+ this.xtrPerform2dchart1.SetAxisTitle("闃�闂ㄥ紑搴�", "鎹熷け绯绘暟");
+ }
+ else
+ {
+ this.xtrPerform2dchart1.SetAxisTitle("娴侀噺", "鎹熷け绯绘暟");
+ }
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
index e77d408..fbaa359 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
@@ -127,12 +127,12 @@
var dlg = new ValveChartShowDlg();
if (vmo.MinorLossCurve != null)
{
- dlg.InitChart(vmo.MinorLossCurve);
+ dlg.InitChart(vmo.MinorLossCurve, false);
}
else if (vmo.OpenLossCurve != null)
{
- dlg.InitChart(vmo.OpenLossCurve);
- }
+ dlg.InitChart(vmo.OpenLossCurve, true);
+ }
dlg.ShowDialog();
}
return;
--
Gitblit v1.9.3