解决冲突

chenn

2025-04-11 e98de937b28d42493de5dea6365c853d6b412d3c

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs

@@ -1,10 +1,7 @@

using System;
using 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
{
@@ -23,7 +20,8 @@
        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方形网格;
@@ -60,8 +58,9 @@
     
        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保存;

 
@@ -83,8 +82,10 @@
        private System.Windows.Forms.RibbonCheckBox RbtnChk日志面板; 
        private System.Windows.Forms.RibbonCheckBox RbtnChk参数面板;

        private System.Windows.Forms.RibbonButton Rbtn上一步;
        private System.Windows.Forms.RibbonButton Rbtn下一步;
        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;
@@ -113,8 +114,6 @@
            ribbonForm.OrbStyle = RibbonOrbStyle.Office_2013;
            ribbonForm.OrbText = "文件";
  


            ribbonTab视图 = new System.Windows.Forms.RibbonTab();
            ribbonTab视图.Name = "ribbonTab视图";
            ribbonTab视图.Text = "视图";
@@ -123,58 +122,9 @@
            ribbonTab编辑.Name = "ribbonTab编辑";
            ribbonTab编辑.Text = "编辑";

            //rebbon
            #region

            RBtn后退 = new System.Windows.Forms.RibbonButton(); 
            RBtn后退.SmallImage = GlobalResource.BuildImage("undo16.png", 20,20);
            RBtn后退.Name = "RBtn后退";
            RBtn后退.Click += (e2,s2)=> {
                if (GoPrevStepCore())
                {
                    CheckStepBtnStatus();
                }
            };

            Rbtn前进 = new System.Windows.Forms.RibbonButton(); 
            Rbtn前进.SmallImage = GlobalResource.BuildImage("do.png", 20, 20);
            Rbtn前进.Name = "Rbtn前进";
            Rbtn前进.Click += (e2, s2) => {
                if (GoNextStepCore())
                {
                    CheckStepBtnStatus();
                }
            };






            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

            //File
            #region
 
           
            #region File

            RBtnFile打开 = new System.Windows.Forms.RibbonButton();
            var RBtnFileimage打开 = "open32.png";
@@ -196,8 +146,8 @@
            RBtnFile选项.Text = "选项";
            #endregion

            //视图
            #region
           
            #region 视图
            ribbonPanel视图 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel视图.Text = "视图";
            ribbonPanel视图.Name = "ribbonPanel视图";
@@ -262,8 +212,8 @@

            #endregion

            //变焦
            #region
           
            #region 变焦
            ribbonPanel变焦 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel变焦.Text = "变焦";
            ribbonPanel变焦.Name = "ribbonPanel变焦";
@@ -301,8 +251,8 @@

            #endregion

            //网格
            #region
            
            #region 网格
            ribbonPanel网格 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel网格.Text = "网格";
            ribbonPanel网格.Name = "ribbonPanel网格";
@@ -594,8 +544,8 @@

            #endregion

            //渲染模式
            #region
            
            #region 渲染模式
            ribbonPanel模式 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel模式.Text = "模式";
            ribbonPanel模式.Name = "ribbonPanel模式";
@@ -641,8 +591,8 @@

            #endregion

            //图层
            #region
            
            #region 图层 暂时没用
            ribbonPanel图层 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel图层.Text = "图层";
            ribbonPanel图层.Name = "ribbonPanel图层";
@@ -724,21 +674,13 @@
            //ribbonComboBox1.DropDownItems.Add(ribbonLabel1);
            #endregion

            //蜗壳设计步骤
            #region

            #region 设计步骤 : 上一步 下一步 完成
            ribbonPanel操作步骤 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel操作步骤.Text = "步骤"; 
            ribbonPanel操作步骤.Name = "ribbonPanel操作步骤";
            ribbonPanel操作步骤.ButtonMoreVisible = isButtonMoreVisible;
            ribbonPanel操作步骤.FlowsTo = RibbonPanelFlowDirection.Left;


            ribbonPanel面板显示 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel面板显示.Text = "面板显示";
            ribbonPanel面板显示.Name = "ribbonPanel面板显示";
            ribbonPanel面板显示.ButtonMoreVisible = isButtonMoreVisible;
            ribbonPanel面板显示.FlowsTo = RibbonPanelFlowDirection.Left;



            Rbtn完成 = new System.Windows.Forms.RibbonButton(); 
@@ -750,6 +692,89 @@
                Rbtn下一步.Enabled = false;
                Rbtn完成.Enabled = false;
            };
            Rbtn上一步 = new System.Windows.Forms.RibbonButton();
            var Btnimagename上一步 = "circle-arrow-left.png";
            Rbtn上一步.Image = GlobalResource.BuildImage(Btnimagename上一步, 40, 40);

            Rbtn上一步.Name = "Rbtn上一步";
            Rbtn上一步.Text = "上一步";
            Rbtn上一步.Click += (sender, e) =>
            {
                if (GoPrevStepCore())
                {

                }
            };

            Rbtn下一步 = new System.Windows.Forms.RibbonButton();
            Rbtn下一步.Image = GlobalResource.BuildImage("circle-arrow-right.png", 40, 40);
            Rbtn下一步.Visible = true;
            Rbtn下一步.Name = "Rbtn下一步";
            Rbtn下一步.Text = "下一步";
            Rbtn下一步.Click += (sender, e) => {
                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 ;
@@ -821,38 +846,15 @@
            };


            

            Rbtn上一步 = new System.Windows.Forms.RibbonButton();
            var Btnimagename上一步 = "circle-arrow-left.png";
            Rbtn上一步.Image = GlobalResource.BuildImage(Btnimagename上一步, 40, 40);
 
            Rbtn上一步.Name = "Rbtn上一步";
            Rbtn上一步.Text = "上一步";
            Rbtn上一步.Click += (sender, e) =>
            {
                if(GoPrevStepCore())
                {
                    CheckStepBtnStatus();
                }
            };

            Rbtn下一步 = new System.Windows.Forms.RibbonButton(); 
            Rbtn下一步.Image = GlobalResource.BuildImage("circle-arrow-right.png", 40, 40);
            Rbtn下一步.Visible = true ;
            Rbtn下一步.Name = "Rbtn下一步";
            Rbtn下一步.Text = "下一步";
            Rbtn下一步.Click += (sender, e) => {
                if (GoNextStepCore())
                {
                    CheckStepBtnStatus(); 
                } 
            };


            #endregion


            #region 蜗壳数据导出
            #region  数据导出
            ribbonPanel数据导出 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel数据导出.Text = "导出";
            ribbonPanel数据导出.Name = "ribbonPanel数据导出";
@@ -888,9 +890,9 @@
            #endregion


            #region 蜗壳数据导入
            #region  数据导入
            ribbonPanel数据导入 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel数据导入.Text = "数据导入";
            ribbonPanel数据导入.Text = "导入";
            ribbonPanel数据导入.Name = "ribbonPanel数据导入";
            ribbonPanel数据导入.ButtonMoreVisible = isButtonMoreVisible;
            ribbonPanel数据导入.FlowsTo = RibbonPanelFlowDirection.Left;
@@ -903,12 +905,76 @@
                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前进);
    
@@ -927,11 +993,11 @@
            ribbonTab视图.Panels.Add(ribbonPanel图层);
            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正视图);
@@ -967,6 +1033,10 @@

            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所有实体);
            RGroup小图标.Items.Add(Rbtn选择全部);
@@ -1001,40 +1071,10 @@
            this.ribbonForm.Tabs.Add(ribbonTab视图);
            #endregion
        }

 

        /// <summary>
        /// 检查上一步,下一步按钮状态
        /// </summary>
        private void CheckStepBtnStatus()
        { 
            if (this._stepTreeDockPanel.PrevStepID > 0 && 
                this._stepTreeDockPanel.PrevStepID　!= this._stepTreeDockPanel.Step_ID_Introduce)
            {
                RBtn后退.Enabled = true; 
                Rbtn上一步.Enabled = true;
            }
            else
            {
                RBtn后退.Enabled = false;
                Rbtn上一步.Enabled = false;
            }
        


            if (this._stepTreeDockPanel.NextStepID == 0)
            {
                Rbtn前进.Enabled = false;
                Rbtn下一步.Enabled = false;
                Rbtn完成.Enabled = true;
            }
            else
            {
                Rbtn前进.Enabled = true;
                Rbtn下一步.Enabled = true;
                Rbtn完成.Enabled = false;
            }
        }


    }
}