Skip to content

F
FGOUT
Commit fd44d70e by 鲁志-悦动
Options

系统版本1.0.10

parent 58136158
Showing with 50 additions and 17 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -1081,6 +1081,7 @@ ...@@ -1081,6 +1081,7 @@
</Grid> </Grid>
</Border> </Border>
<!-- 裁切区域 -->
<!--<Border <!--<Border
Grid.Row="5" Grid.Row="5"
Grid.Column="0" Grid.Column="0"
...@@ -1099,14 +1100,15 @@ ...@@ -1099,14 +1100,15 @@
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
Text="裁切区域" /> Text="裁切区域" />
<Button <ToggleButton
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding Path=Command}" Command="{Binding Path=SelectedCommand}"
Content="选择" Content="选择"
Style="{StaticResource ButtonStyle}" /> IsChecked="{Binding SelectedIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}" />
<Button <Button
Grid.Column="2" Grid.Column="2"
Width="100" Width="100"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -221,6 +221,9 @@ namespace VIZ.FGOUT.Module ...@@ -221,6 +221,9 @@ namespace VIZ.FGOUT.Module
this.Matting_intervalKeyDownCommand = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown); this.Matting_intervalKeyDownCommand = new VCommand<KeyEventArgs>(this.Matting_intervalKeyDown);
this.Moving_pixelKeyDownCommand = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown); this.Moving_pixelKeyDownCommand = new VCommand<KeyEventArgs>(this.Moving_pixelKeyDown);
this.BigModelCommand = new VCommand(this.BigModel); this.BigModelCommand = new VCommand(this.BigModel);
//裁切区域
//this.SelectedCommand = new VCommand(this.Selected);
} }
/// <summary> /// <summary>
...@@ -1927,6 +1930,31 @@ namespace VIZ.FGOUT.Module ...@@ -1927,6 +1930,31 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 裁切区域
//private bool _selectedIsChecked;
//public bool SelectedIsChecked
//{
// get => _selectedIsChecked;
// set
// {
// _selectedIsChecked = value;
// this.RaisePropertyChanged(nameof(SelectedIsChecked));
// }
//}
//public VCommand SelectedCommand { get; set; }
//private void Selected()
//{
// if (SelectedIsChecked)
// {
// }
//}
#endregion
#region Live #region Live
public VCommand LiveCommand { get; set; } public VCommand LiveCommand { get; set; }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4BC8D1A0429685A17E6810578D9774A941940B15D2023C28322D103B8EDBFD70" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92CF01C8D1D0F6848BFA9FFB44D3C7C2403632E228021B49AD2D32C9D10449F4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module { ...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1397 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1399 "..\..\..\..\..\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;
...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module { ...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1582 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1584 "..\..\..\..\..\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;
...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1597 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1599 "..\..\..\..\..\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}" "4BC8D1A0429685A17E6810578D9774A941940B15D2023C28322D103B8EDBFD70" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92CF01C8D1D0F6848BFA9FFB44D3C7C2403632E228021B49AD2D32C9D10449F4"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module { ...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1397 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1399 "..\..\..\..\..\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;
...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module { ...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1582 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1584 "..\..\..\..\..\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;
...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1597 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1599 "..\..\..\..\..\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
...@@ -50,10 +50,10 @@ using System.Windows; ...@@ -50,10 +50,10 @@ using System.Windows;
// 主版本 // 主版本
// 次版本 // 次版本
// 生成号 // 生成号
// 修订号 // 修订号
// //
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.9.0")] [assembly: AssemblyVersion("1.0.10.0")]
[assembly: AssemblyFileVersion("1.0.9.0")] [assembly: AssemblyFileVersion("1.0.10.0")]
VIZ.Framework/VIZ.Framework.Connection/Protocol/UDP/UdpConnection.cs
...@@ -155,14 +155,17 @@ namespace VIZ.Framework.Connection ...@@ -155,14 +155,17 @@ namespace VIZ.Framework.Connection
/// </summary> /// </summary>
private void ReceiveMessage() private void ReceiveMessage()
{ {
//if (this.UdpClient.Available <= 0) return;
//if (this.UdpClient.Client == null) return;
while (this.IsRecvStart) //this.IsRecvStart while (this.IsRecvStart) //this.IsRecvStart
{ {
try try
{ {
#region 在开始调用UDPClient的Receive方法之前对UDPClient.Available属性进行判断,当Available属性大于0时才开始从缓冲区读取网络数据 #region 在开始调用UDPClient的Receive方法之前对UDPClient.Available属性进行判断,当Available属性大于0时才开始从缓冲区读取网络数据
if (this.UdpClient.Available <= 0) continue; //if (this.UdpClient.Available <= 0) continue;
if (this.UdpClient.Client == null) return; //if (this.UdpClient.Client == null) return;
#endregion #endregion
......
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