Skip to content

F
FGOUT
Commit 9dc39a29 by 鲁志-悦动
Options

加_isReplayChecked变量；两个滑块的Slider在StartValue、EndValue的Set方法里加判断来调节帧

parent a96d87e0
Showing with 53 additions and 37 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -721,6 +721,7 @@ namespace VIZ.FGOUT.Module
}
}
private bool _isReplayChecked;
public VCommand ReplayCheckedCommand { get; set; }
public VCommand ReplayUncheckedCommand { get; set; }
private void ReplayChecked()
......@@ -745,8 +746,10 @@ namespace VIZ.FGOUT.Module
managerAlgorithm.SendJson(replayPackage);
manager.SendJson(replayPackage);
_isReplayChecked = true;
SliderStartValue = NDIViewModel.SliderStartValue;
SliderEndValue = NDIViewModel.SliderEndValue;
_isReplayChecked = false;
}
private void ReplayUnchecked()
......@@ -1336,14 +1339,30 @@ namespace VIZ.FGOUT.Module
public int SliderStartValue
{
get => (int)_sliderStartValue;
set { _sliderStartValue = value; this.RaisePropertyChanged(nameof(SliderStartValue)); }
set
{
_sliderStartValue = value;
this.RaisePropertyChanged(nameof(SliderStartValue));
if (!_isReplayChecked)
{
}
}
}
private int _sliderEndValue = 240;
public int SliderEndValue
{
get => (int)_sliderEndValue;
set { _sliderEndValue = value; this.RaisePropertyChanged(nameof(SliderEndValue)); }
set
{
_sliderEndValue = value;
this.RaisePropertyChanged(nameof(SliderEndValue));
if (!_isReplayChecked)
{
}
}
}
private int _sliderValue2 = 150;
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml.cs
using System;
using System.Windows;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
......@@ -40,7 +38,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(StartRectProperty, value); }
}
private static readonly DependencyProperty StartRectProperty =
DependencyProperty.Register("StartRect", typeof(Rect), typeof(SliderArrange));
DependencyProperty.Register(nameof(StartRect), typeof(Rect), typeof(SliderArrange));
/// <summary>
/// 裁剪矩阵（尾）
......@@ -51,7 +49,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(EndRectProperty, value); }
}
private static readonly DependencyProperty EndRectProperty =
DependencyProperty.Register("EndRect", typeof(Rect), typeof(SliderArrange));
DependencyProperty.Register(nameof(EndRect), typeof(Rect), typeof(SliderArrange));
#endregion
......@@ -68,7 +66,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(SliderTickFrequencyProperty, value); }
}
public static readonly DependencyProperty SliderTickFrequencyProperty =
DependencyProperty.Register("SliderTickFrequency", typeof(int), typeof(SliderArrange), new PropertyMetadata(_freq));
DependencyProperty.Register(nameof(SliderTickFrequency), typeof(int), typeof(SliderArrange), new PropertyMetadata(_freq));
/// <summary>
/// 控件高度，默认为30
......@@ -101,7 +99,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(MinimumProperty, value); }
}
public static readonly DependencyProperty MinimumProperty =
DependencyProperty.Register("Minimum", typeof(int), typeof(SliderArrange), new PropertyMetadata(_min));
DependencyProperty.Register(nameof(Minimum), typeof(int), typeof(SliderArrange), new PropertyMetadata(_min));
/// <summary>
/// 最大值，默认为100
......@@ -112,7 +110,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(MaximumProperty, value); }
}
public static readonly DependencyProperty MaximumProperty =
DependencyProperty.Register("Maximum", typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
DependencyProperty.Register(nameof(Maximum), typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
/// <summary>/// 选中开始值，默认为0
/// </summary>
......@@ -122,7 +120,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(StartValueProperty, value); }
}
public static readonly DependencyProperty StartValueProperty =
DependencyProperty.Register("StartValue", typeof(int), typeof(SliderArrange));
DependencyProperty.Register(nameof(StartValue), typeof(int), typeof(SliderArrange));
/// <summary>
/// 选中结束值，默认为100
......@@ -133,7 +131,7 @@ namespace VIZ.FGOUT.Module
set { SetValue(EndValueProperty, value); }
}
public static readonly DependencyProperty EndValueProperty =
DependencyProperty.Register("EndValue", typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
DependencyProperty.Register(nameof(EndValue), typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
#endregion
......@@ -177,30 +175,29 @@ namespace VIZ.FGOUT.Module
ClipSilder();
}
private void TextBox_KeyUp1(object sender, System.Windows.Input.KeyEventArgs e)
{
try
{
if (e.Key == Key.Enter) // 按回车时确认输入
StartValue = Convert.ToInt32(((TextBox)sender).Text);
}
catch
{
}
}
private void TextBox_KeyUp2(object sender, KeyEventArgs e)
{
try
{
if (e.Key == Key.Enter)
EndValue = Convert.ToInt32(((TextBox)sender).Text);
}
catch
{
}
}
//private void TextBox_KeyUp1(object sender, System.Windows.Input.KeyEventArgs e)
//{
// try
// {
// if (e.Key == Key.Enter) // 按回车时确认输入
// StartValue = Convert.ToInt32(((TextBox)sender).Text);
// }
// catch
// {
// }
//}
//private void TextBox_KeyUp2(object sender, KeyEventArgs e)
//{
// try
// {
// if (e.Key == Key.Enter)
// EndValue = Convert.ToInt32(((TextBox)sender).Text);
// }
// catch
// {
// }
//}
#endregion
}
......
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\NDIPreviewView\View\NDIPreviewView.xaml;;
......
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.
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