From 423b9511a9ce98fe36a235d5d2ab0d5a8e66238e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 17:55:44 +0800
Subject: [PATCH] 报告图片导入
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs | 28 +++---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 18 +++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 118 +++++++++++++++--------------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/00-core/SimulationWordReportHelper.cs | 25 ++++++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 16 ++--
5 files changed, 122 insertions(+), 83 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index a501297..5c7a820 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -134,7 +134,7 @@
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1464, 128);
+ ribbonControl1.Size = new Size(1464, 101);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -660,12 +660,12 @@
tabPane1.Controls.Add(tabPageBimface);
tabPane1.Controls.Add(tabPageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 128);
+ tabPane1.Location = new Point(0, 101);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(1189, 407);
+ tabPane1.RegularSize = new Size(1189, 434);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(1189, 407);
+ tabPane1.Size = new Size(1189, 434);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -693,19 +693,19 @@
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.FloatVertical = true;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(1189, 128);
+ docPnlRight.Location = new Point(1189, 101);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.SavedIndex = 0;
- docPnlRight.Size = new Size(275, 572);
+ docPnlRight.Size = new Size(275, 599);
docPnlRight.Text = "灞炴��";
//
// controlContainerRight
//
controlContainerRight.Location = new Point(4, 26);
controlContainerRight.Name = "controlContainerRight";
- controlContainerRight.Size = new Size(268, 543);
+ controlContainerRight.Size = new Size(268, 570);
controlContainerRight.TabIndex = 0;
//
// docPnlBottom
@@ -765,8 +765,8 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlBottom);
Controls.Add(docPnlRight);
+ Controls.Add(docPnlBottom);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 325b531..72ad3b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -30,24 +30,26 @@
/// 鏂板宸ュ喌浜嬩欢
/// </summary>
public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
/// <summary>
/// 淇濆瓨妯″瀷浜嬩欢
/// </summary>
public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;
+
/// <summary>
/// 鍒锋柊妯″瀷浜嬩欢
/// </summary>
public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;
+
/// <summary>
/// 鏇存柊鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> UpdateSchemeEvent;
+
/// <summary>
/// 绉婚櫎鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> RemoveSchemeEvent;
-
-
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -138,7 +140,7 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- #endregion
+ #endregion BIM鎺т欢
#region Q3d鎺т欢
@@ -175,7 +177,7 @@
this.tabPageQ3d.Controls.Add(q3dCtrl);
}
- #endregion
+ #endregion Q3d鎺т欢
#region 灞炴�ф帶浠�
@@ -266,7 +268,6 @@
var flowEffectHelper = await GetFlowEffectHelper();
flowEffectHelper.Set(visual);
};
-
}
return _propertyCtrl;
}
@@ -321,7 +322,7 @@
_propertyCtrl?.UpdateRows();
}
- #endregion
+ #endregion 灞炴�ф帶浠�
#region 閫夋嫨鏋勪欢
@@ -341,12 +342,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Bimface:
{
this.barBtnSetMonitor.Enabled = visual != null;
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Q3d:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -354,12 +357,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Property:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
this.barBtnSetMonitor.Enabled = visual != null;
}
break;
+
case eSimulationVisualSource.List:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -367,6 +372,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Set:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -374,6 +380,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Search:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -381,6 +388,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Monitor:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -388,6 +396,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Check:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -395,6 +404,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Calcu:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -402,6 +412,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eSimulationVisualSource.Warning:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -409,6 +420,7 @@
SetPropertyCtrl(visual);
}
break;
+
default: break;
}
}
@@ -420,7 +432,7 @@
SelectVisual(visual, source);
}
- #endregion
+ #endregion 閫夋嫨鏋勪欢
#region 鏋勪欢鏄庣粏
@@ -469,7 +481,7 @@
return helper.GetSourceList();
}
- #endregion
+ #endregion 鍙鍒楄〃
#region 瑙嗗浘鍒楄〃
@@ -499,7 +511,7 @@
return helper.GetVisualList();
}
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 鏄庣粏鎺т欢
@@ -599,7 +611,7 @@
ShowVisualListCtrl();
}
- #endregion
+ #endregion 鏄庣粏鎺т欢
#region 鏋勪欢鏄剧ず
@@ -648,9 +660,9 @@
SetVisualVisible();
}
- #endregion
+ #endregion 鏋勪欢鏄剧ず
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 涓�閿樉闅�
@@ -674,7 +686,9 @@
SetDecoratorVisible(this.barCkDecorator.Checked);
}
- #endregion
+ #endregion 涓�閿樉闅�
+
+
#region 淇濆瓨淇℃伅
@@ -699,16 +713,15 @@
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
-
//Stopwatch sw = new Stopwatch();
//sw.Start();
- //鑰楁椂宸ㄥぇ鐨勪唬鐮�
+ //鑰楁椂宸ㄥぇ鐨勪唬鐮�
//sw.Stop();
//TimeSpan ts2 = sw.Elapsed;
//Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
}
- #endregion
+ #endregion 淇濆瓨淇℃伅
#region 鎵归噺閰嶇疆
@@ -1006,7 +1019,6 @@
};
}
-
//鏄剧ずRadialMenu
private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -1210,11 +1222,9 @@
{
this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
}
-
-
}
- #endregion
+ #endregion 鎵归噺閰嶇疆
#region 鏋勪欢鏌ヨ
@@ -1305,7 +1315,7 @@
ShowSearchDlg();
}
- #endregion
+ #endregion 鏋勪欢鏌ヨ
#region 妯″瀷鏍囨敞
@@ -1357,7 +1367,7 @@
markHelper.Set();
}
- #endregion
+ #endregion 妯″瀷鏍囨敞
#region 棰滆壊鍒嗙骇
@@ -1439,7 +1449,7 @@
gradingHelper.Set();
}
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 浜哄伐鍒锋柊
@@ -1452,7 +1462,6 @@
}
if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
-
var hydroInfo = await this.RefreshModelEvent.Invoke();
if (hydroInfo == null)
{
@@ -1467,7 +1476,7 @@
}
}
- #endregion
+ #endregion 浜哄伐鍒锋柊
#region 姘存祦鍔ㄧ敾
@@ -1500,7 +1509,7 @@
flowEffectHelper.Set();
}
- #endregion
+ #endregion 姘存祦鍔ㄧ敾
#region 鐩戞祴鍒楄〃
@@ -1567,7 +1576,7 @@
SetMonitorList(_visual);
}
- #endregion
+ #endregion 鐩戞祴鐐�
#region 鐩戞祴鍊�
@@ -1596,10 +1605,9 @@
var helper = GetMonitorValueHelper();
helper.Reset(working.MonitorInfo);
}
-
}
- #endregion
+ #endregion 鐩戞祴鍊�
#region 鐩戞祴鍊兼帶浠�
@@ -1665,7 +1673,7 @@
ShowMonitorValueListCtrl();
}
- #endregion
+ #endregion 鐩戞祴鍊兼帶浠�
#region 鐩戞祴鐐规爣璁�
@@ -1692,9 +1700,9 @@
monitorMarkerHelper.Set();
}
- #endregion
+ #endregion 鐩戞祴鐐规爣璁�
- #endregion
+ #endregion 鐩戞祴鍒楄〃
#region 妯″瀷妫�鏌�
@@ -1778,7 +1786,7 @@
ShowCheckCtrl(checkResult);
}
- #endregion
+ #endregion 妯″瀷妫�鏌�
#region 妯″瀷璁＄畻
@@ -1798,7 +1806,7 @@
return _calcuResultHelper;
}
- #endregion
+ #endregion 璁＄畻缁撴灉
#region 璁＄畻澶辫触
@@ -1862,7 +1870,7 @@
calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
}
- #endregion
+ #endregion 璁＄畻澶辫触
#region 璁＄畻璀﹀憡
@@ -1934,7 +1942,7 @@
calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
}
- #endregion
+ #endregion 璁＄畻璀﹀憡
#region 璁＄畻鏍囩
@@ -1961,9 +1969,9 @@
calcuResultLabelHelper.Set();
}
- #endregion
+ #endregion 璁＄畻鏍囩
- #endregion
+ #endregion 妯″瀷璁＄畻
#region 绠＄綉淇
@@ -2028,7 +2036,7 @@
Repair();
}
- #endregion
+ #endregion 绠＄綉淇
#region 瀵煎嚭INP
@@ -2050,7 +2058,7 @@
TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
}
- #endregion
+ #endregion 瀵煎嚭INP
#region 姘存车鍒楄〃
@@ -2125,11 +2133,10 @@
//骞惰仈妯℃嫙
private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
-
PumpParallel();
}
- #endregion
+ #endregion 姘存车鍒楄〃
#region 姘村姏璁＄畻
@@ -2206,34 +2213,33 @@
var visualVmListHelper = GetVisualVmListHelper();
visualVmListHelper.UpdateCalcuProperty(calcuResult);
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 褰撳墠鏋勪欢
SelectVisual(_visual, eSimulationVisualSource.Calcu);
- #endregion
+ #endregion 褰撳墠鏋勪欢
#region 鏋勪欢鏄庣粏
UpdateVisualListCtrl();
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 棰滆壊鍒嗙骇
var gradingHelper = await GetGradingHelper();
gradingHelper.Set();
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 璁＄畻鏍囩
var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
calcuResultLabelHelper.Set();
- #endregion
-
+ #endregion 璁＄畻鏍囩
};
dlg.ShowDialog();
}
@@ -2244,7 +2250,7 @@
Calcu();
}
- #endregion
+ #endregion 姘村姏璁＄畻
#region 瀵煎嚭鎶ュ憡
@@ -2284,11 +2290,9 @@
};
dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual);
dlg.ShowDialog();
-
-
}
- #endregion
+ #endregion 瀵煎嚭鎶ュ憡
#region 褰撳墠宸ュ喌
@@ -2353,7 +2357,7 @@
AddWorking();
}
- #endregion
+ #endregion 褰撳墠宸ュ喌
#region 閫夋嫨宸ュ喌
@@ -2400,8 +2404,7 @@
helper.Remove(working);
}
-
- #endregion
+ #endregion 閫夋嫨宸ュ喌
#region 宸ュ喌鍒嗘瀽
@@ -2499,7 +2502,6 @@
}
else
{
-
var dlg = new SimulationMultiWorkingEnergyDlg();
dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
dlg.ShowDialog();
@@ -2627,7 +2629,7 @@
}
}
- #endregion
+ #endregion 宸ュ喌鍒嗘瀽
#region 鏂规绠＄悊
@@ -2702,6 +2704,6 @@
DeleteScheme();
}
- #endregion
+ #endregion 鏂规绠＄悊
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/00-core/SimulationWordReportHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/00-core/SimulationWordReportHelper.cs
index 131e39b..24d969e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/00-core/SimulationWordReportHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/00-core/SimulationWordReportHelper.cs
@@ -309,6 +309,31 @@
}
/// <summary>
+ /// 鏋勫缓鍥剧墖 (鍚屼竴琛屽涓浘鐗�)
+ /// </summary>
+ /// <param name="addresses">鍥剧墖鍦板潃鍒楄〃</param>
+ /// <param name="height">鍥剧墖楂樺害</param>
+ /// <param name="width">鍥剧墖瀹藉害</param>
+ /// <param name="spacing">鍥剧墖涔嬮棿鐨勯棿璺�</param>
+ public void structureImagesInRow(List<string> addresses, int height, int width)
+ {
+ _builder.ParagraphFormat.Alignment = _fontalignment;
+ _builder.SetBuilderFont(_font, _fontSize, _fontcolor, _isBlod);
+
+ foreach (var address in addresses)
+ {
+ if (!System.IO.File.Exists(address))
+ {
+ continue; // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欒烦杩囪鍥剧墖
+ }
+
+ _builder.InsertImage(address, width, height);
+ }
+
+ _builder.Writeln(""); // 鍦ㄦ墍鏈夊浘鐗囨彃鍏ュ悗娣诲姞涓�涓崲琛�
+ }
+
+ /// <summary>
/// 鏋勫缓鍥剧墖
/// </summary>
/// <param name="content">鏂囧瓧鍐呭</param>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
index 24256c6..58e6ace 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
@@ -9,7 +9,6 @@
/// </summary>
public class SimulationWorkingReportHelper
{
-
//鏂囧瓧鎻忚堪杩愯妯″紡浠嬬粛 浜岋級杩愯鎯呭喌涓庤兘鑰楀垎鏋愪腑 "鍏ㄥ勾:"鍚�
private string _run_mode = "*******************************************************************";
@@ -49,8 +48,6 @@
//鎶ュ憡缁撳熬 鏃堕棿鏈�
private int _month = DateTime.Today.Month;
-
-
/// <summary>
/// 鍒涘缓word
@@ -120,6 +117,8 @@
SimulationWordReportHelper Text_left_15_black = new SimulationWordReportHelper(builder) { fontsize = 15, isblod = true };//涓�绾ф爣棰�
SimulationWordReportHelper Text_left_12_black = new SimulationWordReportHelper(builder) { fontsize = 12 };
SimulationWordReportHelper Text_reight_10_black = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Right, fontsize = 12 };
+ SimulationWordReportHelper Text_left_13_black = new SimulationWordReportHelper(builder) { fontsize = 13 };
+
SetWordHander(src, vm.Info.Name, vm.ReportType);
SetWordFooter(src, vm.Info.Name, vm.ReportType);
@@ -135,9 +134,7 @@
Text_center_25_black.structureText(string.Format("{0}{1}", vm.Info.Name, vm.ReportType));
Text_left_15_black.structureText("涓�銆佺郴缁熸杩�");
- Text_left_15_black.AddBlankLine();
- Text_left_15_black.AddBlankLine();
- Text_left_12_black.structureText(string.Format("{0}", vm.Info.Description));
+ Text_left_13_black.structureText(string.Format("{0}", vm.Info.Description));
Text_left_12_black.structureText("1.1銆佽澶囧熀鏈厤缃�");
#region 璁惧埆鍩烘湰閰嶇疆琛�
@@ -585,10 +582,17 @@
#endregion 瀹為檯鑳借�楁儏鍐佃〃
Text_left_12_black.structureLeft20Text("2.3銆侀珮鑳借�楀垎鏋�");
+ Text_left_12_black.structureTextAndImage(vm.Working.EnergyAnalyImagePath, 240, 400);
Text_left_12_black.structureLeft20Text("閫氳繃瀵圭郴缁熻繍琛屽伐鍐佃繘琛屾娴嬪垎鏋愶紝璁や负璇ョ郴缁熷瓨鍦� 鈥滀綆鏁堢巼銆侀珮鑳借�椻�濈幇璞°�備富瑕佽〃鐜板湪浠ヤ笅鏂归潰锛�");
Text_left_12_black.structureLeft20Text("1锛夋按娉电壒鎬т笌绠＄綉鐗规�т笉鐩稿尮閰嶏紝閫犳垚姘存车鍋忕璁捐宸ュ喌杩愯锛屽叾瀹為檯杩愯鏁堢巼涓嬮檷锛岄�犳垚杈冨鐨勬棤鏁堣兘鑰楋紝澶勪簬涓嶇粡娴庤繍琛岀姸鎬侊紱鑰屽綋鍓嶅惊鐜按宸ュ喌鍙堝苟闈炴槸绯荤粺鐨勬渶浣崇姸鎬侊紝浼樺寲绠＄綉闃绘姉鏁村悎杩愯鍙傛暟锛屽皢浣挎湰绯荤粺鍏锋湁杈冨ぇ鐨勮妭鑳界┖闂淬��");
Text_left_12_black.structureLeft20Text("2锛夋按娉垫�ц兘鏇茬嚎鍜岀缃戠壒鎬ф洸绾夸笉鐩稿尮閰嶏紝鍦ㄦ按绯荤粺鍦ㄨ緭閫佽繃绋嬩腑瀛樺湪闂榾璋冭妭闃诲姏锛屽鍔犱簡杈撻�佽繃绋嬩腑鐨勬棤鏁堣兘鑰楋紝闄嶄綆姘寸郴缁熺殑杈撻�佹晥鐜囷紱闇�瑕侀噸鏂板绯荤粺杩涜寤烘ā鍒嗘瀽锛岄檷浣庣郴缁熼樆鍔涳紝浼樺寲姘存车鎵▼銆�");
Text_left_12_black.structureLeft20Text("3锛夌己涔忔妧鏈墜娈靛鎹㈢儹璁惧杩涜閲忓寲璋冭妭锛屾祦閲忚繃澶у瓨鍦ㄦ氮璐广�傞�氳繃璋冭瘯骞堕厤缃紭鍖栵紝瀵规崲鐑櫒瀹氶噺鍒嗘瀽锛屽埗瀹氭崲鐑櫒杩愯鍚堢悊鏂规锛屾敼鎹㈢儹鍣ㄤ负瀹氶噺鎺у埗锛屾渶缁堟秷闄ゆ棤鏁堟祦閲忥紝浣跨郴缁熷鍦ㄤ紭鑹姸鎬佷笅杩愯銆�");
+ Text_left_12_black.structureLeft20Text("2.4銆佹崯澶辨洸绾�");
+ Text_left_12_black.structureTextAndImage(vm.Working.LossCurveImagePath, 210, 400);
+ Text_left_12_black.structureLeft20Text("2.5銆佹崯澶辩粺璁�");
+ var pathList = new List<string>() { vm.Working.EnergyInputImagePath, vm.Working.EnergyLossImagePath };
+ Text_left_12_black.structureImagesInRow(pathList, 110, 220);
+ Text_left_12_black.structureTextAndImage(vm.Working.EnergyStatisticsImagePath, 50, 440);
Text_left_15_black.structureText("涓夛級\t鑺傝兘鎶�鏀规柟妗堜笌璁捐鎸囨爣");
Text_left_12_black.structureLeft20Text("3.1銆佽璁′緷鎹�");
@@ -598,15 +602,13 @@
Text_left_12_black.structureLeft20Text("3.1.3 閫氳繃姘存车鎬ц兘鏇茬嚎妯℃嫙锛屾按娉佃繍琛屽湪涓�瀹氱殑宸ュ喌涓嬶紝鍏舵祦閲廞銆佹壃绋婬銆佸姛鐜嘝銆佹晥鐜囄风浉瀵瑰簲锛涘疄闄呮�ц兘涓庢爣鍑嗘�ц兘涓�鑸樊寮傦紙涓昏涓烘晥鐜囄锋寚鏍囷級");
Text_left_12_black.structureLeft20Text("3.1.4 绠¤矾绯荤粺鍘嬪姏闄嶆崲绠楀熀鏈叕寮忥紙i浠ｈ〃鍗曚綅绫抽暱搴︾閬撲笂娌跨▼闃诲姏绯绘暟锛�");
- // 鎻掑叆鍥剧墖
- // builder.Write(" ");
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Pressure_conversion_formula_big1_2, 30, 150);
- Text_left_12_black.structureTextAndImage("00-core\\Pressure_conversion_formula_big1.2.png", 30, 150);
// builder.Write(" ");
- Text_left_12_black.structureTextAndImage("00-core\\Pressure_conversion_formula_small1.2.png", 35, 220);
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Pressure_conversion_formula_small1_2, 35, 220);
Text_left_12_black.structureLeft20Text("3.1.5 灞�閮ㄩ樆鍔涜绠楀叕寮�");
// builder.Write(" ");
- Text_left_12_black.structureTextAndImage("00-core\\Local_resistance.png", 35, 60);
+ Text_left_12_black.structureTextAndImage(Xhs.Core.Properties.Resources.Local_resistance, 35, 60);
Text_left_12_black.structureLeft20Text("3.1.6 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯伙紙鍙傝�冿級");
#region 闃�闂ㄥ紑搴︿笌灞�閮ㄩ樆鍔涚郴鏁板叧绯昏〃
@@ -1279,7 +1281,5 @@
builder.MoveToDocumentEnd();
}
}
-
-
}
-}
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index fd26542..f05e3d7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -94,6 +94,21 @@
<Compile Update="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-simulation\04-scheme\01-info - 澶嶅埗\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\01-info - 澶嶅埗\CreateXhsSchemeInfoPage - 澶嶅埗.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\01-info - 澶嶅埗\CreateXhsSchemeInfoPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -105,9 +120,6 @@
</Compile>
<Compile Update="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg.cs">
<SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs">
- <SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
<SubType>UserControl</SubType>
--
Gitblit v1.9.3