From 3aaaa0fcb67d53f868953318cada13d2a8dc7155 Mon Sep 17 00:00:00 2001 From: NicolaP Date: Thu, 5 Jan 2023 18:58:04 +0100 Subject: [PATCH] Lettura StarEndModifyOnIntCorner da file macchina, ver 2.5a1 --- MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- OptionPanel/MachiningTab/SplitModeVM.vb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index a63d14e..d1e91a8 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -223,8 +223,8 @@ Public Class MainWindowM ' Verifico abilitazione nesting automatico m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2412, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2412, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2501, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2501, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 6c30703..1ef3b82 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,6 +69,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb index 27f9053..1e1d120 100644 --- a/OptionPanel/MachiningTab/SplitModeVM.vb +++ b/OptionPanel/MachiningTab/SplitModeVM.vb @@ -450,7 +450,7 @@ Public Class SplitModeVM m_nDragInd = -1 m_nDragType = 0 ' verifico se è abilitata la possibiltà di allungare i lati interni - m_StartEndModifyOnIntCorner = (GetMainPrivateProfileInt(S_NEST, K_STARTENDMODIFYONINTCORNER, 0) <> 0) + m_StartEndModifyOnIntCorner = (GetPrivateProfileInt(S_NEST, K_STARTENDMODIFYONINTCORNER, 0, sMachIniFile) <> 0) ' Nascondo eventuali pezzi in parcheggio EstCalc.HideParkedParts() ' Nascondo eventuale contorno da foto