From 91105b77c916d06dd30380e20594e29f85eae3da Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 24 十二月 2024 11:39:34 +0800
Subject: [PATCH] 更换HydrEngineCSharp

---
 WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeDockPanel.cs |  112 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeDockPanel.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeDockPanel.cs
index 1305783..f25b03e 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeDockPanel.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeDockPanel.cs
@@ -30,17 +30,17 @@
         //鍑烘按璁捐
         private readonly string Group_Name_Outflow = "Outflow";
         private readonly int Group_ID_Outflow = -3;
-        public readonly long Step_ID_Outflow_Style = 31;
-        public readonly long Step_ID_Outflow_Dim = 32;
-
+        public readonly long Step_ID_Outflow_Style = 32;
+        public readonly long Step_ID_Outflow_Type = 31;
+        public readonly long Step_ID_jiahout = 33;
 
         //
-        private List<DPumpHydr.WinFrmUI.Base.TreeStepNode> _allStepNodes = null;
+        private List<DPumpHydr.WinFrmUI.Base.StepTreeNodePara> _allStepNodes = null;
         /// <summary>
         /// 姝ラ鑺傜偣閫夋嫨鏀瑰彉鍓嶅悗浜嬩欢
         /// </summary>
-        public event Func<TreeStepNode, TreeStepNode, bool> BeforeSelectedNodeChangedEvent;
-        public event Func<TreeStepNode, TreeStepNode, bool> AfterSelectedNodeChangedEvent;
+        public event Func<StepTreeNodePara, StepTreeNodePara, bool> BeforeSelectedNodeChangedEvent;
+        public event Func<StepTreeNodePara, StepTreeNodePara, bool> AfterSelectedNodeChangedEvent;
 
 
         public long PrevStepID
@@ -121,10 +121,10 @@
         /// </summary>
         public void InitialStepNodes()
         {
-            _allStepNodes = new List<DPumpHydr.WinFrmUI.Base.TreeStepNode>();
+            _allStepNodes = new List<DPumpHydr.WinFrmUI.Base.StepTreeNodePara>();
 
             #region 鍩虹淇℃伅/鍑犱綍鍙傛暟
-            var stepGroup_BaseInfo = new DPumpHydr.WinFrmUI.Base.TreeStepNode();
+            var stepGroup_BaseInfo = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara();
             stepGroup_BaseInfo.AllowSelect = false; 
             stepGroup_BaseInfo.Caption = "鍩虹淇℃伅";
             stepGroup_BaseInfo.Name = Group_Name_Base_Info;
@@ -132,19 +132,20 @@
             stepGroup_BaseInfo.ParentID = 0;
             _allStepNodes.Add(stepGroup_BaseInfo);
 
-            var step娆㈣繋浣跨敤 = new DPumpHydr.WinFrmUI.Base.TreeStepNode();
+            var step娆㈣繋浣跨敤 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara();
             step娆㈣繋浣跨敤.AllowSelect = false ; 
             step娆㈣繋浣跨敤.Caption = "娆㈣繋浣跨敤";
             step娆㈣繋浣跨敤.Name = "StepHelp";
             step娆㈣繋浣跨敤.ID = Step_ID_Introduce;
             step娆㈣繋浣跨敤.ParentID = Group_ID_Base_Info;
+            step娆㈣繋浣跨敤.SpecImage = DPumpHydr.WinFrmUI.Volute.Properties.Resources.Smile16;
             _allStepNodes.Add(step娆㈣繋浣跨敤);
 
 
-            var step鍩虹淇℃伅 = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var step鍩虹淇℃伅 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             step鍩虹淇℃伅.AllowSelect = true; 
             step鍩虹淇℃伅.Caption = "绗竴姝�:鍩虹淇℃伅";
@@ -153,10 +154,10 @@
             step鍩虹淇℃伅.ParentID = Group_ID_Base_Info;
             _allStepNodes.Add(step鍩虹淇℃伅);
 
-            var step鍑犱綍鍙傛暟 = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var step鍑犱綍鍙傛暟 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             step鍑犱綍鍙傛暟.AllowSelect = true; 
             step鍑犱綍鍙傛暟.Caption = "绗簩姝�:鍑犱綍鍙傛暟";
@@ -169,10 +170,10 @@
 
             #region 鏂潰璁捐(1-8)
 
-            var stepGroup_CoverPlate = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var stepGroup_CoverPlate = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             stepGroup_CoverPlate.AllowSelect = false;
             stepGroup_CoverPlate.Caption = "鏂潰璁捐";
@@ -182,10 +183,10 @@
             _allStepNodes.Add(stepGroup_CoverPlate);
 
 
-            var step鏂潰鍩烘湰淇℃伅 = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var step鏂潰鍩烘湰淇℃伅 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             step鏂潰鍩烘湰淇℃伅.AllowSelect = true   ;
             step鏂潰鍩烘湰淇℃伅.Caption = string.Format("{0}:{1}",
@@ -197,24 +198,25 @@
             _allStepNodes.Add(step鏂潰鍩烘湰淇℃伅);
 
 
-            var stepSetct18 = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var stepSetct18 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             stepSetct18.AllowSelect = false ;
             stepSetct18.Caption = "绗洓姝�: 绗�1-8鏂潰";
             stepSetct18.Name = "TreeStepNode" + Step_ID_Section18_Grp;
             stepSetct18.ID = Step_ID_Section18_Grp; 
             stepSetct18.ParentID = Group_ID_Section18;
+            stepSetct18.SpecImage = DPumpHydr.WinFrmUI.Volute.Properties.Resources.Sect16;
             _allStepNodes.Add(stepSetct18);
  
             for(int i = 8; i >= 1; i--)
             {
-                var stepSetct0 = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+                var stepSetct0 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
                 {
-                    ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                    DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                    ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                    DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
                 };
                 stepSetct0.AllowSelect = true;
                 stepSetct0.Caption = string.Format("绗瑊0}鏂潰",i);
@@ -228,10 +230,10 @@
 
             #region 鍑烘按浣�
 
-            var stepGroup_鍑烘按浣� = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            var stepGroup_鍑烘按浣� = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             stepGroup_鍑烘按浣�.AllowSelect = false;
             stepGroup_鍑烘按浣�.Caption = "鍑烘按浣撹璁�";
@@ -241,34 +243,50 @@
             _allStepNodes.Add(stepGroup_鍑烘按浣�);
 
 
-            var step鍑烘按浣撶被鍨� = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+
+            var step鍑烘按浣撳昂瀵� = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
+            };
+            step鍑烘按浣撳昂瀵�.AllowSelect = true;
+            step鍑烘按浣撳昂瀵�.Caption = " 绗簲姝�:鍑烘按浣撶被鍨�";
+            step鍑烘按浣撳昂瀵�.Name = "TreeStepNode" + Step_ID_Outflow_Type;
+            step鍑烘按浣撳昂瀵�.ID = Step_ID_Outflow_Type;
+            step鍑烘按浣撳昂瀵�.ParentID = Group_ID_Outflow;
+            _allStepNodes.Add(step鍑烘按浣撳昂瀵�);
+
+
+
+
+            var step鍑烘按浣撶被鍨� = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
+            {
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
             step鍑烘按浣撶被鍨�.AllowSelect = true;
-            step鍑烘按浣撶被鍨�.Caption = "绗簲姝�:鍑烘按浣撶被鍨�";
+            step鍑烘按浣撶被鍨�.Caption = "绗叚姝�:鍑烘按浣撳昂瀵�";
             step鍑烘按浣撶被鍨�.Name = "TreeStepNode" + Step_ID_Outflow_Style;
             step鍑烘按浣撶被鍨�.ID = Step_ID_Outflow_Style; 
             step鍑烘按浣撶被鍨�.ParentID = Group_ID_Outflow;
             _allStepNodes.Add(step鍑烘按浣撶被鍨�);
 
-
-
-            var step鍑烘按浣撳昂瀵� = new DPumpHydr.WinFrmUI.Base.TreeStepNode()
+            
+            var step鍔犲帤 = new DPumpHydr.WinFrmUI.Base.StepTreeNodePara()
             {
-                ProgressState = WinFrmUI.Base.TreeStepNode.eProgressState.鏈畬鎴�,
-                DataState = WinFrmUI.Base.TreeStepNode.eDataState.鏈煡
+                ProgressState = WinFrmUI.Base.StepTreeNodePara.eProgressState.鏈畬鎴�,
+                DataState = WinFrmUI.Base.StepTreeNodePara.eDataState.鏈煡
             };
-            step鍑烘按浣撳昂瀵�.AllowSelect = true;
-            step鍑烘按浣撳昂瀵�.Caption = "绗叚姝�:鍑烘按浣撳昂瀵�";
-            step鍑烘按浣撳昂瀵�.Name = "TreeStepNode" + Step_ID_Outflow_Dim;
-            step鍑烘按浣撳昂瀵�.ID = Step_ID_Outflow_Dim; 
-            step鍑烘按浣撳昂瀵�.ParentID = Group_ID_Outflow;
-            _allStepNodes.Add(step鍑烘按浣撳昂瀵�);
+            step鍔犲帤.AllowSelect = true;
+            step鍔犲帤.Caption = "绗竷姝�:姘翠綋鍔犲帤";
+            step鍔犲帤.Name = "TreeStepNode" + Step_ID_jiahout;
+            step鍔犲帤.ID = Step_ID_jiahout;
+            step鍔犲帤.ParentID = Group_ID_Outflow;
+            _allStepNodes.Add(step鍔犲帤);
+
 
             #endregion
- 
+
 
             //
             this._currentStepID = Step_ID_Hdr_Base_Info;
@@ -282,7 +300,7 @@
             this._currentStepID = StepNodeID;
             this.stepTreeCtrl1.SetFocusedNode(StepNodeID);
         }
-        public void SetStepSource(List<TreeStepNode> steps, long ID)
+        public void SetStepSource(List<StepTreeNodePara> steps, long ID)
         {
             if(ID > 0)
             {

--
Gitblit v1.9.3