From 9be9ba4e159969fb5e32648c2c34e912ccc3ae6d Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:42 +0800
Subject: [PATCH] 优化细节问题
---
WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/propertyform.cs | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/propertyform.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/propertyform.cs
index 32f2142..8a5a67d 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/propertyform.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/propertyform.cs
@@ -1,10 +1,9 @@
-锘縰sing static Hydro.MapViewEnum;
+锘縰sing System.Data;
-namespace Hydro
-{
-
- public partial class PropertyForm : XtraUserControl
+namespace HydroUI
+{
+ public partial class PropertyForm : UserControl
{
private IBaseViewModel _selectedObject;
private MapObjectType _selectedType= MapObjectType.鍏ㄩ儴;
@@ -44,7 +43,7 @@
}
public void SetObj(object o)
{
- propertyGrid.SelectedObject = o;
+ propertyGridControl1.SelectedObject = o;
this.Text= o.GetType().Name;
}
public void SetObj(IBaseViewModel selectedObject)
@@ -58,54 +57,54 @@
if (_selectedObject is JunctionViewModel junc)
{
_selectedType = MapObjectType.鑺傜偣;
- propertyGrid.SelectedObjects = new JunctionViewModel[] { junc };
+ propertyGridControl1.SelectedObjects = new JunctionViewModel[] { junc };
}
else if (_selectedObject is ReservoirViewModel res)
{
_selectedType = MapObjectType.姘村簱;
- propertyGrid.SelectedObjects = new ReservoirViewModel[] { res };
+ propertyGridControl1.SelectedObjects = new ReservoirViewModel[] { res };
}
else if (_selectedObject is TankViewModel tank)
{
_selectedType = MapObjectType.姘存睜;
- propertyGrid.SelectedObjects = new TankViewModel[] { tank };
+ propertyGridControl1.SelectedObjects = new TankViewModel[] { tank };
}
else if (_selectedObject is PipeViewModel pipe)
{
_selectedType = MapObjectType.绠＄嚎;
- propertyGrid.SelectedObjects = new PipeViewModel[] { pipe };
+ propertyGridControl1.SelectedObjects = new PipeViewModel[] { pipe };
}
else if (_selectedObject is ValveViewModel valve)
{
_selectedType = MapObjectType.闃�闂�;
- propertyGrid.SelectedObjects = new ValveViewModel[] { valve };
+ propertyGridControl1.SelectedObjects = new ValveViewModel[] { valve };
}
else if (_selectedObject is RepeaterViewModel repeater)
{
_selectedType = MapObjectType.閲嶅鍣�;
- propertyGrid.SelectedObjects = new RepeaterViewModel[] { repeater };
+ propertyGridControl1.SelectedObjects = new RepeaterViewModel[] { repeater };
}
//姘磋〃
else if (_selectedObject is MeterViewModel meter)
{
_selectedType = MapObjectType.姘磋〃;
- propertyGrid.SelectedObjects = new MeterViewModel[] { meter };
+ propertyGridControl1.SelectedObjects = new MeterViewModel[] { meter };
}
//姘存车
else if (_selectedObject is PumpViewModel pump)
{
_selectedType = MapObjectType.姘存车;
- propertyGrid.SelectedObjects = new PumpViewModel[] { pump };
+ propertyGridControl1.SelectedObjects = new PumpViewModel[] { pump };
}
//鍠峰ごNozzle
else if (_selectedObject is NozzleViewModel nozzle)
{
_selectedType = MapObjectType.鍠峰ご;
- propertyGrid.SelectedObjects = new NozzleViewModel[] { nozzle };
+ propertyGridControl1.SelectedObjects = new NozzleViewModel[] { nozzle };
} else
{
_selectedType = MapObjectType.鍏ㄩ儴;
- propertyGrid.SelectedObjects =new IBaseViewModel[] { selectedObject };
+ propertyGridControl1.SelectedObjects =new IBaseViewModel[] { selectedObject };
}
switch (_selectedType)
{
@@ -180,6 +179,14 @@
void RefreshListBox()
{
if (selectionSet == null) return;
+ if (comboBox_type.Items.Count<1)
+ {
+ foreach (var item in Enum.GetValues(typeof(MapObjectType)))
+ {
+ comboBox_type.Items.Add(item);
+ }
+ comboBox_type.SelectedIndex = 0;
+ }
string txt = comboBox_type.SelectedItem.ToString();
MapObjectType selectedType = (MapObjectType)Enum.Parse(typeof(MapObjectType), txt);
// 浣跨敤 LINQ 鏌ヨ绛涢�夐�夋嫨闆�
@@ -263,7 +270,7 @@
bool _isEnable = true;
private static Dictionary<object, List<object>> _selectedObjectsDict = new Dictionary<object, List<object>>();
- private void propertyGrid_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
+ private void propertyGridControl1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
{
//foreach (var item in listBox1.SelectedItems)
//{
@@ -316,7 +323,7 @@
{
return;
}
- propertyGrid.SelectedObjects = objs;
+ propertyGridControl1.SelectedObjects = objs;
@@ -410,7 +417,7 @@
listBox1.SetSelected(i, true);
}
listBox1.SelectedIndexChanged += listBox1_SelectedIndexChanged;
- this.propertyGrid.SelectedObjects =selectionSet. CurrentSelectedObjects?.ToArray();
+ this.propertyGridControl1.SelectedObjects =selectionSet. CurrentSelectedObjects?.ToArray();
GlobalObject.map.selectedObjs.ForEach(o => o.Selected = false);
if (selectionSet.CurrentSelectedObjects!=null)
{
@@ -439,7 +446,7 @@
}
}
- /*public class SelectionSet
+ public class SelectionSet
{
public string Name;
public MapObjectType filterType=MapObjectType.鍏ㄩ儴;
@@ -523,7 +530,7 @@
}
- }*/
+ }
--
Gitblit v1.9.3