From ffa0ce03bbd8628ff6f6ea7d14dd7c66c4c4c67d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 3 Mar 2026 18:37:24 +0100 Subject: [PATCH 1/2] EgtCAM5 3.1c1 : - ricompilazione con cambio versione. --- MainWindow/MainWindowVM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index a58a66c..b52bf13 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -370,8 +370,8 @@ Public Class MainWindowVM EgtSetLockId(sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 3102, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 3102, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 3103, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 3103, 1, IniFile.m_nKeyOptions) ' Leggo e imposto livello utilizzatore IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1)) ' Imposto abilitazione lavorazioni avanzate diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 15e0f27..86d2c26 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 4147457b7d66c393119cab246288fa2cbbbf6457 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 5 Mar 2026 08:11:40 +0100 Subject: [PATCH 2/2] EgtCAM5 : - correzione nel passaggio da Machining a Draw. --- .../OperationsListExpander/OperationsListExpanderVM.vb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb index f4484be..6cf1c4a 100644 --- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb @@ -1302,10 +1302,12 @@ Public Class OperationsListExpanderVM ' Annullo creazione nuova lavorazione If m_NewMachining Then EndNewMachining(GDB_ID.NULL) ' Disabilito visualizzazione utensile - Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE) - Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False) - Map.refMachiningParameterExpanderVM.ResetSliderValue() - EgtRemovePreviewMachiningTool() + If Not IsNothing(Map.refMachiningParameterExpanderVM) Then + Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE) + Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False) + Map.refMachiningParameterExpanderVM.ResetSliderValue() + EgtRemovePreviewMachiningTool() + End If ' Deseleziono le operazioni correnti per eliminare il mark For Each Operation In OperationList If Operation.IsSelected Then