From 24f31cf1f11318a0e76d31d382313d30c0ad9e1d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 15 八月 2024 00:31:35 +0800
Subject: [PATCH] 水力部件列表尝试修改
---
WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/AddBimfaceFileDlg.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/EditBimfaceFileDlg.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.Designer.cs | 1 +
WinFrmUI/Yw.WinFrmUI.Bimface.Core/00-core/eFormatType.cs | 4 ++--
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/00-core/HydroParterListCtrl.Designer.cs | 6 ++++--
WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Bimface.Core/01-interop/01-interop3d/BimfaceInterop3dContainer.cs | 3 ---
WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/UploadBimfaceFileDlg.cs | 6 +++---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.cs | 10 ++++++++--
9 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/00-core/eFormatType.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/00-core/eFormatType.cs
index 546301f..80d738e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/00-core/eFormatType.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/00-core/eFormatType.cs
@@ -9,12 +9,12 @@
/// 3D
/// </summary>
[Display(Name = "3D")]
- _3D,
+ d3,
/// <summary>
/// 2D
/// </summary>
[Display(Name = "2D")]
- _2D
+ d2
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/01-interop/01-interop3d/BimfaceInterop3dContainer.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/01-interop/01-interop3d/BimfaceInterop3dContainer.cs
index 377f9b9..b2858f3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/01-interop/01-interop3d/BimfaceInterop3dContainer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/01-interop/01-interop3d/BimfaceInterop3dContainer.cs
@@ -73,9 +73,6 @@
}
-
-
-
//鍔犺浇瀹屾垚
private void CallBackObj_LoadCompletedEvent()
{
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/AddBimfaceFileDlg.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/AddBimfaceFileDlg.cs
index 506680e..7d7d80d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/AddBimfaceFileDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/AddBimfaceFileDlg.cs
@@ -57,7 +57,7 @@
this.imgCmbFormatType.Properties.BeginUpdate();
this.imgCmbFormatType.Properties.Items.Clear();
this.imgCmbFormatType.Properties.Items.AddEnum(typeof(eFormatType), false);
- this.imgCmbFormatType.EditValue = eFormatType._3D;
+ this.imgCmbFormatType.EditValue = eFormatType.d3;
this.imgCmbFormatType.Properties.EndUpdate();
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
index b7eec82..baef353 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
@@ -172,7 +172,7 @@
MessageBoxHelper.ShowInfo("姝ゅ姛鑳戒粎閫傜敤浜庝笂浼犳垚鍔熺姸鎬佺殑妯″瀷鏂囦欢锛�");
return;
}
- if (vm.FormatType != eFormatType._3D)
+ if (vm.FormatType != eFormatType.d3)
{
MessageBoxHelper.ShowInfo("姝ゅ姛鑳戒粎閫傜敤浜�3D妯″瀷鏂囦欢锛�");
return;
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/EditBimfaceFileDlg.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/EditBimfaceFileDlg.cs
index 60d7c00..071770c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/EditBimfaceFileDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/EditBimfaceFileDlg.cs
@@ -55,7 +55,7 @@
this.imgCmbFormatType.Properties.BeginUpdate();
this.imgCmbFormatType.Properties.Items.Clear();
this.imgCmbFormatType.Properties.Items.AddEnum(typeof(eFormatType), false);
- this.imgCmbFormatType.EditValue = eFormatType._3D;
+ this.imgCmbFormatType.EditValue = eFormatType.d3;
this.imgCmbFormatType.Properties.EndUpdate();
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/UploadBimfaceFileDlg.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/UploadBimfaceFileDlg.cs
index 450dd52..5eb8fa7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/UploadBimfaceFileDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/UploadBimfaceFileDlg.cs
@@ -22,7 +22,7 @@
public void SetBindingData()
{
this.imgCmbFormatType.Properties.Items.AddEnum(typeof(eFormatType), false);
- this.imgCmbFormatType.EditValue = eFormatType._3D;
+ this.imgCmbFormatType.EditValue = eFormatType.d3;
}
//楠岃瘉
@@ -71,8 +71,8 @@
var formatType = (eFormatType)this.imgCmbFormatType.EditValue;
switch (formatType)
{
- case eFormatType._3D: filter = "妯″瀷鏂囦欢|*.rvt;*.rfa"; break;
- case eFormatType._2D: filter = "妯″瀷鏂囦欢|*.dwg"; break;
+ case eFormatType.d3: filter = "妯″瀷鏂囦欢|*.rvt;*.rfa"; break;
+ case eFormatType.d2: filter = "妯″瀷鏂囦欢|*.dwg"; break;
default: break;
}
if (string.IsNullOrEmpty(filter))
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/00-core/HydroParterListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/00-core/HydroParterListCtrl.Designer.cs
index 09045ee..7e473bc 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/00-core/HydroParterListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/00-core/HydroParterListCtrl.Designer.cs
@@ -122,14 +122,16 @@
tabPageJunctions.Caption = "杩炴帴鑺傜偣";
tabPageJunctions.Controls.Add(hydroJunctionListCtrl1);
tabPageJunctions.Name = "tabPageJunctions";
+ tabPageJunctions.Padding = new Padding(0, 1, 0, 0);
tabPageJunctions.Size = new Size(1028, 596);
//
// hydroJunctionListCtrl1
//
hydroJunctionListCtrl1.Dock = DockStyle.Fill;
- hydroJunctionListCtrl1.Location = new Point(0, 0);
+ hydroJunctionListCtrl1.Location = new Point(0, 1);
hydroJunctionListCtrl1.Name = "hydroJunctionListCtrl1";
- hydroJunctionListCtrl1.Size = new Size(1028, 596);
+ hydroJunctionListCtrl1.ShowFindPanel = true;
+ hydroJunctionListCtrl1.Size = new Size(1028, 595);
hydroJunctionListCtrl1.TabIndex = 0;
//
// tabPageElbows
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.Designer.cs
index 1bc1c99..51156fe 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.Designer.cs
@@ -65,6 +65,7 @@
gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCode, colName, colFlagsString, colQuality, colElev, colDemand, colDemandPattern, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.OptionsFind.AlwaysVisible = true;
gridView1.RowClick += gridView1_RowClick;
//
// colCode
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.cs
index 637b1a6..5394264 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionListCtrl.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing DevExpress.CodeParser;
+
+namespace Yw.WinFrmUI
{
public partial class HydroJunctionListCtrl : DevExpress.XtraEditors.XtraUserControl
{
@@ -45,7 +47,11 @@
this.HydroClickEvent?.Invoke(row.Vmo);
}
-
+ public bool ShowFindPanel
+ {
+ get { return this.gridView1.OptionsFind.AlwaysVisible; }
+ set { this.gridView1.OptionsFind.AlwaysVisible = value; }
+ }
}
}
--
Gitblit v1.9.3