From ccf903acfc4e10fdf2257c0b116a236786170819 Mon Sep 17 00:00:00 2001 From: RenzoL Date: Thu, 25 Nov 2021 17:18:53 +0100 Subject: [PATCH] - Rimozione macchine copiate (con suffisso ".new") dalla lista in Cambio Macchina - Pulsante Cambio Macchina nascosto se presente una sola macchina --- EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb index eedf947e..fefd82c0 100644 --- a/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb @@ -393,6 +393,12 @@ Public Class CALCPanelVM MachineList.Clear() ' ciclo per aggiungere macchine congrue al tipo del progetto corrente For Each Machine In Map.refMachinePanelVM.MachineList + ' se trovo una macchina chiamata come una giĆ  inserita ma con suffisso ".new" non la inserisco e passo al successivo elemento del For + If Machine.Name.EndsWith(".new", StringComparison.InvariantCultureIgnoreCase) AndAlso + MachineList.Count > 0 AndAlso + Not IsNothing(MachineList.FirstOrDefault(Function(x) x.Name.Equals(Machine.Name.Substring(0, Machine.Name.Length - 4)))) Then + Continue For + End If Dim nMachType As MachineType = DirectCast(Machine, MyMachine).nType Dim nProjType As BWType Dim sMachineName As String = "" @@ -414,6 +420,7 @@ Public Class CALCPanelVM End If End If Next + Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(MachineList.Count > 1) End Sub Friend Function IsMachineModified() As Boolean