TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改主UI界面

Browse Source
This commit is contained in:
Tyrone CT
2025-04-27 17:50:57 +08:00
parent cf3d09cb3e
commit 96597c95f2
11 changed files with 545 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CapMachine.Shared/Controls/Meter.xaml.cs
View File

@@ -125,6 +125,24 @@ namespace CapMachine.Shared.Controls
public static readonly DependencyProperty AutoHandStateProperty = DependencyProperty.Register("AutoHandState", typeof(bool), typeof(Meter), new PropertyMetadata(false));
/// <summary>
/// 步骤执行信息
/// </summary>
public string StepExeInfo
{
get
{
return (string)base.GetValue(Meter.StepExeInfoProperty);
}
set
{
base.SetValue(Meter.StepExeInfoProperty, value);
}
}
public static readonly DependencyProperty StepExeInfoProperty = DependencyProperty.Register("StepExeInfo", typeof(string), typeof(Meter), new PropertyMetadata("--"));
private string _AutoStateMsg = "自动";
/// <summary>
/// 手自动的消息
@@ -202,12 +220,12 @@ namespace CapMachine.Shared.Controls
if (control != null && control.IsChecked == true)
{
AutoStateMsg = "手动";
IsHandValueShow = "Visible";
//IsHandValueShow = "Visible";//用TabControl控制了，不需要显示了
}
else
{
AutoStateMsg = "自动";
IsHandValueShow = "Hidden";
//IsHandValueShow = "Hidden";//用TabControl控制了，不需要显示了
}
}
@@ -215,19 +233,19 @@ namespace CapMachine.Shared.Controls
private string _IsHandValueShow = "Hidden";
/// <summary>
/// 手动设置的是值是否显示
/// </summary>
public string IsHandValueShow
{
get { return _IsHandValueShow; }
set
{
_IsHandValueShow = value;
OnRaisePropertyChanged("IsHandValueShow");
}
}
//private string _IsHandValueShow = "Hidden";
///// <summary>
///// 手动设置的是值是否显示
///// </summary>
//public string IsHandValueShow
//{
// get { return _IsHandValueShow; }
// set
// {
// _IsHandValueShow = value;
// OnRaisePropertyChanged("IsHandValueShow");
// }
//}
/// <summary>