From 00cacefa876b3b228b8fb718bd1fcedfc74ba7e8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 10 Jun 2017 15:45:21 +0000 Subject: [PATCH] EgtCAM5 1.8f1 : - migliorata segnalazione errori in aggiorna lavorazioni. --- My Project/AssemblyInfo.vb | 4 ++-- .../OperationExpander/OperationExpanderViewModel.vb | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f64e4ce..e9368e8 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb index 05f311d..33d55ff 100644 --- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb +++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb @@ -698,7 +698,9 @@ Namespace EgtCAM5 If Not EgtSpecialApplyDisposition(Operation.Id, True) Then bOk = False If EgtGetLastMachMgrErrorId() <> 0 Then - sErr &= EgtGetLastMachMgrErrorString() & Environment.NewLine + Dim sName As String = String.Empty + EgtGetName(Operation.Id, sName) + sErr &= sName & " - " & EgtGetLastMachMgrErrorString() & Environment.NewLine End If End If Else @@ -707,7 +709,9 @@ Namespace EgtCAM5 If Not EgtApplyMachining(True) Then bOk = False If EgtGetLastMachMgrErrorId() <> 0 Then - sErr &= EgtGetLastMachMgrErrorString() & Environment.NewLine + Dim sName As String = String.Empty + EgtGetName(Operation.Id, sName) + sErr &= sName & " - " & EgtGetLastMachMgrErrorString() & Environment.NewLine End If End If End If