冲突

Shuxia Ning

2024-11-27 175472475dadbd80e9c23e043ab6cdce36082d6a

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/02-scale/HydroSingleLossScaleDlg.Designer.cs

@@ -32,7 +32,17 @@
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            hydroSingleLossScaleCtrl1 = new HydroSingleLossScaleCtrl();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            hydroEnergyStatisticsBarCtrl1 = new HydroEnergyStatisticsBarCtrl();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            SuspendLayout();
            // 
            // ribbon
@@ -45,7 +55,7 @@
            ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbon.RibbonCaptionAlignment = DevExpress.XtraBars.Ribbon.RibbonCaptionAlignment.Left;
            ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
            ribbon.Size = new Size(886, 32);
            ribbon.Size = new Size(997, 32);
            // 
            // ribbonPage1
            // 
@@ -60,18 +70,66 @@
            // 
            // hydroSingleLossScaleCtrl1
            // 
            hydroSingleLossScaleCtrl1.Dock = DockStyle.Fill;
            hydroSingleLossScaleCtrl1.Location = new Point(0, 32);
            hydroSingleLossScaleCtrl1.Location = new Point(2, 19);
            hydroSingleLossScaleCtrl1.Name = "hydroSingleLossScaleCtrl1";
            hydroSingleLossScaleCtrl1.Size = new Size(886, 555);
            hydroSingleLossScaleCtrl1.TabIndex = 6;
            hydroSingleLossScaleCtrl1.Size = new Size(993, 374);
            hydroSingleLossScaleCtrl1.TabIndex = 0;
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(hydroEnergyStatisticsBarCtrl1);
            layoutControl1.Controls.Add(hydroSingleLossScaleCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 32);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(997, 591);
            layoutControl1.TabIndex = 8;
            layoutControl1.Text = "layoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(997, 591);
            Root.TextVisible = false;
            // 
            // hydroEnergyStatisticsBarCtrl1
            // 
            hydroEnergyStatisticsBarCtrl1.Location = new Point(2, 414);
            hydroEnergyStatisticsBarCtrl1.Name = "hydroEnergyStatisticsBarCtrl1";
            hydroEnergyStatisticsBarCtrl1.Size = new Size(993, 175);
            hydroEnergyStatisticsBarCtrl1.TabIndex = 2;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = hydroEnergyStatisticsBarCtrl1;
            layoutControlItem2.Location = new Point(0, 395);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(997, 196);
            layoutControlItem2.Text = "能量统计";
            layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
            layoutControlItem2.TextSize = new Size(48, 14);
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = hydroSingleLossScaleCtrl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(997, 395);
            layoutControlItem1.Text = "分类统计";
            layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
            layoutControlItem1.TextSize = new Size(48, 14);
            // 
            // HydroSingleLossScaleDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(886, 587);
            Controls.Add(hydroSingleLossScaleCtrl1);
            ClientSize = new Size(997, 623);
            Controls.Add(layoutControl1);
            Controls.Add(ribbon);
            FormBorderStyle = FormBorderStyle.SizableToolWindow;
            Name = "HydroSingleLossScaleDlg";
@@ -80,6 +138,11 @@
            StartPosition = FormStartPosition.CenterParent;
            Text = "损失比例";
            ((ISupportInitialize)ribbon).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -90,5 +153,10 @@
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private HydroSingleLossScaleCtrl hydroSingleLossScaleCtrl1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private HydroEnergyStatisticsBarCtrl hydroEnergyStatisticsBarCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}