From 36c4ee4f56763ba96d37ff9f89bbf9440fb8be9f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 10:43:41 +0800
Subject: [PATCH] 增加编辑曲线菜单
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs | 8
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx | 72 +++++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs | 188 ++++++++++++++------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs | 107 +++++++++++
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs | 50 +++--
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.resx | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PropGroupChoiceViewModel.cs | 1
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs | 15 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs | 45 +---
9 files changed, 338 insertions(+), 152 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
index 7031052..ff62bda 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.Designer.cs
@@ -77,10 +77,10 @@
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.Dock = DockStyle.Fill;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(235, 148);
- xtrPerform2dChart1.Margin = new Padding(1, 2, 1, 2);
+ xtrPerform2dChart1.Location = new Point(164, 101);
+ xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(325, 657);
+ xtrPerform2dChart1.Size = new Size(228, 411);
xtrPerform2dChart1.TabIndex = 1;
//
// sidePanel2
@@ -88,8 +88,9 @@
sidePanel2.Controls.Add(xhsPumpMainPhartListCtrl1);
sidePanel2.Dock = DockStyle.Fill;
sidePanel2.Location = new Point(0, 0);
+ sidePanel2.Margin = new Padding(2, 2, 2, 2);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(234, 623);
+ sidePanel2.Size = new Size(163, 388);
sidePanel2.TabIndex = 4;
sidePanel2.Text = "sidePanel2";
//
@@ -99,18 +100,19 @@
xhsPumpMainPhartListCtrl1.Appearance.Options.UseBackColor = true;
xhsPumpMainPhartListCtrl1.Dock = DockStyle.Fill;
xhsPumpMainPhartListCtrl1.Location = new Point(0, 0);
- xhsPumpMainPhartListCtrl1.Margin = new Padding(6, 8, 6, 8);
+ xhsPumpMainPhartListCtrl1.Margin = new Padding(4, 5, 4, 5);
xhsPumpMainPhartListCtrl1.Name = "xhsPumpMainPhartListCtrl1";
- xhsPumpMainPhartListCtrl1.Size = new Size(234, 623);
+ xhsPumpMainPhartListCtrl1.Size = new Size(163, 388);
xhsPumpMainPhartListCtrl1.TabIndex = 0;
//
// sidePanel1
//
sidePanel1.Controls.Add(tabPane1);
sidePanel1.Dock = DockStyle.Right;
- sidePanel1.Location = new Point(560, 148);
+ sidePanel1.Location = new Point(392, 101);
+ sidePanel1.Margin = new Padding(2, 2, 2, 2);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(500, 657);
+ sidePanel1.Size = new Size(350, 411);
sidePanel1.TabIndex = 3;
sidePanel1.Text = "sidePanel1";
//
@@ -119,11 +121,12 @@
tabPane1.Controls.Add(tabNavigationPage1);
tabPane1.Dock = DockStyle.Fill;
tabPane1.Location = new Point(1, 0);
+ tabPane1.Margin = new Padding(2, 2, 2, 2);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1 });
- tabPane1.RegularSize = new Size(499, 657);
+ tabPane1.RegularSize = new Size(349, 411);
tabPane1.SelectedPage = tabNavigationPage1;
- tabPane1.Size = new Size(499, 657);
+ tabPane1.Size = new Size(349, 411);
tabPane1.TabIndex = 0;
tabPane1.Text = "tabPane1";
//
@@ -131,34 +134,33 @@
//
tabNavigationPage1.Caption = "杩愯鍙傛暟";
tabNavigationPage1.Controls.Add(pumpPerformInfoCtrl1);
+ tabNavigationPage1.Margin = new Padding(2, 2, 2, 2);
tabNavigationPage1.Name = "tabNavigationPage1";
- tabNavigationPage1.Size = new Size(499, 608);
+ tabNavigationPage1.Size = new Size(349, 378);
//
// pumpPerformInfoCtrl1
//
pumpPerformInfoCtrl1.Dock = DockStyle.Fill;
pumpPerformInfoCtrl1.Location = new Point(0, 0);
+ pumpPerformInfoCtrl1.Margin = new Padding(1, 1, 1, 1);
pumpPerformInfoCtrl1.Name = "pumpPerformInfoCtrl1";
- pumpPerformInfoCtrl1.Size = new Size(499, 608);
+ pumpPerformInfoCtrl1.Size = new Size(349, 378);
pumpPerformInfoCtrl1.TabIndex = 0;
//
// ribbonControl1
//
- ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, barBtnEditPumpCurve, BarBtnEidtPumpPart, barCheckItem1, barBtnImportByExcel, barBtnImportByPicture, barButtonItem3, barButtonItem4, barBtnDelete, barBtnAddText, barBtnUpdateimportance, barBtnOtherName, barBtnEditChart, barBtnImportByOnePoint, barBtnVariableSpeed });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.Margin = new Padding(4, 5, 4, 5);
ribbonControl1.MaxItemId = 34;
ribbonControl1.Name = "ribbonControl1";
- ribbonControl1.OptionsMenuMinWidth = 471;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
- ribbonControl1.Size = new Size(1060, 148);
+ ribbonControl1.Size = new Size(742, 101);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// BtnAdd
@@ -320,33 +322,35 @@
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, 148);
+ dockPanel1.Location = new Point(0, 101);
+ dockPanel1.Margin = new Padding(2, 2, 2, 2);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(235, 200);
- dockPanel1.Size = new Size(235, 657);
+ dockPanel1.Size = new Size(164, 411);
dockPanel1.Text = "鏇茬嚎鍒楄〃";
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(sidePanel2);
- dockPanel1_Container.Location = new Point(0, 34);
+ dockPanel1_Container.Location = new Point(0, 23);
+ dockPanel1_Container.Margin = new Padding(2, 2, 2, 2);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(234, 623);
+ dockPanel1_Container.Size = new Size(163, 388);
dockPanel1_Container.TabIndex = 0;
//
// XhsPumpMainPhartPanel
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(xtrPerform2dChart1);
Controls.Add(sidePanel1);
Controls.Add(dockPanel1);
Controls.Add(ribbonControl1);
- Margin = new Padding(6, 8, 6, 8);
+ Margin = new Padding(4, 5, 4, 5);
Name = "XhsPumpMainPhartPanel";
- Size = new Size(1060, 805);
+ Size = new Size(742, 512);
sidePanel2.ResumeLayout(false);
sidePanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)tabPane1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
index 6d0fe9e..6788d54 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.cs
@@ -28,7 +28,7 @@
{
Group = "鏌ヨ鐐�",
Name = "鎵▼",
- Value = $"{gropu_pt.H:N1}",
+ Value = $"{gropu_pt.H:N1}",
Unit = "m"
});
@@ -50,7 +50,6 @@
this.pumpPerformInfoCtrl1.SetBindingData(vm_list);
};
-
}
private long _pump_main_id;
@@ -59,6 +58,7 @@
private readonly BLL.XhsPumpMainPhartMappingExtensions _bll_ex = new();
private Yw.Geometry.Point2d _design_pt;
+
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
@@ -156,10 +156,9 @@
if (_design_pt == null)
{
_design_pt = new Yw.Geometry.Point2d();
- _design_pt.X =Math.Round(cubic_spline_qh.MaxX / 2);
- _design_pt.Y = Math.Round(cubic_spline_qh.GetPointY(_design_pt.X),1);
+ _design_pt.X = Math.Round(cubic_spline_qh.MaxX / 2);
+ _design_pt.Y = Math.Round(cubic_spline_qh.GetPointY(_design_pt.X), 1);
}
-
var disp_paras = diagram.DispParas;
var is_calc_disp_paras = string.IsNullOrWhiteSpace(disp_paras);
@@ -416,9 +415,7 @@
var dlg = new PumpVariableSpeedChartDlg();
dlg.SetBindingData(vm, null);
dlg.ShowDialog();
-
}
-
#region 鍒犻櫎
@@ -451,10 +448,6 @@
#endregion 鍒犻櫎
-
-
#endregion 鎿嶄綔
-
-
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.resx b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.resx
index 8d86234..134f365 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.resx
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump-main/XhsPumpMainPhartPanel.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
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
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PropGroupChoiceViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PropGroupChoiceViewModel.cs
index f74ae1e..7f1a5a4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PropGroupChoiceViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PropGroupChoiceViewModel.cs
@@ -6,5 +6,6 @@
public string PropGroupName { get; set; }
public string PropName { get; set; }
public string Value { get; set; }
+ public string KeyWorldType { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
index 69918a2..c952fd7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
@@ -50,12 +50,16 @@
return;
}
_typeId = catlog.First().TypeID;
- _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "娴侀噺", Value = pump.RatedFlow.ToString() });
+ _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "娴侀噺", Value = pump.RatedFlow.ToString(), KeyWorldType = "Basic" });
+ _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鎵▼", Value = pump.RatedHead.ToString(), KeyWorldType = "Basic" });
+ _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鍔熺巼", Value = pump.RatedPower.ToString(), KeyWorldType = "Basic" });
+ _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "杞��", Value = pump.RatedSpeed.ToString(), KeyWorldType = "Basic" });
+
foreach (var item in catlog)
{
foreach (var prop in item.PropList)
{
- _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID });
+ _allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, KeyWorldType = "Prop" });
}
}
var propbll = new BLL.PumpPartPropContent();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
index a83edc0..527f0c9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
@@ -18,22 +18,22 @@
}
private PumpMatchingViewModel _pump_mathing_vm = null;
+
public void SetBindingData(PumpMatchingViewModel pumpMatchingViewModel)
{
_pump_mathing_vm = pumpMatchingViewModel;
pumpPropViewCtrl1.SetBindingData(pumpMatchingViewModel.DbId);
- if (long.TryParse(_pump_mathing_vm.DbId,out long pump_mian_id))
+ if (long.TryParse(_pump_mathing_vm.DbId, out long pump_mian_id))
{
- InitData(pump_mian_id,null);
- }
+ InitData(pump_mian_id, null);
+ }
}
-
private Yw.Geometry.CubicSpline2d _qh, _qe, _qp;
private Yw.Geometry.Point2d _work_pt;
private double _rated_speed;
-
+
private async void InitData(long pump_main_id, Yw.Geometry.Point2d work_pt)
{
var pump_main = await new BLL.AssetsPumpMain().GetByID(pump_main_id);
@@ -77,10 +77,11 @@
var qh = new Yw.Geometry.CubicSpline2d(points_qh);
var qe = new Yw.Geometry.CubicSpline2d(points_qe);
var qp = new Yw.Geometry.CubicSpline2d(points_qp);
-
+
InitChart(qh, qe, qp, work_pt, pump_main.RatedSpeed);
}
- private void InitChart(
+
+ public void InitChart(
Yw.Geometry.CubicSpline2d qh,
Yw.Geometry.CubicSpline2d qe,
Yw.Geometry.CubicSpline2d qp,
@@ -92,7 +93,6 @@
_qp = qp;
_work_pt = work_pt;
_rated_speed = rated_speed;
-
this.pumpPerformCompareChart1.SetBindingData(_qh, _qe, _qp);
if (work_pt != null)
@@ -118,7 +118,6 @@
this.pumpVariableSpeedInfoCtrl1.SetBindingData(vm_vs, work_pt);
this.pumpVariableSpeedChart1.Add(vm_vs, work_pt);
-
}
private void SetChart()
@@ -127,7 +126,7 @@
this.pumpPerformCompareInfoCtrl1.SetDesignPointEvent += (q, h) =>
{
- _work_pt = new Yw.Geometry.Point2d(q,h);
+ _work_pt = new Yw.Geometry.Point2d(q, h);
var calc_speed = PumpCalcHelper.GetSimuValue(_qh, _work_pt, _rated_speed);
var calc_hz = calc_speed / _rated_speed * 50;
calc_hz = Math.Round(calc_hz, 1);
@@ -147,9 +146,9 @@
var qe_wk = PumpCalcHelper.CalculateSimilarQE(_qe, 50, hz);
var qp_wk = PumpCalcHelper.CalculateSimilarQP(_qp, 50, hz);
this.pumpPerformCompareChart1.SetWkData(qh_wk, qe_wk, qp_wk);
- if (_work_pt!=null)
+ if (_work_pt != null)
{
- this.pumpPerformCompareChart1.CalcDesignPointByQ(_work_pt.X, _work_pt.Y);
+ this.pumpPerformCompareChart1.CalcDesignPointByQ(_work_pt.X, _work_pt.Y);
}
};
@@ -187,7 +186,7 @@
this.pumpPerformCompareInfoCtrl1.SetBindingData(vm_list);
};
- #endregion
+ #endregion 鏇茬嚎
#region 鍙橀�熸洸绾�
@@ -232,7 +231,6 @@
this.pumpVariableSpeedInfoCtrl1.SetQueryInfo(id, pt);
};
-
void ResetSectPointGrid()
{
var vm_list = this.pumpVariableSpeedChart1.GetList();
@@ -241,7 +239,6 @@
void AddBySpeed()
{
-
var list = this.pumpVariableSpeedInfoCtrl1.GetList();
if (list == null || list.Count < 1)
{
@@ -273,12 +270,10 @@
return true;
};
dlg.ShowDialog();
-
}
void AddByHz()
{
-
var list = this.pumpVariableSpeedInfoCtrl1.GetList();
if (list == null || list.Count < 1)
{
@@ -348,12 +343,8 @@
dlg.ShowDialog();
}
-
- #endregion
-
+ #endregion 鍙橀�熸洸绾�
}
-
-
private void OnFrmLoad(object sender, EventArgs e)
{
@@ -391,8 +382,6 @@
SetChart();
}
-
-
#region Color
private List<Color> _color_array = new List<Color>()
@@ -420,7 +409,7 @@
return Color.FromArgb(r, g, b);
}
- #endregion
+ #endregion Color
#region 璧伴┈鐏彁绀�
@@ -504,8 +493,6 @@
#endregion 璧伴┈鐏彁绀�
-
-
public void CloseFrm()
{
if (tRollTipText != null)
@@ -573,7 +560,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
private void xtraTabCtrlMain_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
- {
+ {
//
if (e.Page == this._tabPage涓夌淮妯″瀷)
{
@@ -590,7 +577,7 @@
{
this.xtraTabControlRight.SelectedTabPage = this._tabPage澶氶�熷害鏇茬嚎鍙傛暟;
}
-
+
if (e.Page == this._tabPage鎬ц兘鏇茬嚎鍥�1)
{
this.xtraTabControlRight.SelectedTabPage = this.tabPage鍩烘湰鍙傛暟;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
index 9a27084..0d52330 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing DevExpress.XtraBars;
+
+namespace HStation.WinFrmUI
{
partial class PumpFullInfoViewDlg
{
@@ -30,19 +32,21 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpFullInfoViewDlg));
- DevExpress.Utils.SuperToolTip superToolTip6 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem6 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip7 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem7 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip8 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem8 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip9 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem9 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip10 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem10 = new DevExpress.Utils.ToolTipItem();
- PageTitle pageTitle2 = new PageTitle();
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
+ PageTitle pageTitle1 = new PageTitle();
tileNavPaneTop = new DevExpress.XtraBars.Navigation.TileNavPane();
navBtnTitle = new DevExpress.XtraBars.Navigation.NavButton();
+ navBtnRefreshMatching = new DevExpress.XtraBars.Navigation.NavButton();
+ navBtnEdit = new DevExpress.XtraBars.Navigation.NavButton();
navBtn鎵嬫満椤甸潰 = new DevExpress.XtraBars.Navigation.NavButton();
navBtn瀵垮懡鎴愭湰璁＄畻 = new DevExpress.XtraBars.Navigation.NavButton();
navBtn瀵煎嚭 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -50,17 +54,22 @@
navButton8 = new DevExpress.XtraBars.Navigation.NavButton();
navBtnbutton9 = new DevExpress.XtraBars.Navigation.NavButton();
navBtnbutton10 = new DevExpress.XtraBars.Navigation.NavButton();
- popupMenu1 = new DevExpress.XtraBars.PopupMenu(components);
- bbi瀵煎嚭瀹夎鍥� = new DevExpress.XtraBars.BarButtonItem();
- bbi瀵煎嚭鎬ц兘鏇茬嚎 = new DevExpress.XtraBars.BarButtonItem();
- bbi涓嬭浇BIM鏂囦欢 = new DevExpress.XtraBars.BarButtonItem();
- bbi瀵煎嚭灞炴�ц〃 = new DevExpress.XtraBars.BarButtonItem();
- barManager1 = new DevExpress.XtraBars.BarManager(components);
- barDockControlTop = new DevExpress.XtraBars.BarDockControl();
- barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
- barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
- barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ popupMenu1 = new PopupMenu(components);
+ bbi瀵煎嚭瀹夎鍥� = new BarButtonItem();
+ bbi瀵煎嚭鎬ц兘鏇茬嚎 = new BarButtonItem();
+ bbi涓嬭浇BIM鏂囦欢 = new BarButtonItem();
+ bbi瀵煎嚭灞炴�ц〃 = new BarButtonItem();
+ barManager1 = new BarManager(components);
+ barDockControlTop = new BarDockControl();
+ barDockControlBottom = new BarDockControl();
+ barDockControlLeft = new BarDockControl();
+ barDockControlRight = new BarDockControl();
imageCollection1 = new DevExpress.Utils.ImageCollection(components);
+ barButtonItem1 = new BarButtonItem();
+ barButtonItem2 = new BarButtonItem();
+ barButtonItem3 = new BarButtonItem();
+ barButtonItem4 = new BarButtonItem();
+ barButtonItem5 = new BarButtonItem();
tileNavPane1 = new DevExpress.XtraBars.Navigation.TileNavPane();
navButton1 = new DevExpress.XtraBars.Navigation.NavButton();
navButton2 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -78,14 +87,14 @@
bbi娣诲姞鏀惰棌 = new DevExpress.XtraBars.Navigation.NavButton();
bbi娣诲姞姣旇緝 = new DevExpress.XtraBars.Navigation.NavButton();
bbi娣诲姞涓插苟鑱� = new DevExpress.XtraBars.Navigation.NavButton();
- barManager2 = new DevExpress.XtraBars.BarManager(components);
- barDockControl1 = new DevExpress.XtraBars.BarDockControl();
- barDockControl2 = new DevExpress.XtraBars.BarDockControl();
- barDockControl3 = new DevExpress.XtraBars.BarDockControl();
- barDockControl4 = new DevExpress.XtraBars.BarDockControl();
- bbi澶嶅埗娉靛瀷鍙锋枃瀛� = new DevExpress.XtraBars.BarButtonItem();
- popupMenu2 = new DevExpress.XtraBars.PopupMenu(components);
- navBtnRefreshMatching = new DevExpress.XtraBars.Navigation.NavButton();
+ barManager2 = new BarManager(components);
+ barDockControl1 = new BarDockControl();
+ barDockControl2 = new BarDockControl();
+ barDockControl3 = new BarDockControl();
+ barDockControl4 = new BarDockControl();
+ bbi澶嶅埗娉靛瀷鍙锋枃瀛� = new BarButtonItem();
+ popupMenu2 = new PopupMenu(components);
+ popupMenuEdit = new PopupMenu(components);
((ISupportInitialize)tileNavPaneTop).BeginInit();
((ISupportInitialize)popupMenu1).BeginInit();
((ISupportInitialize)barManager1).BeginInit();
@@ -95,6 +104,7 @@
((ISupportInitialize)tileNavPane3).BeginInit();
((ISupportInitialize)barManager2).BeginInit();
((ISupportInitialize)popupMenu2).BeginInit();
+ ((ISupportInitialize)popupMenuEdit).BeginInit();
SuspendLayout();
//
// tileNavPaneTop
@@ -103,6 +113,7 @@
tileNavPaneTop.ButtonPadding = new Padding(6);
tileNavPaneTop.Buttons.Add(navBtnTitle);
tileNavPaneTop.Buttons.Add(navBtnRefreshMatching);
+ tileNavPaneTop.Buttons.Add(navBtnEdit);
tileNavPaneTop.Buttons.Add(navBtn鎵嬫満椤甸潰);
tileNavPaneTop.Buttons.Add(navBtn瀵垮懡鎴愭湰璁＄畻);
tileNavPaneTop.Buttons.Add(navBtn瀵煎嚭);
@@ -146,6 +157,21 @@
navBtnTitle.Name = "navBtnTitle";
navBtnTitle.ElementClick += navBtnTitle_ElementClick;
//
+ // navBtnRefreshMatching
+ //
+ navBtnRefreshMatching.Caption = "閲嶆柊鍖归厤";
+ navBtnRefreshMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnRefreshMatching.ImageOptions.SvgImage");
+ navBtnRefreshMatching.Name = "navBtnRefreshMatching";
+ navBtnRefreshMatching.ElementClick += navBtnRefreshMatching_ElementClick;
+ //
+ // navBtnEdit
+ //
+ navBtnEdit.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
+ navBtnEdit.Caption = "缂栬緫";
+ navBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnEdit.ImageOptions.SvgImage");
+ navBtnEdit.Name = "navBtnEdit";
+ navBtnEdit.ElementClick += navBtnEdit_ElementClick;
+ //
// navBtn鎵嬫満椤甸潰
//
navBtn鎵嬫満椤甸潰.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
@@ -177,9 +203,9 @@
navBtnDock.Caption = "鍋滈潬";
navBtnDock.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnDock.ImageOptions.SvgImage");
navBtnDock.Name = "navBtnDock";
- toolTipItem6.Text = "鍋滈潬";
- superToolTip6.Items.Add(toolTipItem6);
- navBtnDock.SuperTip = superToolTip6;
+ toolTipItem1.Text = "鍋滈潬";
+ superToolTip1.Items.Add(toolTipItem1);
+ navBtnDock.SuperTip = superToolTip1;
navBtnDock.ElementClick += navBtnDock_ElementClick;
//
// navButton8
@@ -188,9 +214,9 @@
navButton8.Caption = null;
navButton8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton8.ImageOptions.SvgImage");
navButton8.Name = "navButton8";
- toolTipItem7.Text = "鏈�灏忓寲";
- superToolTip7.Items.Add(toolTipItem7);
- navButton8.SuperTip = superToolTip7;
+ toolTipItem2.Text = "鏈�灏忓寲";
+ superToolTip2.Items.Add(toolTipItem2);
+ navButton8.SuperTip = superToolTip2;
navButton8.ElementClick += navBtnMin_ElementClick;
//
// navBtnbutton9
@@ -198,9 +224,9 @@
navBtnbutton9.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtnbutton9.Caption = null;
navBtnbutton9.Name = "navBtnbutton9";
- toolTipItem8.Text = "鍚戜笅杩樺師";
- superToolTip8.Items.Add(toolTipItem8);
- navBtnbutton9.SuperTip = superToolTip8;
+ toolTipItem3.Text = "鍚戜笅杩樺師";
+ superToolTip3.Items.Add(toolTipItem3);
+ navBtnbutton9.SuperTip = superToolTip3;
navBtnbutton9.ElementClick += navBtnSize_ElementClick;
//
// navBtnbutton10
@@ -209,14 +235,14 @@
navBtnbutton10.Caption = null;
navBtnbutton10.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnbutton10.ImageOptions.SvgImage");
navBtnbutton10.Name = "navBtnbutton10";
- toolTipItem9.Text = "鍏抽棴";
- superToolTip9.Items.Add(toolTipItem9);
- navBtnbutton10.SuperTip = superToolTip9;
+ toolTipItem4.Text = "鍏抽棴";
+ superToolTip4.Items.Add(toolTipItem4);
+ navBtnbutton10.SuperTip = superToolTip4;
navBtnbutton10.ElementClick += navBtnClose_ElementClick;
//
// popupMenu1
//
- popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(bbi瀵煎嚭瀹夎鍥�), new DevExpress.XtraBars.LinkPersistInfo(bbi瀵煎嚭鎬ц兘鏇茬嚎), new DevExpress.XtraBars.LinkPersistInfo(bbi涓嬭浇BIM鏂囦欢), new DevExpress.XtraBars.LinkPersistInfo(bbi瀵煎嚭灞炴�ц〃) });
+ popupMenu1.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(bbi瀵煎嚭瀹夎鍥�), new LinkPersistInfo(bbi瀵煎嚭鎬ц兘鏇茬嚎), new LinkPersistInfo(bbi涓嬭浇BIM鏂囦欢), new LinkPersistInfo(bbi瀵煎嚭灞炴�ц〃) });
popupMenu1.Manager = barManager1;
popupMenu1.Name = "popupMenu1";
//
@@ -256,8 +282,8 @@
barManager1.DockControls.Add(barDockControlRight);
barManager1.Form = this;
barManager1.Images = imageCollection1;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢 });
- barManager1.MaxItemId = 10;
+ barManager1.Items.AddRange(new BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢, barButtonItem1, barButtonItem2, barButtonItem3, barButtonItem4, barButtonItem5 });
+ barManager1.MaxItemId = 17;
//
// barDockControlTop
//
@@ -300,6 +326,37 @@
imageCollection1.Images.SetKeyName(3, "Compare32WhiteSolid.png");
imageCollection1.Images.SetKeyName(4, "涓插苟鑱�32White.png");
imageCollection1.Images.SetKeyName(5, "涓插苟鑱�32WhiteSolid.png");
+ //
+ // barButtonItem1
+ //
+ barButtonItem1.Caption = "琛ㄦ牸缂栬緫";
+ barButtonItem1.Id = 10;
+ barButtonItem1.Name = "barButtonItem1";
+ barButtonItem1.ItemClick += BarButtonItem1_ItemClick;
+ //
+ // barButtonItem2
+ //
+ barButtonItem2.Caption = "鏇茬嚎缂栬緫";
+ barButtonItem2.Id = 13;
+ barButtonItem2.Name = "barButtonItem2";
+ //
+ // barButtonItem3
+ //
+ barButtonItem3.Caption = "鍗曠偣缂栬緫";
+ barButtonItem3.Id = 14;
+ barButtonItem3.Name = "barButtonItem3";
+ //
+ // barButtonItem4
+ //
+ barButtonItem4.Caption = "barButtonItem4";
+ barButtonItem4.Id = 15;
+ barButtonItem4.Name = "barButtonItem4";
+ //
+ // barButtonItem5
+ //
+ barButtonItem5.Caption = "barButtonItem5";
+ barButtonItem5.Id = 16;
+ barButtonItem5.Name = "barButtonItem5";
//
// tileNavPane1
//
@@ -375,9 +432,9 @@
navButton6.AppearanceSelected.Options.UseForeColor = true;
navButton6.Caption = null;
navButton6.Name = "navButton6";
- toolTipItem10.Text = "鏈�灏忓寲";
- superToolTip10.Items.Add(toolTipItem10);
- navButton6.SuperTip = superToolTip10;
+ toolTipItem5.Text = "鏈�灏忓寲";
+ superToolTip5.Items.Add(toolTipItem5);
+ navButton6.SuperTip = superToolTip5;
//
// panelMain
//
@@ -394,12 +451,12 @@
pumpFullInfoCtrl1.Location = new Point(0, 0);
pumpFullInfoCtrl1.Name = "pumpFullInfoCtrl1";
pumpFullInfoCtrl1.PageGuid = null;
- pageTitle2.AllowClose = true;
- pageTitle2.Caption = "姘存车淇℃伅";
- pageTitle2.HeaderImage = null;
- pageTitle2.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle2.HeaderSvgImage");
- pageTitle2.SvgImageSize = new Size(0, 0);
- pumpFullInfoCtrl1.PageTitle = pageTitle2;
+ pageTitle1.AllowClose = true;
+ pageTitle1.Caption = "姘存车淇℃伅";
+ pageTitle1.HeaderImage = null;
+ pageTitle1.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle1.HeaderSvgImage");
+ pageTitle1.SvgImageSize = new Size(0, 0);
+ pumpFullInfoCtrl1.PageTitle = pageTitle1;
pumpFullInfoCtrl1.Size = new Size(1274, 659);
pumpFullInfoCtrl1.TabIndex = 0;
//
@@ -535,7 +592,7 @@
barManager2.DockControls.Add(barDockControl4);
barManager2.Form = this;
barManager2.Images = imageCollection1;
- barManager2.Items.AddRange(new DevExpress.XtraBars.BarItem[] { bbi澶嶅埗娉靛瀷鍙锋枃瀛� });
+ barManager2.Items.AddRange(new BarItem[] { bbi澶嶅埗娉靛瀷鍙锋枃瀛� });
barManager2.MaxItemId = 11;
//
// barDockControl1
@@ -581,16 +638,15 @@
//
// popupMenu2
//
- popupMenu2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(bbi澶嶅埗娉靛瀷鍙锋枃瀛�) });
+ popupMenu2.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(bbi澶嶅埗娉靛瀷鍙锋枃瀛�) });
popupMenu2.Manager = barManager2;
popupMenu2.Name = "popupMenu2";
//
- // navBtnRefreshMatching
+ // popupMenuEdit
//
- navBtnRefreshMatching.Caption = "閲嶆柊鍖归厤";
- navBtnRefreshMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton9.ImageOptions.SvgImage");
- navBtnRefreshMatching.Name = "navBtnRefreshMatching";
- navBtnRefreshMatching.ElementClick += navBtnRefreshMatching_ElementClick;
+ popupMenuEdit.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(barButtonItem1, true), new LinkPersistInfo(barButtonItem2), new LinkPersistInfo(barButtonItem3), new LinkPersistInfo(barButtonItem4, true), new LinkPersistInfo(barButtonItem5) });
+ popupMenuEdit.Manager = barManager1;
+ popupMenuEdit.Name = "popupMenuEdit";
//
// PumpFullInfoViewDlg
//
@@ -624,9 +680,12 @@
((ISupportInitialize)tileNavPane3).EndInit();
((ISupportInitialize)barManager2).EndInit();
((ISupportInitialize)popupMenu2).EndInit();
+ ((ISupportInitialize)popupMenuEdit).EndInit();
ResumeLayout(false);
PerformLayout();
}
+
+
#endregion
@@ -676,5 +735,12 @@
private PumpFullInfoCtrl pumpFullInfoCtrl1;
private DevExpress.XtraBars.Navigation.NavButton navBtnDock;
private DevExpress.XtraBars.Navigation.NavButton navBtnRefreshMatching;
+ private DevExpress.XtraBars.Navigation.NavButton navBtnEdit;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem1;
+ private DevExpress.XtraBars.PopupMenu popupMenuEdit;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem2;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem3;
+ private BarButtonItem barButtonItem4;
+ private BarButtonItem barButtonItem5;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
index 41567ed..d4efff7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
@@ -1,12 +1,11 @@
锘縰sing DevExpress.XtraBars;
+using HStation.WinFrmUI.PhartRelation;
+using Yw.WinFrmUI.Phart;
namespace HStation.WinFrmUI
{
public partial class PumpFullInfoViewDlg : XtraForm
{
- private bool _isMaxWindowStatus = true;//鏈�澶у寲绐椾綋瑕嗙洊浠诲姟鏍�
- private PumpFullInfoCtrl thePumpCtrl = null;
-
#region 鏋勯��
public PumpFullInfoViewDlg()
@@ -21,6 +20,12 @@
this.bsiPromptInfo.Caption = "";
}
+ private Vmo.XhsPumpMainPhartMappingExtensions _xhs_phart_diagram_ex_std_dto = null;
+ private readonly BLL.XhsPumpMainPhartMappingExtensions _bll_ex = new();
+
+ private bool _isMaxWindowStatus = true;//鏈�澶у寲绐椾綋瑕嗙洊浠诲姟鏍�
+ private PumpFullInfoCtrl thePumpCtrl = null;
+
private void OnFrmLoad(object sender, EventArgs e)
{
//鎵嬫満椤甸潰
@@ -34,11 +39,28 @@
private event Action<PumpMatchingViewModel> ReloadDataEvent;
- public void SetBindindData(PumpMatchingViewModel pumpMatchingViewModel)
+ private long _PumpId;
+
+ public async void SetBindindData(PumpMatchingViewModel pumpMatchingViewModel)
{
_pumpMatchingView = pumpMatchingViewModel;
this.navBtnTitle.Caption = $"娉靛瀷鍙�:{pumpMatchingViewModel.ModelType}";
pumpFullInfoCtrl1.SetBindingData(pumpMatchingViewModel);
+ if (long.TryParse(pumpMatchingViewModel.DbId, out long pumpId))
+ {
+ _PumpId = pumpId;
+ }
+ var list = await _bll_ex.GetByPumpMainID(_PumpId);
+ if (list != null && list.Any())
+ {
+ //list= list.OrderBy(x => x.Importance).ToList();
+ /* foreach (var item in list)
+ {
+ var vm = new CurrentViewModel(item);
+ _allBindingList.Add(vm);
+ }*/
+ _xhs_phart_diagram_ex_std_dto = list.First();
+ }
}
private void OnFrmShown(object sender, EventArgs e)
@@ -341,5 +363,82 @@
};
dlg.ShowDialog();
}
+
+ private void navBtnEdit_ElementClick(object sender, DevExpress.XtraBars.Navigation.NavElementEventArgs e)
+ {
+ this.popupMenuEdit.ShowPopup(MousePosition);
+ }
+
+ //琛ㄦ牸缂栬緫
+ private void BarButtonItem1_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (_xhs_phart_diagram_ex_std_dto == null)
+ {
+ return;
+ }
+ var diagram = _xhs_phart_diagram_ex_std_dto.Diagram;
+ if (diagram == null)
+ {
+ return;
+ }
+ var graph_list = diagram.GraphList;
+ if (graph_list == null || !graph_list.Any())
+ {
+ return;
+ }
+
+ var graph_qh = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
+ var graph_qe = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQE);
+ var graph_qp = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQP);
+
+ if (graph_qh == null)
+ {
+ return;
+ }
+ Yw.Pump.CurveQH qh = null;
+ Yw.Pump.CurveQE qe = null;
+ Yw.Pump.CurveQP qp = null;
+ List<Yw.Geometry.Point2d> points_qh = null, points_qe = null, points_qp = null;
+ points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_qh.GraphType, graph_qh.GeometryInfo, 12, null);
+ qh = new Yw.Pump.CurveQH(Yw.Pump.eFeatType.Cubic, points_qh);
+ if (graph_qe != null)
+ {
+ points_qe = PhartPerformCurveHelper.GetFeatPointList(graph_qe.GraphType, graph_qe.GeometryInfo, 12, null);
+ qe = new Yw.Pump.CurveQE(Yw.Pump.eFeatType.Cubic, points_qe);
+ }
+ if (graph_qp != null)
+ {
+ points_qp = PhartPerformCurveHelper.GetFeatPointList(graph_qp.GraphType, graph_qp.GeometryInfo, 12, null);
+ qp = new Yw.Pump.CurveQP(Yw.Pump.eFeatType.Cubic, points_qp);
+ }
+
+ var dlg = new Yw.WinFrmUI.Phart.PumpPerform2dEditDlg();
+ dlg.SetBindingData(qh, qe, qp);
+ dlg.ReloadDataEvent += async (new_qh, new_qe, new_qp) =>
+ {
+ var new_points_qh = new_qh.GetPointList();
+ var new_points_qe = new_qe.GetPointList();
+ var new_points_qp = new_qp.GetPointList();
+
+ graph_qh.GeometryInfo = new Yw.Pump.CurveQH(Yw.Pump.eFeatType.Cubic, new_points_qh).ToDbString();
+ graph_qe.GeometryInfo = new Yw.Pump.CurveQE(Yw.Pump.eFeatType.Cubic, new_points_qe).ToDbString();
+ graph_qp.GeometryInfo = new Yw.Pump.CurveQP(Yw.Pump.eFeatType.Cubic, new_points_qp).ToDbString();
+
+ _xhs_phart_diagram_ex_std_dto.Diagram.GraphList = new List<Vmo.PhartGraph>()
+ {
+ graph_qh,
+ graph_qe,
+ graph_qp,
+ };
+ var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
+ if (bol)
+ {
+ // var pump_main = await new BLL.AssetsPumpMain().GetByID(_PumpId);
+ // this.pumpFullInfoCtrl1.InitChart(_pump_main, _xhs_phart_diagram_ex_std_dto);
+ }
+ return bol;
+ };
+ dlg.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
index 8e2f975..da26b76 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
@@ -138,7 +138,7 @@
</value>
</data>
<assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <data name="navButton9.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="navBtnRefreshMatching.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -165,6 +165,35 @@
My0wLjQsMS44LTAuN2wxLjgsMS4zbDEuNC0xLjRsLTEuMy0xLjggICBjMC4zLTAuNSwwLjYtMS4yLDAu
OC0xLjhMMzEsMjN6IE0yMywyNGMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDJTMjQu
MSwyNCwyMywyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+ </data>
+ <data name="navBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABwFAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
+ RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
+ Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
+ aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lXzFfIj4NCiAgICA8
+ cGF0aCBkPSJNMi4xLDE2aDIuMmwwLjYtMi4zaDMuMkw4LjgsMTZIMTFMNy44LDZINS40TDIuMSwxNnog
+ TTYuNCw4LjdjMC4xLTAuMywwLjEtMC42LDAuMS0wLjloMC4xICAgYzAsMC4zLDAuMSwwLjYsMC4xLDAu
+ OWwxLDMuM0g1LjRMNi40LDguN3ogTTE3LjUsMTAuNmMwLjYtMC4yLDEuMS0wLjUsMS41LTAuOWMwLjQt
+ MC40LDAuNi0wLjksMC42LTEuNGMwLTAuNy0wLjMtMS4zLTAuOS0xLjcgICBDMTguMSw2LjIsMTcuMSw2
+ LDE1LjksNkgxMnY5LjlWMTZoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMTkuNywxNC42LDIwLDE0LDIw
+ LDEzYzAtMC42LTAuMi0xLjItMC43LTEuNiAgIEMxOC45LDExLDE4LjMsMTAuNywxNy41LDEwLjZ6IE0x
+ NC40LDcuN2gwLjljMS4xLDAsMS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMxNi40
+ LDkuOSwxNiwxMCwxNS41LDEwaC0xLjFWNy43eiAgICBNMTcsMTMuOGMtMC4zLDAuMi0wLjgsMC40LTEu
+ MywwLjRoLTEuM3YtMi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAu
+ NSwwLjlDMTcuNSwxMy4zLDE3LjQsMTMuNiwxNywxMy44eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw
+ YXRoIGQ9Ik0yNywxOWwtOCw4bC00LTRsOC04TDI3LDE5eiBNMjgsMThsMS43LTEuN2MwLjQtMC40LDAu
+ NC0xLDAtMS4zTDI3LDEyLjNjLTAuNC0wLjQtMS0wLjQtMS4zLDBMMjQsMTRMMjgsMTh6ICAgIE0xNCwy
+ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
<data name="navBtn瀵垮懡鎴愭湰璁＄畻.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -286,6 +315,25 @@
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <data name="pageTitle1.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0xpbmVfQ2hhcnRfTm9fTWFya2VycyIgc3R5bGU9ImVuYWJs
+ ZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJs
+ dWV7ZmlsbDojMTE3N0Q3O30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFD
+ O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjgsNS44IDIuOCw1LjggMy43LDQgMTUuMyw5
+ LjcgMjguOCwyIDI5LjgsMy43IDE1LjMsMTIgMi44LDUuOCAiIGNsYXNzPSJSZWQiIC8+DQogIDxwb2x5
+ Z29uIHBvaW50cz0iMi43LDE3LjYgMi43LDE3LjYgMy45LDE2LjEgMTUuMiwyNS41IDI4LjYsMTIuMiAz
+ MCwxMy42IDE1LjQsMjguMiAyLjcsMTcuNiAiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwb2x5Z29uIHBv
+ aW50cz0iMi43LDI4LjEgMTUuMSwxNy44IDI5LjYsMjEuOSAyOSwyMy44IDE1LjUsMjAgMy45LDI5LjYg
+ Mi43LDI4LjEgIiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
+</value>
+ </data>
<metadata name="barManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>435, 17</value>
</metadata>
@@ -389,26 +437,10 @@
BwdQ9F/AOGC3chKJ6AAAAABJRU5ErkJggg==
</value>
</data>
- <data name="pageTitle2.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0xpbmVfQ2hhcnRfTm9fTWFya2VycyIgc3R5bGU9ImVuYWJs
- ZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJs
- dWV7ZmlsbDojMTE3N0Q3O30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFD
- O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjgsNS44IDIuOCw1LjggMy43LDQgMTUuMyw5
- LjcgMjguOCwyIDI5LjgsMy43IDE1LjMsMTIgMi44LDUuOCAiIGNsYXNzPSJSZWQiIC8+DQogIDxwb2x5
- Z29uIHBvaW50cz0iMi43LDE3LjYgMi43LDE3LjYgMy45LDE2LjEgMTUuMiwyNS41IDI4LjYsMTIuMiAz
- MCwxMy42IDE1LjQsMjguMiAyLjcsMTcuNiAiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwb2x5Z29uIHBv
- aW50cz0iMi43LDI4LjEgMTUuMSwxNy44IDI5LjYsMjEuOSAyOSwyMy44IDE1LjUsMjAgMy45LDI5LjYg
- Mi43LDI4LjEgIiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
-</value>
- </data>
<metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>566, 17</value>
</metadata>
+ <metadata name="popupMenuEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>700, 17</value>
+ </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3