Skip to content

F
FGOUT
Commit 5346a6b5 by 鲁志-悦动
Options

主页面优化

parent 889ad032
Showing with 55 additions and 44 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -110,12 +110,12 @@
</StackPanel>
</Grid>
<!-- 主体 -->
<Grid Grid.Row="1" Margin="40,0,40,10">
<Grid Grid.Row="1" Margin="15">
<Grid.RowDefinitions>
<RowDefinition Height="45" />
<RowDefinition Height="*" />
<RowDefinition Height="30" />
<RowDefinition Height="*" />
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="230*" />
......@@ -127,7 +127,7 @@
</Grid.ColumnDefinitions>
<!-- 背景border -->
<Border
Grid.RowSpan="2"
Grid.RowSpan="4"
Grid.ColumnSpan="3"
Background="#2C333B"
CornerRadius="6" />
......@@ -190,8 +190,8 @@
</Slider>
</Canvas>-->
<Slider
Grid.Row="2"
Width="740"
Grid.Row="3"
Width="Auto"
Height="30"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
......@@ -209,7 +209,7 @@
</b:Interaction.Triggers>
</Slider>
<WrapPanel
Grid.Row="3"
Grid.Row="2"
Grid.Column="2"
Margin="90,0,0,0">
<Grid>
......@@ -916,18 +916,20 @@
MouseLeftButtonDown="cam1_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}"
VideoBorderBrush="#46AFA0" />
<!-- Replay窗口 -->
<Grid
Grid.Row="3"
Grid.Row="2"
Grid.Column="0"
Visibility="{Binding SliderVisibility}">
<local:NDIView
x:Name="cam3"
Margin="10"
IsHiddenSetting="True"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" />
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}"
VideoBorderBrush="#378CFF" />
</Grid>
<StackPanel Grid.Row="1" Grid.Column="1">
<Button
Width="130"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -628,8 +628,9 @@ namespace VIZ.FGOUT.Module
type = ClipPackageSignal.REPLAY,
status = ReplayStatus.PreStart
};
manager.SendJson(replayPackage);
managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage);
}
private void ReplayUnchecked()
......@@ -652,8 +653,8 @@ namespace VIZ.FGOUT.Module
type = ClipPackageSignal.REPLAY,
status = ReplayStatus.Stop
};
manager.SendJson(replayPackage);
managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage);
}
#endregion
......@@ -706,8 +707,8 @@ namespace VIZ.FGOUT.Module
status = ReplayStatus.ReStart
};
manager.SendJson(replayPackage);
managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Restart OK.");
}
private void ReplayStop()
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
......@@ -84,7 +84,8 @@
</behaviors:Interaction.Triggers>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="70" />
<!--<RowDefinition Height="70" />-->
<RowDefinition Height="0" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -210,8 +210,15 @@ namespace VIZ.FGOUT.Module
// Replay更新画面
WPFHelper.Invoke(() =>
{
var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, "cam3");
view3.video.UpdateVideoFrame(dsExtend, true);
try
{
var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, "cam3");
view3.video.UpdateVideoFrame(dsExtend, true);
}
catch (Exception ex)
{
log.Error(ex);
}
});
//view.video.UpdateVideoFrame(dse, true);
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -232,8 +232,8 @@ namespace VIZ.FGOUT.Module
status = ReplayStatus.Start
};
manager.SendJson(replayPackage);
managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage);
MessageBoxEx.ShowDialog("Replay Start OK.");
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5AF01E6CDCAAA9BAF5ACE6770F4F3A0D5B77D1414CE9039D69C9FAEE8A4891DD"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F7E31AF7C684FC230365F0EB5CBFB35D5A0FF9028A004C278D0DD9FC304C7CE0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 924 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 926 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 971 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 973 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
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}" "5AF01E6CDCAAA9BAF5ACE6770F4F3A0D5B77D1414CE9039D69C9FAEE8A4891DD"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F7E31AF7C684FC230365F0EB5CBFB35D5A0FF9028A004C278D0DD9FC304C7CE0"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 924 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 926 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 971 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 973 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "10D3B59B06037EA036639900A7AA9D066CB2339D77995FC1F9E6159EEC9031B7"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B9BB199B9AE46746348239A2D459CA103BC232A1E4BAE6A28DDC12BD0E16B322"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -84,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 414 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 415 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -92,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 435 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 449 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -143,25 +143,25 @@ namespace VIZ.FGOUT.Module {
case 2:
this.Border = ((System.Windows.Controls.Border)(target));
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "10D3B59B06037EA036639900A7AA9D066CB2339D77995FC1F9E6159EEC9031B7"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B9BB199B9AE46746348239A2D459CA103BC232A1E4BAE6A28DDC12BD0E16B322"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -84,7 +84,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 414 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 415 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _Setting_;
......@@ -92,7 +92,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 435 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 436 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _RestartBtn_;
......@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 449 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 450 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StopBtn_;
......@@ -143,25 +143,25 @@ namespace VIZ.FGOUT.Module {
case 2:
this.Border = ((System.Windows.Controls.Border)(target));
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
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