From 62596f5885f056a4f7a4e51918dad99a67d8e7df Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期日, 03 十一月 2024 09:32:36 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs | 79 +++++++++++++++++++++++----------------
1 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
index d63f470..1dc418b 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -9,10 +9,7 @@
namespace DPumpHydr.WinFrmUI.Volute
{
public partial class MainViewPage
- {
-
-
-
+ {
/// <summary>
/// 鎺т欢澹版槑
/// </summary>
@@ -93,7 +90,7 @@
#endregion
-
+ private bool _isInitialOk = false;
private void InitialRibbonForm()
{
bool isButtonMoreVisible = false;
@@ -234,48 +231,60 @@
ribbonPanel瑙嗗浘.Name = "ribbonPanel瑙嗗浘";
ribbonPanel瑙嗗浘.ButtonMoreVisible = isButtonMoreVisible;
- ////宸﹁鍥炬寜閽�
- RBtn宸﹁鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage宸﹁鍥� = "View-Left.png";
- RBtn宸﹁鍥�.Image = GlobalResource.BuildImage(RBtnimage宸﹁鍥�, 40, 40);
+ //宸﹁鍥炬寜閽�
+ RBtn宸﹁鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn宸﹁鍥�.Image = GlobalResource.BuildImage("View-Left.png", 40, 40);
RBtn宸﹁鍥�.Name = "RBtn宸﹁鍥�";
RBtn宸﹁鍥�.Text = "宸﹁鍥�";
-
+ RBtn宸﹁鍥�.Click+=(sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.LEFT);
+ };
////鍙宠鍥炬寜閽�
- RBtn鍙宠鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage鍙宠鍥� = "View-Right.png";
- RBtn鍙宠鍥�.Image = GlobalResource.BuildImage(RBtnimage鍙宠鍥�, 40, 40);
+ RBtn鍙宠鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn鍙宠鍥�.Image = GlobalResource.BuildImage("View-Right.png", 40, 40);
RBtn鍙宠鍥�.Name = "RBtn鍙宠鍥�";
RBtn鍙宠鍥�.Text = "鍙宠鍥�";
-
+ RBtn鍙宠鍥�.Click += (sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.RIGHT);
+ };
////淇鍥炬寜閽�
- RBtn淇鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage淇鍥� = "View-Top.png";
- RBtn淇鍥�.Image = GlobalResource.BuildImage(RBtnimage淇鍥�, 40, 40);
+ RBtn淇鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn淇鍥�.Image = GlobalResource.BuildImage("View-Top.png", 40, 40);
RBtn淇鍥�.Name = "RBtn淇鍥�";
RBtn淇鍥�.Text = "淇鍥�";
-
+ RBtn淇鍥�.Click += (sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.TOP);
+ };
////浠拌鍥炬寜閽�
- RBtn浠拌鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage浠拌鍥� = "View-Bottom.png";
- RBtn浠拌鍥�.Image = GlobalResource.BuildImage(RBtnimage浠拌鍥�, 40, 40);
+ RBtn浠拌鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn浠拌鍥�.Image = GlobalResource.BuildImage("View-Bottom.png", 40, 40);
RBtn浠拌鍥�.Name = "RBtn浠拌鍥�";
RBtn浠拌鍥�.Text = "浠拌鍥�";
-
+ RBtn浠拌鍥�.Click += (sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.BOTTOM);
+ };
////姝ｈ鍥炬寜閽�
- RBtn姝ｈ鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage姝ｈ鍥� = "View-Front.png";
- RBtn姝ｈ鍥�.Image = GlobalResource.BuildImage(RBtnimage姝ｈ鍥�, 40, 40);
+ RBtn姝ｈ鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn姝ｈ鍥�.Image = GlobalResource.BuildImage("View-Front.png", 40, 40);
RBtn姝ｈ鍥�.Name = "RBtn姝ｈ鍥�";
RBtn姝ｈ鍥�.Text = "姝ｈ鍥�";
-
+ RBtn浠拌鍥�.Click += (sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.FRONT);
+ };
////鍚庤鍥炬寜閽�
- RBtn鍚庤鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage鍚庤鍥� = "View-Back.png";
- RBtn鍚庤鍥�.Image = GlobalResource.BuildImage(RBtnimage鍚庤鍥�, 40, 40);
+ RBtn鍚庤鍥� = new System.Windows.Forms.RibbonButton();
+ RBtn鍚庤鍥�.Image = GlobalResource.BuildImage("View-Back.png", 40, 40);
RBtn鍚庤鍥�.Name = "RBtn鍚庤鍥�";
RBtn鍚庤鍥�.Text = "鍚庤鍥�";
-
+ RBtn鍚庤鍥�.Click += (sender, e) =>
+ {
+ this._occDesignCtrl.SetViewDirect(Model.eViewDirect.BACK);
+ };
@@ -758,8 +767,14 @@
Rbtn寮�濮�.Click += (sender, e) => {
Rbtn涓嬩竴姝�.Visible = true;
Rbtn鍙栨秷.Visible = true;
-
- InitialStepNodes();
+ if(_isInitialOk == false)
+ {
+ //this.panelParas.Controls.Clear();
+ _isInitialOk = true;
+ this._occDesignCtrl.Initial();
+ InitialStepNodes();
+ }
+ Rbtn寮�濮�.Visible = false;
};
Rbtn瀹屾垚 = new System.Windows.Forms.RibbonButton();
--
Gitblit v1.9.3