From 04ef5d66b53eff9175c2cb6dafda8b65872b9f52 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 15 一月 2025 22:52:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs | 188 ++++++++++++++++++++++++++++++-----------------
1 files changed, 120 insertions(+), 68 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs
index 858db00..af7c639 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.Designer.cs
@@ -32,15 +32,17 @@
pumpViewChart1 = new Yw.WinFrmUI.Phart.PumpViewChart();
barManager1 = new DevExpress.XtraBars.BarManager(components);
bar1 = new DevExpress.XtraBars.Bar();
+ barCekSplitPanel = new DevExpress.XtraBars.BarCheckItem();
+ barCekEffVisible = new DevExpress.XtraBars.BarCheckItem();
+ barCekEqulEffVisible = new DevExpress.XtraBars.BarCheckItem();
barBtnAddVariableSpeedMenu = new DevExpress.XtraBars.BarSubItem();
barBtnAddVariableSpeedByN = new DevExpress.XtraBars.BarButtonItem();
barBtnAddVariableSpeedByHz = new DevExpress.XtraBars.BarButtonItem();
barBtnAddVariableSpeedByPoint = new DevExpress.XtraBars.BarButtonItem();
+ barBtnDeleteVariableSpeed = new DevExpress.XtraBars.BarButtonItem();
barBtnAddEqualEffMenu = new DevExpress.XtraBars.BarSubItem();
barBtnAddEqualEffByEff = new DevExpress.XtraBars.BarButtonItem();
- barCekSplitPanel = new DevExpress.XtraBars.BarCheckItem();
- barCekEffVisible = new DevExpress.XtraBars.BarCheckItem();
- barCekPowerVisible = new DevExpress.XtraBars.BarCheckItem();
+ barBtnDeleteEqualEff = new DevExpress.XtraBars.BarButtonItem();
barTxtPipeQ = new DevExpress.XtraBars.BarEditItem();
repTxtPipeQ = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
barTxtPipeHead = new DevExpress.XtraBars.BarEditItem();
@@ -48,26 +50,30 @@
barTxtStartHead = new DevExpress.XtraBars.BarEditItem();
repTxtStartHead = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
barBtnSetEqPt = new DevExpress.XtraBars.BarButtonItem();
- barCekEqulEffVisible = new DevExpress.XtraBars.BarCheckItem();
- barCekEqVisible = new DevExpress.XtraBars.BarCheckItem();
barBtnEqClear = new DevExpress.XtraBars.BarButtonItem();
+ barImgCmbChartSel = new DevExpress.XtraBars.BarEditItem();
+ repImgCmbCurveSel = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
barDockControlTop = new DevExpress.XtraBars.BarDockControl();
barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ barCekPowerVisible = new DevExpress.XtraBars.BarCheckItem();
+ barCekEqVisible = new DevExpress.XtraBars.BarCheckItem();
+ barCekLineVisible = new DevExpress.XtraBars.BarCheckItem();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)repTxtPipeQ).BeginInit();
((System.ComponentModel.ISupportInitialize)repTxtPipeHead).BeginInit();
((System.ComponentModel.ISupportInitialize)repTxtStartHead).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)repImgCmbCurveSel).BeginInit();
SuspendLayout();
//
// pumpViewChart1
//
pumpViewChart1.Dock = DockStyle.Fill;
pumpViewChart1.LineVisible = false;
- pumpViewChart1.Location = new Point(0, 34);
+ pumpViewChart1.Location = new Point(0, 68);
pumpViewChart1.Name = "pumpViewChart1";
- pumpViewChart1.Size = new Size(1369, 890);
+ pumpViewChart1.Size = new Size(1369, 856);
pumpViewChart1.SplitPanel = false;
pumpViewChart1.TabIndex = 0;
//
@@ -79,9 +85,9 @@
barManager1.DockControls.Add(barDockControlLeft);
barManager1.DockControls.Add(barDockControlRight);
barManager1.Form = this;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCekSplitPanel, barCekEffVisible, barCekPowerVisible, barTxtStartHead, barTxtPipeQ, barTxtPipeHead, barBtnSetEqPt, barCekEqVisible, barCekEqulEffVisible, barBtnEqClear, barBtnAddVariableSpeedMenu, barBtnAddVariableSpeedByN, barBtnAddVariableSpeedByHz, barBtnAddVariableSpeedByPoint, barBtnAddEqualEffMenu, barBtnAddEqualEffByEff });
- barManager1.MaxItemId = 25;
- barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repTxtStartHead, repTxtPipeQ, repTxtPipeHead });
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCekSplitPanel, barCekEffVisible, barCekPowerVisible, barTxtStartHead, barTxtPipeQ, barTxtPipeHead, barBtnSetEqPt, barCekEqVisible, barCekEqulEffVisible, barBtnEqClear, barBtnAddVariableSpeedMenu, barBtnAddVariableSpeedByN, barBtnAddVariableSpeedByHz, barBtnAddVariableSpeedByPoint, barBtnAddEqualEffMenu, barBtnAddEqualEffByEff, barBtnDeleteVariableSpeed, barBtnDeleteEqualEff, barImgCmbChartSel, barCekLineVisible });
+ barManager1.MaxItemId = 31;
+ barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repTxtStartHead, repTxtPipeQ, repTxtPipeHead, repImgCmbCurveSel });
//
// bar1
//
@@ -89,19 +95,49 @@
bar1.DockCol = 0;
bar1.DockRow = 0;
bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedMenu), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffMenu), new DevExpress.XtraBars.LinkPersistInfo(barCekSplitPanel), new DevExpress.XtraBars.LinkPersistInfo(barCekEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeQ), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeHead), new DevExpress.XtraBars.LinkPersistInfo(barTxtStartHead), new DevExpress.XtraBars.LinkPersistInfo(barBtnSetEqPt), new DevExpress.XtraBars.LinkPersistInfo(barCekEqulEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barBtnEqClear) });
+ bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barImgCmbChartSel), new DevExpress.XtraBars.LinkPersistInfo(barCekLineVisible), new DevExpress.XtraBars.LinkPersistInfo(barCekSplitPanel), new DevExpress.XtraBars.LinkPersistInfo(barCekEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barCekEqulEffVisible), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedMenu), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffMenu), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeQ), new DevExpress.XtraBars.LinkPersistInfo(barTxtPipeHead), new DevExpress.XtraBars.LinkPersistInfo(barTxtStartHead), new DevExpress.XtraBars.LinkPersistInfo(barBtnSetEqPt), new DevExpress.XtraBars.LinkPersistInfo(barBtnEqClear) });
bar1.OptionsBar.AllowQuickCustomization = false;
bar1.OptionsBar.DrawBorder = false;
bar1.OptionsBar.MultiLine = true;
bar1.OptionsBar.UseWholeRow = true;
bar1.Text = "Tools";
//
+ // barCekSplitPanel
+ //
+ barCekSplitPanel.BindableChecked = true;
+ barCekSplitPanel.Caption = "鍒嗗壊鏉�";
+ barCekSplitPanel.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekSplitPanel.Checked = true;
+ barCekSplitPanel.Id = 1;
+ barCekSplitPanel.Name = "barCekSplitPanel";
+ barCekSplitPanel.CheckedChanged += barCekSplitPanel_CheckedChanged;
+ //
+ // barCekEffVisible
+ //
+ barCekEffVisible.BindableChecked = true;
+ barCekEffVisible.Caption = "鏁堢巼绾�";
+ barCekEffVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekEffVisible.Checked = true;
+ barCekEffVisible.Id = 2;
+ barCekEffVisible.Name = "barCekEffVisible";
+ barCekEffVisible.CheckedChanged += barCekEffVisible_CheckedChanged;
+ //
+ // barCekEqulEffVisible
+ //
+ barCekEqulEffVisible.BindableChecked = true;
+ barCekEqulEffVisible.Caption = "绛夋晥绾�";
+ barCekEqulEffVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekEqulEffVisible.Checked = true;
+ barCekEqulEffVisible.Id = 11;
+ barCekEqulEffVisible.Name = "barCekEqulEffVisible";
+ barCekEqulEffVisible.CheckedChanged += barCekEqulEffVisible_CheckedChanged;
+ //
// barBtnAddVariableSpeedMenu
//
barBtnAddVariableSpeedMenu.Caption = "鍙橀�熸洸绾�";
barBtnAddVariableSpeedMenu.Id = 17;
- barBtnAddVariableSpeedMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add;
- barBtnAddVariableSpeedMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByN), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByHz), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByPoint) });
+ barBtnAddVariableSpeedMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.createstackedlinechart;
+ barBtnAddVariableSpeedMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByN), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByHz), new DevExpress.XtraBars.LinkPersistInfo(barBtnAddVariableSpeedByPoint), new DevExpress.XtraBars.LinkPersistInfo(barBtnDeleteVariableSpeed, true) });
barBtnAddVariableSpeedMenu.Name = "barBtnAddVariableSpeedMenu";
barBtnAddVariableSpeedMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
//
@@ -129,12 +165,20 @@
barBtnAddVariableSpeedByPoint.Name = "barBtnAddVariableSpeedByPoint";
barBtnAddVariableSpeedByPoint.ItemClick += barBtnAddVariableSpeedByPoint_ItemClick;
//
+ // barBtnDeleteVariableSpeed
+ //
+ barBtnDeleteVariableSpeed.Caption = "鍒犻櫎";
+ barBtnDeleteVariableSpeed.Id = 26;
+ barBtnDeleteVariableSpeed.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_deletecircled;
+ barBtnDeleteVariableSpeed.Name = "barBtnDeleteVariableSpeed";
+ barBtnDeleteVariableSpeed.ItemClick += barBtnDeleteVariableSpeed_ItemClick;
+ //
// barBtnAddEqualEffMenu
//
barBtnAddEqualEffMenu.Caption = "绛夋晥绾�";
barBtnAddEqualEffMenu.Id = 23;
- barBtnAddEqualEffMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_add1;
- barBtnAddEqualEffMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffByEff) });
+ barBtnAddEqualEffMenu.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.charttype_scatterline;
+ barBtnAddEqualEffMenu.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAddEqualEffByEff), new DevExpress.XtraBars.LinkPersistInfo(barBtnDeleteEqualEff, true) });
barBtnAddEqualEffMenu.Name = "barBtnAddEqualEffMenu";
barBtnAddEqualEffMenu.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
//
@@ -146,35 +190,13 @@
barBtnAddEqualEffByEff.Name = "barBtnAddEqualEffByEff";
barBtnAddEqualEffByEff.ItemClick += barBtnAddEqualEffByEff_ItemClick;
//
- // barCekSplitPanel
+ // barBtnDeleteEqualEff
//
- barCekSplitPanel.BindableChecked = true;
- barCekSplitPanel.Caption = "鍒嗗壊鏉�";
- barCekSplitPanel.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCekSplitPanel.Checked = true;
- barCekSplitPanel.Id = 1;
- barCekSplitPanel.Name = "barCekSplitPanel";
- barCekSplitPanel.CheckedChanged += barCekSplitPanel_CheckedChanged;
- //
- // barCekEffVisible
- //
- barCekEffVisible.BindableChecked = true;
- barCekEffVisible.Caption = "鏁堢巼绾�";
- barCekEffVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCekEffVisible.Checked = true;
- barCekEffVisible.Id = 2;
- barCekEffVisible.Name = "barCekEffVisible";
- barCekEffVisible.CheckedChanged += barCekEffVisible_CheckedChanged;
- //
- // barCekPowerVisible
- //
- barCekPowerVisible.BindableChecked = true;
- barCekPowerVisible.Caption = "鍔熺巼绾�";
- barCekPowerVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCekPowerVisible.Checked = true;
- barCekPowerVisible.Id = 3;
- barCekPowerVisible.Name = "barCekPowerVisible";
- barCekPowerVisible.CheckedChanged += barCekPowerVisible_CheckedChanged;
+ barBtnDeleteEqualEff.Caption = "鍒犻櫎";
+ barBtnDeleteEqualEff.Id = 27;
+ barBtnDeleteEqualEff.ImageOptions.SvgImage = PhartRelation.Core.Properties.Resources.actions_deletecircled1;
+ barBtnDeleteEqualEff.Name = "barBtnDeleteEqualEff";
+ barBtnDeleteEqualEff.ItemClick += barBtnDeleteEqualEff_ItemClick;
//
// barTxtPipeQ
//
@@ -235,26 +257,6 @@
barBtnSetEqPt.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
barBtnSetEqPt.ItemClick += barBtnSetEqPt_ItemClick;
//
- // barCekEqulEffVisible
- //
- barCekEqulEffVisible.BindableChecked = true;
- barCekEqulEffVisible.Caption = "绛夋晥绾�";
- barCekEqulEffVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCekEqulEffVisible.Checked = true;
- barCekEqulEffVisible.Id = 11;
- barCekEqulEffVisible.Name = "barCekEqulEffVisible";
- barCekEqulEffVisible.CheckedChanged += barCekEqulEffVisible_CheckedChanged;
- //
- // barCekEqVisible
- //
- barCekEqVisible.BindableChecked = true;
- barCekEqVisible.Caption = "瑁呯疆绾�";
- barCekEqVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
- barCekEqVisible.Checked = true;
- barCekEqVisible.Id = 10;
- barCekEqVisible.Name = "barCekEqVisible";
- barCekEqVisible.CheckedChanged += barCekEqVisible_CheckedChanged;
- //
// barBtnEqClear
//
barBtnEqClear.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
@@ -265,13 +267,29 @@
barBtnEqClear.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
barBtnEqClear.ItemClick += barBtnEqClear_ItemClick;
//
+ // barImgCmbChartSel
+ //
+ barImgCmbChartSel.Caption = "鏌ヨ:";
+ barImgCmbChartSel.Edit = repImgCmbCurveSel;
+ barImgCmbChartSel.EditWidth = 80;
+ barImgCmbChartSel.Id = 28;
+ barImgCmbChartSel.Name = "barImgCmbChartSel";
+ barImgCmbChartSel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ barImgCmbChartSel.EditValueChanged += barImgCmbChartSel_EditValueChanged;
+ //
+ // repImgCmbCurveSel
+ //
+ repImgCmbCurveSel.AutoHeight = false;
+ repImgCmbCurveSel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ repImgCmbCurveSel.Name = "repImgCmbCurveSel";
+ //
// barDockControlTop
//
barDockControlTop.CausesValidation = false;
barDockControlTop.Dock = DockStyle.Top;
barDockControlTop.Location = new Point(0, 0);
barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(1369, 34);
+ barDockControlTop.Size = new Size(1369, 68);
//
// barDockControlBottom
//
@@ -285,17 +303,45 @@
//
barDockControlLeft.CausesValidation = false;
barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 34);
+ barDockControlLeft.Location = new Point(0, 68);
barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 890);
+ barDockControlLeft.Size = new Size(0, 856);
//
// barDockControlRight
//
barDockControlRight.CausesValidation = false;
barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(1369, 34);
+ barDockControlRight.Location = new Point(1369, 68);
barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 890);
+ barDockControlRight.Size = new Size(0, 856);
+ //
+ // barCekPowerVisible
+ //
+ barCekPowerVisible.BindableChecked = true;
+ barCekPowerVisible.Caption = "鍔熺巼绾�";
+ barCekPowerVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekPowerVisible.Checked = true;
+ barCekPowerVisible.Id = 3;
+ barCekPowerVisible.Name = "barCekPowerVisible";
+ barCekPowerVisible.CheckedChanged += barCekPowerVisible_CheckedChanged;
+ //
+ // barCekEqVisible
+ //
+ barCekEqVisible.BindableChecked = true;
+ barCekEqVisible.Caption = "瑁呯疆绾�";
+ barCekEqVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekEqVisible.Checked = true;
+ barCekEqVisible.Id = 10;
+ barCekEqVisible.Name = "barCekEqVisible";
+ barCekEqVisible.CheckedChanged += barCekEqVisible_CheckedChanged;
+ //
+ // barCekLineVisible
+ //
+ barCekLineVisible.Caption = "鏌ヨ";
+ barCekLineVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCekLineVisible.Id = 30;
+ barCekLineVisible.Name = "barCekLineVisible";
+ barCekLineVisible.CheckedChanged += barCekLineVisible_CheckedChanged;
//
// PumpChartViewCtrl
//
@@ -312,6 +358,7 @@
((System.ComponentModel.ISupportInitialize)repTxtPipeQ).EndInit();
((System.ComponentModel.ISupportInitialize)repTxtPipeHead).EndInit();
((System.ComponentModel.ISupportInitialize)repTxtStartHead).EndInit();
+ ((System.ComponentModel.ISupportInitialize)repImgCmbCurveSel).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -344,5 +391,10 @@
private DevExpress.XtraBars.BarButtonItem barBtnAddVariableSpeedByPoint;
private DevExpress.XtraBars.BarSubItem barBtnAddEqualEffMenu;
private DevExpress.XtraBars.BarButtonItem barBtnAddEqualEffByEff;
+ private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repImgCmbCurveSel;
+ private DevExpress.XtraBars.BarButtonItem barBtnDeleteVariableSpeed;
+ private DevExpress.XtraBars.BarButtonItem barBtnDeleteEqualEff;
+ private DevExpress.XtraBars.BarEditItem barImgCmbChartSel;
+ private DevExpress.XtraBars.BarCheckItem barCekLineVisible;
}
}
--
Gitblit v1.9.3