From 6241f1ee241d27c9baa67fbebc0913e38d911c96 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 20 Sep 2016 07:35:10 +0000 Subject: [PATCH] EgtCAM5 1.6u3 : - corretto problema crezione/salvataggio lavorazione senza utensile definito. --- MachiningsDbWindow/MachiningTreeView.vb | 6 +++++- MachiningsDbWindow/MachiningsDbViewModel.vb | 2 +- My Project/AssemblyInfo.vb | 4 ++-- ToolsDbWindow/ToolsDbViewModel.vb | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/MachiningsDbWindow/MachiningTreeView.vb b/MachiningsDbWindow/MachiningTreeView.vb index 7490796..30718d9 100644 --- a/MachiningsDbWindow/MachiningTreeView.vb +++ b/MachiningsDbWindow/MachiningTreeView.vb @@ -1614,7 +1614,11 @@ Public Class MachiningTreeViewItem EgtMdbSetCurrMachiningParam(MCH_MP.SIDESTEP, dValue) StringToLen(VertFeed, dValue) EgtMdbSetCurrMachiningParam(MCH_MP.VERTFEED, dValue) - EgtMdbSetCurrMachiningParam(MCH_MP.TOOL, ToolList(SelectedTool)) + If SelectedTool >= 0 Then + EgtMdbSetCurrMachiningParam(MCH_MP.TOOL, ToolList(SelectedTool)) + Else + EgtMdbSetCurrMachiningParam(MCH_MP.TOOL, "") + End If EgtMdbSetCurrMachiningParam(MCH_MP.DEPTH_STR, DepthStr) EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes) EgtMdbSetCurrMachiningParam(MCH_MP.OVERLAP_STR, OverLapStr) diff --git a/MachiningsDbWindow/MachiningsDbViewModel.vb b/MachiningsDbWindow/MachiningsDbViewModel.vb index 9b97e73..3b398a1 100644 --- a/MachiningsDbWindow/MachiningsDbViewModel.vb +++ b/MachiningsDbWindow/MachiningsDbViewModel.vb @@ -653,7 +653,7 @@ Namespace EgtCAM5 EgtMdbSaveCurrMachining() Case MsgBoxResult.No If CurrMachining.NewMachining Then - Application.Msn.NotifyColleagues(Application.REMOVEMACHINING, Me) + Application.Msn.NotifyColleagues(Application.REMOVEMACHINING, CurrMachining) ElseIf CurrMachining.m_IsModifiedName Then Dim DbName As String = String.Empty EgtMdbGetCurrMachiningParam(MCH_MP.NAME, DbName) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 6c3860b..4158268 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/ToolsDbWindow/ToolsDbViewModel.vb b/ToolsDbWindow/ToolsDbViewModel.vb index 408ef50..a5fdb39 100644 --- a/ToolsDbWindow/ToolsDbViewModel.vb +++ b/ToolsDbWindow/ToolsDbViewModel.vb @@ -572,7 +572,7 @@ Namespace EgtCAM5 EgtTdbSaveCurrTool() Case MsgBoxResult.No If CurrTool.NewTool Then - Application.Msn.NotifyColleagues(Application.REMOVETOOL, Me) + Application.Msn.NotifyColleagues(Application.REMOVETOOL, CurrTool) ElseIf CurrTool.m_IsModifiedName Then Dim DbName As String = String.Empty EgtTdbGetCurrToolParam(MCH_TP.NAME, DbName)