冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/09-working/HydroLossCurveWorkingDlg.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/01-curve/HydroMultiWorkingLossCurveDlg.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class HydroMultiWorkingLossCurveDlg
    partial class HydroLossCurveWorkingDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -32,13 +32,13 @@
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            hydroSingleWorkingLossCurveCtrl1 = new HydroSingleWorkingLossCurveCtrl();
            hydroWorkingListViewCtrl1 = new HydroWorkingListViewCtrl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            groupForWorkingList = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            splitter = new DevExpress.XtraLayout.SplitterItem();
            itemForChart = new DevExpress.XtraLayout.LayoutControlItem();
            hydroLossCurveCtrl1 = new HydroLossCurveCtrl();
            itemForLossCurve = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -46,7 +46,7 @@
            ((ISupportInitialize)groupForWorkingList).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)splitter).BeginInit();
            ((ISupportInitialize)itemForChart).BeginInit();
            ((ISupportInitialize)itemForLossCurve).BeginInit();
            SuspendLayout();
            // 
            // ribbon
@@ -74,7 +74,7 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(hydroSingleWorkingLossCurveCtrl1);
            layoutControl1.Controls.Add(hydroLossCurveCtrl1);
            layoutControl1.Controls.Add(hydroWorkingListViewCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 32);
@@ -84,13 +84,6 @@
            layoutControl1.Size = new Size(994, 573);
            layoutControl1.TabIndex = 1;
            layoutControl1.Text = "layoutControl1";
            // 
            // hydroSingleWorkingLossCurveCtrl1
            // 
            hydroSingleWorkingLossCurveCtrl1.Location = new Point(177, 2);
            hydroSingleWorkingLossCurveCtrl1.Name = "hydroSingleWorkingLossCurveCtrl1";
            hydroSingleWorkingLossCurveCtrl1.Size = new Size(815, 569);
            hydroSingleWorkingLossCurveCtrl1.TabIndex = 4;
            // 
            // hydroWorkingListViewCtrl1
            // 
@@ -104,7 +97,7 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { groupForWorkingList, splitter, itemForChart });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { groupForWorkingList, splitter, itemForLossCurve });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(994, 573);
@@ -136,18 +129,25 @@
            splitter.Name = "splitter";
            splitter.Size = new Size(10, 573);
            // 
            // itemForChart
            // hydroLossCurveCtrl1
            // 
            itemForChart.Control = hydroSingleWorkingLossCurveCtrl1;
            itemForChart.Location = new Point(175, 0);
            itemForChart.Name = "itemForChart";
            itemForChart.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            itemForChart.Size = new Size(819, 573);
            itemForChart.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
            itemForChart.TextSize = new Size(0, 0);
            itemForChart.TextVisible = false;
            hydroLossCurveCtrl1.Location = new Point(177, 2);
            hydroLossCurveCtrl1.Name = "hydroLossCurveCtrl1";
            hydroLossCurveCtrl1.Size = new Size(815, 569);
            hydroLossCurveCtrl1.TabIndex = 5;
            // 
            // HydroMultiWorkingLossCurveDlg
            // itemForLossCurve
            // 
            itemForLossCurve.Control = hydroLossCurveCtrl1;
            itemForLossCurve.Location = new Point(175, 0);
            itemForLossCurve.Name = "itemForLossCurve";
            itemForLossCurve.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            itemForLossCurve.Size = new Size(819, 573);
            itemForLossCurve.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
            itemForLossCurve.TextSize = new Size(0, 0);
            itemForLossCurve.TextVisible = false;
            // 
            // HydroLossCurveWorkingDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
@@ -155,7 +155,7 @@
            Controls.Add(layoutControl1);
            Controls.Add(ribbon);
            FormBorderStyle = FormBorderStyle.SizableToolWindow;
            Name = "HydroMultiWorkingLossCurveDlg";
            Name = "HydroLossCurveWorkingDlg";
            Ribbon = ribbon;
            RibbonVisibility = DevExpress.XtraBars.Ribbon.RibbonVisibility.Hidden;
            StartPosition = FormStartPosition.CenterParent;
@@ -167,7 +167,7 @@
            ((ISupportInitialize)groupForWorkingList).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)splitter).EndInit();
            ((ISupportInitialize)itemForChart).EndInit();
            ((ISupportInitialize)itemForLossCurve).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -178,14 +178,13 @@
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private HydroSingleWorkingLossStatisticsCtrl hydroSingleWorkingLossStatisticsCtrl1;
        private HydroWorkingListViewCtrl hydroWorkingListViewCtrl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlGroup groupForWorkingList;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.SplitterItem splitter;
        private HydroSingleWorkingLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem itemForChart;
        private HydroLossCurveCtrl hydroLossCurveCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem itemForLossCurve;
    }
}