Skip to content

Commit 4a7c8c9

Browse files
kingsznhonekingsznhone
committed
v6.0
1 parent e0c182c commit 4a7c8c9

File tree

6 files changed

+162
-158
lines changed

6 files changed

+162
-158
lines changed

‎Electrical Weathering/App.config‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Electrical Weathering/Electrical Weathering.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
3+
<TargetFramework>net9.0-windows10.0.22000.0</TargetFramework>
44
<OutputType>WinExe</OutputType>
5-
<Version>5.1.0</Version>
5+
<Version>6.0.0</Version>
66
<UseWPF>true</UseWPF>
77
<Platforms>x64</Platforms>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
9-
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
9+
<SupportedOSPlatformVersion>10.0.22000.0</SupportedOSPlatformVersion>
1010
<Authors>[email protected]</Authors>
1111
<Copyright>Copyright © 2017-2023 ZNH Industry™</Copyright>
1212
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -47,10 +47,10 @@
4747

4848
<ItemGroup>
4949
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
50-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
50+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
5151
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
52-
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />
53-
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.10.0.20241108" />
54-
<PackageReference Include="WPF-UI" Version="4.0.0" />
52+
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
53+
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.11.0.20250507" />
54+
<PackageReference Include="WPF-UI" Version="4.0.3" />
5555
</ItemGroup>
5656
</Project>

‎Electrical Weathering/MainWindow.xaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
Command="{Binding SelectFileClickCommand}" />
7878

7979
<ui:Card Grid.Row="1" Margin="24,24,24,0" VerticalAlignment="Top">
80-
<ui:ToggleSwitch Name="Swtitch_Mode" OffContent="Skia 慢火烘焙" OnContent="OpenCV 大火收汁"
80+
<ui:ToggleSwitch Name="Swtitch_Mode" OffContent="Skia 慢火烘焙" OnContent="OpenCV 猛火爆炒"
8181
IsChecked="{Binding Mode,Converter={StaticResource ModeConverter},Mode=TwoWay}"
8282
Command="{Binding ModeSwitchCommand}"
8383
Margin="0,0,0,0" HorizontalAlignment="Left">
@@ -95,9 +95,9 @@
9595
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonUp">
9696
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseUpCommand}" />
9797
</Behaviors:EventTrigger>
98-
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
98+
<!--<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
9999
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseDownCommand}" />
100-
</Behaviors:EventTrigger>
100+
</Behaviors:EventTrigger>-->
101101
</Behaviors:Interaction.Triggers>
102102
</Slider>
103103
<TextBlock TextWrapping="Wrap" Text="噪点"
@@ -114,9 +114,9 @@
114114
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonUp">
115115
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseUpCommand}" />
116116
</Behaviors:EventTrigger>
117-
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
117+
<!--<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
118118
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseDownCommand}" />
119-
</Behaviors:EventTrigger>
119+
</Behaviors:EventTrigger>-->
120120
</Behaviors:Interaction.Triggers>
121121
</Slider>
122122
<TextBlock TextWrapping="Wrap" Text="绿化"
@@ -133,9 +133,9 @@
133133
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonUp">
134134
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseUpCommand}" />
135135
</Behaviors:EventTrigger>
136-
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
136+
<!--<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
137137
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseDownCommand}" />
138-
</Behaviors:EventTrigger>
138+
</Behaviors:EventTrigger>-->
139139
</Behaviors:Interaction.Triggers>
140140
</Slider>
141141
<TextBlock TextWrapping="Wrap" Text="压缩"
@@ -152,9 +152,9 @@
152152
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonUp">
153153
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseUpCommand}" />
154154
</Behaviors:EventTrigger>
155-
<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
155+
<!--<Behaviors:EventTrigger EventName="PreviewMouseLeftButtonDown">
156156
<Behaviors:InvokeCommandAction Command="{Binding SliderMouseDownCommand}" />
157-
</Behaviors:EventTrigger>
157+
</Behaviors:EventTrigger>-->
158158
</Behaviors:Interaction.Triggers>
159159
</Slider>
160160
<TextBlock TextWrapping="Wrap" Text="缩放"
@@ -178,7 +178,7 @@
178178
<CheckBox x:Name="Check_Watermark" Content="添加水印" VerticalContentAlignment="Center"
179179
HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="32,0,0,24"
180180
IsEnabled="{Binding Watermark_Available}" IsChecked="{Binding Watermark_Checked}"
181-
Command="{Binding WatermarkCommand}" />
181+
Command="{Binding WatermarkClickCommand}" />
182182
</Grid>
183183

184184
<Grid Grid.Row="6">

0 commit comments

Comments
 (0)