添加OCC融合

tangxu

2024-11-04 ebd031e3bed6c1cfddce8fc9b98f7f9e95fb9e32

 Client/DesktopMain/MainWindow/frmMainWindowRLT.cs

@@ -2,6 +2,7 @@
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using DPumpHydr.WinFrmUI.Volute;

namespace DPumpHydr.DesktopMain
{
@@ -15,7 +16,7 @@
            this.DrawerShowIconsWhenHidden = true;
            this.DrawerTabControl = mainTabControl;


            //等待框
            //DPumpHydr.WinFrmUI.RLT.Controls.ParrotSplashScreen parrotSplashScreen1 
            //    = new DPumpHydr.WinFrmUI.RLT.Controls.ParrotSplashScreen();
            //parrotSplashScreen1.AllowDragging = true;
@@ -36,14 +37,34 @@
            //parrotSplashScreen1.TopTextColor = System.Drawing.Color.White;
            //parrotSplashScreen1.TopTextSize = 36;
            //parrotSplashScreen1.UnloadedColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
         


            //parrotSplashScreen1.InitializeLoader(this);

            //原始dock界面控件
            //DPumpHydr.WinFrmUI.Volute.dockCtrl原始 mainViewPage1
            //    = new DPumpHydr.WinFrmUI.Volute.dockCtrl原始();

            //mainViewPage1.Dock = DockStyle.Fill;
            //mainViewPage1.Location = new System.Drawing.Point(0, 0);
            //mainViewPage1.Name = "mainViewPage1";
            //mainViewPage1.Size = new System.Drawing.Size(1184, 753);
            //mainViewPage1.TabIndex = 0;
            //tabPage1.Controls.Add(mainViewPage1);


            DPumpHydr.WinFrmUI.Volute.dockCtrl测试 mainViewPage1
                = new DPumpHydr.WinFrmUI.Volute.dockCtrl测试();

            mainViewPage1.Dock = DockStyle.Fill;
            mainViewPage1.Location = new System.Drawing.Point(0, 0);
            mainViewPage1.Name = "mainViewPage1";
            mainViewPage1.Size = new System.Drawing.Size(1184, 753);
            mainViewPage1.TabIndex = 0;
            tabPage1.Controls.Add(mainViewPage1);

        }

   

    }
}