From be256404ff6c123135c2f42a21ba6bec7cc6aea6 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 2 Feb 2024 17:02:37 +0100 Subject: [PATCH] EgtCAM5 2.6b1 : - corretto falso rilevamento modifica testa usata da posizione in attrezzaggio. --- MainWindow/MainWindowVM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- SetUp/SetUpVM.vb | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index f900d38..a360e99 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -388,8 +388,8 @@ Public Class MainWindowVM EgtSetLockId(sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 2601, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2601, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2602, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2602, 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 87707e4..c5777e2 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/SetUp/SetUpVM.vb b/SetUp/SetUpVM.vb index bfe0d15..fd10af7 100644 --- a/SetUp/SetUpVM.vb +++ b/SetUp/SetUpVM.vb @@ -409,18 +409,18 @@ Public Class SetUpVM ' verifico se la testa รจ diversa If TempPosition.Head <> sHead Then ' altrimenti la sovrascrivo - TempPosition.Head = sHead + TempPosition.SetHead( sHead) ' la metto anche come testa originale If bOriginal Then TempPosition.OrigHead = sHead ' e verifico il numero di uscite For ExitIndex = TempPosition.ExitToolAssociationList.Count + 1 To EgtGetHeadExitCount(sHead) - TempPosition.ExitToolAssociationList.Add(New ExitToolAssociation(ExitIndex.ToString, TempPosition)) - Next - For ExitIndex = TempPosition.ExitToolAssociationList.Count - 1 To EgtGetHeadExitCount(sHead) Step -1 - TempPosition.ExitToolAssociationList.RemoveAt(ExitIndex) - Next - End If - For ExitIndex = 0 To TempPosition.ExitToolAssociationList.Count - 1 + TempPosition.ExitToolAssociationList.Add(New ExitToolAssociation(ExitIndex.ToString, TempPosition)) + Next + For ExitIndex = TempPosition.ExitToolAssociationList.Count - 1 To EgtGetHeadExitCount(sHead) Step -1 + TempPosition.ExitToolAssociationList.RemoveAt(ExitIndex) + Next + End If + For ExitIndex = 0 To TempPosition.ExitToolAssociationList.Count - 1 Dim CurrExitToolAss As ExitToolAssociation = TempPosition.ExitToolAssociationList(ExitIndex) If CurrExitToolAss.ExitPar = sExitList(ToolIndex) Then ' vi metto l'utensile e segno l'uscita come occupata