Skip to content

F
FGOUT
Commit 94f88b91 by 鲁志-悦动
Options

选框操作内元素 And 自动模式下开始、结束抠图不可用 And 二次确认自动发送倒计时显示

parent 1164b610
Showing with 167 additions and 37 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Setting/AutoSendModel.cs 0 → 100644
namespace VIZ.FGOUT.Domain
{
public class AutoSendModel
{
public int Interval { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Domain/VIZ.FGOUT.Domain.csproj
......@@ -80,6 +80,7 @@
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__detect.cs" />
<Compile Include="Message\Algorithm\Implementation\AlgorithmMessage__start_end.cs" />
<Compile Include="Message\Algorithm\Interface\IAlgorithmMessage__roi.cs" />
<Compile Include="Message\Setting\AutoSendModel.cs" />
<Compile Include="Message\Setting\CleanInPointsModel.cs" />
<Compile Include="Message\Setting\CleanPlaceModel.cs" />
<Compile Include="Message\Setting\DisplayPlaceModel.cs" />
......
VIZ.FGOUT/VIZ.FGOUT.Domain/obj/x64/Debug/VIZ.FGOUT.Domain.csproj.CoreCompileInputs.cache
d3e4f59c122a03f90859987a8cf2800734b297bb
93ee4586c7532ced3ab352476596ea66c48809f0
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -197,7 +197,8 @@
Style="{StaticResource CheckBox_Setting}" />
</Grid>
</GroupBox>-->
<GroupBox
<!-- 检测模式 -->
<!--<GroupBox
Grid.ColumnSpan="2"
Foreground="White"
Header="检测模式">
......@@ -224,22 +225,51 @@
IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
</StackPanel>
</GroupBox>
</GroupBox>-->
<CheckBox
x:Name="_AutoMode_"
Grid.Row="0"
Grid.Column="0"
Width="100"
Height="40"
Margin="10,5"
Click="AutoMode_OnClick"
Content="自动"
Foreground="White"
IsChecked="{Binding Path=IsAutoEnable, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<CheckBox
x:Name="_ManualMode_"
Grid.Row="1"
Grid.Column="0"
Width="100"
Height="40"
Margin="10,5,0,5"
Click="ManualMode_OnClick"
Content="手动"
Foreground="White"
IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<Button
Grid.Column="2"
Grid.Row="1"
Grid.Column="1"
Width="100"
Height="40"
Margin="10,10,0,0"
Command="{Binding Path=MattStartCommand}"
Content="开始"
IsEnabled="{Binding MattStartIsEnabled}"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Column="3"
Grid.Row="1"
Grid.Column="2"
Width="100"
Height="40"
Margin="10,10,0,0"
Command="{Binding Path=MattEndCommand}"
Content="结束"
IsEnabled="{Binding MattStartIsEnabled}"
Style="{StaticResource ButtonStyle}" />
<!--<GroupBox
Grid.Row="1"
......@@ -390,8 +420,8 @@
Style="{StaticResource ButtonStyle}" />-->
<ToggleButton
Grid.Row="1"
Grid.Column="0"
Grid.Row="0"
Grid.Column="1"
Width="100"
Height="40"
Margin="10,10,10,10"
......@@ -410,8 +440,8 @@
</ToggleButton>
<ToggleButton
Grid.Row="1"
Grid.Column="1"
Grid.Row="0"
Grid.Column="2"
Width="100"
Height="40"
Margin="10"
......@@ -428,10 +458,26 @@
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<!-- 选框操作 -->
<GroupBox
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="3"
Grid.ColumnSpan="2"
Foreground="White"
Header="选框操作">
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<ToggleButton
Grid.Row="1"
Grid.Column="2"
Grid.Row="0"
Grid.Column="0"
Width="100"
Height="40"
Margin="10"
......@@ -451,7 +497,7 @@
<Button
Grid.Row="1"
Grid.Column="3"
Grid.Column="0"
Width="100"
Height="40"
Margin="10"
......@@ -462,7 +508,7 @@
<Button
Grid.Row="1"
Grid.Column="4"
Grid.Column="1"
Width="100"
Height="40"
Margin="10"
......@@ -483,8 +529,8 @@
Style="{StaticResource ButtonStyle}" />-->
<Button
Grid.Row="1"
Grid.Column="5"
Grid.Row="0"
Grid.Column="1"
Width="100"
Height="40"
Margin="10"
......@@ -492,6 +538,8 @@
Content="恢复"
IsEnabled="{Binding SendEnable}"
Style="{StaticResource ButtonStyle}" />
</Grid>
</GroupBox>
<!--<Button
Grid.Row="2"
......@@ -627,6 +675,12 @@
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>-->
</TextBox>
<TextBlock
Margin="20,5,5,5"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="{Binding AutoSendCount}" />
</StackPanel>
</GroupBox>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -50,6 +50,11 @@ namespace VIZ.FGOUT.Module
// 注册服务
//ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this);
ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
// 初始化二次确认自动发送倒计时器
InitAutoSendTimer();
//_autoSend_Timer.Stop();
//_autoSend_Timer.Start();
}
/// <summary>
......@@ -135,8 +140,46 @@ namespace VIZ.FGOUT.Module
//ApplicationDomain.MessageManager.Register<ReplayStartValueModel>(this, this.ReplayStartValueFromNDIViewModel);
////Replay出点值
//ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
ApplicationDomain.MessageManager.Register<AutoSendModel>(this, this.AutoSendIntervalTimeChanged);
}
private int _tempAutoSendCount = 4;
private void AutoSendIntervalTimeChanged(AutoSendModel model)
{
_tempAutoSendCount = AutoSendCount = model.Interval / 1000 + 1;
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
}
#region 自动发送倒计时器
private System.Timers.Timer _autoSend_Timer = new System.Timers.Timer();
public void InitAutoSendTimer()
{
_autoSend_Timer.Interval = 1000;
_autoSend_Timer.Elapsed += UpdateAutoSendTimer_Tick;
}
private void UpdateAutoSendTimer_Tick(object sender, EventArgs e)
{
try
{
WPFHelper.BeginInvoke(() =>
{
if (AutoSendCount == 1)
AutoSendCount = _tempAutoSendCount;
AutoSendCount--;
});
}
catch (Exception ex)
{
log.Error(ex);
}
}
#endregion
//int _sliderStartInitValue;
//int _sliderEndInitValue;
//private void ReplayStartValueFromNDIViewModel(ReplayStartValueModel vm)
......@@ -536,6 +579,8 @@ namespace VIZ.FGOUT.Module
//2个位置相关按钮都不可用
EndEnable = StartEnable = false;
StartIsChecked = EndIsChecked = InvalidIsChecked = false;
MattStartIsEnabled = true;
}
#endregion
......@@ -616,6 +661,8 @@ namespace VIZ.FGOUT.Module
{
//ReconfirmSendParamsCommon(ReconfirmStatus.Abandon);
ApplicationDomain.MessageManager.Send(_reconfirmAbandonModel);
_autoSend_Timer.Stop();
}
public VCommand SendCommand { get; set; }
......@@ -640,6 +687,17 @@ namespace VIZ.FGOUT.Module
}
}
private int _autoSendCount = 3;
public int AutoSendCount
{
get => _autoSendCount;
set
{
_autoSendCount = value;
this.RaisePropertyChanged(nameof(AutoSendCount));
}
}
public ReconfirmAutoSendIntervalTimeModel _reconfirmAutoSendIntervalTimeModel = new ReconfirmAutoSendIntervalTimeModel();
public VCommand<RoutedEventArgs> AutoSendIntervalTimeChangedCommand { get; set; }
private void AutoSendIntervalTimeChanged(RoutedEventArgs e)
......@@ -828,6 +886,8 @@ namespace VIZ.FGOUT.Module
SliderStartValue = NDIViewModel.SliderStartValue;
SliderEndValue = NDIViewModel.SliderEndValue;
_isReplayChecked = false;
_autoSend_Timer.Stop();
}
private void ReplayUnchecked()
......@@ -1372,6 +1432,8 @@ namespace VIZ.FGOUT.Module
//6个位置相关按钮都可用
InvalidEnable = EndEnable = StartEnable = true;
SaveEnable = SendEnable = CleanEnable = true;
MattStartIsEnabled = false;
}
/// <summary>
......@@ -1513,6 +1575,13 @@ namespace VIZ.FGOUT.Module
set { startEnable = value; this.RaisePropertyChanged(nameof(StartEnable)); }
}
private bool _mattStartIsEnabled = true;
public bool MattStartIsEnabled
{
get { return _mattStartIsEnabled; }
set { _mattStartIsEnabled = value; this.RaisePropertyChanged(nameof(MattStartIsEnabled)); }
}
private bool _endIsChecked;
/// <summary>
/// 结束位置是否选中
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
......@@ -31,6 +31,8 @@ namespace VIZ.FGOUT.Module
_autoSend_Timer.Stop();
_autoSend_Timer.Start();
AutoSendModel autoSendModel = new AutoSendModel(){ Interval = ALGORITHM_ReconfirmAutoSend_TIME };
}
/// <summary>
......@@ -41,7 +43,7 @@ namespace VIZ.FGOUT.Module
/// <summary>
/// 算法二次确认自动发送时间
/// </summary>
protected readonly int ALGORITHM_ReconfirmAutoSend_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ReconfirmAutoSend_TIME);
protected int ALGORITHM_ReconfirmAutoSend_TIME = ApplicationDomain.IniStorage.GetValue<AlgorithmConfig, int>(p => p.ALGORITHM_ReconfirmAutoSend_TIME);
//CleanPlaceModel cpModel = new CleanPlaceModel{ CleanPlace = true };
/// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
......@@ -344,7 +344,7 @@ namespace VIZ.FGOUT.Module
{
if (this.ViewKey != NDIViewKeys.CAM_1)
return;
_autoSend_Timer.Interval = reconfirmAutoSendIntervalTimeModel.IntervalTime * 1000;
_autoSend_Timer.Interval = ALGORITHM_ReconfirmAutoSend_TIME = reconfirmAutoSendIntervalTimeModel.IntervalTime * 1000;
}
private void ReconfirmSendParamsCommon(ReconfirmStatus reconfirmStatus)
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9D2B2F6CF035D1B06FC8DD16AFF531F620ADEAE09A243CC524307F1763D19790"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A5E5C45B7C6682273BB06D6E7240FD1F78577BC498AD968A13AE3C50311E4AB"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 206 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 230 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 217 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 243 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1018 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1072 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1109 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1163 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1124 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1178 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 210 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 221 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 249 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......
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}" "9D2B2F6CF035D1B06FC8DD16AFF531F620ADEAE09A243CC524307F1763D19790"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1A5E5C45B7C6682273BB06D6E7240FD1F78577BC498AD968A13AE3C50311E4AB"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 206 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 230 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 217 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 243 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1018 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1072 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1109 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1163 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1124 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1178 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 210 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 236 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 221 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 249 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#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.Framework/VIZ.Framework.Common/Widgets/TimeDisplayControl/TimeDisplayControl.cs
using log4net;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
......
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