From b4bbeb0e55a02f286401ecbab599e5b90ca78a64 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 07 五月 2025 01:50:32 +0800
Subject: [PATCH] 增加一些调试
---
Yw.WpfUI.Test.Core/MainWindow.xaml | 77 ++++++++++++-------
Yw.WpfUI.Test.Core/MainWindow.xaml.cs | 115 ++++++++++++++++++++--------
2 files changed, 129 insertions(+), 63 deletions(-)
diff --git a/Yw.WpfUI.Test.Core/MainWindow.xaml b/Yw.WpfUI.Test.Core/MainWindow.xaml
index 6d0ae14..dcda362 100644
--- a/Yw.WpfUI.Test.Core/MainWindow.xaml
+++ b/Yw.WpfUI.Test.Core/MainWindow.xaml
@@ -39,37 +39,58 @@
Content="鉃� 姘存睜"
ToolTip="娣诲姞姘存睜 (T)" />
<Separator />
- <Button
- x:Name="rbAddPipe"
- Margin="5"
- Click="AddPipe_Click"
- Content="鉃� 鑷敱绠�"
- ToolTip="鑷敱绠＄嚎" />
- <Button
- x:Name="rbAddHorizPipe"
- Margin="5"
- Click="AddHorizPipe_Click"
- Content="鉃� 姘村钩绠�"
- ToolTip="姘村钩绠＄嚎 (H)" />
- <Button
- x:Name="rbVertPipe"
- Margin="5"
- Click="AddVertPipe_Click"
- Content="猬� 鍨傜洿绠�"
- ToolTip="鍨傜洿绠＄嚎 (V)" />
+ <Button Content="绠￠亾">
+ <Button.ContextMenu>
+ <ContextMenu>
+ <MenuItem Click="PipeMenuItem_Click" Header="鉃� 鑷敱" />
+ <MenuItem Click="HorizPipeMenuItem_Click" Header="鉃� 姘村钩" />
+ <MenuItem Click="VertPipeMenuItem_Click" Header="猬� 鍨傜洿" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
+ <Button Content="姘存车">
+ <Button.ContextMenu>
+ <ContextMenu>
+ <MenuItem Click="PumpMenuItem_Click" Header="鉃� 鑷敱" />
+ <MenuItem Click="HorizPumpMenuItem_Click" Header="鉃� 姘村钩" />
+ <MenuItem Click="VertPumpMenuItem_Click" Header="猬� 鍨傜洿" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
+ <Button Content="闃�闂�">
+ <Button.ContextMenu>
+ <ContextMenu>
+ <MenuItem Click="ValveMenuItem_Click" Header="鉃� 鑷敱" />
+ <MenuItem Click="HorizValveMenuItem_Click" Header="鉃� 姘村钩" />
+ <MenuItem Click="VertValveMenuItem_Click" Header="猬� 鍨傜洿" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
+ <Button Content="鎹㈢儹鍣�">
+ <Button.ContextMenu>
+ <ContextMenu>
+ <MenuItem Click="ExchangerMenuItem_Click" Header="鉃� 鑷敱" />
+ <MenuItem Click="HorizExchangerMenuItem_Click" Header="鉃� 姘村钩" />
+ <MenuItem Click="VertExchangerMenuItem_Click" Header="猬� 鍨傜洿" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
+ <Button Content="鍘嬬缉鏈�">
+ <Button.ContextMenu>
+ <ContextMenu>
+ <MenuItem Click="CompressorMenuItem_Click" Header="鉃� 鑷敱" />
+ <MenuItem Click="HorizCompressorMenuItem_Click" Header="鉃� 姘村钩" />
+ <MenuItem Click="VertCompressorMenuItem_Click" Header="猬� 鍨傜洿" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
<Separator />
<Button
- x:Name="rbAddPump"
+ x:Name="rbCancelAdd"
Margin="5"
- Click="AddPump_Click"
- Content="鉃� 姘存车"
- ToolTip="姘存车 (P)" />
- <Button
- x:Name="rbAddValve"
- Margin="5"
- Click="AddValve_Click"
- Content="鉃� 闃�闂�"
- ToolTip="闃�闂� (V)" />
+ Click="CancelAdd_Click"
+ Content="鍙栨秷娣诲姞"
+ ToolTip="鍙栨秷娣诲姞 (T)" />
<Separator />
<Button Content="瑙嗚">
<Button.ContextMenu>
diff --git a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
index 48bd62b..b48d49d 100644
--- a/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
+++ b/Yw.WpfUI.Test.Core/MainWindow.xaml.cs
@@ -115,51 +115,19 @@
private void AddJunction_Click(object sender, RoutedEventArgs e)
{
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Junction);
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Junction);
}
private void AddReservoir_Click(object sender, RoutedEventArgs e)
{
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Reservoir);
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Reservoir);
}
private void AddTank_Click(object sender, RoutedEventArgs e)
{
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Tank);
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Tank);
}
- private void AddPipe_Click(object sender, RoutedEventArgs e)
- {
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Pipe);
- }
-
- private void AddHorizPipe_Click(object sender, RoutedEventArgs e)
- {
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.HorizPipe);
- }
-
- private void AddVertPipe_Click(object sender, RoutedEventArgs e)
- {
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.VertPipe);
- }
-
- private void AddPump_Click(object sender, RoutedEventArgs e)
- {
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Pump);
- }
-
- private void AddValve_Click(object sender, RoutedEventArgs e)
- {
- this.editer.SetAddWay(eDrawAddWay.Click);
- this.editer.SetAddType(eDrawAddType.Valve);
- }
private void TopMenuItem_Click(object sender, RoutedEventArgs e)
{
@@ -269,8 +237,85 @@
this.editer.ShowFlowDirection();
}
+ private void PipeMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Pipe);
+ }
+ private void HorizPipeMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.HorizPipe);
+ }
+ private void VertPipeMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.VertPipe);
+ }
+
+ private void PumpMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Pump);
+ }
+
+ private void HorizPumpMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.HorizPump);
+ }
+
+ private void VertPumpMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.VertPump);
+ }
+
+ private void ValveMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Valve);
+ }
+
+ private void HorizValveMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.HorizValve);
+ }
+
+ private void VertValveMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.VertValve);
+ }
+
+ private void ExchangerMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Exchanger);
+ }
+
+ private void HorizExchangerMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.HorizExchanger);
+ }
+
+ private void VertExchangerMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.VertExchanger);
+ }
+
+ private void CompressorMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.Compressor);
+ }
+
+ private void HorizCompressorMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.HorizCompressor);
+ }
+
+ private void VertCompressorMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.Click, eDrawAddType.VertCompressor);
+ }
+
+ private void CancelAdd_Click(object sender, RoutedEventArgs e)
+ {
+ this.editer.SetAddMode(eDrawAddWay.None, eDrawAddType.None);
+ }
}
--
Gitblit v1.9.3