Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

tx

2025-04-14 5fc444fd4e3a7f94fed8c848211e52012d6c522f

Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs

@@ -142,6 +142,7 @@
                this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
                this._occDesign3dCtrl.SetAllSectionCurveVisible(false);

                RbtnChk标注.Visible = true;
                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Outflow_Paras);

                #endregion
@@ -154,7 +155,8 @@

                DockStepParaCtrl(_ctrlThicknessParas);
                _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Thickness);
                

                RbtnChk标注.Visible = true;
                #endregion

                GoNextStep();

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs

@@ -84,6 +84,7 @@

        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;
@@ -925,12 +926,32 @@
                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;
@@ -941,10 +962,12 @@
                if (!RbtnChk标注.Checked)
                {
                    this._occDesign2dCtrl.SetDimVisible(true);
                    this._occDesign2dCtrl.Invalidate(true);
                }
                else
                {
                    this._occDesign2dCtrl.SetDimVisible(false);
                    this._occDesign2dCtrl.Invalidate(true);
                }
            };

@@ -1011,6 +1034,7 @@
            ribbonPanel数据导入.Items.Add(Rbtn数据导入XML);

            ribbonPanel组件显示.Items.Add(RbtnChk截面18);
            //ribbonPanel组件显示.Items.Add(RbtnChk截面910);
            ribbonPanel组件显示.Items.Add(RbtnChk标注);

            RGroup下拉框.Items.Add(RBox图层);

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs

@@ -65,7 +65,6 @@
        private bool ChangeStep(long current_step_id, long next_step_id)
        {
            RbtnChk截面18.Visible = false;
            RbtnChk标注.Visible = false;
            if (current_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
            {
                if (!SaveParaStep1())
@@ -101,6 +100,8 @@
                if (next_step_id < current_step_id && next_step_id != 0)
                {//删除加厚体
                    this._occDesign3dCtrl.RemoveThicknessBody( );

                    this._occDesign3dCtrl.Invalidate(true);
                }
            }

@@ -112,6 +113,8 @@
            this._stepTreeDockPanel.SetFocusedNode(next_step_id);


            if (next_step_id != this._stepTreeDockPanel.Step_ID_Thickness)
                RbtnChk标注.Visible = false;

            Rbtn数据导出STP.Visible = false;
            Rbtn数据导出IGS.Visible = false;
@@ -147,6 +150,7 @@
            
            else if (next_step_id == this._stepTreeDockPanel.Step_ID_Thickness)
            {
                RbtnChk标注.Visible = true;
                this.RBtn后退.Enabled = true;
                this.Rbtn前进.Enabled = false;


 WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs

@@ -352,7 +352,7 @@
        }

        /// <summary>
        /// 
        /// 显示/隐藏1-8断面
        /// </summary>
        /// <param name="isVisible"></param>
        public void SetAllSectionCurveVisible(bool isVisible)
@@ -367,6 +367,21 @@
            }
        }
        /// <summary>
         /// 显示/隐藏9、10断面
         /// </summary>
         /// <param name="isVisible"></param>
        public void SetAllSection910CurveVisible(bool isVisible)
        {
            for (int i = 10; i >= 9; i--)
            {
                string wstrShapeNameI = string.Format("SectShape_{0}", i);
                if (isVisible)
                    pDisplayView.showVoluteCurve(wstrShapeNameI);
                else
                    pDisplayView.hideVoluteCurve(wstrShapeNameI);
            }
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="sectIndex"></param>