Commit a96d87e0 by 鲁志-悦动

点击Replay滑块Start、End停留在热键入点、出点时间戳的下标Index位置上

parent 94068ecf
...@@ -744,6 +744,9 @@ namespace VIZ.FGOUT.Module ...@@ -744,6 +744,9 @@ namespace VIZ.FGOUT.Module
managerAlgorithm.SendJson(replayPackage); managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage); manager.SendJson(replayPackage);
SliderStartValue = NDIViewModel.SliderStartValue;
SliderEndValue = NDIViewModel.SliderEndValue;
} }
private void ReplayUnchecked() private void ReplayUnchecked()
...@@ -1329,14 +1332,14 @@ namespace VIZ.FGOUT.Module ...@@ -1329,14 +1332,14 @@ namespace VIZ.FGOUT.Module
set { _sliderValue = value; this.RaisePropertyChanged(nameof(SliderValue)); } set { _sliderValue = value; this.RaisePropertyChanged(nameof(SliderValue)); }
} }
private int _sliderStartValue; private int _sliderStartValue = 120;
public int SliderStartValue public int SliderStartValue
{ {
get => (int)_sliderStartValue; get => (int)_sliderStartValue;
set { _sliderStartValue = value; this.RaisePropertyChanged(nameof(SliderStartValue)); } set { _sliderStartValue = value; this.RaisePropertyChanged(nameof(SliderStartValue)); }
} }
private int _sliderEndValue; private int _sliderEndValue = 240;
public int SliderEndValue public int SliderEndValue
{ {
get => (int)_sliderEndValue; get => (int)_sliderEndValue;
......
...@@ -153,7 +153,6 @@ namespace VIZ.FGOUT.Module ...@@ -153,7 +153,6 @@ namespace VIZ.FGOUT.Module
if (view == null) if (view == null)
return; return;
//不能这么判断,会崩,要用WPFHelper.Invoke这个 //不能这么判断,会崩,要用WPFHelper.Invoke这个
//if (view.NDIKey == NDIViewKeys.CAM_3) //if (view.NDIKey == NDIViewKeys.CAM_3)
//{ //{
...@@ -186,12 +185,16 @@ namespace VIZ.FGOUT.Module ...@@ -186,12 +185,16 @@ namespace VIZ.FGOUT.Module
var index = 0; var index = 0;
foreach (var matExtend in buffer) foreach (var matExtend in buffer)
{ {
index++;
if (matExtend.TimeStamp == SliderStartTimeStamp) if (matExtend.TimeStamp == SliderStartTimeStamp)
SliderStartValue = index;
else if(matExtend.TimeStamp == SliderEndTimeStamp)
break; break;
index++;
} }
view.vm.SliderStartValue = index; //view.vm.SliderStartValue = index;
//view.vm.SliderEndValue = index;
SliderEndValue = index;
//var index = view.vm.SliderValue; //var index = view.vm.SliderValue;
if (index >= 500) index = 499; if (index >= 500) index = 499;
......
...@@ -360,8 +360,8 @@ namespace VIZ.FGOUT.Module ...@@ -360,8 +360,8 @@ namespace VIZ.FGOUT.Module
public bool IsSliderEndClicked; public bool IsSliderEndClicked;
public long SliderStartTimeStamp; public long SliderStartTimeStamp;
public long SliderEndTimeStamp; public long SliderEndTimeStamp;
public int SliderStartValue; public static int SliderStartValue;
public int SliderEndValue; public static int SliderEndValue;
/// <summary> /// <summary>
/// Replay选中和SliderValueChanged传值共用这一个方法 /// Replay选中和SliderValueChanged传值共用这一个方法
......
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