From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突

---
 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs |  756 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 432 insertions(+), 324 deletions(-)

diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
index 2b24466..6a75352 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -1,76 +1,27 @@
-锘�
-using System;
+锘縰sing System;
 using System.Collections.Generic;
-using System.Windows.Forms;
-using System.IO;
-using System.Text;
 using System.Drawing;
+using System.Windows.Forms;
 
 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>
-        #region
+        # region 鎺т欢澹版槑
         private System.Windows.Forms.RibbonTab ribbonTab瑙嗗浘;
         private System.Windows.Forms.RibbonTab ribbonTab缂栬緫;
+
         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.RibbonPanel ribbonPanel鍥惧眰;
-        private System.Windows.Forms.RibbonPanel ribbonPanel铚楀3璁捐姝ラ;
+        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.RibbonPanel ribbonPanel缁勪欢鏄剧ず;
+        
         private System.Windows.Forms.RibbonButton RBtn宸﹁鍥�;
         private System.Windows.Forms.RibbonButton RBtn鏄剧ず缃戞牸;
         private System.Windows.Forms.RibbonButton RBtn鏂瑰舰缃戞牸;
@@ -104,16 +55,17 @@
         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.RibbonButton RBtn鍚庨��;
         private System.Windows.Forms.RibbonButton Rbtn鍓嶈繘;
-        private System.Windows.Forms.RibbonButton RBtnMenu鍚庨��;
-        private System.Windows.Forms.RibbonButton RBtnMenu鍓嶈繘;
+        private System.Windows.Forms.RibbonButton Rbtn涓婁竴姝�;
+        private System.Windows.Forms.RibbonButton Rbtn涓嬩竴姝�;
+
         private System.Windows.Forms.RibbonButton RBtnMenu淇濆瓨;
-        private System.Windows.Forms.RibbonButton RBtnFile鏂板缓;
+
+ 
         private System.Windows.Forms.RibbonButton RBtnFile鎵撳紑;
-        private System.Windows.Forms.RibbonButton RBtnFile淇濆瓨;
-        private System.Windows.Forms.RibbonButton RBtnFile鍙﹀瓨涓�;
+        private System.Windows.Forms.RibbonButton RBtnFile淇濆瓨; 
         private System.Windows.Forms.RibbonButton RBtnFile閫夐」;
         private System.Windows.Forms.RibbonButton Rbtn鍥惧眰缂栬緫;
         private System.Windows.Forms.RibbonButton Rbtn鎵�鏈夊疄浣�;
@@ -122,11 +74,22 @@
         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.RibbonButton Rbtn瀹屾垚;
-        private System.Windows.Forms.RibbonButton Rbtn鍙栨秷;
-        private System.Windows.Forms.RibbonButton Rbtn涓婁竴姝�;
-        private System.Windows.Forms.RibbonButton Rbtn涓嬩竴姝�;
+
+        private System.Windows.Forms.RibbonCheckBox RbtnChk姝ラ闈㈡澘;
+        private System.Windows.Forms.RibbonCheckBox RbtnChk鍥惧眰闈㈡澘;
+        private System.Windows.Forms.RibbonCheckBox RbtnChk鏃ュ織闈㈡澘; 
+        private System.Windows.Forms.RibbonCheckBox RbtnChk鍙傛暟闈㈡澘;
+
+        private System.Windows.Forms.RibbonCheckBox RbtnChk鎴潰18;
+        private System.Windows.Forms.RibbonCheckBox RbtnChk鏍囨敞;
+        //private System.Windows.Forms.RibbonCheckBox RbtnChk鎴潰910;
+
+        private System.Windows.Forms.RibbonButton Rbtn鏁版嵁瀵煎嚭XML;
+        private System.Windows.Forms.RibbonButton Rbtn鏁版嵁瀵煎叆XML;
+        private System.Windows.Forms.RibbonButton Rbtn鏁版嵁瀵煎嚭STP;
+        private System.Windows.Forms.RibbonButton Rbtn鏁版嵁瀵煎嚭IGS;
         private System.Windows.Forms.RibbonComboBox RBox鍥惧眰;
         private System.Windows.Forms.RibbonTextBox ribbonTextBox姝ヨ繘鍊�;
         private System.Windows.Forms.RibbonTextBox ribbonTextBox鏃嬭浆鍊�;
@@ -137,19 +100,20 @@
 
         #endregion
 
+ 
+        /// <summary>
+        /// 鍒濆鍖� RibbonForm
+        /// </summary>
         private void InitialRibbonForm()
         {
             bool isButtonMoreVisible = false;
-            string ResourcesPath = @"Data\MainForm\Icons";
 
 
             ribbonForm.OrbDropDown.Size = new System.Drawing.Size(160, 474);
             ribbonForm.OrbDropDown.TabIndex = 0;
             ribbonForm.OrbStyle = RibbonOrbStyle.Office_2013;
-            ribbonForm.OrbText = "FILE";
-            //ribbonOrbMenuItem4.DropDownItems.Add(ribbonDescriptionMenuItem1);
-
-
+            ribbonForm.OrbText = "鏂囦欢";
+  
             ribbonTab瑙嗗浘 = new System.Windows.Forms.RibbonTab();
             ribbonTab瑙嗗浘.Name = "ribbonTab瑙嗗浘";
             ribbonTab瑙嗗浘.Text = "瑙嗗浘";
@@ -158,175 +122,98 @@
             ribbonTab缂栬緫.Name = "ribbonTab缂栬緫";
             ribbonTab缂栬緫.Text = "缂栬緫";
 
-            //rebbon
-            #region
 
-            RBtn鍚庨�� = new System.Windows.Forms.RibbonButton();
-            var Btnimagename鍚庨�� = "undo16.png";
-            RBtn鍚庨��.SmallImage = SmallIcon(ResourcesPath, Btnimagename鍚庨��);
-            RBtn鍚庨��.Name = "RBtn鍚庨��";
-
-            Rbtn鍓嶈繘 = new System.Windows.Forms.RibbonButton();
-            var Btnimagename鍓嶈繘 = "do.png";
-            Rbtn鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, Btnimagename鍓嶈繘);
-            Rbtn鍓嶈繘.Name = "Rbtn鍓嶈繘";
-
-            RBtn淇濆瓨 = new System.Windows.Forms.RibbonButton();
-            var Btnimagename淇濆瓨 = "save16.png";
-            RBtn淇濆瓨.SmallImage = SmallIcon(ResourcesPath, Btnimagename淇濆瓨);
-            RBtn淇濆瓨.Name = "RBtn淇濆瓨";
-
-            RBtnMenu鍚庨�� = new System.Windows.Forms.RibbonButton(); 
-            var RBtnMenuimage鍚庨�� = "Select.png";
-            var lucencyimage = "lucency.png";
-            RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍚庨��);
-            RBtnMenu鍚庨��.DropDownArrowDirection = RibbonArrowDirection.Right;
-            RBtnMenu鍚庨��.Name = "RBtnMenu鍚庨��";
-            RBtnMenu鍚庨��.Text = "鍚庨��";
-            RBtnMenu鍚庨��.Click += (sender, e) =>
-            {
-                if (RBtn鍚庨��.Visible == true)
-                {
-                    RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
-                    RBtn鍚庨��.Visible = false;
-                }
-                else
-                {
-                    RBtnMenu鍚庨��.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍚庨��);
-                    RBtn鍚庨��.Visible = true;
-                }
-            };
-
-            RBtnMenu鍓嶈繘 = new System.Windows.Forms.RibbonButton();
-            var RBtnMenuimage鍓嶈繘 = "Select.png";
-            RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍓嶈繘);
-            RBtnMenu鍓嶈繘.DropDownArrowDirection = RibbonArrowDirection.Left;
-            RBtnMenu鍓嶈繘.Name = "RBtnMenu鍓嶈繘";
-            RBtnMenu鍓嶈繘.Text = "鍓嶈繘";
-            RBtnMenu鍓嶈繘.Click += (sender, e) =>
-            {
-                if (Rbtn鍓嶈繘.Visible == true)
-                {
-                    RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
-                    Rbtn鍓嶈繘.Visible = false;
-                }
-                else
-                {
-                    RBtnMenu鍓嶈繘.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage鍓嶈繘);
-                    Rbtn鍓嶈繘.Visible = true;
-                }
-            };
-
-            RBtnMenu淇濆瓨 = new System.Windows.Forms.RibbonButton();
-            var RBtnMenuimage淇濆瓨 = "Select.png";
-            RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage淇濆瓨);
-            RBtnMenu淇濆瓨.DropDownArrowDirection = RibbonArrowDirection.Left;
-            RBtnMenu淇濆瓨.Name = "RBtnMenu淇濆瓨";
-            RBtnMenu淇濆瓨.Text = "淇濆瓨";
-            RBtnMenu淇濆瓨.Click += (sender, e) =>
-            {
-                if (RBtn淇濆瓨.Visible == true)
-                {
-                    RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, lucencyimage);
-                    RBtn淇濆瓨.Visible = false;
-                }
-                else
-                {
-                    RBtnMenu淇濆瓨.SmallImage = SmallIcon(ResourcesPath, RBtnMenuimage淇濆瓨);
-                    RBtn淇濆瓨.Visible = true;
-                }
-            };
-            #endregion
-
-            //File
-            #region
-            RBtnFile鏂板缓 = new System.Windows.Forms.RibbonButton();
-            var RBtnFileimage鏂板缓 = "newdocument32.png";
-            RBtnFile鏂板缓.SmallImage = BigIcon(ResourcesPath, RBtnFileimage鏂板缓);
-            RBtnFile鏂板缓.Name = "RBtnFile鏂板缓";
-            RBtnFile鏂板缓.Text = "鏂板缓";
+           
+            #region File
 
             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鍙﹀瓨涓�.Name = "RBtnFile鍙﹀瓨涓�";
-            RBtnFile鍙﹀瓨涓�.Text = "鍙﹀瓨涓�";
+ 
 
-            RBtnFile閫夐」 = new System.Windows.Forms.RibbonButton();
-            var RBtnFileimage閫夐」 = "select16.png";
-            RBtnFile閫夐」.SmallImage = BigIcon(ResourcesPath, RBtnFileimage閫夐」);
+            RBtnFile閫夐」 = new System.Windows.Forms.RibbonButton(); 
+            RBtnFile閫夐」.SmallImage = GlobalResource.BuildImage("select16.png", 40, 40);
             RBtnFile閫夐」.Name = "RBtnFile閫夐」";
             RBtnFile閫夐」.Text = "閫夐」";
             #endregion
 
-            //瑙嗗浘
-            #region
+           
+            #region 瑙嗗浘
             ribbonPanel瑙嗗浘 = new System.Windows.Forms.RibbonPanel();
             ribbonPanel瑙嗗浘.Text = "瑙嗗浘";
             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._occDesign3dCtrl.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._occDesign3dCtrl.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._occDesign3dCtrl.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._occDesign3dCtrl.SetViewDirect(Model.eViewDirect.BOTTOM);
+            };
             ////姝h鍥炬寜閽�
-            RBtn姝h鍥� = new System.Windows.Forms.RibbonButton();
-            var RBtnimage姝h鍥� = "View-Front.png";
-            RBtn姝h鍥�.Image = BigIcon(ResourcesPath, RBtnimage姝h鍥�);
+            RBtn姝h鍥� = new System.Windows.Forms.RibbonButton(); 
+            RBtn姝h鍥�.Image = GlobalResource.BuildImage("View-Front.png", 40, 40);
             RBtn姝h鍥�.Name = "RBtn姝h鍥�";
             RBtn姝h鍥�.Text = "姝h鍥�";
-
+            RBtn浠拌鍥�.Click += (sender, e) =>
+            {
+                this._occDesign3dCtrl.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._occDesign3dCtrl.SetViewDirect(Model.eViewDirect.BACK);
+            };
 
 
 
             #endregion
 
-            //鍙樼劍
-            #region
+           
+            #region 鍙樼劍
             ribbonPanel鍙樼劍 = new System.Windows.Forms.RibbonPanel();
             ribbonPanel鍙樼劍.Text = "鍙樼劍";
             ribbonPanel鍙樼劍.Name = "ribbonPanel鍙樼劍";
@@ -335,28 +222,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 = "缂╁皬";
 
@@ -364,8 +251,8 @@
 
             #endregion
 
-            //缃戞牸
-            #region
+            
+            #region 缃戞牸
             ribbonPanel缃戞牸 = new System.Windows.Forms.RibbonPanel();
             ribbonPanel缃戞牸.Text = "缃戞牸";
             ribbonPanel缃戞牸.Name = "ribbonPanel缃戞牸";
@@ -375,7 +262,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 +272,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 +297,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 +389,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 +467,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 = "鍒嗗尯";
@@ -657,8 +544,8 @@
 
             #endregion
 
-            //娓叉煋妯″紡
-            #region
+            
+            #region 娓叉煋妯″紡
             ribbonPanel妯″紡 = new System.Windows.Forms.RibbonPanel();
             ribbonPanel妯″紡.Text = "妯″紡";
             ribbonPanel妯″紡.Name = "ribbonPanel妯″紡";
@@ -667,7 +554,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,41 +563,42 @@
             //////娓叉煋妯″紡鎸夐挳涓嬫媺鑿滃崟
             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);
             };
 
 
             #endregion
 
-            //鍥惧眰
-            #region
+            
+            #region 鍥惧眰 鏆傛椂娌$敤
             ribbonPanel鍥惧眰 = new System.Windows.Forms.RibbonPanel();
             ribbonPanel鍥惧眰.Text = "鍥惧眰";
             ribbonPanel鍥惧眰.Name = "ribbonPanel鍥惧眰";
             ribbonPanel鍥惧眰.ButtonMoreVisible = isButtonMoreVisible;
             ribbonPanel鍥惧眰.FlowsTo = RibbonPanelFlowDirection.Left;
+            ribbonPanel鍥惧眰.Visible = false;
 
             RGroup澶у浘鏍� = new System.Windows.Forms.RibbonItemGroup();
             RGroup澶у浘鏍�.DrawBackground = false;
@@ -729,7 +617,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 +627,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 +635,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 = "鐗规��";
 
@@ -786,126 +674,330 @@
             //ribbonComboBox1.DropDownItems.Add(ribbonLabel1);
             #endregion
 
-            //铚楀3璁捐姝ラ
-            #region
-            ribbonPanel铚楀3璁捐姝ラ = new System.Windows.Forms.RibbonPanel();
-            ribbonPanel铚楀3璁捐姝ラ.Text = "铚楀3璁捐姝ラ";
-            ribbonPanel铚楀3璁捐姝ラ.Name = "ribbonPanel铚楀3璁捐姝ラ";
-            ribbonPanel铚楀3璁捐姝ラ.ButtonMoreVisible = isButtonMoreVisible;
-            ribbonPanel铚楀3璁捐姝ラ.FlowsTo = RibbonPanelFlowDirection.Left;
 
-            Rbtn寮�濮� = new System.Windows.Forms.RibbonButton();
-            var Btnimagename寮�濮� = "circle-plus.png";
-            Rbtn寮�濮�.Image = BigIcon(ResourcesPath, Btnimagename寮�濮�);
-            Rbtn寮�濮�.Name = "Rbtn寮�濮�";
-            Rbtn寮�濮�.Text = "寮�濮�";
-            Rbtn寮�濮�.Click += (sender, e) => {
-                Rbtn涓嬩竴姝�.Visible = true;
-                Rbtn鍙栨秷.Visible = true;
+            #region 璁捐姝ラ : 涓婁竴姝� 涓嬩竴姝� 瀹屾垚
+            ribbonPanel鎿嶄綔姝ラ = new System.Windows.Forms.RibbonPanel();
+            ribbonPanel鎿嶄綔姝ラ.Text = "姝ラ"; 
+            ribbonPanel鎿嶄綔姝ラ.Name = "ribbonPanel鎿嶄綔姝ラ";
+            ribbonPanel鎿嶄綔姝ラ.ButtonMoreVisible = isButtonMoreVisible;
+            ribbonPanel鎿嶄綔姝ラ.FlowsTo = RibbonPanelFlowDirection.Left;
 
-                InitialStepNodes();
-            };
 
-            Rbtn瀹屾垚 = new System.Windows.Forms.RibbonButton();
-            var Btnimagename瀹屾垚 = "circle-check.png";
-            Rbtn瀹屾垚.Image = BigIcon(ResourcesPath, Btnimagename瀹屾垚 );
-            Rbtn瀹屾垚.Visible = false;
+            Rbtn瀹屾垚 = new System.Windows.Forms.RibbonButton(); 
+            Rbtn瀹屾垚.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
             Rbtn瀹屾垚.Name = "Rbtn瀹屾垚";
             Rbtn瀹屾垚.Text = "瀹屾垚";
-            Rbtn瀹屾垚.Click += (sender, e) => {
-                this.panelParas.Controls.Remove(_ctrlSetOutflowStyle);
-                Rbtn涓婁竴姝�.Visible = false;
-                Rbtn鍙栨秷.Visible = false;
-                Rbtn涓嬩竴姝�.Visible = false;
-                Rbtn瀹屾垚.Visible = false;
+            Rbtn瀹屾垚.Click += (sender, e) => { 
+                Rbtn涓婁竴姝�.Enabled = false; 
+                Rbtn涓嬩竴姝�.Enabled = false;
+                Rbtn瀹屾垚.Enabled = false;
             };
-
-             
-            Rbtn鍙栨秷 = new System.Windows.Forms.RibbonButton();
-            var Btnimagename鍙栨秷 = "circle-rectangle.png";
-            Rbtn鍙栨秷.Image = BigIcon(ResourcesPath, Btnimagename鍙栨秷);
-            Rbtn鍙栨秷.Visible = false;
-            Rbtn鍙栨秷.Name = "Rbtn鍙栨秷";
-            Rbtn鍙栨秷.Text = "鍙栨秷";
-            Rbtn鍙栨秷.Click += (sender, e) => {
-               //if( MessageBox.Show("纭畾瑕佸彇娑堝悧锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question)== DialogResult.OK)
-               // {
-               //     Rbtn涓婁竴姝�.Visible = false;
-               //     Rbtn鍙栨秷.Visible = false;
-               //     Rbtn涓嬩竴姝�.Visible = false;
-               //     Rbtn瀹屾垚.Visible = false;
-               //     if (this.panel1.Controls.Contains(_ctrlHdrBaseInfo))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlHdrBaseInfo);
-               //     }
-               //     if (this.panel1.Controls.Contains(_ctrlGeomBaseInfo))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlGeomBaseInfo);
-               //     }
-               //     if (this.panel1.Controls.Contains(_ctrlSectionBaseInfo))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlSectionBaseInfo);
-               //     }
-               //     if (this.panel1.Controls.Contains(_ctrlSectionShapeInfo18))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlSectionShapeInfo18);
-               //     }
-               //     if (this.panel1.Controls.Contains(_ctrlSetOutflowStyle))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlSetOutflowStyle);
-               //     }
-               //     if (this.panel1.Controls.Contains(_ctrlSetOutflowDim))
-               //     {
-               //         this.panel1.Controls.Remove(_ctrlSetOutflowDim);
-               //     }
-               // }
-                
-            };
-
             Rbtn涓婁竴姝� = new System.Windows.Forms.RibbonButton();
             var Btnimagename涓婁竴姝� = "circle-arrow-left.png";
-            Rbtn涓婁竴姝�.Image = BigIcon(ResourcesPath, Btnimagename涓婁竴姝�);
-            Rbtn涓婁竴姝�.Visible = false;
+            Rbtn涓婁竴姝�.Image = GlobalResource.BuildImage(Btnimagename涓婁竴姝�, 40, 40);
+
             Rbtn涓婁竴姝�.Name = "Rbtn涓婁竴姝�";
             Rbtn涓婁竴姝�.Text = "涓婁竴姝�";
             Rbtn涓婁竴姝�.Click += (sender, e) =>
             {
-                GoPrevStepCore(); 
+                if (GoPrevStepCore())
+                {
+
+                }
             };
 
             Rbtn涓嬩竴姝� = new System.Windows.Forms.RibbonButton();
-            var Btnimagename涓嬩竴姝� = "circle-arrow-right.png";
-            Rbtn涓嬩竴姝�.Image = BigIcon(ResourcesPath, Btnimagename涓嬩竴姝�);
-            Rbtn涓嬩竴姝�.Visible = false;
+            Rbtn涓嬩竴姝�.Image = GlobalResource.BuildImage("circle-arrow-right.png", 40, 40);
+            Rbtn涓嬩竴姝�.Visible = true;
             Rbtn涓嬩竴姝�.Name = "Rbtn涓嬩竴姝�";
             Rbtn涓嬩竴姝�.Text = "涓嬩竴姝�";
             Rbtn涓嬩竴姝�.Click += (sender, e) => {
-                GoNextStepCore();
+                if (GoNextStepCore())
+                {
+
+                }
+            };
+
+            RBtn鍚庨�� = new System.Windows.Forms.RibbonButton();
+            RBtn鍚庨��.SmallImage = GlobalResource.BuildImage("undo16.png", 20, 20);
+            RBtn鍚庨��.Name = "RBtn鍚庨��";
+            RBtn鍚庨��.Click += (e2, s2) => {
+                if (GoPrevStepCore())
+                {
+
+                }
+            };
+
+            Rbtn鍓嶈繘 = new System.Windows.Forms.RibbonButton();
+            Rbtn鍓嶈繘.SmallImage = GlobalResource.BuildImage("do.png", 20, 20);
+            Rbtn鍓嶈繘.Name = "Rbtn鍓嶈繘";
+            Rbtn鍓嶈繘.Click += (e2, s2) => {
+                if (GoNextStepCore())
+                {
+
+                }
+            };
+
+
+
+
+
+
+            RBtnMenu淇濆瓨 = new System.Windows.Forms.RibbonButton();
+            var RBtnMenuimage淇濆瓨 = "Select.png";
+            RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
+            RBtnMenu淇濆瓨.DropDownArrowDirection = RibbonArrowDirection.Left;
+            RBtnMenu淇濆瓨.Name = "RBtnMenu淇濆瓨";
+            RBtnMenu淇濆瓨.Text = "淇濆瓨";
+            RBtnMenu淇濆瓨.Click += (sender, e) =>
+            {
+                //if (RBtn淇濆瓨.Visible == true)
+                //{
+                //    RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
+                //    RBtn淇濆瓨.Visible = false;
+                //}
+                //else
+                //{
+                //    RBtnMenu淇濆瓨.SmallImage = GlobalResource.BuildImage(RBtnMenuimage淇濆瓨, 20, 20);
+                //    RBtn淇濆瓨.Visible = true;
+                //}
+            };
+
+            #endregion
+
+
+            #region  闈㈡澘鏄剧ず
+
+
+            ribbonPanel闈㈡澘鏄剧ず = new System.Windows.Forms.RibbonPanel();
+            ribbonPanel闈㈡澘鏄剧ず.Text = "闈㈡澘鏄剧ず";
+            ribbonPanel闈㈡澘鏄剧ず.Name = "ribbonPanel闈㈡澘鏄剧ず";
+            ribbonPanel闈㈡澘鏄剧ず.ButtonMoreVisible = isButtonMoreVisible;
+            ribbonPanel闈㈡澘鏄剧ず.FlowsTo = RibbonPanelFlowDirection.Left;
+
+
+            RbtnChk姝ラ闈㈡澘 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk姝ラ闈㈡澘.Checked = true ;
+            //RbtnChk姝ラ闈㈡澘.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk姝ラ闈㈡澘.Name = "RbtnChk姝ラ闈㈡澘";
+            RbtnChk姝ラ闈㈡澘.Text = "姝ラ闈㈡澘";
+            RbtnChk姝ラ闈㈡澘.CheckBoxCheckChanged += (sender, e) => { 
+
+            };
+            RbtnChk鍥惧眰闈㈡澘 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk鍥惧眰闈㈡澘.Checked = true;
+            //RbtnChk姝ラ闈㈡澘.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk鍥惧眰闈㈡澘.Name = "RbtnChk鍥惧眰闈㈡澘";
+            RbtnChk鍥惧眰闈㈡澘.Text = "鍥惧眰闈㈡澘";
+            RbtnChk鍥惧眰闈㈡澘.CheckBoxCheckChanged += (sender, e) => {
+                if (_layersDockPanel.DockPanel == null)
+                {
+                    MainDockPanel.AddContent(_layersDockPanel);
+                }
+                else
+                {
+                    MainDockPanel.RemoveContent(_layersDockPanel);
+                }
+            };
+            RbtnChk姝ラ闈㈡澘 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk姝ラ闈㈡澘.Checked = true;
+            //RbtnChk姝ラ闈㈡澘.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk姝ラ闈㈡澘.Name = "RbtnChk姝ラ闈㈡澘";
+            RbtnChk姝ラ闈㈡澘.Text = "姝ラ闈㈡澘";
+            RbtnChk姝ラ闈㈡澘.CheckBoxCheckChanged += (sender, e) => {
+                if (_stepTreeDockPanel.DockPanel == null)
+                {
+                    MainDockPanel.AddContent(_stepTreeDockPanel);
+                }
+                else
+                {
+                    MainDockPanel.RemoveContent(_stepTreeDockPanel);
+                }
+            };
+            RbtnChk鏃ュ織闈㈡澘 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk鏃ュ織闈㈡澘.Checked = true;
+            //RbtnChk姝ラ闈㈡澘.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk鏃ュ織闈㈡澘.Name = "RbtnChk鏃ュ織闈㈡澘";
+            RbtnChk鏃ュ織闈㈡澘.Text = "鏃ュ織闈㈡澘";
+            RbtnChk鏃ュ織闈㈡澘.CheckBoxCheckChanged += (sender, e) => {
+                if (_logListDockPanel.DockPanel == null)
+                {
+                    MainDockPanel.AddContent(_logListDockPanel);
+                }
+                else
+                {
+                    MainDockPanel.RemoveContent(_logListDockPanel);
+                }
+            };
+            RbtnChk鍙傛暟闈㈡澘 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk鍙傛暟闈㈡澘.Checked = true;
+            //RbtnChk鍙傛暟闈㈡澘.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk鍙傛暟闈㈡澘.Name = "RbtnChk鍙傛暟闈㈡澘";
+            RbtnChk鍙傛暟闈㈡澘.Text = "鍙傛暟闈㈡澘";
+            RbtnChk鍙傛暟闈㈡澘.CheckBoxCheckChanged += (sender, e) => {
+                if (_parasDockPanel.DockPanel == null)
+                {
+                    MainDockPanel.AddContent(_parasDockPanel);
+                }
+                else
+                {
+                    MainDockPanel.RemoveContent(_parasDockPanel);
+                }
+            };
+
+
+            
+
+
+
+
+            #endregion
+
+
+            #region  鏁版嵁瀵煎嚭
+            ribbonPanel鏁版嵁瀵煎嚭 = new System.Windows.Forms.RibbonPanel();
+            ribbonPanel鏁版嵁瀵煎嚭.Text = "瀵煎嚭";
+            ribbonPanel鏁版嵁瀵煎嚭.Name = "ribbonPanel鏁版嵁瀵煎嚭";
+            ribbonPanel鏁版嵁瀵煎嚭.ButtonMoreVisible = isButtonMoreVisible;
+            ribbonPanel鏁版嵁瀵煎嚭.FlowsTo = RibbonPanelFlowDirection.Left;
+
+            Rbtn鏁版嵁瀵煎嚭XML = new System.Windows.Forms.RibbonButton();
+            Rbtn鏁版嵁瀵煎嚭XML.Image = GlobalResource.BuildImage("device-ipad-share.png", 40, 40);
+            Rbtn鏁版嵁瀵煎嚭XML.Name = "Rbtn鏁版嵁瀵煎嚭XML";
+            Rbtn鏁版嵁瀵煎嚭XML.Text = "瀵煎嚭XML";
+            Rbtn鏁版嵁瀵煎嚭XML.Click += (sender, e) => {
+                ExportXmlFile();
+            };
+
+            Rbtn鏁版嵁瀵煎嚭STP = new System.Windows.Forms.RibbonButton();
+            Rbtn鏁版嵁瀵煎嚭STP.Image = GlobalResource.BuildImage("device-ipad-share.png", 40, 40);
+            Rbtn鏁版嵁瀵煎嚭STP.Name = "Rbtn鏁版嵁瀵煎嚭STP";
+            Rbtn鏁版嵁瀵煎嚭STP.Text = "瀵煎嚭stp";
+            Rbtn鏁版嵁瀵煎嚭STP.Click += (sender, e) => {
+                ExportStpFile();
+            };
+            Rbtn鏁版嵁瀵煎嚭STP.Visible = false;
+
+
+            Rbtn鏁版嵁瀵煎嚭IGS = new System.Windows.Forms.RibbonButton();
+            Rbtn鏁版嵁瀵煎嚭IGS.Image = GlobalResource.BuildImage("device-ipad-share.png", 40, 40);
+            Rbtn鏁版嵁瀵煎嚭IGS.Name = "Rbtn鏁版嵁瀵煎嚭IGS";
+            Rbtn鏁版嵁瀵煎嚭IGS.Text = "瀵煎嚭igs";
+            Rbtn鏁版嵁瀵煎嚭IGS.Click += (sender, e) => {
+                ExportIgsFile();
+            };
+            Rbtn鏁版嵁瀵煎嚭IGS.Visible = false;
+            #endregion
+
+
+            #region  鏁版嵁瀵煎叆
+            ribbonPanel鏁版嵁瀵煎叆 = new System.Windows.Forms.RibbonPanel();
+            ribbonPanel鏁版嵁瀵煎叆.Text = "瀵煎叆";
+            ribbonPanel鏁版嵁瀵煎叆.Name = "ribbonPanel鏁版嵁瀵煎叆";
+            ribbonPanel鏁版嵁瀵煎叆.ButtonMoreVisible = isButtonMoreVisible;
+            ribbonPanel鏁版嵁瀵煎叆.FlowsTo = RibbonPanelFlowDirection.Left;
+
+            Rbtn鏁版嵁瀵煎叆XML = new System.Windows.Forms.RibbonButton();
+            Rbtn鏁版嵁瀵煎叆XML.Image = GlobalResource.BuildImage("device-ipad-share.png", 40, 40);
+            Rbtn鏁版嵁瀵煎叆XML.Name = "Rbtn鏁版嵁瀵煎叆XML";
+            Rbtn鏁版嵁瀵煎叆XML.Text = "瀵煎叆XML";
+            Rbtn鏁版嵁瀵煎叆XML.Click += (sender, e) => {
+                ImportXmlFile();
             };
 
 
             #endregion
 
-            //鎺т欢娣诲姞
-            #region  
+
+            #region 缁勪欢鏄剧ず
+            ribbonPanel缁勪欢鏄剧ず = new System.Windows.Forms.RibbonPanel();
+            ribbonPanel缁勪欢鏄剧ず.Text = "缁勪欢鏄剧ず";
+            ribbonPanel缁勪欢鏄剧ず.Name = "ribbonPanel缁勪欢鏄剧ず";
+            ribbonPanel缁勪欢鏄剧ず.ButtonMoreVisible = isButtonMoreVisible;
+            ribbonPanel缁勪欢鏄剧ず.FlowsTo = RibbonPanelFlowDirection.Left;
+
+            RbtnChk鎴潰18 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk鎴潰18.Checked = false ;
+            //RbtnChk鎴潰18.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            RbtnChk鎴潰18.Name = "RbtnChk鎴潰18";
+            RbtnChk鎴潰18.Text = "鎴潰18";
+            RbtnChk鎴潰18.Visible = false;
+            RbtnChk鎴潰18.CheckBoxCheckChanged += (sender, e) => {
+                if (RbtnChk鎴潰18.Checked)
+                {
+                    this._occDesign3dCtrl.SetAllSectionCurveVisible(true );
+                    this._occDesign3dCtrl.Invalidate(true);
+                }
+                else
+                {
+                    this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
+                    this._occDesign3dCtrl.Invalidate(true);
+                }
+            };
+            //RbtnChk鎴潰910 = new System.Windows.Forms.RibbonCheckBox();
+            //RbtnChk鎴潰910.Checked = false ;
+            ////RbtnChk鎴潰18.Image = GlobalResource.BuildImage("circle-check.png", 40, 40);
+            //RbtnChk鎴潰910.Name = "RbtnChk鎴潰910";
+            //RbtnChk鎴潰910.Text = "鎴潰9銆�10";
+            //RbtnChk鎴潰910.Visible = true;
+            //RbtnChk鎴潰910.CheckBoxCheckChanged += (sender, e) => {
+            //    if (RbtnChk鎴潰910.Checked)
+            //    {
+            //        this._occDesign3dCtrl.SetAllSection910CurveVisible(true );
+            //        this._occDesign3dCtrl.Invalidate(true);
+            //    }
+            //    else
+            //    {
+            //        this._occDesign3dCtrl.SetAllSection910CurveVisible(false);
+            //        this._occDesign3dCtrl.Invalidate(true);
+            //    }
+            //};
+
+            RbtnChk鏍囨敞 = new System.Windows.Forms.RibbonCheckBox();
+            RbtnChk鏍囨敞.Checked = false;
+            RbtnChk鏍囨敞.Name = "RbtnChk鏍囨敞";
+            RbtnChk鏍囨敞.Text = "2D鏍囨敞闅愯棌";
+            RbtnChk鏍囨敞.Visible = false;
+            RbtnChk鏍囨敞.CheckBoxCheckChanged += (sender, e) => {
+                if (!RbtnChk鏍囨敞.Checked)
+                {
+                    this._occDesign2dCtrl.SetDimVisible(true);
+                    this._occDesign2dCtrl.Invalidate(true);
+                }
+                else
+                {
+                    this._occDesign2dCtrl.SetDimVisible(false);
+                    this._occDesign2dCtrl.Invalidate(true);
+                }
+            };
+
+            #endregion
+
+
+            #region  鎺т欢娣诲姞  鍚庨�� 鍓嶈繘
             ribbonForm.QuickAccessToolbar.Items.Add(this.RBtn鍚庨��);
             ribbonForm.QuickAccessToolbar.Items.Add(this.Rbtn鍓嶈繘);
-            ribbonForm.QuickAccessToolbar.Items.Add(this.RBtn淇濆瓨);
-            ribbonForm.QuickAccessToolbar.DropDownButtonItems.Add(RBtnMenu鍚庨��);
-            ribbonForm.QuickAccessToolbar.DropDownButtonItems.Add(RBtnMenu淇濆瓨);
-            ribbonForm.QuickAccessToolbar.DropDownButtonItems.Add(RBtnMenu鍓嶈繘);
-            ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile鏂板缓);
+    
+            //灏忓浘鏍� 鐐瑰嚮鏇村 灞曞紑鍚庢樉绀�
+            ribbonForm.QuickAccessToolbar.DropDownButtonItems.Add(RBtnMenu淇濆瓨); 
+
+            //宸︿笂閮ㄨ彍鍗� 
             ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile淇濆瓨);
-            ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile鎵撳紑);
-            ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile鍙﹀瓨涓�);
+            ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile鎵撳紑); 
             ribbonForm.OrbDropDown.MenuItems.Add(RBtnFile閫夐」);
 
+            //
             ribbonTab瑙嗗浘.Panels.Add(ribbonPanel瑙嗗浘);
             ribbonTab瑙嗗浘.Panels.Add(ribbonPanel鍙樼劍);
             ribbonTab瑙嗗浘.Panels.Add(ribbonPanel妯″紡);
             ribbonTab瑙嗗浘.Panels.Add(ribbonPanel鍥惧眰);
-            ribbonTab缂栬緫.Panels.Add(ribbonPanel缃戞牸);
-            ribbonTab缂栬緫.Panels.Add(ribbonPanel铚楀3璁捐姝ラ);
+            ribbonTab瑙嗗浘.Panels.Add(ribbonPanel缃戞牸);
+
+            ribbonTab缂栬緫.Panels.Add(ribbonPanel鎿嶄綔姝ラ);
+            ribbonTab缂栬緫.Panels.Add(ribbonPanel闈㈡澘鏄剧ず); 
+            ribbonTab缂栬緫.Panels.Add(ribbonPanel鏁版嵁瀵煎嚭);
+            ribbonTab缂栬緫.Panels.Add(ribbonPanel鏁版嵁瀵煎叆);
+            ribbonTab缂栬緫.Panels.Add(ribbonPanel缁勪欢鏄剧ず);
 
             ribbonPanel瑙嗗浘.Items.Add(RBtn鍚庤鍥�);
             ribbonPanel瑙嗗浘.Items.Add(RBtn姝h鍥�);
@@ -925,11 +1017,25 @@
             ribbonPanel鍥惧眰.Items.Add(RGroup灏忓浘鏍�);
             ribbonPanel鍥惧眰.Items.Add(RGroup涓嬫媺妗�);
             ribbonPanel鍥惧眰.Items.Add(Rbtn鍥惧眰缂栬緫);
-            ribbonPanel铚楀3璁捐姝ラ.Items.Add(Rbtn瀹屾垚);
-            ribbonPanel铚楀3璁捐姝ラ.Items.Add(Rbtn涓嬩竴姝�);
-            ribbonPanel铚楀3璁捐姝ラ.Items.Add(Rbtn涓婁竴姝�);
-            ribbonPanel铚楀3璁捐姝ラ.Items.Add(Rbtn鍙栨秷);
-            ribbonPanel铚楀3璁捐姝ラ.Items.Add(Rbtn寮�濮�);
+
+            ribbonPanel鎿嶄綔姝ラ.Items.Add(Rbtn瀹屾垚);
+            ribbonPanel鎿嶄綔姝ラ.Items.Add(Rbtn涓嬩竴姝�);
+            ribbonPanel鎿嶄綔姝ラ.Items.Add(Rbtn涓婁竴姝�);
+
+            ribbonPanel闈㈡澘鏄剧ず.Items.Add(RbtnChk姝ラ闈㈡澘);
+            ribbonPanel闈㈡澘鏄剧ず.Items.Add(RbtnChk鍥惧眰闈㈡澘);
+            ribbonPanel闈㈡澘鏄剧ず.Items.Add(RbtnChk鏃ュ織闈㈡澘); 
+            ribbonPanel闈㈡澘鏄剧ず.Items.Add(RbtnChk鍙傛暟闈㈡澘);
+
+            ribbonPanel鏁版嵁瀵煎嚭.Items.Add(Rbtn鏁版嵁瀵煎嚭XML);
+            ribbonPanel鏁版嵁瀵煎嚭.Items.Add(Rbtn鏁版嵁瀵煎嚭STP);
+            ribbonPanel鏁版嵁瀵煎嚭.Items.Add(Rbtn鏁版嵁瀵煎嚭IGS);
+
+            ribbonPanel鏁版嵁瀵煎叆.Items.Add(Rbtn鏁版嵁瀵煎叆XML);
+
+            ribbonPanel缁勪欢鏄剧ず.Items.Add(RbtnChk鎴潰18);
+            //ribbonPanel缁勪欢鏄剧ず.Items.Add(RbtnChk鎴潰910);
+            ribbonPanel缁勪欢鏄剧ず.Items.Add(RbtnChk鏍囨敞);
 
             RGroup涓嬫媺妗�.Items.Add(RBox鍥惧眰);
             RGroup灏忓浘鏍�.Items.Add(Rbtn鎵�鏈夊疄浣�);
@@ -965,6 +1071,8 @@
             this.ribbonForm.Tabs.Add(ribbonTab瑙嗗浘);
             #endregion
         }
+        
+
 
 
 

--
Gitblit v1.9.3