周立功开发过程1
This commit is contained in:
@@ -54,6 +54,8 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//MachineDataService = machineDataService;
|
||||
DialogService = dialogService;
|
||||
|
||||
EventAggregator.GetEvent<LogicRuleChangeEvent>().Subscribe(LogicRuleChangeEventCall);
|
||||
|
||||
//仲裁波特率
|
||||
ArbBaudRateCbxItems = new ObservableCollection<CbxItems>()
|
||||
{
|
||||
@@ -713,6 +715,33 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
private DelegateCommand _btnTestPLC;
|
||||
/// <summary>
|
||||
/// 临时测试的方法
|
||||
/// </summary>
|
||||
public DelegateCommand btnTestPLC
|
||||
{
|
||||
set
|
||||
{
|
||||
_btnTestPLC = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_btnTestPLC == null)
|
||||
{
|
||||
_btnTestPLC = new DelegateCommand(() => btnTestPLCCall());
|
||||
}
|
||||
return _btnTestPLC;
|
||||
}
|
||||
}
|
||||
//临时测试的方法
|
||||
private void btnTestPLCCall()
|
||||
{
|
||||
CanFdDriveService.ToomossCanFDDrive.UpdateSchDataByCmdDataChanged();
|
||||
}
|
||||
|
||||
|
||||
#region Dbc操作
|
||||
|
||||
private ObservableCollection<CanDbcModel> _ListCanDbcModel;
|
||||
@@ -973,18 +1002,12 @@ namespace CapMachine.Wpf.ViewModels
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void SchEnableCmdCall(object par)
|
||||
{
|
||||
var dd = SelectedCANConfigExdDto.SchEnable;
|
||||
var Result = (bool)par;
|
||||
if (Result)
|
||||
if (SelectedCANConfigExdDto == null)
|
||||
{
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = true;
|
||||
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = false;
|
||||
|
||||
}
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = SelectedCANConfigExdDto.SchEnable;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user