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 | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
index 3650187..6a75352 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_InitialRibbon.cs
@@ -83,6 +83,8 @@
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;
@@ -924,13 +926,50 @@
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
@@ -995,6 +1034,8 @@
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鎵�鏈夊疄浣�);
--
Gitblit v1.9.3