From 21d9f7bcbe8c82d2af9dbdc18f189a3bb1672d74 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 15 十月 2024 13:06:59 +0800
Subject: [PATCH] 优化泵信息界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
index 8d85ff4..6d4431b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
@@ -1,11 +1,9 @@
-锘縰sing DevExpress.CodeParser;
-using HStation.WinFrmUI.PhartRelation;
-using System;
+锘縰sing HStation.WinFrmUI.PhartRelation;
using Yw.WinFrmUI.Phart;
namespace HStation.WinFrmUI
{
- public partial class PumpFullInfoCtrl : DevExpress.XtraEditors.XtraUserControl
+ public partial class PumpFullInfoCtrl : DocumentPage
{
#region 鏋勯�犲嚱鏁板拰鍔犺浇鍑芥暟
@@ -16,20 +14,22 @@
this.navBarControlPara.GroupExpanded += new DevExpress.XtraNavBar.NavBarGroupEventHandler(this.NavBarControlPara_GroupExpanded);
this.navBarControlPara.GroupCollapsed += new DevExpress.XtraNavBar.NavBarGroupEventHandler(this.NavBarControlPara_GroupCollapsed);
this.navBarControlPara.ClientSizeChanged += new System.EventHandler(this.NavBarControlPara_ClientSizeChanged);
+ this.PageTitle.Caption = "姘存车淇℃伅";
+ this.PageTitle.HeaderSvgImage = this.svgImageCollection1[0];
}
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))
+ {
Init(pump_mian_id);
- }
+ }
}
-
private async void Init(long pump_main_id)
{
@@ -45,7 +45,6 @@
return;
}
var phart = phart_list.OrderBy(x => x.Importance).First();
-
var diagram = phart.Diagram;
if (diagram == null)
@@ -77,12 +76,10 @@
var cubic_spline_qh = new Yw.Geometry.CubicSpline2d(points_qh);
var cubic_spline_qe = new Yw.Geometry.CubicSpline2d(points_qe);
var cubic_spline_qp = new Yw.Geometry.CubicSpline2d(points_qp);
-
var 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);
-
var disp_paras = diagram.DispParas;
var is_calc_disp_paras = string.IsNullOrWhiteSpace(disp_paras);
@@ -98,14 +95,13 @@
vm_vs.CurrentHz = 50;
vm_vs.Qh = cubic_spline_qh;
vm_vs.Qe = cubic_spline_qe;
- vm_vs.Qp = cubic_spline_qp;
+ vm_vs.Qp = cubic_spline_qp;
var vm_vs_info = new Yw.WinFrmUI.Phart.PumpVariableSpeedInfoViewModel(vm_vs);
vm_vs_info.Color = Color.Black;
vm_vs_info.IsDefault = true;
this.pumpVariableSpeedInfoCtrl1.SetBindingData(vm_vs_info, design_pt);
this.pumpVariableSpeedChart1.Add(vm_vs_info, design_pt);
-
var vm_sp = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
vm_sp.Id = phart.ID.ToString();
@@ -123,8 +119,6 @@
this.pumpSingleSerialParallelInfoCtrl1.SetBindingData(vm_sp_info, design_pt);
this.pumpSerialParallelChart1.Add(vm_sp_info, design_pt);
}
-
-
private void OnFrmLoad(object sender, EventArgs e)
{
@@ -167,8 +161,7 @@
if (vm == null)
{
return;
- }
-
+ }
}
private void InitChart()
@@ -217,7 +210,7 @@
this.pumpPerformInfoCtrl1.SetBindingData(vm_list);
};
- #endregion
+ #endregion 鏇茬嚎
#region 鍙橀�熸洸绾�
@@ -262,7 +255,6 @@
this.pumpVariableSpeedInfoCtrl1.SetQueryInfo(id, pt);
};
-
void ResetSectPointGrid()
{
var vm_list = this.pumpVariableSpeedChart1.GetList();
@@ -271,7 +263,6 @@
void AddBySpeed()
{
-
var list = this.pumpVariableSpeedInfoCtrl1.GetList();
if (list == null || list.Count < 1)
{
@@ -303,12 +294,10 @@
return true;
};
dlg.ShowDialog();
-
}
void AddByHz()
{
-
var list = this.pumpVariableSpeedInfoCtrl1.GetList();
if (list == null || list.Count < 1)
{
@@ -378,8 +367,7 @@
dlg.ShowDialog();
}
-
- #endregion
+ #endregion 鍙橀�熸洸绾�
#region 涓插苟鑱旀洸绾�
@@ -403,7 +391,7 @@
};
this.pumpSingleSerialParallelInfoCtrl1.ResetEvent += (type, count) =>
{
- if (count<1)
+ if (count < 1)
{
return;
}
@@ -411,7 +399,7 @@
var list = this.pumpSingleSerialParallelInfoCtrl1.GetList();
var first = list.First();
var new_list = new List<Yw.WinFrmUI.Phart.PumpSerialParallelInfoViewModel>();
- for (int i = 0; i <count; i++)
+ for (int i = 0; i < count; i++)
{
var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelInfoViewModel(first);
vm.Id = Guid.NewGuid().ToString();
@@ -419,12 +407,12 @@
vm.CurrentSpeed = vm.RatedSpeed;
vm.CurrentHz = 50;
vm.Calc();
- new_list.Add(vm);
+ new_list.Add(vm);
}
var design_pt = this.pumpSingleSerialParallelInfoCtrl1.GetDesignPoint();
- this.pumpSingleSerialParallelInfoCtrl1.SetBindingData(new_list,design_pt);
+ this.pumpSingleSerialParallelInfoCtrl1.SetBindingData(new_list, design_pt);
this.pumpSerialParallelChart1.Add(new_list, design_pt);
- SetSerialParallel(new_list, design_pt, is_parallel);
+ SetSerialParallel(new_list, design_pt, is_parallel);
};
this.pumpSerialParallelChart1.OnCalcQueryPoint += (id, pt) =>
@@ -439,7 +427,7 @@
{
return "鏃犳暟鎹�!";
}
- if (list.Count<2)
+ if (list.Count < 2)
{
return "鏁版嵁杩囧皯!";
}
@@ -524,8 +512,7 @@
return vm_sp;
}
- #endregion
-
+ #endregion 涓插苟鑱旀洸绾�
}
#region Color
@@ -555,7 +542,7 @@
return Color.FromArgb(r, g, b);
}
- #endregion
+ #endregion Color
#region 璧伴┈鐏彁绀�
@@ -638,8 +625,6 @@
}
#endregion 璧伴┈鐏彁绀�
-
-
public void CloseFrm()
{
@@ -846,5 +831,10 @@
}
#endregion 鍙充晶闈㈡澘瀹藉害
+
+ private void xtraTabControlRight_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3