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

LIN SCH 更改

Browse Source
This commit is contained in:
Tyrone CT
2025-10-15 09:54:46 +08:00
parent db6acc2741
commit ad1d3e081f
6 changed files with 164 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CapMachine.Model/CANLIN/LINScheduleConfig.cs
View File

@@ -1,4 +1,4 @@
using FreeSql.DataAnnotations;
using FreeSql.DataAnnotations;
namespace CapMachine.Model.CANLIN
{
@@ -22,6 +22,12 @@ namespace CapMachine.Model.CANLIN
[Column(Name = "IsActive")]
public bool IsActive { get; set; }
/// <summary>
/// 帧/报文是否被选中（属于当前调度表内生效的帧）
/// </summary>
[Column(Name = "IsMsgActived")]
public bool IsMsgActived { get; set; }
/// <summary>
/// 消息名称/帧名称
/// </summary>

12
CapMachine.Wpf/Dtos/LINScheduleConfigDto.cs
View File

@@ -1,4 +1,4 @@
using CapMachine.Model.CANLIN;
using CapMachine.Model.CANLIN;
using Prism.Mvvm;
namespace CapMachine.Wpf.Dtos
@@ -20,6 +20,16 @@ namespace CapMachine.Wpf.Dtos
set { _IsActive = value; RaisePropertyChanged(); }
}
private bool _IsMsgActived;
/// <summary>
/// 帧/报文是否被选中（隶属某个调度表）
/// </summary>
public bool IsMsgActived
{
get { return _IsMsgActived; }
set { _IsMsgActived = value; RaisePropertyChanged(); }
}
private string? _MsgName;
/// <summary>
/// 消息名称/帧名称

84
CapMachine.Wpf/LinDrive/ToomossLin.cs
View File

@@ -186,6 +186,12 @@ namespace CapMachine.Wpf.LinDrive
/// </summary>
public List<LinCmdData> CmdData { get; set; } = new List<LinCmdData>();
/// <summary>
/// 当前激活调度表下，启用的帧/报文名称集合（来自 ListLINScheduleConfig 的 IsMsgActived）。
/// 为空(null) 表示不过滤，使用所有 CmdData 中的帧；非空则仅对包含在集合内的帧做信号更新与下发。
/// </summary>
private HashSet<string>? ActiveMsgNames;
/// <summary>
/// ******************【1】*********************
/// 是否存在Dll文件
@@ -809,25 +815,7 @@ namespace CapMachine.Wpf.LinDrive
if (LDFHandle == 0)
return;
// 1) 先将当前指令值写入对应帧（可选，用于初始化）
if (CmdData != null && CmdData.Count > 0)
{
var groupMsg = CmdData.GroupBy(x => x.MsgName);
foreach (var itemMsg in groupMsg)
{
foreach (var itemSignal in itemMsg)
{
//测试的速度数据
//if (!string.IsNullOrEmpty(itemSignal.ConfigName) && itemSignal.ConfigName.Contains("速"))
//{
// itemSignal.SignalCmdValue = 1000;
//}
LDFParser.LDF_SetSignalValue(LDFHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
}
}
}
// 2) 将要执行的调度表烧入适配器并自动运行（若不指定，则启动全部调度表）
// 1) 将要执行的调度表烧入适配器并自动运行（若不指定，则启动全部调度表）
// 优先使用 ListLINScheduleConfig 指定的调度表名；否则默认取第一个
string selectedSch = string.Empty;
if (ListLINScheduleConfig != null && ListLINScheduleConfig.Count > 0)
@@ -848,6 +836,40 @@ namespace CapMachine.Wpf.LinDrive
//当前激活的调度表
ActiveSchName = selectedSch;
// 计算当前激活调度表下的“被选中帧”集合（IsMsgActived=true）
if (!string.IsNullOrEmpty(ActiveSchName) && ListLINScheduleConfig != null)
{
var actives = ListLINScheduleConfig
.Where(d => d.IsActive && d.IsMsgActived && string.Equals(d.SchTabName ?? string.Empty, ActiveSchName ?? string.Empty, StringComparison.Ordinal))
.Select(d => d.MsgName)
.Where(n => !string.IsNullOrEmpty(n))
.Distinct()
.ToList();
ActiveMsgNames = actives.Count > 0 ? new HashSet<string>(actives) : new HashSet<string>();
}
else
{
ActiveMsgNames = null; // 不过滤
}
// 2) 先将当前指令值写入对应帧（可选，用于初始化，仅对被选中的帧）
if (CmdData != null && CmdData.Count > 0)
{
var groupMsg = CmdData.GroupBy(x => x.MsgName);
foreach (var itemMsg in groupMsg)
{
// 若设置了激活的帧集合，则进行过滤
if (ActiveMsgNames != null && !ActiveMsgNames.Contains(itemMsg.Key))
continue;
foreach (var itemSignal in itemMsg)
{
LDFParser.LDF_SetSignalValue(LDFHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
}
}
}
// 3) 下发选中调度表到表格并自动执行
var ret = LDFParser.LDF_SetSchToTable(LDFHandle, new StringBuilder(ActiveSchName), 0);
if (ret < 0)
{
@@ -859,22 +881,7 @@ namespace CapMachine.Wpf.LinDrive
LoggerService?.Info($"调度表[{ActiveSchName}]已启动(自动执行)");
}
//SchCount = GetSchCount();
//for (int i = 0; i < SchCount; i++)
//{
// var schName = GetSchName(i);
// var ret = LDFParser.LDF_SetSchToTable(LDFHandle, new StringBuilder(schName), 0);
// if (ret < 0)
// {
// LoggerService?.Info($"启动调度表[{schName}]失败, 返回:{ret}");
// }
// else
// {
// Console.WriteLine($"调度表[{schName}]已启动(自动执行)");
// }
//}
// 3) 置位调度更新开关，启动参数更新任务
// 4) 置位调度更新开关，启动参数更新任务
//SchEnable = true;
if (CycleUpdateCmdTask == null || CycleUpdateCmdTask.IsCompleted)
{
@@ -903,6 +910,9 @@ namespace CapMachine.Wpf.LinDrive
var GroupMsg = CmdData.GroupBy(x => x.MsgName);
foreach (var itemMsg in GroupMsg)
{
// 若设置了激活的帧集合，则进行过滤
if (ActiveMsgNames != null && !ActiveMsgNames.Contains(itemMsg.Key))
continue;
foreach (var itemSignal in itemMsg)
{
if (itemSignal.ConfigName.Contains("速"))
@@ -919,7 +929,8 @@ namespace CapMachine.Wpf.LinDrive
//读取当前的指令帧数据，LDF_ExeFrameToBus执行后就可以读取本身的数据
foreach (var item in ListLinLdfModel)
{
if (CmdData.Any(a => a.MsgName == item.MsgName))
if (CmdData.Any(a => a.MsgName == item.MsgName)
&& (ActiveMsgNames == null || ActiveMsgNames.Contains(item.MsgName)))
{
LDFParser.LDF_GetSignalValueStr(LDFHandle, new StringBuilder(item.MsgName), new StringBuilder(item.SignalName), ReadValueStr);
item.SignalRtValueSb = ReadValueStr;
@@ -960,6 +971,7 @@ namespace CapMachine.Wpf.LinDrive
try
{
IsCycleSend = false;
ActiveMsgNames = null; // 清空激活帧过滤集合
if (LDFHandle != 0)
{
LDFParser.LDF_StopSchTable(LDFHandle);

81
CapMachine.Wpf/ViewModels/DialogLINSchConfigViewModel.cs
View File

@@ -7,6 +7,9 @@ using Prism.Commands;
using Prism.Services.Dialogs;
using System.Collections.ObjectModel;
using System.Windows;
using System.Linq;
using System.ComponentModel;
using System;
namespace CapMachine.Wpf.ViewModels
{
@@ -155,7 +158,7 @@ namespace CapMachine.Wpf.ViewModels
/// <summary>
/// 激活选中的调度表（父节点单选），并联动：
/// 1) 取消其它调度表的选中；
/// 2) 让当前选中调度表的子节点全部选中（仅显示语义，不编辑）；
/// 2) 仅控制子节点可编辑状态（不强制选中/取消），子节点勾选独立由用户控制；
/// 3) 同步底层 ListLINScheduleConfigDto 的 IsActive（只允许一个调度表 Active）。
/// 通过 _isUpdatingSelection 防重入，避免模型 -> 视图 -> 模型 的递归通知。
/// </summary>
@@ -175,16 +178,14 @@ namespace CapMachine.Wpf.ViewModels
{
bool isTarget = ReferenceEquals(n, node);
n.IsSelected = isTarget;
foreach (var c in n.Children)
{
c.IsSelected = isTarget; // 子节点选中与父保持一致
}
// 仅控制可编辑性
foreach (var c in n.Children) c.CanEdit = isTarget;
}
}
else
{
// 取消选中：其子节点也全部取消
foreach (var c in node.Children) c.IsSelected = false;
// 取消选中：仅禁止子节点编辑，保留勾选状态
foreach (var c in node.Children) c.CanEdit = false;
}
// 同步 DTO 激活状态：按当前树中第一个被选中的调度表名写回
@@ -225,9 +226,11 @@ namespace CapMachine.Wpf.ViewModels
Children = new ObservableCollection<LinMsgNode>(
g.Select(x => new LinMsgNode
{
SchTabName = g.Key,
MsgName = x.MsgName ?? string.Empty,
MsgNameIndex = x.MsgNameIndex,
IsSelected = x.IsActive
IsSelected = x.IsMsgActived,
CanEdit = g.Any(t => t.IsActive) // 仅激活的调度表可编辑
}))
};
newTree.Add(node);
@@ -249,6 +252,7 @@ namespace CapMachine.Wpf.ViewModels
// 绑定节点属性变化事件：
// - 父节点 IsSelected 变化 -> Node_PropertyChanged() -> OnSelectSchTab()
// - 子节点 IsSelected 变化 -> Child_PropertyChanged() -> 回写 DTO.IsMsgActived
// 这样可以不依赖 XAML EventTrigger，减少 UI 侧的递归触发风险。
AttachNodeHandlers(SchTabTree);
}
@@ -266,7 +270,11 @@ namespace CapMachine.Wpf.ViewModels
n.PropertyChanged += Node_PropertyChanged;
if (n.Children != null && n.Children.Any())
{
// 子节点目前仅做显示，不处理其 PropertyChanged
foreach (var c in n.Children)
{
c.PropertyChanged -= Child_PropertyChanged;
c.PropertyChanged += Child_PropertyChanged;
}
}
}
}
@@ -282,6 +290,44 @@ namespace CapMachine.Wpf.ViewModels
}
}
/// <summary>
/// 子节点属性变更：当 IsSelected 变化时，回写对应 DTO.IsMsgActived。
/// 仅当其父节点为选中状态时允许写回（CanEdit=true）。
/// </summary>
private void Child_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName != nameof(LinMsgNode.IsSelected)) return;
if (_isUpdatingSelection) return;
try
{
_isUpdatingSelection = true;
var child = sender as LinMsgNode;
if (child == null) return;
// 查找父节点
var parent = SchTabTree?.FirstOrDefault(n => n.Children.Contains(child));
if (parent == null) return;
// 仅在父节点选中（可编辑）时回写 DTO
if (!parent.IsSelected || !child.CanEdit) return;
var dto = ListLINScheduleConfigDto?.FirstOrDefault(d =>
string.Equals(d.SchTabName ?? string.Empty, parent.SchTabName ?? string.Empty, StringComparison.Ordinal)
&& string.Equals(d.MsgName ?? string.Empty, child.MsgName ?? string.Empty, StringComparison.Ordinal)
&& d.MsgNameIndex == child.MsgNameIndex);
if (dto != null)
{
dto.IsMsgActived = child.IsSelected;
}
}
finally
{
_isUpdatingSelection = false;
}
}
private DelegateCommand<object> _GridSelectionChangedCmd;
/// <summary>
@@ -427,7 +473,6 @@ namespace CapMachine.Wpf.ViewModels
//}
}
// 保存前：根据树中选中的调度表更新 DTO 的 IsActive，确保只保留一个激活调度表
var activeNode = SchTabTree?.FirstOrDefault(n => n.IsSelected);
foreach (var dto in ListLINScheduleConfigDto)
@@ -435,6 +480,22 @@ namespace CapMachine.Wpf.ViewModels
dto.IsActive = activeNode != null && string.Equals(dto.SchTabName, activeNode.SchTabName, StringComparison.Ordinal);
}
// 保存前：将子节点的勾选状态写回 DTO.IsMsgActived
foreach (var parent in SchTabTree)
{
foreach (var child in parent.Children)
{
var dto = ListLINScheduleConfigDto.FirstOrDefault(d =>
string.Equals(d.SchTabName ?? string.Empty, parent.SchTabName ?? string.Empty, StringComparison.Ordinal)
&& string.Equals(d.MsgName ?? string.Empty, child.MsgName ?? string.Empty, StringComparison.Ordinal)
&& d.MsgNameIndex == child.MsgNameIndex);
if (dto != null)
{
dto.IsMsgActived = child.IsSelected;
}
}
}
//检查数据是否正常并持久化（结构来自 LDF，不允许新增/删除，仅更新激活状态与周期等）
foreach (var item in ListLINScheduleConfigDto)
{

20
CapMachine.Wpf/ViewModels/LinTreeNodes.cs
View File

@@ -56,6 +56,16 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
public class LinMsgNode : BindableBase
{
/// <summary>
/// 所属的调度表名称（便于回写 DTO 时定位）。
/// </summary>
private string _SchTabName;
public string SchTabName
{
get => _SchTabName;
set => SetProperty(ref _SchTabName, value);
}
/// <summary>
/// 消息/帧名称。
/// </summary>
@@ -85,5 +95,15 @@ namespace CapMachine.Wpf.ViewModels
get => _IsSelected;
set => SetProperty(ref _IsSelected, value);
}
/// <summary>
/// 子节点勾选是否可用（仅当父调度表被选中时可编辑）。
/// </summary>
private bool _CanEdit;
public bool CanEdit
{
get => _CanEdit;
set => SetProperty(ref _CanEdit, value);
}
}
}

13
CapMachine.Wpf/Views/DialogLINSchConfigView.xaml
View File

@@ -167,12 +167,13 @@
<!-- 子节点模板：文本显示 -->
<HierarchicalDataTemplate.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock
FontSize="16"
Foreground="DimGray"
Text="• " />
<TextBlock FontSize="16" Foreground="DimGray">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<CheckBox
Margin="0,0,6,0"
IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding CanEdit}"
VerticalAlignment="Center" />
<TextBlock FontSize="16" Foreground="DimGray" VerticalAlignment="Center">
<Run Text="{Binding MsgName}" />
<Run Text=" (Index: " />
<Run Text="{Binding MsgNameIndex}" />