diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index f83c7f6..a489cdc 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -385,8 +385,8 @@ Public Class MainWindowVM EgtSetLockId(sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 3101, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 3101, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2712, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2712, 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 b9b54a4..510a39d 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index 8c2eab8..9a1a98e 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb @@ -451,16 +451,16 @@ Public Class SimulationExpanderVM sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile Else sCncFile = Path.ChangeExtension(sCurrFilePath, Nothing) - Dim sExt As String = ".cnc" - EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath) If IniFile.m_bMachiningGroup Then Dim sMGrpName As String = String.Empty If EgtGetMachGroupName(EgtGetCurrMachGroup(), sMGrpName) Then sCncFile &= "_" & sMGrpName sInfo &= "-" & sMGrpName End If - sCncFile = Path.ChangeExtension(sCncFile, sExt) End If + Dim sExt As String = ".cnc" + EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath) + sCncFile = Path.ChangeExtension(sCncFile, sExt) End If Return True End Function