Skip to content

F
FGOUT
Commit 38f633e8 by 鲁志-悦动
Options

修复Replay滑动条最大值动态生成滑块少一个的缺陷

parent d2cafa6e
Showing with 44 additions and 37 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -811,7 +811,7 @@ ...@@ -811,7 +811,7 @@
Foreground="Black" Foreground="Black"
IsEnabled="False" IsEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount}" />--> Text="{Binding AutoSendCount, Mode=TwoWay}" />-->
<TextBlock <TextBlock
Width="30" Width="30"
Height="30" Height="30"
...@@ -822,7 +822,7 @@ ...@@ -822,7 +822,7 @@
FontSize="14" FontSize="14"
Foreground="Black" Foreground="Black"
IsEnabled="False" IsEnabled="False"
Text="{Binding AutoSendCount}" Text="{Binding AutoSendCount, Mode=TwoWay}"
TextAlignment="Center" /> TextAlignment="Center" />
</StackPanel> </StackPanel>
</Border> </Border>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -107,7 +107,8 @@ namespace VIZ.FGOUT.Module ...@@ -107,7 +107,8 @@ namespace VIZ.FGOUT.Module
private void InitStreamCachedTime() private void InitStreamCachedTime()
{ {
int STREAM_CACHEED_TIME = ApplicationDomain.IniStorage.GetValue<StreamConfig, int>(p => p.STREAM_CACHEED_TIME); int STREAM_CACHEED_TIME = ApplicationDomain.IniStorage.GetValue<StreamConfig, int>(p => p.STREAM_CACHEED_TIME);
SliderMaxValue = STREAM_CACHEED_TIME * 50; //SliderEndValue = SliderMaxValue = STREAM_CACHEED_TIME * 50;
SliderMaximum = STREAM_CACHEED_TIME * 50;
} }
/// <summary> /// <summary>
...@@ -136,7 +137,7 @@ namespace VIZ.FGOUT.Module ...@@ -136,7 +137,7 @@ namespace VIZ.FGOUT.Module
this.ReplayCommand = new VCommand(this.Replay); this.ReplayCommand = new VCommand(this.Replay);
this.ReplayCheckedCommand = new VCommand(this.ReplayChecked); this.ReplayCheckedCommand = new VCommand(this.ReplayChecked);
this.ReplayUncheckedCommand = new VCommand(this.ReplayUnchecked); this.ReplayUncheckedCommand = new VCommand(this.ReplayUnchecked);
this.SliderValueChangedCommand = new VCommand(this.SliderValueChanged); //this.SliderValueChangedCommand = new VCommand(this.SliderValueChanged);
//Replay Start //Replay Start
this.ReplayStartCommand = new VCommand(this.ReplayStart); this.ReplayStartCommand = new VCommand(this.ReplayStart);
//Replay Stop //Replay Stop
...@@ -963,17 +964,17 @@ namespace VIZ.FGOUT.Module ...@@ -963,17 +964,17 @@ namespace VIZ.FGOUT.Module
//ApplicationDomainEx.MessageManager.Send(replayModel); //ApplicationDomainEx.MessageManager.Send(replayModel);
} }
public VCommand SliderValueChangedCommand { get; set; } //public VCommand SliderValueChangedCommand { get; set; }
private int _initialValue = 150; //private int _initialValue = 150;
private void SliderValueChanged() //private void SliderValueChanged()
{ //{
if (_initialValue != SliderValue) // if (_initialValue != SliderValue)
{ // {
_initialValue = SliderValue; // _initialValue = SliderValue;
var replayModel = new ReplayModel() { IsReplay = true, IsSliderValueChanged = true, SliderValue = SliderValue }; // var replayModel = new ReplayModel() { IsReplay = true, IsSliderValueChanged = true, SliderValue = SliderValue };
ApplicationDomain.MessageManager.Send(replayModel); // ApplicationDomain.MessageManager.Send(replayModel);
} // }
} //}
private bool _replayIsChecked = false; private bool _replayIsChecked = false;
public bool ReplayIsChecked public bool ReplayIsChecked
...@@ -992,7 +993,7 @@ namespace VIZ.FGOUT.Module ...@@ -992,7 +993,7 @@ namespace VIZ.FGOUT.Module
{ {
ReplaySendVisibility = Visibility.Visible; ReplaySendVisibility = Visibility.Visible;
SliderVisibility = Visibility.Visible; SliderVisibility = Visibility.Visible;
SliderValue = SliderMaxValue; //SliderValue = SliderMaxValue;
var replayModel = new ReplayModel(); var replayModel = new ReplayModel();
replayModel.IsReplay = true; replayModel.IsReplay = true;
replayModel.IsReplayStarted = true; replayModel.IsReplayStarted = true;
...@@ -1038,7 +1039,7 @@ namespace VIZ.FGOUT.Module ...@@ -1038,7 +1039,7 @@ namespace VIZ.FGOUT.Module
SliderVisibility = Visibility.Hidden; SliderVisibility = Visibility.Hidden;
var replayModel = new ReplayModel() { IsReplay = false }; var replayModel = new ReplayModel() { IsReplay = false };
ApplicationDomain.MessageManager.Send(replayModel); ApplicationDomain.MessageManager.Send(replayModel);
_initialValue = SliderMaxValue; //_initialValue = SliderMaxValue;
StartTime = 0; StartTime = 0;
EndTime = 0; EndTime = 0;
...@@ -1577,12 +1578,12 @@ namespace VIZ.FGOUT.Module ...@@ -1577,12 +1578,12 @@ namespace VIZ.FGOUT.Module
set { _sliderVisibility = value; this.RaisePropertyChanged(nameof(SliderVisibility)); } set { _sliderVisibility = value; this.RaisePropertyChanged(nameof(SliderVisibility)); }
} }
private int _sliderValue; //private int _sliderValue;
public int SliderValue //public int SliderValue
{ //{
get => (int)_sliderValue; // get => (int)_sliderValue;
set { _sliderValue = value; this.RaisePropertyChanged(nameof(SliderValue)); } // set { _sliderValue = value; this.RaisePropertyChanged(nameof(SliderValue)); }
} //}
private int _sliderStartValue = 0; private int _sliderStartValue = 0;
public int SliderStartValue public int SliderStartValue
...@@ -1651,13 +1652,12 @@ namespace VIZ.FGOUT.Module ...@@ -1651,13 +1652,12 @@ namespace VIZ.FGOUT.Module
set { _sliderValue2 = value; this.RaisePropertyChanged(nameof(SliderValue2)); } set { _sliderValue2 = value; this.RaisePropertyChanged(nameof(SliderValue2)); }
} }
private int _sliderMaxValue = 500; //private int _sliderMaxValue = 500;
public int SliderMaxValue //public int SliderMaxValue
{ //{
get => (int)_sliderMaxValue; // get => (int)_sliderMaxValue;
set { _sliderMaxValue = value; this.RaisePropertyChanged(nameof(SliderMaxValue)); } // set { _sliderMaxValue = value; this.RaisePropertyChanged(nameof(SliderMaxValue)); }
} //}
private bool _startIsChecked; private bool _startIsChecked;
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -379,8 +379,7 @@ namespace VIZ.FGOUT.Module ...@@ -379,8 +379,7 @@ namespace VIZ.FGOUT.Module
info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里 //把选中框的信息也加到这个集合里
_cam3Infos.Add(info); _cam3Infos.Add(info);
//_cam3Infos.Add(view3.saveInfo); //view3.video.UpdateTrackingBox(new List<TrackingBoxInfo>(){ info });
view3.video.UpdateTrackingBox(new List<TrackingBoxInfo>(){ info });
} }
} }
//先清除跟踪框 //先清除跟踪框
...@@ -537,6 +536,8 @@ namespace VIZ.FGOUT.Module ...@@ -537,6 +536,8 @@ namespace VIZ.FGOUT.Module
public class FrameBuffer public class FrameBuffer
{ {
#region 注释的代码
//private Queue<Mat> buffer; //private Queue<Mat> buffer;
//private int bufferSize; //private int bufferSize;
//private TimeSpan bufferDuration; //private TimeSpan bufferDuration;
...@@ -563,6 +564,8 @@ namespace VIZ.FGOUT.Module ...@@ -563,6 +564,8 @@ namespace VIZ.FGOUT.Module
// return buffer; // return buffer;
//} //}
#endregion
private Queue<MatExtend> buffer; private Queue<MatExtend> buffer;
private int bufferSize; private int bufferSize;
private TimeSpan bufferDuration; private TimeSpan bufferDuration;
...@@ -597,6 +600,8 @@ namespace VIZ.FGOUT.Module ...@@ -597,6 +600,8 @@ namespace VIZ.FGOUT.Module
public long TimeStamp { get; set; } public long TimeStamp { get; set; }
} }
#region 注释的代码
//public class FrameBuffer //public class FrameBuffer
//{ //{
// private Queue<DataStreamExtend> buffer; // private Queue<DataStreamExtend> buffer;
...@@ -625,4 +630,6 @@ namespace VIZ.FGOUT.Module ...@@ -625,4 +630,6 @@ namespace VIZ.FGOUT.Module
// return buffer; // return buffer;
// } // }
//} //}
#endregion
} }
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml.cs
...@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module ...@@ -100,7 +100,7 @@ namespace VIZ.FGOUT.Module
DependencyProperty.Register(nameof(Minimum), typeof(int), typeof(SliderArrange), new PropertyMetadata(_min)); DependencyProperty.Register(nameof(Minimum), typeof(int), typeof(SliderArrange), new PropertyMetadata(_min));
/// <summary> /// <summary>
/// 最大值，默认为100 /// 最大值，默认为500
/// </summary> /// </summary>
public int Maximum public int Maximum
{ {
...@@ -121,7 +121,7 @@ namespace VIZ.FGOUT.Module ...@@ -121,7 +121,7 @@ namespace VIZ.FGOUT.Module
DependencyProperty.Register(nameof(StartValue), typeof(int), typeof(SliderArrange)); DependencyProperty.Register(nameof(StartValue), typeof(int), typeof(SliderArrange));
/// <summary> /// <summary>
/// 选中结束值，默认为100 /// 选中结束值，默认为500
/// </summary> /// </summary>
public int EndValue public int EndValue
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CB04D08D8547EFF26DD2E9EA28C48C8E4D8A6BC58D64B84670B83011A002669" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17FE220AD980A726BEEBAB4819C71DFB53C9A7CAAE07A0EF18ACDBB808871D30"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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}" "9CB04D08D8547EFF26DD2E9EA28C48C8E4D8A6BC58D64B84670B83011A002669" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17FE220AD980A726BEEBAB4819C71DFB53C9A7CAAE07A0EF18ACDBB808871D30"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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/config/config.ini
...@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000 ...@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000
ALGORITHM_ReconfirmAutoSend_TIME=3000 ALGORITHM_ReconfirmAutoSend_TIME=3000
[Stream] [Stream]
;音视频流的缓存时间（单位：秒） ;音视频流的缓存时间（单位：秒）
STREAM_CACHEED_TIME=20 STREAM_CACHEED_TIME=10
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