冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportCtrl.cs

@@ -14,8 +14,8 @@

        private SimulationProjectTitleCtrl _titleCtrl = null;
        private SimulationPumpSingleWorkingChartCtrl _workingChart = null;
        private HydroSingleWorkingLossCurveCtrl _lossCurve = null;
        private HydroSingleWorkingLossStatisticsCtrl _lossStatistics = null;
        private HydroLossCurveCtrl _lossCurve = null;
        private HydroLossStatisticsCtrl _lossStatistics = null;

        private XhsProjectVmo _project = null;
        private Yw.Model.HydroModelInfo _hydroInfo = null;
@@ -92,8 +92,8 @@
            lossCurveGroup.Expanded = false;
            lossCurveGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
            lossCurveGroup.ExpandOnDoubleClick = true;
            _lossCurve = new HydroSingleWorkingLossCurveCtrl();
            _lossCurve.SetBindingData(hydroInfo, calcuResult, visual);
            _lossCurve = new HydroLossCurveCtrl();
            //_lossCurve.SetBindingData(hydroInfo, calcuResult, visual);
            var lossCurveItem = lossCurveGroup.AddItem("损失曲线", _lossCurve);
            lossCurveItem.TextVisible = false;
            lossCurveItem.Height = 250;
@@ -112,8 +112,8 @@
            lossStatisticsGroup.Expanded = false;
            lossStatisticsGroup.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
            lossStatisticsGroup.ExpandOnDoubleClick = true;
            _lossStatistics = new HydroSingleWorkingLossStatisticsCtrl();
            _lossStatistics.SetBindingData(hydroInfo, calcuResult);
            _lossStatistics = new HydroLossStatisticsCtrl();
            _lossStatistics.SetBindingData(hydroInfo, working, calcuResult);
            var lossStatisticsItem = lossStatisticsGroup.AddItem("损失统计", _lossStatistics);
            lossStatisticsItem.TextVisible = false;
            lossStatisticsItem.Height = 250;
@@ -207,9 +207,9 @@
            vm.Working.EnergyInputImagePath = GetImageFilePath(_energyInputImageFileName);
            _lossStatistics.ExportInputToImage(vm.Working.EnergyInputImagePath);
            vm.Working.EnergyLossImagePath = GetImageFilePath(_energyLossImageFileName);
            _lossStatistics.ExportLossToImage(vm.Working.EnergyLossImagePath);
            _lossStatistics.ExportCatalogToImage(vm.Working.EnergyLossImagePath);
            vm.Working.EnergyStatisticsImagePath = GetImageFilePath(_energyStatisticsImageFileName);
            _lossStatistics.ExportStatisticsToImage(vm.Working.EnergyStatisticsImagePath);
            _lossStatistics.ExportCategoryToImage(vm.Working.EnergyStatisticsImagePath);

            vm.PumpChart = new Yw.DiagramFile.PumpChartViewModel();