冲突

duheng

2024-08-14 71ff3ccde064c104db61fa28300b039456c0ba06

 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(164, 101);
            xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1);
            xtrPerform2dChart1.Location = new Point(336, 148);
            xtrPerform2dChart1.Margin = new Padding(1, 2, 1, 2);
            xtrPerform2dChart1.Name = "xtrPerform2dChart1";
            xtrPerform2dChart1.Size = new Size(388, 411);
            xtrPerform2dChart1.Size = new Size(453, 657);
            xtrPerform2dChart1.TabIndex = 1;
            // 
            // sidePanel2
@@ -88,9 +88,8 @@
            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(163, 388);
            sidePanel2.Size = new Size(335, 623);
            sidePanel2.TabIndex = 4;
            sidePanel2.Text = "sidePanel2";
            // 
@@ -100,18 +99,18 @@
            xhsPumpMainPhartListCtrl1.Appearance.Options.UseBackColor = true;
            xhsPumpMainPhartListCtrl1.Dock = DockStyle.Fill;
            xhsPumpMainPhartListCtrl1.Location = new Point(0, 0);
            xhsPumpMainPhartListCtrl1.Margin = new Padding(6, 8, 6, 8);
            xhsPumpMainPhartListCtrl1.Name = "xhsPumpMainPhartListCtrl1";
            xhsPumpMainPhartListCtrl1.Size = new Size(163, 388);
            xhsPumpMainPhartListCtrl1.Size = new Size(335, 623);
            xhsPumpMainPhartListCtrl1.TabIndex = 0;
            // 
            // sidePanel1
            // 
            sidePanel1.Controls.Add(tabPane1);
            sidePanel1.Dock = DockStyle.Right;
            sidePanel1.Location = new Point(552, 101);
            sidePanel1.Margin = new Padding(2, 2, 2, 2);
            sidePanel1.Location = new Point(789, 148);
            sidePanel1.Name = "sidePanel1";
            sidePanel1.Size = new Size(190, 411);
            sidePanel1.Size = new Size(271, 657);
            sidePanel1.TabIndex = 3;
            sidePanel1.Text = "sidePanel1";
            // 
@@ -121,12 +120,11 @@
            tabPane1.Controls.Add(tabNavigationPage2);
            tabPane1.Dock = DockStyle.Top;
            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, tabNavigationPage2 });
            tabPane1.RegularSize = new Size(189, 417);
            tabPane1.RegularSize = new Size(270, 655);
            tabPane1.SelectedPage = tabNavigationPage1;
            tabPane1.Size = new Size(189, 417);
            tabPane1.Size = new Size(270, 655);
            tabPane1.TabIndex = 0;
            tabPane1.Text = "tabPane1";
            // 
@@ -134,17 +132,15 @@
            // 
            tabNavigationPage1.Caption = "运行参数";
            tabNavigationPage1.Controls.Add(simpleButton2);
            tabNavigationPage1.Margin = new Padding(2, 2, 2, 2);
            tabNavigationPage1.Name = "tabNavigationPage1";
            tabNavigationPage1.Size = new Size(189, 384);
            tabNavigationPage1.Size = new Size(270, 606);
            // 
            // simpleButton2
            // 
            simpleButton2.Dock = DockStyle.Fill;
            simpleButton2.Location = new Point(0, 0);
            simpleButton2.Margin = new Padding(2, 2, 2, 2);
            simpleButton2.Name = "simpleButton2";
            simpleButton2.Size = new Size(189, 384);
            simpleButton2.Size = new Size(270, 606);
            simpleButton2.TabIndex = 0;
            simpleButton2.Text = "待补充";
            // 
@@ -152,34 +148,35 @@
            // 
            tabNavigationPage2.Caption = "属性";
            tabNavigationPage2.Controls.Add(simpleButton3);
            tabNavigationPage2.Margin = new Padding(2, 2, 2, 2);
            tabNavigationPage2.Name = "tabNavigationPage2";
            tabNavigationPage2.Size = new Size(190, 386);
            tabNavigationPage2.Size = new Size(271, 607);
            // 
            // simpleButton3
            // 
            simpleButton3.Dock = DockStyle.Fill;
            simpleButton3.Location = new Point(0, 0);
            simpleButton3.Margin = new Padding(2, 2, 2, 2);
            simpleButton3.Name = "simpleButton3";
            simpleButton3.Size = new Size(190, 386);
            simpleButton3.Size = new Size(271, 607);
            simpleButton3.TabIndex = 0;
            simpleButton3.Text = "待补充";
            // 
            // 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 });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.Margin = new Padding(4, 5, 4, 5);
            ribbonControl1.MaxItemId = 31;
            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(742, 101);
            ribbonControl1.Size = new Size(1060, 148);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // BtnAdd
@@ -314,35 +311,33 @@
            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, 101);
            dockPanel1.Margin = new Padding(2, 2, 2, 2);
            dockPanel1.Location = new Point(0, 148);
            dockPanel1.Name = "dockPanel1";
            dockPanel1.OriginalSize = new Size(235, 200);
            dockPanel1.Size = new Size(164, 411);
            dockPanel1.Size = new Size(336, 657);
            dockPanel1.Text = "曲线列表";
            // 
            // dockPanel1_Container
            // 
            dockPanel1_Container.Controls.Add(sidePanel2);
            dockPanel1_Container.Location = new Point(0, 23);
            dockPanel1_Container.Margin = new Padding(2, 2, 2, 2);
            dockPanel1_Container.Location = new Point(0, 34);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(163, 388);
            dockPanel1_Container.Size = new Size(335, 623);
            dockPanel1_Container.TabIndex = 0;
            // 
            // XhsPumpMainPhartPanel
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(xtrPerform2dChart1);
            Controls.Add(sidePanel1);
            Controls.Add(dockPanel1);
            Controls.Add(ribbonControl1);
            Margin = new Padding(4, 5, 4, 5);
            Margin = new Padding(6, 8, 6, 8);
            Name = "XhsPumpMainPhartPanel";
            Size = new Size(742, 512);
            Size = new Size(1060, 805);
            sidePanel2.ResumeLayout(false);
            sidePanel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)tabPane1).EndInit();