From 144f2cfce3bf16c1c8ad53b0ca2ee91e4c93b492 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期日, 03 十一月 2024 09:32:34 +0800
Subject: [PATCH] 提交
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 5 +++++
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ViewModel/SectionShapePara.cs | 23 +++++++++++++++++++++++
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.cs | 4 ++++
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ViewModel/SectionBaseInfo.cs | 2 ++
4 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index ff69fac..da2d35e 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -145,6 +145,11 @@
MessageBox.Show(error_info);
return false;
}
+ if (!sectionShapeInfo18.Verify(out error_info))
+ {
+ MessageBox.Show(error_info);
+ return false;
+ }
_sectionShapePara = sectionShapeInfo18;
_sectionShapePara.CalcHeightByArea(_sectionBaseInfo.ShapeType);
_sectionBaseInfo.EditSingleShape(_sectionShapePara, index);
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionBaseInfo.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionBaseInfo.cs"
index 30bd0dd..a500ae9 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionBaseInfo.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionBaseInfo.cs"
@@ -357,6 +357,8 @@
return true;
}
+
+
public void EditSingleShape(SectionShapePara sectionShapePara,int index)
{
this.GaMa1[index] = sectionShapePara.Gama_Left;
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionShapePara.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionShapePara.cs"
index cab1b4c..6bd9779 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionShapePara.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ViewModel/SectionShapePara.cs"
@@ -92,6 +92,29 @@
}
}
+
+
+ /// <summary>
+ /// 楠岃瘉鏄惁鍚堢悊
+ /// </summary>
+ /// <param name="sectionShapePara"></param>
+ /// <param name="index"></param>銆�
+ public bool Verify(out string error)
+ {
+ error = "";
+ bool isverify = true;
+ if ((this.H - this.R_Left) * Math.Tan(this.Gama_Left)+(this.H - this.R_Right) * Math.Tan(this.R_Right)+this.BaseWidth >= this.R_Right + this.R_Left)
+ {
+ error = "杈撳叆鐨勭洿寰勯潪娉曪紒";
+ isverify = false;
+ }
+ if(this.Gama_Left > 45 || this.Gama_Right > 45)
+ {
+ error = "杈撳叆鐨勮搴﹂潪娉曪紒";
+ isverify = false;
+ }
+ return isverify;
+ }
//private double DecreaseR = 0.5;
//public bool CalculateR(HdrBaseInfo BaseInfo, SectionBaseInfo sectionBaseInfo, GeomBaseInfo geomBaseInfo, bool isFirst)
//{
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
index cb0c813..d0db1db 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
@@ -386,6 +386,10 @@
}
}
}
+ if (_paras.ShapeType == ViewModel.eSectionShapeType.瀵圭О)
+ {
+ mTextBoxEditR2.Text = mTextBoxEditR1.Text;
+ }
}
--
Gitblit v1.9.3