From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 147 +++++++++++++++++++++++++++++--------------------
1 files changed, 87 insertions(+), 60 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 7e886fb..29bc659 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -60,8 +60,6 @@
xhsProjectSimulationBimfaceCtrl1 = new XhsProjectSimulationBimfaceCtrl();
pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl();
- tabPageL3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
- xhsProjectSimulationL3dCtrl1 = new XhsProjectSimulationL3dCtrl();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
@@ -80,15 +78,18 @@
xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl();
docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer();
- xhsProjectSimulationMatchingListCtrl1 = new Xhs.XhsProjectSimulationMatchingListCtrl();
+ xhsProjectSimulationMatchingListCtrl1 = new XhsProjectSimulationMatchingListCtrl();
+ docPnlSearch = new DevExpress.XtraBars.Docking.DockPanel();
+ controlContainer6 = new DevExpress.XtraBars.Docking.ControlContainer();
+ xhsProjectSimulationSearchCtrl1 = new XhsProjectSimulationSearchCtrl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
+ barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
pageBimface.SuspendLayout();
pageQ3d.SuspendLayout();
- tabPageL3d.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
docPnlProperty.SuspendLayout();
dockPanel1_Container.SuspendLayout();
@@ -102,6 +103,8 @@
controlContainer4.SuspendLayout();
docPnlMatchingList.SuspendLayout();
controlContainer5.SuspendLayout();
+ docPnlSearch.SuspendLayout();
+ controlContainer6.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
((ISupportInitialize)rmSet).BeginInit();
SuspendLayout();
@@ -111,16 +114,16 @@
ribbonControl1.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 32;
+ ribbonControl1.MaxItemId = 33;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1161, 110);
+ ribbonControl1.Size = new Size(1166, 110);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -295,6 +298,7 @@
//
ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
+ ribbonPageGroup3.ItemLinks.Add(barBtnSearch);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -307,14 +311,13 @@
//
tabPane1.Controls.Add(pageBimface);
tabPane1.Controls.Add(pageQ3d);
- tabPane1.Controls.Add(tabPageL3d);
tabPane1.Dock = DockStyle.Fill;
tabPane1.Location = new Point(0, 110);
tabPane1.Name = "tabPane1";
- tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d, tabPageL3d });
- tabPane1.RegularSize = new Size(886, 200);
+ tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
+ tabPane1.RegularSize = new Size(891, 183);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(886, 200);
+ tabPane1.Size = new Size(891, 183);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -323,14 +326,14 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(886, 167);
+ pageBimface.Size = new Size(891, 150);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 167);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(891, 150);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
@@ -340,35 +343,20 @@
pageQ3d.Caption = "姘村姏妯″瀷";
pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
pageQ3d.Name = "pageQ3d";
- pageQ3d.Size = new Size(886, 185);
+ pageQ3d.Size = new Size(886, 167);
//
// xhsProjectSimulationQ3dCtrl1
//
xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
- xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 185);
+ xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 167);
xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
- //
- // tabPageL3d
- //
- tabPageL3d.Caption = "L3d";
- tabPageL3d.Controls.Add(xhsProjectSimulationL3dCtrl1);
- tabPageL3d.Name = "tabPageL3d";
- tabPageL3d.Size = new Size(886, 185);
- //
- // xhsProjectSimulationL3dCtrl1
- //
- xhsProjectSimulationL3dCtrl1.Dock = DockStyle.Fill;
- xhsProjectSimulationL3dCtrl1.Location = new Point(0, 0);
- xhsProjectSimulationL3dCtrl1.Name = "xhsProjectSimulationL3dCtrl1";
- xhsProjectSimulationL3dCtrl1.Size = new Size(886, 185);
- xhsProjectSimulationL3dCtrl1.TabIndex = 0;
//
// dockManager1
//
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList, docPnlMatchingList });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList, docPnlMatchingList, docPnlSearch });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
//
// docPnlProperty
@@ -376,10 +364,10 @@
docPnlProperty.Controls.Add(dockPanel1_Container);
docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlProperty.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlProperty.Location = new Point(886, 110);
+ docPnlProperty.Location = new Point(891, 110);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 629);
+ docPnlProperty.Size = new Size(275, 718);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -387,7 +375,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 600);
+ dockPanel1_Container.Size = new Size(268, 689);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -395,7 +383,7 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 600);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 689);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
//
// docPnlHydroParterList
@@ -404,10 +392,10 @@
docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroParterList.FloatVertical = true;
docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e");
- docPnlHydroParterList.Location = new Point(0, 660);
+ docPnlHydroParterList.Location = new Point(0, 749);
docPnlHydroParterList.Name = "docPnlHydroParterList";
docPnlHydroParterList.OriginalSize = new Size(200, 79);
- docPnlHydroParterList.Size = new Size(886, 79);
+ docPnlHydroParterList.Size = new Size(891, 79);
docPnlHydroParterList.Text = "鏋勪欢鏄庣粏";
//
// controlContainer3
@@ -415,7 +403,7 @@
controlContainer3.Controls.Add(hydroParterListCtrl1);
controlContainer3.Location = new Point(3, 27);
controlContainer3.Name = "controlContainer3";
- controlContainer3.Size = new Size(880, 49);
+ controlContainer3.Size = new Size(885, 49);
controlContainer3.TabIndex = 0;
//
// hydroParterListCtrl1
@@ -424,7 +412,7 @@
hydroParterListCtrl1.HidePageWhenListIsNull = true;
hydroParterListCtrl1.Location = new Point(0, 0);
hydroParterListCtrl1.Name = "hydroParterListCtrl1";
- hydroParterListCtrl1.Size = new Size(880, 49);
+ hydroParterListCtrl1.Size = new Size(885, 49);
hydroParterListCtrl1.TabIndex = 0;
hydroParterListCtrl1.HydroClickEvent += hydroParterListCtrl1_HydroClickEvent;
//
@@ -434,10 +422,10 @@
docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCalcu.FloatVertical = true;
docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4");
- docPnlHydroCalcu.Location = new Point(0, 576);
+ docPnlHydroCalcu.Location = new Point(0, 665);
docPnlHydroCalcu.Name = "docPnlHydroCalcu";
docPnlHydroCalcu.OriginalSize = new Size(200, 84);
- docPnlHydroCalcu.Size = new Size(886, 84);
+ docPnlHydroCalcu.Size = new Size(891, 84);
docPnlHydroCalcu.Text = "姘村姏璁＄畻";
//
// controlContainer2
@@ -445,7 +433,7 @@
controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
controlContainer2.Location = new Point(3, 27);
controlContainer2.Name = "controlContainer2";
- controlContainer2.Size = new Size(880, 54);
+ controlContainer2.Size = new Size(885, 54);
controlContainer2.TabIndex = 0;
//
// xhsProjectSimulationHydroCalcuFailedCtrl1
@@ -453,7 +441,7 @@
xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
- xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 54);
+ xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(885, 54);
xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
//
// docPnlHydroCheck
@@ -462,12 +450,12 @@
docPnlHydroCheck.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCheck.FloatVertical = true;
docPnlHydroCheck.ID = new Guid("dee18895-8b3d-44cd-9001-28bee516095d");
- docPnlHydroCheck.Location = new Point(0, 488);
+ docPnlHydroCheck.Location = new Point(0, 577);
docPnlHydroCheck.Name = "docPnlHydroCheck";
docPnlHydroCheck.OriginalSize = new Size(200, 88);
docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlHydroCheck.SavedIndex = 1;
- docPnlHydroCheck.Size = new Size(886, 88);
+ docPnlHydroCheck.Size = new Size(891, 88);
docPnlHydroCheck.Text = "姘村姏鏍￠獙";
//
// controlContainer1
@@ -475,7 +463,7 @@
controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckResultCtrl1);
controlContainer1.Location = new Point(3, 27);
controlContainer1.Name = "controlContainer1";
- controlContainer1.Size = new Size(880, 58);
+ controlContainer1.Size = new Size(885, 58);
controlContainer1.TabIndex = 0;
//
// xhsProjectSimulationHydroCheckResultCtrl1
@@ -483,7 +471,7 @@
xhsProjectSimulationHydroCheckResultCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationHydroCheckResultCtrl1.Location = new Point(0, 0);
xhsProjectSimulationHydroCheckResultCtrl1.Name = "xhsProjectSimulationHydroCheckResultCtrl1";
- xhsProjectSimulationHydroCheckResultCtrl1.Size = new Size(880, 58);
+ xhsProjectSimulationHydroCheckResultCtrl1.Size = new Size(885, 58);
xhsProjectSimulationHydroCheckResultCtrl1.TabIndex = 0;
xhsProjectSimulationHydroCheckResultCtrl1.HydroClickEvent += xhsProjectSimulationHydroCheckResultCtrl1_HydroClickEvent;
//
@@ -493,10 +481,10 @@
docPnlUnMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlUnMatchingList.FloatVertical = true;
docPnlUnMatchingList.ID = new Guid("fdc5c4e2-7bd3-4114-90a6-3cd0ed365103");
- docPnlUnMatchingList.Location = new Point(0, 405);
+ docPnlUnMatchingList.Location = new Point(0, 494);
docPnlUnMatchingList.Name = "docPnlUnMatchingList";
docPnlUnMatchingList.OriginalSize = new Size(200, 83);
- docPnlUnMatchingList.Size = new Size(886, 83);
+ docPnlUnMatchingList.Size = new Size(891, 83);
docPnlUnMatchingList.Text = "鏈尮閰嶅垪琛�";
//
// controlContainer4
@@ -504,7 +492,7 @@
controlContainer4.Controls.Add(xhsProjectSimulationUnMatchingListCtrl1);
controlContainer4.Location = new Point(3, 27);
controlContainer4.Name = "controlContainer4";
- controlContainer4.Size = new Size(880, 53);
+ controlContainer4.Size = new Size(885, 53);
controlContainer4.TabIndex = 0;
//
// xhsProjectSimulationUnMatchingListCtrl1
@@ -513,7 +501,7 @@
xhsProjectSimulationUnMatchingListCtrl1.HidePageWhenListIsNull = true;
xhsProjectSimulationUnMatchingListCtrl1.Location = new Point(0, 0);
xhsProjectSimulationUnMatchingListCtrl1.Name = "xhsProjectSimulationUnMatchingListCtrl1";
- xhsProjectSimulationUnMatchingListCtrl1.Size = new Size(880, 53);
+ xhsProjectSimulationUnMatchingListCtrl1.Size = new Size(885, 53);
xhsProjectSimulationUnMatchingListCtrl1.TabIndex = 0;
xhsProjectSimulationUnMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent;
xhsProjectSimulationUnMatchingListCtrl1.ViewModelEvent += xhsProjectSimulationUnMatchingListCtrl1_ViewModelEvent;
@@ -524,10 +512,10 @@
docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlMatchingList.FloatVertical = true;
docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a");
- docPnlMatchingList.Location = new Point(0, 310);
+ docPnlMatchingList.Location = new Point(0, 399);
docPnlMatchingList.Name = "docPnlMatchingList";
docPnlMatchingList.OriginalSize = new Size(200, 95);
- docPnlMatchingList.Size = new Size(886, 95);
+ docPnlMatchingList.Size = new Size(891, 95);
docPnlMatchingList.Text = "鍖归厤鍒楄〃";
//
// controlContainer5
@@ -535,7 +523,7 @@
controlContainer5.Controls.Add(xhsProjectSimulationMatchingListCtrl1);
controlContainer5.Location = new Point(3, 27);
controlContainer5.Name = "controlContainer5";
- controlContainer5.Size = new Size(880, 65);
+ controlContainer5.Size = new Size(885, 65);
controlContainer5.TabIndex = 0;
//
// xhsProjectSimulationMatchingListCtrl1
@@ -543,10 +531,37 @@
xhsProjectSimulationMatchingListCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationMatchingListCtrl1.Location = new Point(0, 0);
xhsProjectSimulationMatchingListCtrl1.Name = "xhsProjectSimulationMatchingListCtrl1";
- xhsProjectSimulationMatchingListCtrl1.Size = new Size(880, 65);
+ xhsProjectSimulationMatchingListCtrl1.Size = new Size(885, 65);
xhsProjectSimulationMatchingListCtrl1.TabIndex = 0;
xhsProjectSimulationMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationMatchingListCtrl1_HydroClickEvent;
xhsProjectSimulationMatchingListCtrl1.ApplyMatchingEvent += xhsProjectSimulationMatchingListCtrl1_ApplyMatchingEvent;
+ //
+ // docPnlSearch
+ //
+ docPnlSearch.Controls.Add(controlContainer6);
+ docPnlSearch.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
+ docPnlSearch.ID = new Guid("35c854bb-37b4-4601-8ca5-60dee4323ca2");
+ docPnlSearch.Location = new Point(0, 293);
+ docPnlSearch.Name = "docPnlSearch";
+ docPnlSearch.OriginalSize = new Size(200, 106);
+ docPnlSearch.Size = new Size(891, 106);
+ docPnlSearch.Text = "鏌ヨ";
+ //
+ // controlContainer6
+ //
+ controlContainer6.Controls.Add(xhsProjectSimulationSearchCtrl1);
+ controlContainer6.Location = new Point(3, 27);
+ controlContainer6.Name = "controlContainer6";
+ controlContainer6.Size = new Size(885, 76);
+ controlContainer6.TabIndex = 0;
+ //
+ // xhsProjectSimulationSearchCtrl1
+ //
+ xhsProjectSimulationSearchCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationSearchCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationSearchCtrl1.Name = "xhsProjectSimulationSearchCtrl1";
+ xhsProjectSimulationSearchCtrl1.Size = new Size(885, 76);
+ xhsProjectSimulationSearchCtrl1.TabIndex = 0;
//
// svgImg32
//
@@ -569,6 +584,14 @@
rmSet.Name = "rmSet";
rmSet.Ribbon = ribbonControl1;
//
+ // barBtnSearch
+ //
+ barBtnSearch.Caption = "鏌ヨ";
+ barBtnSearch.Id = 32;
+ barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
+ barBtnSearch.Name = "barBtnSearch";
+ barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+ //
// XhsProjectSimulationCorePage
//
Appearance.BackColor = SystemColors.Control;
@@ -576,6 +599,7 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
+ Controls.Add(docPnlSearch);
Controls.Add(docPnlMatchingList);
Controls.Add(docPnlUnMatchingList);
Controls.Add(docPnlHydroCheck);
@@ -585,13 +609,12 @@
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1161, 739);
+ Size = new Size(1166, 828);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
pageBimface.ResumeLayout(false);
pageQ3d.ResumeLayout(false);
- tabPageL3d.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
docPnlProperty.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
@@ -605,6 +628,8 @@
controlContainer4.ResumeLayout(false);
docPnlMatchingList.ResumeLayout(false);
controlContainer5.ResumeLayout(false);
+ docPnlSearch.ResumeLayout(false);
+ controlContainer6.ResumeLayout(false);
((ISupportInitialize)svgImg32).EndInit();
((ISupportInitialize)rmSet).EndInit();
ResumeLayout(false);
@@ -647,13 +672,11 @@
private DevExpress.XtraBars.Docking.DockPanel docPnlUnMatchingList;
private DevExpress.XtraBars.Docking.ControlContainer controlContainer4;
private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
- private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageL3d;
private DevExpress.XtraBars.Docking.DockPanel docPnlMatchingList;
private DevExpress.XtraBars.Docking.ControlContainer controlContainer5;
private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1;
- private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1;
private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
- private Xhs.XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
+ private XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1;
private DevExpress.XtraBars.BarButtonItem barBtnSetList;
private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
private DevExpress.XtraBars.BarButtonItem barBtnSetValveList;
@@ -666,5 +689,9 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
private DevExpress.XtraBars.BarButtonItem barBtnFeatCurve;
private XhsProjectSimulationHydroCheckResultCtrl xhsProjectSimulationHydroCheckResultCtrl1;
+ private DevExpress.XtraBars.Docking.DockPanel docPnlSearch;
+ private DevExpress.XtraBars.Docking.ControlContainer controlContainer6;
+ private XhsProjectSimulationSearchCtrl xhsProjectSimulationSearchCtrl1;
+ private DevExpress.XtraBars.BarButtonItem barBtnSearch;
}
}
--
Gitblit v1.9.3