Skip to content

F
FGOUT
Commit 16540bd9 by 鲁志-悦动
Options

UE控制页面Combox和Button宽度设置

parent f12ac498
Showing with 20 additions and 78 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -546,7 +546,7 @@ namespace VIZ.FGOUT.Module ...@@ -546,7 +546,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void Restart() private void Restart()
{ {
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程需要大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL) if (result == MessageBoxExResult.CANCEL)
return; return;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
...@@ -354,7 +354,7 @@ namespace VIZ.FGOUT.Module ...@@ -354,7 +354,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void Restart() private void Restart()
{ {
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程需要大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL); MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL) if (result == MessageBoxExResult.CANCEL)
return; return;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -81,6 +81,7 @@ namespace VIZ.FGOUT.Module ...@@ -81,6 +81,7 @@ namespace VIZ.FGOUT.Module
{ {
this.LoadedCommand = new VCommand(this.Loaded); this.LoadedCommand = new VCommand(this.Loaded);
this.SettingCommand = new VCommand<string>(this.Setting); this.SettingCommand = new VCommand<string>(this.Setting);
//目标检测命令
this.DetectCommand = new VCommand(this.Detect); this.DetectCommand = new VCommand(this.Detect);
this.RestartCommand = new VCommand(this.Restart); this.RestartCommand = new VCommand(this.Restart);
this.StopCommand = new VCommand(this.Stop); this.StopCommand = new VCommand(this.Stop);
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/UEControlPanelView.xaml
...@@ -305,6 +305,7 @@ ...@@ -305,6 +305,7 @@
<Button <Button
Grid.Row="6" Grid.Row="6"
Grid.Column="2" Grid.Column="2"
Width="60"
Margin="5,0,0,0" Margin="5,0,0,0"
Command="{Binding DetailCommand}" Command="{Binding DetailCommand}"
Content="{Binding DetailContent, Mode=TwoWay}" Content="{Binding DetailContent, Mode=TwoWay}"
...@@ -312,6 +313,7 @@ ...@@ -312,6 +313,7 @@
<Button <Button
Grid.Row="8" Grid.Row="8"
Grid.Column="2" Grid.Column="2"
Width="60"
Margin="5,0,0,0" Margin="5,0,0,0"
Command="{Binding SendPresetCommand}" Command="{Binding SendPresetCommand}"
Content="Save" Content="Save"
...@@ -345,6 +347,7 @@ ...@@ -345,6 +347,7 @@
Text="ZoomEase:" /> Text="ZoomEase:" />
<ComboBox <ComboBox
Grid.Column="1" Grid.Column="1"
Width="120"
ItemsSource="{StaticResource Eases}" ItemsSource="{StaticResource Eases}"
SelectedItem="{Binding ZoomEaseItem, Mode=TwoWay}" SelectedItem="{Binding ZoomEaseItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" /> Style="{StaticResource ComboBoxStyle}" />
...@@ -355,6 +358,7 @@ ...@@ -355,6 +358,7 @@
Text="MoveEase:" /> Text="MoveEase:" />
<ComboBox <ComboBox
Grid.Column="3" Grid.Column="3"
Width="120"
ItemsSource="{StaticResource Eases}" ItemsSource="{StaticResource Eases}"
SelectedItem="{Binding MoveEaseItem, Mode=TwoWay}" SelectedItem="{Binding MoveEaseItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" /> Style="{StaticResource ComboBoxStyle}" />
...@@ -542,6 +546,7 @@ ...@@ -542,6 +546,7 @@
<Button <Button
Grid.Row="9" Grid.Row="9"
Grid.Column="3" Grid.Column="3"
Width="60"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding Path=SaveCommand}" Command="{Binding Path=SaveCommand}"
Content="Save" Content="Save"
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
22-808211288 22-1559853185
4414250355 4-137960189
90-747441034 90-1236168610
151697787199 151-737430311
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
False True
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
 D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880 21265083526
6968741766 6-790135758
431460283494 42-431505870
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
False True
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------ 
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.lref
 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;; FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
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