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/断面设计/ctrlSectionBundleInfo.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
index 7d666a3..bc08eea 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
@@ -472,9 +472,9 @@
}
else
{
- var initialR = _sectionBundleInfo.CalInitialR(_hdrBaseInfo, _geomBaseInfo);
- var height = _sectionBundleInfo.CalcHeight(_geomBaseInfo, index, result, initialR[index]);
- var R = _sectionBundleInfo.CheckChamferR(height, index, result, initialR[index]);
+ //var initialR = _sectionBundleInfo.CalInitialR(_hdrBaseInfo, _geomBaseInfo);
+ var height = _sectionBundleInfo.CalcHeight(_geomBaseInfo, index, result, _sectionBundleInfo.R_Left[index]);
+ var R = _sectionBundleInfo.CheckChamferR(height, index, result, _sectionBundleInfo.R_Left[index]);
SkyTextBox controlh1 = this.Controls.Find($"skyTextBox鏂潰H1{index}", true).FirstOrDefault() as SkyTextBox;
SkyTextBox controlr1 = this.Controls.Find($"skyTextBox鏂潰r1{index}", true).FirstOrDefault() as SkyTextBox;
controlh1.Text = height.ToString();
@@ -493,7 +493,7 @@
{
skytextBox.Text = _sectionBundleInfo.GaMa_Right[index].ToString();
}
- if (string.IsNullOrEmpty(skytextBox.Text))
+ if (string.IsNullOrEmpty(skytextBox.Text) || Convert.ToDouble(skytextBox.Text) == 0)
{
MessageBox.Show("r涓嶅悎鐞嗭紒璇烽噸鏂拌緭鍏�");
}
@@ -549,7 +549,7 @@
var c = _sectionBundleInfo.R_out / 1000;
var TopWidth = _sectionBundleInfo.BaseWidth + (2 * x);
var Slash = (Convert.ToDouble(controlh1.Text) - Convert.ToDouble(controlr1.Text) - (Math.Sin(Convert.ToDouble(controlGaMa1.Text) * Math.PI / 180) * Convert.ToDouble(controlr1.Text))) / Math.Cos(Convert.ToDouble(controlGaMa1.Text) * Math.PI / 180);
- if ((!RBtn鐭╁舰.Checked && (TopWidth < c || Slash < c)) || Convert.ToDouble(controlr1.Text) == 0)
+ if ((!RBtn鐭╁舰.Checked && (TopWidth < c || Slash < c - 0.1))) //
{
controlr1.BackColor = Color.OrangeRed;
MessageBox.Show("r涓嶅悎鐞嗭紒璇烽噸鏂拌緭鍏�");
@@ -718,14 +718,14 @@
SkyTextBox controH1 = this.Controls.Find(controlnameHeight, true).FirstOrDefault() as SkyTextBox;
controly1.Enabled = true;
- if (controly1 != null)
- controly1.Text = Math.Round(_sectionBundleInfo.GaMa_Left[sect_index], 1).ToString();
- if (controly2 != null)
- controly2.Text = Math.Round(_sectionBundleInfo.R_Left[sect_index], 1).ToString();
if (control鏂潰闈㈢Н != null)
control鏂潰闈㈢Н.Text = Math.Round(_sectionBundleInfo.Area[sect_index], 1).ToString();
if (controH1 != null)
controH1.Text = Math.Round(_sectionBundleInfo.H[sect_index], 1).ToString();
+ if (controly2 != null)
+ controly2.Text = Math.Round(_sectionBundleInfo.R_Left[sect_index], 1).ToString();
+ if (controly1 != null)
+ controly1.Text = Math.Round(_sectionBundleInfo.GaMa_Left[sect_index], 1).ToString();
}
}
--
Gitblit v1.9.3