From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期二, 14 一月 2025 17:31:20 +0800 Subject: [PATCH] 泵曲线修改 --- WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/01-operation/PumpOperationChart.cs | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/01-operation/PumpOperationChart.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/01-operation/PumpOperationChart.cs index d3b5e8f..96d6e2f 100644 --- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/01-operation/PumpOperationChart.cs +++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/04-special/01-operation/PumpOperationChart.cs @@ -31,8 +31,8 @@ private TextAnnotation _anno_txt_query_info; private PumpCoordinate _coordinate; - private bool _qe_visible = true; - private bool _qp_visible = true; + private bool _eff_visible = true; + private bool _power_visible = true; private bool _equip_visible = true; private List<Yw.Geometry.Point2d> _equip_pt_list = null; @@ -125,11 +125,11 @@ /// </summary> public bool QEVisible { - get => _qe_visible; + get => _eff_visible; set { - _qe_visible = value; - this.barCekCurveQEVisible.Checked = _qe_visible; + _eff_visible = value; + this.barCekCurveQEVisible.Checked = _eff_visible; } } @@ -138,11 +138,11 @@ /// </summary> public bool QPVisible { - get => _qp_visible; + get => _power_visible; set { - _qp_visible = value; - this.barCekCurveQPVisible.Checked = _qp_visible; + _power_visible = value; + this.barCekCurveQPVisible.Checked = _power_visible; } } @@ -289,7 +289,7 @@ var qh_pt_y = qh_pt.Point.Y; cache.DrawLine(pen, new Point(qh_pt_x, qh_pt_y - offset_size), new Point(qh_pt_x, qh_pt_y + offset_size)); - if (E.HasValue && _qe_visible) + if (E.HasValue && _eff_visible) { var qe_pt = _diagram.DiagramToPoint(Q, E.Value, _axis_x_flow, _axis_y_eff); var qe_pt_x = qe_pt.Point.X; @@ -297,7 +297,7 @@ cache.DrawLine(pen, new Point(qe_pt_x, qe_pt_y - offset_size), new Point(qe_pt_x, qe_pt_y + offset_size)); } - if (P.HasValue && _qp_visible) + if (P.HasValue && _power_visible) { var qp_pt = _diagram.DiagramToPoint(Q, P.Value, _axis_x_flow, _axis_y_power); var qp_pt_x = qp_pt.Point.X; @@ -609,7 +609,7 @@ _query_flow_line.Visible = false; _bottom_pane.Visibility = ChartElementVisibility.Hidden; - _bottom_pane.Visibility = _qp_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden; + _bottom_pane.Visibility = _power_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden; //璁$畻鍒诲害 Q var axisQLabels = new List<CustomAxisLabel>(); @@ -641,7 +641,7 @@ _axis_y_head.GridLines.Visible = true; //鏁堢巼 - if (_max_eff > _min_eff && _qe_visible) + if (_max_eff > _min_eff && _eff_visible) { //璁$畻鍒诲害 var labels = new List<CustomAxisLabel>(); @@ -659,7 +659,7 @@ } //鍔熺巼 - if (_max_power > _min_power && _qp_visible) + if (_max_power > _min_power && _power_visible) { //璁$畻鍒诲害 var labels = new List<CustomAxisLabel>(); @@ -683,7 +683,7 @@ var grid_count_head = _coordinate.EndLineNoH - _coordinate.StartLineNoH; var grid_count_eff = _coordinate.EndLineNoE - _coordinate.StartLineNoE; int grid_count_up = Math.Max(grid_count_head, grid_count_eff); - if (_qe_visible) + if (_eff_visible) { grid_count_up += 2;//澶氫袱鏉� } @@ -944,7 +944,7 @@ series_qe.SeriesPointsSorting = SortingMode.None; series_qe.SeriesPointsSortingKey = SeriesPointKey.Value_1; series_qe.View = series_qe_view; - series_qe.Visible = _qe_visible; + series_qe.Visible = _eff_visible; var pt_qe_list = vm.CurveQE.GetPointList(_feat_type_qe, 100); @@ -978,7 +978,7 @@ series_qp.SeriesPointsSorting = SortingMode.None; series_qp.SeriesPointsSortingKey = SeriesPointKey.Value_1; series_qp.View = series_qp_view; - series_qp.Visible = _qp_visible; + series_qp.Visible = _power_visible; var pt_qp_list = vm.CurveQP.GetPointList(_feat_type_qp, 100); for (int i = 0; i < pt_qp_list.Count; i++) @@ -1078,7 +1078,7 @@ series_qe.SeriesPointsSorting = SortingMode.None; series_qe.SeriesPointsSortingKey = SeriesPointKey.Value_1; series_qe.View = series_qe_view; - series_qe.Visible = _qe_visible; + series_qe.Visible = _eff_visible; var pt_qe_list = vm.CurrentCurveQE.GetPointList(_feat_type_qe, 100); for (int i = 0; i < pt_qe_list.Count; i++) @@ -1110,7 +1110,7 @@ series_qp.SeriesPointsSorting = SortingMode.None; series_qp.SeriesPointsSortingKey = SeriesPointKey.Value_1; series_qp.View = series_qp_view; - series_qp.Visible = _qp_visible; + series_qp.Visible = _power_visible; var pt_qp_list = vm.CurrentCurveQP.GetPointList(_feat_type_qp, 100); for (int i = 0; i < pt_qp_list.Count; i++) @@ -1175,10 +1175,10 @@ if (_onMoveWorkPointLine) { var diagram_coordinates = _diagram.PointToDiagram(e.Location); - var axisValue = diagram_coordinates.GetAxisValue(_axis_x_flow); - if (axisValue == null) + var axis_value = diagram_coordinates.GetAxisValue(_axis_x_flow); + if (axis_value == null) return; - double chartQ = axisValue.NumericalValue; + double chartQ = axis_value.NumericalValue; CalcWorkPointByQ(chartQ); } else @@ -1271,14 +1271,14 @@ private void barCekCurveQEVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - _qe_visible = this.barCekCurveQEVisible.Checked; + _eff_visible = this.barCekCurveQEVisible.Checked; UpdateChart(); } private void barCekCurveQPVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - _qp_visible = this.barCekCurveQPVisible.Checked; - _bottom_pane.Visibility = _qp_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden; + _power_visible = this.barCekCurveQPVisible.Checked; + _bottom_pane.Visibility = _power_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden; UpdateChart(); } @@ -1311,7 +1311,7 @@ /// </summary> public bool GetQEVisible() { - return _qe_visible; + return _eff_visible; } /// <summary> @@ -1319,7 +1319,7 @@ /// </summary> public bool GetQPVisible() { - return _qp_visible; + return _power_visible; } -- Gitblit v1.9.3