Skip to content

F
FGOUT
Commit 118513ff by 鲁志-悦动
Options

添加取消裁切功能

parent be1fbff7
Showing with 41 additions and 13 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
...@@ -74,4 +74,6 @@ ...@@ -74,4 +74,6 @@
<sys:String x:Key="DefaultHotkey">RestoreDefault</sys:String> <sys:String x:Key="DefaultHotkey">RestoreDefault</sys:String>
<sys:String x:Key="CutZone">CutZone</sys:String> <sys:String x:Key="CutZone">CutZone</sys:String>
<sys:String x:Key="PullBox">PullBox</sys:String> <sys:String x:Key="PullBox">PullBox</sys:String>
<sys:String x:Key="Cut">Cut</sys:String>
<sys:String x:Key="NotCut">NotCut</sys:String>
</ResourceDictionary> </ResourceDictionary>
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
...@@ -73,4 +73,6 @@ ...@@ -73,4 +73,6 @@
<sys:String x:Key="DefaultHotkey">恢复默认</sys:String> <sys:String x:Key="DefaultHotkey">恢复默认</sys:String>
<sys:String x:Key="CutZone">裁切区域</sys:String> <sys:String x:Key="CutZone">裁切区域</sys:String>
<sys:String x:Key="PullBox">拖框</sys:String> <sys:String x:Key="PullBox">拖框</sys:String>
<sys:String x:Key="Cut">裁切</sys:String>
<sys:String x:Key="NotCut">不裁切</sys:String>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -1177,7 +1177,16 @@ ...@@ -1177,7 +1177,16 @@
Height="40" Height="40"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding Path=SendSelectedCommand}" Command="{Binding Path=SendSelectedCommand}"
Content="{DynamicResource Send}" Content="{DynamicResource Cut}"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Column="3"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=NotCutCommand}"
Content="{DynamicResource NotCut}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
</Grid> </Grid>
</Border> </Border>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -224,6 +224,7 @@ namespace VIZ.FGOUT.Module ...@@ -224,6 +224,7 @@ namespace VIZ.FGOUT.Module
//裁切区域 //裁切区域
this.SelectedCommand = new VCommand(this.Selected); this.SelectedCommand = new VCommand(this.Selected);
this.SendSelectedCommand = new VCommand(this.SendSelected); this.SendSelectedCommand = new VCommand(this.SendSelected);
this.NotCutCommand = new VCommand(this.NotCut);
this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel); this.IntervalPixelCommand = new VCommand(this.OnIntervalPixel);
this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame); this.IntervalFrameCommand = new VCommand(this.OnIntervalFrame);
...@@ -1732,6 +1733,19 @@ namespace VIZ.FGOUT.Module ...@@ -1732,6 +1733,19 @@ namespace VIZ.FGOUT.Module
ApplicationDomain.MessageManager.Send(_sendSelectedModel); ApplicationDomain.MessageManager.Send(_sendSelectedModel);
} }
public VCommand NotCutCommand { get; set; }
private void NotCut()
{
// 发送UDP命令给音视频
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
if (manager == null) return;
CutPackage package = new CutPackage() { point = new int[] { 0, 0 },width = 3840, height = 2160, type = ClipPackageSignal.CUT };
manager.SendJson(package);
WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("取消裁切发送成功。"); });
}
#endregion #endregion
#region Live #region Live
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -347,7 +347,7 @@ namespace VIZ.FGOUT.Module ...@@ -347,7 +347,7 @@ namespace VIZ.FGOUT.Module
//裁切 //裁切
if (vm.IsSelected) if (vm.IsSelected)
{ {
if (rectSelected.Width > 300 && rectSelected.Height > 150) if (rectSelected.Width > 320 && rectSelected.Height > 180)
{ {
Path tempPath = new Path(); Path tempPath = new Path();
foreach (UIElement uec in canvas1.Children) foreach (UIElement uec in canvas1.Children)
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E84CF04F9630AF8440F7BF892A0E567159D27CC51997E50F9228CA77CB348C4" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D45B66326BF707625E61F9AD8F8E4C04A17E261BE8152B30375E608CF2D4CC98"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1470 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1655 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1670 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8E84CF04F9630AF8440F7BF892A0E567159D27CC51997E50F9228CA77CB348C4" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D45B66326BF707625E61F9AD8F8E4C04A17E261BE8152B30375E608CF2D4CC98"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1461 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1470 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1646 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1655 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1661 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1670 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs
...@@ -55,5 +55,5 @@ using System.Windows; ...@@ -55,5 +55,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.17.0")] [assembly: AssemblyVersion("1.0.18.0")]
[assembly: AssemblyFileVersion("1.0.17.0")] [assembly: AssemblyFileVersion("1.0.18.0")]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment