From 4ee432aa0ec5ec8058d720b49ae7f46e5ad1c49c Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期日, 03 十一月 2024 09:24:33 +0800
Subject: [PATCH] 确认提交
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index b07e29e..f8507ea 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -7,7 +7,7 @@
namespace DPumpHydr.WinFrmUI.Volute
{
- public partial class MainViewPage
+ public partial class MainViewPage
{
//
ctrlHdrBaseInfo _ctrlHdrBaseInfo = null;
@@ -33,16 +33,16 @@
//鍑烘按璁捐
private readonly string Group_Name_Outflow = "Outflow";
- private readonly int Group_ID_Outflow = -3;
+ private readonly int Group_ID_Outflow = -3;
private long Step_ID_Outflow_Style = 31;
private long Step_ID_Outflow_Dim = 32;
//
private List<DPumpHydr.WinFrmUI.Volute.TreeStepNode> _allStepNodes = null;
-
+
private long _currentStepID = 0;
-
+
/// <summary>
/// 涓嬩竴姝�
/// </summary>
@@ -72,30 +72,30 @@
/// <returns></returns>
private bool GoNextStepCore()
{
- if (_currentStepID != Step_ID_Section18_Dim || _currentSectIndex>8 || _currentSectIndex<=1)
+ if (_currentStepID != Step_ID_Section18_Dim || _currentSectIndex > 8 || _currentSectIndex <= 1)
{
_currentSectIndex = 9;
next_step = (from x in _allStepNodes
- where x.ID > _currentStepID
- orderby x.ID
- select x).FirstOrDefault();
+ where x.ID > _currentStepID
+ orderby x.ID
+ select x).FirstOrDefault();
if (next_step == null)
return false;
}
-
+
//绗竴姝ヨ繘琛屼笅涓�姝ョ偣鍑�
- if(_currentStepID == Step_ID_Hdr_Base_Info)
+ if (_currentStepID == Step_ID_Hdr_Base_Info)
{
string error_info;
var hdrBaseInfo = _ctrlHdrBaseInfo.GetBindingData(out error_info);
- if(hdrBaseInfo == null)
+ if (hdrBaseInfo == null)
{
MessageBox.Show(error_info);
return false;
}
hdrBaseInfo.CalcNs();
_hdrBaseInfo = hdrBaseInfo;
- if(_geomBaseInfo == null)
+ if (_geomBaseInfo == null)
{
_geomBaseInfo = new ViewModel.GeomBaseInfo();
}
@@ -112,7 +112,7 @@
return false;
}
_geomBaseInfo = geomBaseInfo;
- if(_sectionBaseInfo == null)
+ if (_sectionBaseInfo == null)
{
_sectionBaseInfo = new ViewModel.SectionBaseInfo();
}
@@ -123,7 +123,7 @@
//绗笁姝ヨ繘琛屼笅涓�姝ョ偣鍑�
if (_currentStepID == Step_ID_Section18_Base)
{
-
+
string error_info;
var sectionBaseInfo = _ctrlSectionBaseInfo.GetBindingData(out error_info);
if (sectionBaseInfo == null)
@@ -153,14 +153,14 @@
_sectionShapePara = sectionShapeInfo18;
_sectionShapePara.CalcHeightByArea(_sectionBaseInfo.ShapeType);
_sectionBaseInfo.EditSingleShape(_sectionShapePara, _currentSectIndex);
- if(_currentSectIndex != 9)
+ if (_currentSectIndex != 9)
{
_currentSectIndex--;
}
_sectionShapePara.Initialparameters(_currentSectIndex, _sectionBaseInfo);
}
SetParasCtrl(next_step.ID);
-
+
return true;
}
@@ -169,7 +169,7 @@
/// </summary>
/// <returns></returns>
private bool GoPrevStepCore()
- {
+ {
//bool IsChanges = true;
//if (_currentStepID == Step_ID_Section18_Base && _ctrlSectionBaseInfo.IsParameterChange())
//{
@@ -191,26 +191,26 @@
//}
if (_currentStepID == Step_ID_Hdr_Base_Info)
return false;
- if(_currentStepID == Step_ID_Section18_Dim && _currentSectIndex >=1 &&_currentSectIndex < 8)
+ if (_currentStepID == Step_ID_Section18_Dim && _currentSectIndex >= 1 && _currentSectIndex < 8)
{
_currentSectIndex++;
_sectionShapePara.Initialparameters(_currentSectIndex, _sectionBaseInfo);
SetParasCtrl(Step_ID_Section18_Dim);
return true;
}
- if(_currentStepID == Step_ID_Outflow_Style)
+ if (_currentStepID == Step_ID_Outflow_Style)
{
_currentSectIndex = 1;
_sectionShapePara.Initialparameters(_currentSectIndex, _sectionBaseInfo);
}
var prev_step = (from x in _allStepNodes
- where x.ID < _currentStepID
- orderby x.ID
- select x).LastOrDefault();
+ where x.ID < _currentStepID
+ orderby x.ID
+ select x).LastOrDefault();
if (prev_step == null)
return false;
- SetParasCtrl(prev_step.ID);
+ SetParasCtrl(prev_step.ID);
return true;
}
@@ -220,7 +220,7 @@
/// </summary>
/// <param name="step_id"></param>
private void SetParasCtrl(long step_id)
- {
+ {
//绗竴姝�
if (step_id == Step_ID_Hdr_Base_Info)
{
@@ -274,10 +274,10 @@
- if(step_id == Step_ID_Outflow_Style)
+ if (step_id == Step_ID_Outflow_Style)
{
if (_ctrlSetOutflowStyle == null)
- {
+ {
_ctrlSetOutflowStyle = new ctrlSetOutflowStyle();
_ctrlSetOutflowStyle.Name = "ctrlSetOutflowStyle";
_ctrlSetOutflowStyle.Dock = DockStyle.Right;
@@ -304,20 +304,20 @@
this._currentStepID = step_id;
}
-
+
/// <summary>
/// 铚楀３鍙傛暟瀵煎嚭
/// </summary>
public void VoluteDeriveArgument()
{
- if(_sectionBaseInfo == null )
+ if (_sectionBaseInfo == null)
{
MessageBox.Show("鎮ㄨ繕娌℃湁瀹屾垚瀹氫箟鍙傛暟锛佽瀹氫箟瀹屾垚鍚庡湪杩涜瀵煎嚭锛侊紙鑷冲皯瀹屾垚绗笁姝ワ級");
return;
}
- if(_currentStepID <= 21)
+ if (_currentStepID <= 21)
{
- DialogResult result = MessageBox.Show("纭畾涓嶈繘琛屽悗缁柇闈㈠弬鏁扮殑璋冩暣锛屼娇鐢ㄥ垵濮嬭绠楀悗鐨勫弬鏁板悧锛�","鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+ DialogResult result = MessageBox.Show("纭畾涓嶈繘琛屽悗缁柇闈㈠弬鏁扮殑璋冩暣锛屼娇鐢ㄥ垵濮嬭绠楀悗鐨勫弬鏁板悧锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if (result == DialogResult.Cancel)
{
return;
@@ -414,23 +414,23 @@
step鏂潰鍩烘湰淇℃伅.ParentID = Group_ID_Section18;
_allStepNodes.Add(step鏂潰鍩烘湰淇℃伅);
-
- var stepSetct18 = new DPumpHydr.WinFrmUI.Volute.TreeStepNode()
- {
- ProgressState = WinFrmUI.Volute.TreeStepNode.eProgressState.鏈畬鎴�,
- DataState = WinFrmUI.Volute.TreeStepNode.eDataState.鏈煡
- };
- stepSetct18.AllowSelect = true;
- stepSetct18.Caption = "绗洓姝�: 绗�1-8鏂潰" ;
+
+ var stepSetct18 = new DPumpHydr.WinFrmUI.Volute.TreeStepNode()
+ {
+ ProgressState = WinFrmUI.Volute.TreeStepNode.eProgressState.鏈畬鎴�,
+ DataState = WinFrmUI.Volute.TreeStepNode.eDataState.鏈煡
+ };
+ stepSetct18.AllowSelect = true;
+ stepSetct18.Caption = "绗洓姝�: 绗�1-8鏂潰";
stepSetct18.Name = "TreeStepNode" + Step_ID_Section18_Dim;
- stepSetct18.ID = Step_ID_Section18_Dim ;
- stepSetct18.Group = "鐩栨澘杩炴帴";
- stepSetct18.ParentID = Group_ID_Section18;
- _allStepNodes.Add(stepSetct18);
-
+ stepSetct18.ID = Step_ID_Section18_Dim;
+ stepSetct18.Group = "鐩栨澘杩炴帴";
+ stepSetct18.ParentID = Group_ID_Section18;
+ _allStepNodes.Add(stepSetct18);
-
+
+
#endregion
@@ -458,14 +458,14 @@
};
step鍑烘按浣撶被鍨�.AllowSelect = true;
step鍑烘按浣撶被鍨�.Caption = "绗簲姝�:鍑烘按浣撶被鍨�";
- step鍑烘按浣撶被鍨�.Name = "TreeStepNode"+ Step_ID_Outflow_Style;
+ step鍑烘按浣撶被鍨�.Name = "TreeStepNode" + Step_ID_Outflow_Style;
step鍑烘按浣撶被鍨�.ID = Step_ID_Outflow_Style;
step鍑烘按浣撶被鍨�.Group = Group_Name_Outflow;
step鍑烘按浣撶被鍨�.ParentID = Group_ID_Outflow;
_allStepNodes.Add(step鍑烘按浣撶被鍨�);
-
+
var step鍑烘按浣撳昂瀵� = new DPumpHydr.WinFrmUI.Volute.TreeStepNode()
{
ProgressState = WinFrmUI.Volute.TreeStepNode.eProgressState.鏈畬鎴�,
@@ -473,7 +473,7 @@
};
step鍑烘按浣撳昂瀵�.AllowSelect = true;
step鍑烘按浣撳昂瀵�.Caption = "绗叚姝�:鍑烘按浣撳昂瀵�";
- step鍑烘按浣撳昂瀵�.Name = "TreeStepNode"+ Step_ID_Outflow_Dim;
+ step鍑烘按浣撳昂瀵�.Name = "TreeStepNode" + Step_ID_Outflow_Dim;
step鍑烘按浣撳昂瀵�.ID = Step_ID_Outflow_Dim;
step鍑烘按浣撳昂瀵�.Group = Group_Name_Outflow;
step鍑烘按浣撳昂瀵�.ParentID = Group_ID_Outflow;
--
Gitblit v1.9.3