冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/08-dlg/HydroLossCurveDlg.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/01-curve/HydroSingleWorkingLossCurveDlg.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class HydroSingleWorkingLossCurveDlg
    partial class HydroLossCurveDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -31,7 +31,7 @@
            ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            hydroSingleWorkingLossCurveCtrl1 = new HydroSingleWorkingLossCurveCtrl();
            hydroLossCurveCtrl1 = new HydroLossCurveCtrl();
            ((ISupportInitialize)ribbon).BeginInit();
            SuspendLayout();
            // 
@@ -58,23 +58,23 @@
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "ribbonPageGroup1";
            // 
            // hydroSingleLossCurveCtrl1
            // hydroLossCurveCtrl1
            // 
            hydroSingleWorkingLossCurveCtrl1.Dock = DockStyle.Fill;
            hydroSingleWorkingLossCurveCtrl1.Location = new Point(0, 32);
            hydroSingleWorkingLossCurveCtrl1.Name = "hydroSingleLossCurveCtrl1";
            hydroSingleWorkingLossCurveCtrl1.Size = new Size(886, 555);
            hydroSingleWorkingLossCurveCtrl1.TabIndex = 4;
            hydroLossCurveCtrl1.Dock = DockStyle.Fill;
            hydroLossCurveCtrl1.Location = new Point(0, 32);
            hydroLossCurveCtrl1.Name = "hydroLossCurveCtrl1";
            hydroLossCurveCtrl1.Size = new Size(886, 555);
            hydroLossCurveCtrl1.TabIndex = 6;
            // 
            // HydroSingleLossCurveDlg
            // HydroLossCurveDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(886, 587);
            Controls.Add(hydroSingleWorkingLossCurveCtrl1);
            Controls.Add(hydroLossCurveCtrl1);
            Controls.Add(ribbon);
            FormBorderStyle = FormBorderStyle.SizableToolWindow;
            Name = "HydroSingleLossCurveDlg";
            Name = "HydroLossCurveDlg";
            Ribbon = ribbon;
            RibbonVisibility = DevExpress.XtraBars.Ribbon.RibbonVisibility.Hidden;
            StartPosition = FormStartPosition.CenterParent;
@@ -89,6 +89,6 @@
        private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private HydroSingleWorkingLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
        private HydroLossCurveCtrl hydroLossCurveCtrl1;
    }
}