From 75263eb2d74528acf0086ddf2d8eab89fcecd8fb Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期四, 27 三月 2025 18:31:57 +0800
Subject: [PATCH] 直线圆弧修改

---
 WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowParas.cs |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
index 02e24d1..8ecd57d 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
@@ -107,6 +107,12 @@
                 return _sharp_type;
             }
         }
+        bool _isxml = false;
+        public bool Isxml
+        {
+            get { return _isxml; }
+            set { _isxml = value; }
+        }
         private void InitialOutflowStyle()
         {
             if (_parasControlCenter == null)
@@ -172,11 +178,20 @@
             if(outflowParas != null)
             {
                 _sharp_type = outflowParas.ShapeStyle;
+                _link_type = outflowParas.LinkStyle;
             }
             //
             InitialCtrlDefaultParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo, outflowParas);
 
      
+            if(_link_type == eOutflowLinkStyle.鏇茬嚎)
+            {
+                checkBox鍦嗗姬杩炴帴.Checked = false;
+            }
+            else
+            {
+                checkBox鍦嗗姬杩炴帴.Checked = true;
+            }
 
             if (_sharp_type == eOutflowShapeStyle.鏈煡)
             {
@@ -185,9 +200,15 @@
             }
             else
             {
+                comboBoxType.SelectedIndex = (int)_sharp_type;
+                if (_isxml)
+                {
+                    _isxml = false;
+
+                }
                 InitialOutflowStyle();
 
-                RefreshModel();
+                    RefreshModel();
             }
 
             return 1;
@@ -622,8 +643,8 @@
             else if (comboBoxType.SelectedIndex == 1)
             {
                 _sharp_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鏇茬嚎杩炴帴;
-                checkBox鍦嗗姬杩炴帴.Enabled = false;
-                checkBox鍦嗗姬杩炴帴.Visible = false;
+                checkBox鍦嗗姬杩炴帴.Enabled = true;
+                checkBox鍦嗗姬杩炴帴.Visible = true;
                 _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.鏇茬嚎;
                 if (checkBox鍦嗗姬杩炴帴.Checked)
                 {
@@ -641,10 +662,13 @@
                 checkBox鍦嗗姬杩炴帴.Visible = false;
                 _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.鏇茬嚎;
             }
-
+            if (_isxml)
+            {
+                return;
+            }
             InitialOutflowStyle();
 
-            RefreshModel();
+                RefreshModel();
         }
 
         private void btnNextStep_Click(object sender, EventArgs e)
@@ -662,6 +686,10 @@
             {
                 _link_type = DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬;
             }
+            if (_isxml)
+            {
+                return;
+            }
 
             InitialOutflowStyle();
 

--
Gitblit v1.9.3