tangxu
2025-02-26 0f0af979b3108483a7f5206e6967a74a5f10918f
添加截面的显示隐藏
已修改3个文件
260 ■■■■■ 文件已修改
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs 239 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_出口_水体.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -1,10 +1,6 @@

using System;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using System.IO;
using System.Text;
using System.Drawing;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -23,6 +19,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显示网格;
@@ -84,6 +81,7 @@
        private System.Windows.Forms.RibbonCheckBox RbtnChk日志面板; 
        private System.Windows.Forms.RibbonCheckBox RbtnChk参数面板;
        private System.Windows.Forms.RibbonCheckBox RbtnChk截面18;
        private System.Windows.Forms.RibbonButton Rbtn数据导出XML;
        private System.Windows.Forms.RibbonButton Rbtn数据导入XML;
@@ -113,8 +111,6 @@
            ribbonForm.OrbStyle = RibbonOrbStyle.Office_2013;
            ribbonForm.OrbText = "文件";
  
            ribbonTab视图 = new System.Windows.Forms.RibbonTab();
            ribbonTab视图.Name = "ribbonTab视图";
            ribbonTab视图.Text = "视图";
@@ -123,58 +119,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())
                {
                }
            };
            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
            //File
            #region
            #region File
            RBtnFile打开 = new System.Windows.Forms.RibbonButton();
            var RBtnFileimage打开 = "open32.png";
@@ -196,8 +143,8 @@
            RBtnFile选项.Text = "选项";
            #endregion
            //视图
            #region
            #region è§†å›¾
            ribbonPanel视图 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel视图.Text = "视图";
            ribbonPanel视图.Name = "ribbonPanel视图";
@@ -262,8 +209,8 @@
            #endregion
            //变焦
            #region
            #region å˜ç„¦
            ribbonPanel变焦 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel变焦.Text = "变焦";
            ribbonPanel变焦.Name = "ribbonPanel变焦";
@@ -301,8 +248,8 @@
            #endregion
            //网格
            #region
            #region ç½‘æ ¼
            ribbonPanel网格 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel网格.Text = "网格";
            ribbonPanel网格.Name = "ribbonPanel网格";
@@ -594,8 +541,8 @@
            #endregion
            //渲染模式
            #region
            #region æ¸²æŸ“模式
            ribbonPanel模式 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel模式.Text = "模式";
            ribbonPanel模式.Name = "ribbonPanel模式";
@@ -641,8 +588,8 @@
            #endregion
            //图层
            #region
            #region å›¾å±‚ æš‚时没用
            ribbonPanel图层 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel图层.Text = "图层";
            ribbonPanel图层.Name = "ribbonPanel图层";
@@ -724,21 +671,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 +689,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 ;
@@ -822,37 +844,14 @@
            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())
                {
                }
            };
            #endregion
            #region èœ—壳数据导出
            #region  æ•°æ®å¯¼å‡º
            ribbonPanel数据导出 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel数据导出.Text = "导出";
            ribbonPanel数据导出.Name = "ribbonPanel数据导出";
@@ -888,9 +887,9 @@
            #endregion
            #region èœ—壳数据导入
            #region  æ•°æ®å¯¼å…¥
            ribbonPanel数据导入 = new System.Windows.Forms.RibbonPanel();
            ribbonPanel数据导入.Text = "数据导入";
            ribbonPanel数据导入.Text = "导入";
            ribbonPanel数据导入.Name = "ribbonPanel数据导入";
            ribbonPanel数据导入.ButtonMoreVisible = isButtonMoreVisible;
            ribbonPanel数据导入.FlowsTo = RibbonPanelFlowDirection.Left;
@@ -907,8 +906,35 @@
            #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 );
                }
                else
                {
                    this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
                }
            };
            #endregion
            #region  æŽ§ä»¶æ·»åŠ   åŽé€€ å‰è¿›
            ribbonForm.QuickAccessToolbar.Items.Add(this.RBtn后退);
            ribbonForm.QuickAccessToolbar.Items.Add(this.Rbtn前进);
    
@@ -932,6 +958,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正视图);
@@ -967,6 +994,8 @@
            ribbonPanel数据导入.Items.Add(Rbtn数据导入XML);
            ribbonPanel组件显示.Items.Add(RbtnChk截面18);
            RGroup下拉框.Items.Add(RBox图层);
            RGroup小图标.Items.Add(Rbtn所有实体);
            RGroup小图标.Items.Add(Rbtn选择全部);
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -64,8 +64,7 @@
        /// <param name="next_step_id"></param>
        private bool ChangeStep(long current_step_id, long next_step_id)
        {
            RbtnChk截面18.Visible = false;
            if (current_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
            {
                if (!SaveParaStep1())
@@ -90,6 +89,7 @@
            }
            else if (current_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
            {
                if (!SaveParaStep3())
                    return false;
            }
@@ -130,6 +130,18 @@
                this._occDesign2dCtrl.HideAll();
                this._occDesign3dCtrl.HideAll();
            }
            else if (next_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
            {
                RbtnChk截面18.Visible = true;
                this.RBtn后退.Enabled = true;
                this.Rbtn前进.Enabled = true;
                this.Rbtn上一步.Enabled = true;
                this.Rbtn下一步.Enabled = true;
                this.Rbtn完成.Enabled = false;
            }
            else if (next_step_id == this._stepTreeDockPanel.Step_ID_Thickness)
            {
                this.RBtn后退.Enabled = true;
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_³ö¿Ú_Ë®Ìå.cs
@@ -33,7 +33,7 @@
            CreateOutflowStepCtrl();
            this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
            this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
            this._occDesign3dCtrl.SetAllSectionCurveVisible(RbtnChk截面18.Checked);
            if (last_step_id >= this._stepTreeDockPanel.Step_ID_Thickness)
            {
                this._occDesign3dCtrl.setWaterBodyOpacity(
@@ -212,11 +212,10 @@
                this._occDesign3dCtrl.SectStartAngle = start_angle;
                this._occDesign3dCtrl.ClearAll();
                this._occDesign3dCtrl.RefreshAllSectShape18(this._sectionBundleInfo);
                this._occDesign3dCtrl.SetAllSectionCurveVisible(RbtnChk截面18.Checked);
                this._sectAreaDockPanel.SetArea18(_sectionBundleInfo);
            }