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_InitialRibbon.cs | 270 ++++++++++++++++++++++++++++-------------------------
1 files changed, 142 insertions(+), 128 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
index 2b24466..1dc418b 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -9,56 +9,7 @@
namespace DPumpHydr.WinFrmUI.Volute
{
public partial class MainViewPage
- {
-
- /// <summary>
- /// 灏忓浘鏍�
- /// </summary>
- /// <param name="path">鏂囦欢澶硅矾寰勶紙缂栬瘧璺緞涓嬬殑锛�</param>
- /// <param name="filename">鏂囦欢鍚�</param>
- /// <returns></returns>
- private System.Drawing.Image SmallIcon(string path, string filename)
- {
- System.Drawing.Image thumbnail = AssembledPath(path, filename).GetThumbnailImage(20, 20, () => false, IntPtr.Zero);
- return thumbnail;
- }
-
- /// <summary>
- /// 澶у浘鏍�
- /// </summary>
- /// <param name="path">鏂囦欢澶硅矾寰勶紙缂栬瘧璺緞涓嬬殑锛�</param>
- /// <param name="filename">鏂囦欢鍚�</param>
- /// <returns></returns>
- private System.Drawing.Image BigIcon(string path, string filename)
- {
- System.Drawing.Image thumbnail = AssembledPath(path, filename).GetThumbnailImage(40, 40, () => false, IntPtr.Zero);
- return thumbnail;
- }
-
- /// <summary>
- /// 璺緞銆佹枃浠跺悕鎷兼帴
- /// </summary>
- /// <param name="path">璺緞</param>
- /// <param name="filename">鏂囦欢鍚�</param>
- /// <returns></returns>
- private System.Drawing.Image AssembledPath(string path, string filename)
- {
- if (path == null&&filename == null)
- {
- return null;
- }
- string fullPath = Path.Combine( AppDomain.CurrentDomain.BaseDirectory, path, filename);
- if (System.IO.File.Exists(fullPath))
- {
- System.Drawing.Image image = System.Drawing.Image.FromFile(fullPath);
- return image;
- }
- else
- {
- return null;
- }
- }
-
+ {
/// <summary>
/// 鎺т欢澹版槑
/// </summary>
@@ -71,6 +22,7 @@
private System.Windows.Forms.RibbonPanel ribbonPanel妯″紡;
private System.Windows.Forms.RibbonPanel ribbonPanel鍥惧眰;
private System.Windows.Forms.RibbonPanel ribbonPanel铚楀３璁捐姝ラ;
+ private System.Windows.Forms.RibbonPanel ribbonPanel铚楀３鏁版嵁瀵煎嚭;
private System.Windows.Forms.RibbonButton RBtn宸﹁鍥�;
private System.Windows.Forms.RibbonButton RBtn鏄剧ず缃戞牸;
private System.Windows.Forms.RibbonButton RBtn鏂瑰舰缃戞牸;
@@ -127,6 +79,7 @@
private System.Windows.Forms.RibbonButton Rbtn鍙栨秷;
private System.Windows.Forms.RibbonButton Rbtn涓婁竴姝�;
private System.Windows.Forms.RibbonButton Rbtn涓嬩竴姝�;
+ private System.Windows.Forms.RibbonButton Rbtn铚楀３鏁版嵁瀵煎嚭;
private System.Windows.Forms.RibbonComboBox RBox鍥惧眰;
private System.Windows.Forms.RibbonTextBox ribbonTextBox姝ヨ繘鍊�;
private System.Windows.Forms.RibbonTextBox ribbonTextBox鏃嬭浆鍊�;
@@ -137,10 +90,10 @@
#endregion
+ private bool _isInitialOk = false;
private void InitialRibbonForm()
{
bool isButtonMoreVisible = false;
- string ResourcesPath = @"Data\MainForm\Icons";
ribbonForm.OrbDropDown.Size = new System.Drawing.Size(160, 474);
@@ -163,23 +116,23 @@
RBtn鍚庨�� = new System.Windows.Forms.RibbonButton();
var Btnimagename鍚庨�� = "undo16.png";
- RBtn鍚庨��.SmallImage = SmallIcon(ResourcesPath, Btnimagename鍚庨��);
+ RBtn鍚庨��.SmallImage = GlobalResource.BuildImage(Btnimagename鍚庨��,20,20);
RBtn鍚庨��.Name = "RBtn鍚庨��";
Rbtn鍓嶈繘 = new System.Windows.Forms.RibbonButton();
var Btnimagename鍓嶈繘 = "do.png";
- Rbtn鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, Btnimagename鍓嶈繘);
+ Rbtn鍓嶈繘.SmallImage = GlobalResource.BuildImage(Btnimagename鍓嶈繘, 20, 20);
Rbtn鍓嶈繘.Name = "Rbtn鍓嶈繘";
RBtn淇濆瓨 = new System.Windows.Forms.RibbonButton();
var Btnimagename淇濆瓨 = "save16.png";
- RBtn淇濆瓨.SmallImage = SmallIcon(ResourcesPath, Btnimagename淇濆瓨);
+ RBtn淇濆瓨.SmallImage = GlobalResource.BuildImage(Btnimagename淇濆瓨, 20, 20);
RBtn淇濆瓨.Name = "RBtn淇濆瓨";
RBtnMenu鍚庨�� = new System.Windows.Forms.RibbonButton();
var RBtnMenuimage鍚庨�� = "Select.png";
var lucencyimage = "lucency.png";
- RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍚庨��);
+ RBtnMenu鍚庨��.SmallImage = GlobalResource.BuildImage(RBtnMenuimage鍚庨��, 20, 20);
RBtnMenu鍚庨��.DropDownArrowDirection = RibbonArrowDirection.Right;
RBtnMenu鍚庨��.Name = "RBtnMenu鍚庨��";
RBtnMenu鍚庨��.Text = "鍚庨��";
@@ -187,19 +140,19 @@
{
if (RBtn鍚庨��.Visible == true)
{
- RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
+ RBtnMenu鍚庨��.SmallImage = GlobalResource.BuildImage(lucencyimage, 20, 20);
RBtn鍚庨��.Visible = false;
}
else
{
- RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍚庨��);
+ RBtnMenu鍚庨��.SmallImage = GlobalResource.BuildImage(RBtnMenuimage鍚庨��, 20, 20);
RBtn鍚庨��.Visible = true;
}
};
RBtnMenu鍓嶈繘 = new System.Windows.Forms.RibbonButton();
var RBtnMenuimage鍓嶈繘 = "Select.png";
- RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍓嶈繘);
+ RBtnMenu鍓嶈繘.SmallImage = GlobalResource.BuildImage(RBtnMenuimage鍓嶈繘, 20, 20);
RBtnMenu鍓嶈繘.DropDownArrowDirection = RibbonArrowDirection.Left;
RBtnMenu鍓嶈繘.Name = "RBtnMenu鍓嶈繘";
RBtnMenu鍓嶈繘.Text = "鍓嶈繘";
@@ -207,19 +160,19 @@
{
if (Rbtn鍓嶈繘.Visible == true)
{
- RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
+ RBtnMenu鍓嶈繘.SmallImage = GlobalResource.BuildImage(lucencyimage, 20, 20);
Rbtn鍓嶈繘.Visible = false;
}
else
{
- RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍓嶈繘);
+ RBtnMenu鍓嶈繘.SmallImage = GlobalResource.BuildImage(RBtnMenuimage鍓嶈繘, 20, 20);
Rbtn鍓嶈繘.Visible = true;
}
};
RBtnMenu淇濆瓨 = new System.Windows.Forms.RibbonButton();
var RBtnMenuimage淇濆瓨 = "Select.png";
- RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage淇濆瓨);
+ RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
RBtnMenu淇濆瓨.DropDownArrowDirection = RibbonArrowDirection.Left;
RBtnMenu淇濆瓨.Name = "RBtnMenu淇濆瓨";
RBtnMenu淇濆瓨.Text = "淇濆瓨";
@@ -227,12 +180,12 @@
{
if (RBtn淇濆瓨.Visible == true)
{
- RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
+ RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
RBtn淇濆瓨.Visible = false;
}
else
{
- RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage淇濆瓨);
+ RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
RBtn淇濆瓨.Visible = true;
}
};
@@ -242,31 +195,31 @@
#region
RBtnFile鏂板缓 = new System.Windows.Forms.RibbonButton();
var RBtnFileimage鏂板缓 = "newdocument32.png";
- RBtnFile鏂板缓.SmallImage = BigIcon(ResourcesPath, RBtnFileimage鏂板缓);
+ RBtnFile鏂板缓.SmallImage = GlobalResource.BuildImage(RBtnFileimage鏂板缓, 40, 40);
RBtnFile鏂板缓.Name = "RBtnFile鏂板缓";
RBtnFile鏂板缓.Text = "鏂板缓";
RBtnFile鎵撳紑 = new System.Windows.Forms.RibbonButton();
var RBtnFileimage鎵撳紑 = "open32.png";
- RBtnFile鎵撳紑.SmallImage = BigIcon(ResourcesPath, RBtnFileimage鎵撳紑);
+ RBtnFile鎵撳紑.SmallImage = GlobalResource.BuildImage(RBtnFileimage鎵撳紑, 40, 40);
RBtnFile鎵撳紑.Name = "RBtnFile鎵撳紑";
RBtnFile鎵撳紑.Text = "鎵撳紑";
RBtnFile淇濆瓨 = new System.Windows.Forms.RibbonButton();
var RBtnFileimage淇濆瓨 = "save32.png";
- RBtnFile淇濆瓨.SmallImage = BigIcon(ResourcesPath, RBtnFileimage淇濆瓨);
+ RBtnFile淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnFileimage淇濆瓨, 40, 40);
RBtnFile淇濆瓨.Name = "RBtnFile淇濆瓨";
RBtnFile淇濆瓨.Text = "淇濆瓨";
RBtnFile鍙﹀瓨涓� = new System.Windows.Forms.RibbonButton();
var RBtnFileimage鍙﹀瓨涓� = "saveas32.png";
- RBtnFile鍙﹀瓨涓�.SmallImage = BigIcon(ResourcesPath, RBtnFileimage鍙﹀瓨涓�);
+ RBtnFile鍙﹀瓨涓�.SmallImage = GlobalResource.BuildImage(RBtnFileimage鍙﹀瓨涓�, 40, 40);
RBtnFile鍙﹀瓨涓�.Name = "RBtnFile鍙﹀瓨涓�";
RBtnFile鍙﹀瓨涓�.Text = "鍙﹀瓨涓�";
RBtnFile閫夐」 = new System.Windows.Forms.RibbonButton();
var RBtnFileimage閫夐」 = "select16.png";
- RBtnFile閫夐」.SmallImage = BigIcon(ResourcesPath, RBtnFileimage閫夐」);
+ RBtnFile閫夐」.SmallImage = GlobalResource.BuildImage(RBtnFileimage閫夐」, 40, 40);
RBtnFile閫夐」.Name = "RBtnFile閫夐」";
RBtnFile閫夐」.Text = "閫夐」";
#endregion
@@ -278,48 +231,60 @@
ribbonPanel瑙嗗浘.Name = "ribbonPanel瑙嗗浘";
ribbonPanel瑙嗗浘.ButtonMoreVisible = isButtonMoreVisible;
- ////宸﹁鍥炬寜閽�
- RBtn宸﹁鍥� = new System.Windows.Forms.RibbonButton();
- var RBtnimage宸﹁鍥� = "View-Left.png";
- RBtn宸﹁鍥�.Image = BigIcon(ResourcesPath, RBtnimage宸﹁鍥�);
+ //宸﹁鍥炬寜閽�
+ 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 = BigIcon(ResourcesPath, RBtnimage鍙宠鍥�);
+ 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 = BigIcon(ResourcesPath, RBtnimage淇鍥�);
+ 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 = BigIcon(ResourcesPath, RBtnimage浠拌鍥�);
+ 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 = BigIcon(ResourcesPath, RBtnimage姝ｈ鍥�);
+ 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 = BigIcon(ResourcesPath, RBtnimage鍚庤鍥�);
+ 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);
+ };
@@ -335,28 +300,28 @@
////鍏ㄩ儴缂╂斁鎸夐挳
RBtn鍏ㄩ儴缂╂斁 = new System.Windows.Forms.RibbonButton();
var RBtnimage鍏ㄩ儴缂╂斁 = "Zoom-All.png";
- RBtn鍏ㄩ儴缂╂斁.Image = BigIcon(ResourcesPath, RBtnimage鍏ㄩ儴缂╂斁);
+ RBtn鍏ㄩ儴缂╂斁.Image = GlobalResource.BuildImage(RBtnimage鍏ㄩ儴缂╂斁, 40, 40);
RBtn鍏ㄩ儴缂╂斁.Name = "RBtn鍏ㄩ儴缂╂斁";
RBtn鍏ㄩ儴缂╂斁.Text = "鍏ㄩ儴缂╂斁";
////缂╂斁閫変腑鎸夐挳
RBtn缂╂斁閫変腑 = new System.Windows.Forms.RibbonButton();
var RBtnimage缂╂斁閫変腑 = "Zoom-Selection.png";
- RBtn缂╂斁閫変腑.Image = BigIcon(ResourcesPath, RBtnimage缂╂斁閫変腑);
+ RBtn缂╂斁閫変腑.Image = GlobalResource.BuildImage(RBtnimage缂╂斁閫変腑, 40, 40);
RBtn缂╂斁閫変腑.Name = "RBtn缂╂斁閫変腑";
RBtn缂╂斁閫変腑.Text = "缂╂斁閫変腑";
////鏀惧ぇ鎸夐挳
RBtn鏀惧ぇ = new System.Windows.Forms.RibbonButton();
var RBtnimage鏀惧ぇ = "Zoom-In.png";
- RBtn鏀惧ぇ.Image = BigIcon(ResourcesPath, RBtnimage鏀惧ぇ);
+ RBtn鏀惧ぇ.Image = GlobalResource.BuildImage(RBtnimage鏀惧ぇ, 40, 40);
RBtn鏀惧ぇ.Name = "RBtn鏀惧ぇ";
RBtn鏀惧ぇ.Text = "鏀惧ぇ";
////缂╁皬鎸夐挳
RBtn缂╁皬 = new System.Windows.Forms.RibbonButton();
var RBtnimage缂╁皬 = "Zoom-Out.png";
- RBtn缂╁皬.Image = BigIcon(ResourcesPath, RBtnimage缂╁皬);
+ RBtn缂╁皬.Image = GlobalResource.BuildImage(RBtnimage缂╁皬, 40, 40);
RBtn缂╁皬.Name = "RBtn缂╁皬";
RBtn缂╁皬.Text = "缂╁皬";
@@ -375,7 +340,7 @@
#region
RBtn鏄剧ず缃戞牸 = new System.Windows.Forms.RibbonButton();
var RBtnimage鏄剧ず缃戞牸 = "Grid-RectCenter.png";
- RBtn鏄剧ず缃戞牸.Image = BigIcon(ResourcesPath, RBtnimage鏄剧ず缃戞牸);
+ RBtn鏄剧ず缃戞牸.Image = GlobalResource.BuildImage(RBtnimage鏄剧ず缃戞牸, 40, 40);
RBtn鏄剧ず缃戞牸.MinSizeMode = RibbonElementSizeMode.Large;
RBtn鏄剧ず缃戞牸.Name = "RBtn鏄剧ず缃戞牸";
RBtn鏄剧ず缃戞牸.Style = RibbonButtonStyle.SplitDropDown;
@@ -385,21 +350,21 @@
//////鏄剧ず缃戞牸涓嬫媺鑿滃崟
RBtn鏂瑰舰缃戞牸 = new System.Windows.Forms.RibbonButton();
var RBtnimage鏂瑰舰缃戞牸= "Grid-Rect.png";
- RBtn鏂瑰舰缃戞牸.SmallImage = SmallIcon(ResourcesPath, RBtnimage鏂瑰舰缃戞牸);
+ RBtn鏂瑰舰缃戞牸.SmallImage = GlobalResource.BuildImage(RBtnimage鏂瑰舰缃戞牸, 20, 20);
RBtn鏂瑰舰缃戞牸.Name = "RBtn鏂瑰舰缃戞牸";
RBtn鏂瑰舰缃戞牸.Text = "鏂瑰舰缃戞牸";
RBtn鏂瑰舰缃戞牸.Click += (sender, e) => {
- RBtn鏄剧ず缃戞牸.Image = BigIcon(ResourcesPath, RBtnimage鏂瑰舰缃戞牸);
+ RBtn鏄剧ず缃戞牸.Image = GlobalResource.BuildImage(RBtnimage鏂瑰舰缃戞牸, 40, 40);
this.RBtn鍒嗗尯.Enabled = false;
};
RBtn鍦嗗舰缃戞牸 = new System.Windows.Forms.RibbonButton();
var RBtnimage鍦嗗舰缃戞牸 = "Grid-Circ.png";
- RBtn鍦嗗舰缃戞牸.SmallImage = SmallIcon(ResourcesPath, RBtnimage鍦嗗舰缃戞牸);
+ RBtn鍦嗗舰缃戞牸.SmallImage = GlobalResource.BuildImage(RBtnimage鍦嗗舰缃戞牸, 20, 20);
RBtn鍦嗗舰缃戞牸.Name = "RBtn鍦嗗舰缃戞牸";
RBtn鍦嗗舰缃戞牸.Text = "鍦嗗舰缃戞牸";
RBtn鍦嗗舰缃戞牸.Click += (sender, e) => {
- RBtn鏄剧ず缃戞牸.Image = BigIcon(ResourcesPath, RBtnimage鍦嗗舰缃戞牸);
+ RBtn鏄剧ず缃戞牸.Image = GlobalResource.BuildImage(RBtnimage鍦嗗舰缃戞牸, 40, 40);
this.RBtn鍒嗗尯.Enabled = true;
};
@@ -410,7 +375,7 @@
#region
RBtn姝ヨ繘 = new System.Windows.Forms.RibbonButton();
var RBtnimage姝ヨ繘 = "Grid-Step.png";
- RBtn姝ヨ繘.Image = BigIcon(ResourcesPath, RBtnimage姝ヨ繘);
+ RBtn姝ヨ繘.Image = GlobalResource.BuildImage(RBtnimage姝ヨ繘, 40, 40);
RBtn姝ヨ繘.Style = RibbonButtonStyle.DropDown;
RBtn姝ヨ繘.Name = "RBtn姝ヨ繘";
RBtn姝ヨ繘.Text = "姝ヨ繘";
@@ -502,7 +467,7 @@
#region
RBtn鏃嬭浆 = new System.Windows.Forms.RibbonButton();
var RBtnimage鏃嬭浆 = "Grid-Rotation.png";
- RBtn鏃嬭浆.Image = BigIcon(ResourcesPath, RBtnimage鏃嬭浆);
+ RBtn鏃嬭浆.Image = GlobalResource.BuildImage(RBtnimage鏃嬭浆, 40, 40);
RBtn鏃嬭浆.Style = RibbonButtonStyle.DropDown;
RBtn鏃嬭浆.Name = "RBtn鏃嬭浆";
RBtn鏃嬭浆.Text = "鏃嬭浆";
@@ -580,7 +545,7 @@
#region
RBtn鍒嗗尯 = new System.Windows.Forms.RibbonButton();
var RBtnimage鍒嗗尯 = "Grid-Divisions.png";
- RBtn鍒嗗尯.Image = BigIcon(ResourcesPath, RBtnimage鍒嗗尯);
+ RBtn鍒嗗尯.Image = GlobalResource.BuildImage(RBtnimage鍒嗗尯, 40, 40);
RBtn鍒嗗尯.Style = RibbonButtonStyle.DropDown;
RBtn鍒嗗尯.Name = "RBtn鍒嗗尯";
RBtn鍒嗗尯.Text = "鍒嗗尯";
@@ -667,7 +632,7 @@
////娓叉煋妯″紡鎸夐挳
RBtn娓叉煋妯″紡 = new System.Windows.Forms.RibbonButton();
var RBtnimage娓叉煋妯″紡 = "View-RenderRaytraced.png";
- RBtn娓叉煋妯″紡.Image = BigIcon(ResourcesPath, RBtnimage娓叉煋妯″紡);
+ RBtn娓叉煋妯″紡.Image = GlobalResource.BuildImage(RBtnimage娓叉煋妯″紡, 40, 40);
RBtn娓叉煋妯″紡.MinSizeMode = RibbonElementSizeMode.Large;
RBtn娓叉煋妯″紡.Name = "RBtn娓叉煋妯″紡";
RBtn娓叉煋妯″紡.Style = RibbonButtonStyle.DropDown;
@@ -676,29 +641,29 @@
//////娓叉煋妯″紡鎸夐挳涓嬫媺鑿滃崟
RBtn瀹炰綋鐫�鑹叉ā寮� = new System.Windows.Forms.RibbonButton();
var RBtnimage瀹炰綋鐫�鑹叉ā寮� = "View-RenderSolidShaded.png";
- RBtn瀹炰綋鐫�鑹叉ā寮�.SmallImage = SmallIcon(ResourcesPath, RBtnimage瀹炰綋鐫�鑹叉ā寮�);
+ RBtn瀹炰綋鐫�鑹叉ā寮�.SmallImage = GlobalResource.BuildImage(RBtnimage瀹炰綋鐫�鑹叉ā寮�, 20, 20);
RBtn瀹炰綋鐫�鑹叉ā寮�.Text = "瀹炰綋鐫�鑹叉ā寮�";
RBtn瀹炰綋鐫�鑹叉ā寮�.Name = "RBtn瀹炰綋鐫�鑹叉ā寮�";
RBtn瀹炰綋鐫�鑹叉ā寮�.Click += (sender, e) => {
- RBtn娓叉煋妯″紡.Image = BigIcon(ResourcesPath, RBtnimage瀹炰綋鐫�鑹叉ā寮�);
+ RBtn娓叉煋妯″紡.Image = GlobalResource.BuildImage(RBtnimage瀹炰綋鐫�鑹叉ā寮�, 40, 40);
};
RBtn缁樼敾妯″紡 = new System.Windows.Forms.RibbonButton();
var RBtnimage缁樼敾妯″紡 = "View-RenderHLR.png";
- RBtn缁樼敾妯″紡.SmallImage = SmallIcon(ResourcesPath, RBtnimage缁樼敾妯″紡);
+ RBtn缁樼敾妯″紡.SmallImage = GlobalResource.BuildImage(RBtnimage缁樼敾妯″紡, 20, 20);
RBtn缁樼敾妯″紡.Text = "缁樼敾妯″紡";
RBtn缁樼敾妯″紡.Name = "RBtn缁樼敾妯″紡";
RBtn缁樼敾妯″紡.Click += (sender, e) => {
- RBtn娓叉煋妯″紡.Image = BigIcon(ResourcesPath, RBtnimage缁樼敾妯″紡);
+ RBtn娓叉煋妯″紡.Image = GlobalResource.BuildImage(RBtnimage缁樼敾妯″紡, 40, 40);
};
RBtn鍏夌嚎杩借釜妯″紡 = new System.Windows.Forms.RibbonButton();
var RBtnimage鍏夌嚎杩借釜妯″紡 = "View-RenderRaytraced.png";
- RBtn鍏夌嚎杩借釜妯″紡.SmallImage = SmallIcon(ResourcesPath, RBtnimage鍏夌嚎杩借釜妯″紡);
+ RBtn鍏夌嚎杩借釜妯″紡.SmallImage = GlobalResource.BuildImage(RBtnimage鍏夌嚎杩借釜妯″紡, 20, 20);
RBtn鍏夌嚎杩借釜妯″紡.Text = "鍏夌嚎杩借釜妯″紡";
RBtn鍏夌嚎杩借釜妯″紡.Name = "RBtn鍏夌嚎杩借釜妯″紡";
RBtn鍏夌嚎杩借釜妯″紡.Click += (sender, e) => {
- RBtn娓叉煋妯″紡.Image = BigIcon(ResourcesPath, RBtnimage鍏夌嚎杩借釜妯″紡);
+ RBtn娓叉煋妯″紡.Image = GlobalResource.BuildImage(RBtnimage鍏夌嚎杩借釜妯″紡, 40, 40);
};
@@ -729,7 +694,7 @@
Rbtn鍥惧眰缂栬緫 = new System.Windows.Forms.RibbonButton();
var RBtnimage鍥惧眰缂栬緫 = "Layer-Editor.png";
- Rbtn鍥惧眰缂栬緫.Image = BigIcon(ResourcesPath, RBtnimage鍥惧眰缂栬緫);
+ Rbtn鍥惧眰缂栬緫.Image = GlobalResource.BuildImage(RBtnimage鍥惧眰缂栬緫, 40, 40);
Rbtn鍥惧眰缂栬緫.Name = "Rbtn鍥惧眰缂栬緫";
Rbtn鍥惧眰缂栬緫.Text = "鍥惧眰缂栬緫";
Rbtn鍥惧眰缂栬緫.Click += (sender, e) => {
@@ -739,7 +704,7 @@
Rbtn閿佸畾 = new System.Windows.Forms.RibbonButton();
var RBtnimage閿佸畾 = "Generic-Locked.png";
- Rbtn閿佸畾.SmallImage = SmallIcon(ResourcesPath, RBtnimage閿佸畾);
+ Rbtn閿佸畾.SmallImage = GlobalResource.BuildImage(RBtnimage閿佸畾, 20, 20);
Rbtn閿佸畾.CheckOnClick = true;
Rbtn閿佸畾.Name = "Rbtn閿佸畾";
Rbtn閿佸畾.Text = "閿佸畾";
@@ -747,33 +712,33 @@
Rbtn鎵�鏈夊疄浣� = new System.Windows.Forms.RibbonButton();
var RBtnimage鎵�鏈夊疄浣� = "Layer-MoveToLayer.png";
- Rbtn鎵�鏈夊疄浣�.SmallImage = SmallIcon(ResourcesPath, RBtnimage鎵�鏈夊疄浣�);
+ Rbtn鎵�鏈夊疄浣�.SmallImage = GlobalResource.BuildImage(RBtnimage鎵�鏈夊疄浣�, 20, 20);
Rbtn鎵�鏈夊疄浣�.Name = "Rbtn鎵�鏈夊疄浣�";
Rbtn鎵�鏈夊疄浣�.Text = "鎵�鏈夊疄浣�";
Rbtn閫夋嫨鍏ㄩ儴 = new System.Windows.Forms.RibbonButton();
var RBtnimage閫夋嫨鍏ㄩ儴 = "Layer-SelectAllEntities.png";
- Rbtn閫夋嫨鍏ㄩ儴.SmallImage = SmallIcon(ResourcesPath, RBtnimage閫夋嫨鍏ㄩ儴);
+ Rbtn閫夋嫨鍏ㄩ儴.SmallImage = GlobalResource.BuildImage(RBtnimage閫夋嫨鍏ㄩ儴, 20, 20);
Rbtn閫夋嫨鍏ㄩ儴.Name = "Rbtn閫夋嫨鍏ㄩ儴";
Rbtn閫夋嫨鍏ㄩ儴.Text = "閫夋嫨鍏ㄩ儴";
Rbtn闅旂 = new System.Windows.Forms.RibbonButton();
var RBtnimage闅旂 = "Layer-Isolation.png";
- Rbtn闅旂.SmallImage = SmallIcon(ResourcesPath, RBtnimage闅旂);
+ Rbtn闅旂.SmallImage = GlobalResource.BuildImage(RBtnimage闅旂, 20, 20);
Rbtn闅旂.CheckOnClick = true;
Rbtn闅旂.Name = "Rbtn闅旂";
Rbtn闅旂.Text = "闅旂";
Rbtn鏄剧ず = new System.Windows.Forms.RibbonButton();
var RBtnimage鏄剧ず = "Generic-Visible.png";
- Rbtn鏄剧ず.SmallImage = SmallIcon(ResourcesPath, RBtnimage鏄剧ず);
+ Rbtn鏄剧ず.SmallImage = GlobalResource.BuildImage(RBtnimage鏄剧ず, 20, 20);
Rbtn鏄剧ず.CheckOnClick = true;
Rbtn鏄剧ず.Name = "Rbtn鏄剧ず";
Rbtn鏄剧ず.Text = "鏄剧ず";
Rbtn鐗规�� = new System.Windows.Forms.RibbonButton();
var RBtnimage鐗规�� = "Layer-VisualProps.png";
- Rbtn鐗规��.SmallImage = SmallIcon(ResourcesPath, RBtnimage鐗规��);
+ Rbtn鐗规��.SmallImage = GlobalResource.BuildImage(RBtnimage鐗规��, 20, 20);
Rbtn鐗规��.Name = "Rbtn鐗规��";
Rbtn鐗规��.Text = "鐗规��";
@@ -796,19 +761,25 @@
Rbtn寮�濮� = new System.Windows.Forms.RibbonButton();
var Btnimagename寮�濮� = "circle-plus.png";
- Rbtn寮�濮�.Image = BigIcon(ResourcesPath, Btnimagename寮�濮�);
+ Rbtn寮�濮�.Image = GlobalResource.BuildImage(Btnimagename寮�濮�, 40, 40);
Rbtn寮�濮�.Name = "Rbtn寮�濮�";
Rbtn寮�濮�.Text = "寮�濮�";
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();
var Btnimagename瀹屾垚 = "circle-check.png";
- Rbtn瀹屾垚.Image = BigIcon(ResourcesPath, Btnimagename瀹屾垚 );
+ Rbtn瀹屾垚.Image = GlobalResource.BuildImage(Btnimagename瀹屾垚, 40, 40);
Rbtn瀹屾垚.Visible = false;
Rbtn瀹屾垚.Name = "Rbtn瀹屾垚";
Rbtn瀹屾垚.Text = "瀹屾垚";
@@ -823,7 +794,7 @@
Rbtn鍙栨秷 = new System.Windows.Forms.RibbonButton();
var Btnimagename鍙栨秷 = "circle-rectangle.png";
- Rbtn鍙栨秷.Image = BigIcon(ResourcesPath, Btnimagename鍙栨秷);
+ Rbtn鍙栨秷.Image = GlobalResource.BuildImage(Btnimagename鍙栨秷, 40, 40);
Rbtn鍙栨秷.Visible = false;
Rbtn鍙栨秷.Name = "Rbtn鍙栨秷";
Rbtn鍙栨秷.Text = "鍙栨秷";
@@ -864,23 +835,64 @@
Rbtn涓婁竴姝� = new System.Windows.Forms.RibbonButton();
var Btnimagename涓婁竴姝� = "circle-arrow-left.png";
- Rbtn涓婁竴姝�.Image = BigIcon(ResourcesPath, Btnimagename涓婁竴姝�);
+ Rbtn涓婁竴姝�.Image = GlobalResource.BuildImage(Btnimagename涓婁竴姝�, 40, 40);
Rbtn涓婁竴姝�.Visible = false;
Rbtn涓婁竴姝�.Name = "Rbtn涓婁竴姝�";
Rbtn涓婁竴姝�.Text = "涓婁竴姝�";
Rbtn涓婁竴姝�.Click += (sender, e) =>
{
- GoPrevStepCore();
+ if(GoPrevStepCore())
+ {
+ if (this.panelParas.Controls.Contains(_ctrlHdrBaseInfo))
+ {
+ Rbtn涓婁竴姝�.Visible = false;
+ }
+ if (!this.panelParas.Controls.Contains(_ctrlSetOutflowDim))
+ {
+ Rbtn瀹屾垚.Visible = false;
+ }
+ }
};
Rbtn涓嬩竴姝� = new System.Windows.Forms.RibbonButton();
var Btnimagename涓嬩竴姝� = "circle-arrow-right.png";
- Rbtn涓嬩竴姝�.Image = BigIcon(ResourcesPath, Btnimagename涓嬩竴姝�);
+ Rbtn涓嬩竴姝�.Image = GlobalResource.BuildImage(Btnimagename涓嬩竴姝�, 40, 40);
Rbtn涓嬩竴姝�.Visible = false;
Rbtn涓嬩竴姝�.Name = "Rbtn涓嬩竴姝�";
Rbtn涓嬩竴姝�.Text = "涓嬩竴姝�";
Rbtn涓嬩竴姝�.Click += (sender, e) => {
- GoNextStepCore();
+ if (GoNextStepCore())
+ {
+ if (this.panelParas.Controls.Contains(_ctrlGeomBaseInfo))
+ {
+ Rbtn涓婁竴姝�.Visible = true;
+ }
+ if (this.panelParas.Controls.Contains(_ctrlSetOutflowDim))
+ {
+ Rbtn涓嬩竴姝�.Visible = false;
+ Rbtn瀹屾垚.Visible = true;
+ }
+ }
+
+ };
+
+
+ #endregion
+
+ //铚楀３鏁版嵁瀵煎嚭
+ #region
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭 = new System.Windows.Forms.RibbonPanel();
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭.Text = "铚楀３鏁版嵁瀵煎嚭";
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭.Name = "ribbonPanel铚楀３鏁版嵁瀵煎嚭";
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭.ButtonMoreVisible = isButtonMoreVisible;
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭.FlowsTo = RibbonPanelFlowDirection.Left;
+
+ Rbtn铚楀３鏁版嵁瀵煎嚭 = new System.Windows.Forms.RibbonButton();
+ Rbtn铚楀３鏁版嵁瀵煎嚭.Image = GlobalResource.BuildImage("device-ipad-share.png", 40, 40);
+ Rbtn铚楀３鏁版嵁瀵煎嚭.Name = "Rbtn铚楀３鏁版嵁瀵煎嚭";
+ Rbtn铚楀３鏁版嵁瀵煎嚭.Text = "瀵煎嚭";
+ Rbtn铚楀３鏁版嵁瀵煎嚭.Click += (sender, e) => {
+ VoluteDeriveArgument();
};
@@ -906,6 +918,7 @@
ribbonTab瑙嗗浘.Panels.Add(ribbonPanel鍥惧眰);
ribbonTab缂栬緫.Panels.Add(ribbonPanel缃戞牸);
ribbonTab缂栬緫.Panels.Add(ribbonPanel铚楀３璁捐姝ラ);
+ ribbonTab缂栬緫.Panels.Add(ribbonPanel铚楀３鏁版嵁瀵煎嚭);
ribbonPanel瑙嗗浘.Items.Add(RBtn鍚庤鍥�);
ribbonPanel瑙嗗浘.Items.Add(RBtn姝ｈ鍥�);
@@ -930,6 +943,7 @@
ribbonPanel铚楀３璁捐姝ラ.Items.Add(Rbtn涓婁竴姝�);
ribbonPanel铚楀３璁捐姝ラ.Items.Add(Rbtn鍙栨秷);
ribbonPanel铚楀３璁捐姝ラ.Items.Add(Rbtn寮�濮�);
+ ribbonPanel铚楀３鏁版嵁瀵煎嚭.Items.Add(Rbtn铚楀３鏁版嵁瀵煎嚭);
RGroup涓嬫媺妗�.Items.Add(RBox鍥惧眰);
RGroup灏忓浘鏍�.Items.Add(Rbtn鎵�鏈夊疄浣�);
--
Gitblit v1.9.3