From c8552b21551b7fccd19e5dac28c05092fcde29cb Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期四, 13 二月 2025 17:40:23 +0800
Subject: [PATCH] 优化导入XML

---
 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs |  117 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 53 insertions(+), 64 deletions(-)

diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
index 56c441b..2b4e6f6 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
@@ -100,8 +100,9 @@
                 this._occDesign3dCtrl.ClearAll();
 
                 #region  绗竴姝� 
-                if (_hdrBaseInfo != null ) 
-                {
+                if (_hdrBaseInfo == null)
+                    return;
+                
                     if (_ctrlHdrBaseInfo == null)
                     {
                         _ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
@@ -110,86 +111,74 @@
                     _ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
                     _ctrlHdrBaseInfo.SetBindingData(_geomBaseInfo);
                     _ctrlHdrBaseInfo.SaveHistoryParas(_hdrBaseInfo, _geomBaseInfo);
-                }
+                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Hdr_Base_Info);
                 #endregion
- 
 
                 #region  绗�2姝� 鏂潰鎬昏
-                if (_sectionBundleInfo != null)
-                {
-                    if (_ctrlSectionBundleInfo == null)
-                    {
-                        _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
-                        _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
-                        _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
-                        _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
-                    }
+                if (_sectionBundleInfo == null)
+                    return;
+                CreateSectionStepCtrl();
+                DockStepParaCtrl(_ctrlSectionBundleInfo);
 
-                    _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
-                        DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘,true);
-                    _ctrlSectionBundleInfo.RefreshAllSectPara(_sectionBundleInfo);
-                    RefreshSectShapeWhole18(_sectionBundleInfo);
-                }
+                _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
+                        DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘, true);
+                _ctrlSectionBundleInfo.RefreshAllSectPara(_sectionBundleInfo);
+                RefreshSectShapeWhole18(_sectionBundleInfo);
+                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Section18_Full);
                 #endregion
 
-        
 
-                #region  鍑烘按闈㈢被鍨嬮�夋嫨
-                //if (_outflowType != ViewModel.eOutflowStyle.鏈煡)
-                //{
-                //    if (_ctrlSetOutflowType == null)
-                //    {
-                //        _ctrlSetOutflowType = new ctrlSetOutflowType();
-                //        _ctrlSetOutflowType.Name = "ctrlSetOutflowDim";
-                //    }
-                //    this._ctrlSetOutflowType.SetBindingData(_outflowType);
-                //} 
-                #endregion
 
                 #region  鍑烘按闈㈠弬鏁�
-                if (_outflowParas != null)
-                { 
-                    if (_ctrlSetOutflowParas == null)
-                    {
-                        _ctrlSetOutflowParas = new ctrlSetOutflowParas();
-                        _ctrlSetOutflowParas.Name = "ctrlSetOutflowStyle";
-                        _ctrlSetOutflowParas.OnRefreshShape2D += RefreshWaterBody2D;
-                        _ctrlSetOutflowParas.OnRefreshShape3D += RefreshWaterBody3D;
-                        _ctrlSetOutflowParas.InitialParas( _hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
-                    }
-                    //CreateWaterBody2D(_outflowParas);
-                    RefreshWaterBody3D(_outflowParas);
-                    
+                if (_outflowParas == null)
+                    return;
+                CreateOutflowStepCtrl();
 
-                    _ctrlSetOutflowParas.SetBindingData( _outflowParas);
+                DockStepParaCtrl(_ctrlSetOutflowParas);
 
-                    #region  鍔犲帤
-                    if (_bodyThickness>0)
-                    {
-                        Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
-                        Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
+                InitilOutflowStepCtrl(this._stepTreeDockPanel.Step_ID_Section18_Full);
 
-                        if (_ctrlThicknessParas == null)
-                        {
-                            _ctrlThicknessParas = new ctrlThicknessParas();
-                            _ctrlThicknessParas.Name = "ctrlThicknessParas";
-                            _ctrlThicknessParas.OnRefreshShape += (houdu) => {
-                                this._bodyThickness = houdu;
-                                this._occDesign3dCtrl.BuildThicknessBody(houdu);
-                            };
-                             _ctrlThicknessParas.InitialParas(_bodyThickness);
-                            this._occDesign3dCtrl.BuildThicknessBody(_bodyThickness);
-                        }
- 
-                    }
-                    #endregion
-                }
+                this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
+                this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
+
+                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Outflow_Paras);
 
                 #endregion
 
+                #region  鍔犲帤
+                if (_bodyThickness < 1)
+                    return;
+                CreateThicknessStepCtrl();
 
+
+
+                InitilThicknessStepCtrl(this._stepTreeDockPanel.Step_ID_Outflow_Paras);
+
+
+                DockStepParaCtrl(_ctrlThicknessParas);
+                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_jiahout);
+                //{
+                //    Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
+                //    Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
+
+                //    if (_ctrlThicknessParas == null)
+                //    {
+                //        _ctrlThicknessParas = new ctrlThicknessParas();
+                //        _ctrlThicknessParas.Name = "ctrlThicknessParas";
+                //        _ctrlThicknessParas.OnRefreshShape += (houdu) =>
+                //        {
+                //            this._bodyThickness = houdu;
+                //            this._occDesign3dCtrl.BuildThicknessBody(houdu);
+                //        };
+                //        _ctrlThicknessParas.InitialParas(_bodyThickness);
+                //        this._occDesign3dCtrl.BuildThicknessBody(_bodyThickness);
+                //    }
+
+                //}
+                #endregion
             }
         }
+        
 
 
         /// <summary>

--
Gitblit v1.9.3