From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs
index 6d0d209..0618ecc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/10-analy/SimulationSingleWorkingAnalyCtrl.Designer.cs
@@ -28,15 +28,16 @@
/// </summary>
private void InitializeComponent()
{
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(SimulationSingleWorkingAnalyCtrl));
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
pageForEvaluation = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- pageForEnergy = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- pageForLossCurve = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- pageForLossStatistics = new DevExpress.XtraBars.Navigation.TabNavigationPage();
hydroSingleWorkingEvaluationCtrl1 = new HydroSingleWorkingEvaluationCtrl();
+ pageForEnergy = new DevExpress.XtraBars.Navigation.TabNavigationPage();
simulationSingleWorkingEnergyCtrl1 = new SimulationSingleWorkingEnergyCtrl();
- hydroSingleWorkingLossCurveCtrl1 = new HydroSingleWorkingLossCurveCtrl();
- hydroSingleWorkingLossStatisticsCtrl1 = new HydroSingleWorkingLossStatisticsCtrl();
+ pageForLossCurve = new DevExpress.XtraBars.Navigation.TabNavigationPage();
+ hydroSingleWorkingLossCurveCtrl1 = new HydroLossCurveCtrl();
+ pageForLossStatistics = new DevExpress.XtraBars.Navigation.TabNavigationPage();
+ hydroSingleWorkingLossStatisticsCtrl1 = new HydroLossStatisticsCtrl();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
pageForEvaluation.SuspendLayout();
@@ -65,29 +66,12 @@
//
pageForEvaluation.Caption = "绮惧害璇勪及";
pageForEvaluation.Controls.Add(hydroSingleWorkingEvaluationCtrl1);
+ pageForEvaluation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageForEvaluation.ImageOptions.SvgImage");
+ pageForEvaluation.ImageOptions.SvgImageSize = new Size(16, 16);
+ pageForEvaluation.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
pageForEvaluation.Name = "pageForEvaluation";
+ pageForEvaluation.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
pageForEvaluation.Size = new Size(984, 589);
- //
- // pageForEnergy
- //
- pageForEnergy.Caption = "鑳借�楀垎鏋�";
- pageForEnergy.Controls.Add(simulationSingleWorkingEnergyCtrl1);
- pageForEnergy.Name = "pageForEnergy";
- pageForEnergy.Size = new Size(984, 589);
- //
- // pageForLossCurve
- //
- pageForLossCurve.Caption = "鎹熷け鏇茬嚎";
- pageForLossCurve.Controls.Add(hydroSingleWorkingLossCurveCtrl1);
- pageForLossCurve.Name = "pageForLossCurve";
- pageForLossCurve.Size = new Size(984, 589);
- //
- // pageForLossStatistics
- //
- pageForLossStatistics.Caption = "鎹熷け缁熻";
- pageForLossStatistics.Controls.Add(hydroSingleWorkingLossStatisticsCtrl1);
- pageForLossStatistics.Name = "pageForLossStatistics";
- pageForLossStatistics.Size = new Size(984, 589);
//
// hydroSingleWorkingEvaluationCtrl1
//
@@ -97,6 +81,17 @@
hydroSingleWorkingEvaluationCtrl1.Size = new Size(984, 589);
hydroSingleWorkingEvaluationCtrl1.TabIndex = 0;
//
+ // pageForEnergy
+ //
+ pageForEnergy.Caption = "鑳借�楀垎鏋�";
+ pageForEnergy.Controls.Add(simulationSingleWorkingEnergyCtrl1);
+ pageForEnergy.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageForEnergy.ImageOptions.SvgImage");
+ pageForEnergy.ImageOptions.SvgImageSize = new Size(16, 16);
+ pageForEnergy.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForEnergy.Name = "pageForEnergy";
+ pageForEnergy.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForEnergy.Size = new Size(984, 589);
+ //
// simulationSingleWorkingEnergyCtrl1
//
simulationSingleWorkingEnergyCtrl1.Dock = DockStyle.Fill;
@@ -105,6 +100,17 @@
simulationSingleWorkingEnergyCtrl1.Size = new Size(984, 589);
simulationSingleWorkingEnergyCtrl1.TabIndex = 0;
//
+ // pageForLossCurve
+ //
+ pageForLossCurve.Caption = "鎹熷け鏇茬嚎";
+ pageForLossCurve.Controls.Add(hydroSingleWorkingLossCurveCtrl1);
+ pageForLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageForLossCurve.ImageOptions.SvgImage");
+ pageForLossCurve.ImageOptions.SvgImageSize = new Size(16, 16);
+ pageForLossCurve.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForLossCurve.Name = "pageForLossCurve";
+ pageForLossCurve.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForLossCurve.Size = new Size(984, 589);
+ //
// hydroSingleWorkingLossCurveCtrl1
//
hydroSingleWorkingLossCurveCtrl1.Dock = DockStyle.Fill;
@@ -112,6 +118,17 @@
hydroSingleWorkingLossCurveCtrl1.Name = "hydroSingleWorkingLossCurveCtrl1";
hydroSingleWorkingLossCurveCtrl1.Size = new Size(984, 589);
hydroSingleWorkingLossCurveCtrl1.TabIndex = 0;
+ //
+ // pageForLossStatistics
+ //
+ pageForLossStatistics.Caption = "鎹熷け缁熻";
+ pageForLossStatistics.Controls.Add(hydroSingleWorkingLossStatisticsCtrl1);
+ pageForLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageForLossStatistics.ImageOptions.SvgImage");
+ pageForLossStatistics.ImageOptions.SvgImageSize = new Size(16, 16);
+ pageForLossStatistics.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForLossStatistics.Name = "pageForLossStatistics";
+ pageForLossStatistics.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
+ pageForLossStatistics.Size = new Size(984, 589);
//
// hydroSingleWorkingLossStatisticsCtrl1
//
@@ -145,8 +162,8 @@
private DevExpress.XtraBars.Navigation.TabNavigationPage pageForLossCurve;
private HydroSingleWorkingEvaluationCtrl hydroSingleWorkingEvaluationCtrl1;
private SimulationSingleWorkingEnergyCtrl simulationSingleWorkingEnergyCtrl1;
- private HydroSingleWorkingLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
+ private HydroLossCurveCtrl hydroSingleWorkingLossCurveCtrl1;
private DevExpress.XtraBars.Navigation.TabNavigationPage pageForLossStatistics;
- private HydroSingleWorkingLossStatisticsCtrl hydroSingleWorkingLossStatisticsCtrl1;
+ private HydroLossStatisticsCtrl hydroSingleWorkingLossStatisticsCtrl1;
}
}
--
Gitblit v1.9.3