From bcc9ecb9dbd91adcbd4e44e170a8fad322b78702 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 31 Jul 2025 08:06:46 +0200 Subject: [PATCH] -gestito visualizzazione pezzo quando rimosso -gestito livello utente per parametri strategie --- EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb | 8 ++++---- .../ForcedStrategyBTL/ForcedStrategyBTLV.xaml | 5 ++++- .../ForcedStrategyBTL/ForcedStrategyBTLVM.vb | 6 ++++++ .../ForcedStrategyPanel/ForcedStrategyPanelV.xaml | 7 ++++--- .../ForcedStrategyPanel/ForcedStrategyPanelVM.vb | 6 ++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb index 70ae6373..3f674d95 100644 --- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb @@ -262,11 +262,11 @@ Public Class BTLPartManagerVM End If ' Eseguo cancellazione EgtBeamSetPart(BTLPartToDelete.nPartId) + ' seleziono elemento precedente + Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete) + Dim FilteredIndex As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.IndexOf(BTLPartToDelete) + Map.refProjectVM.BTLStructureVM.SelBTLParts.Remove(BTLPartToDelete) If EgtBeamErasePart() Then - ' seleziono elemento precedente - Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete) - Dim FilteredIndex As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.IndexOf(BTLPartToDelete) - Map.refProjectVM.BTLStructureVM.SelBTLParts.Remove(BTLPartToDelete) If bSelPrevious Then If FilteredIndex = 0 Then If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml index 96c73bb6..6d7b9fe8 100644 --- a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml +++ b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Optmizer="clr-namespace:EgtBEAMWALL.Optimizer"> + @@ -40,7 +41,8 @@ Foreground="Black" BorderThickness="2" Margin="0,-5,0,0" - BorderBrush="{StaticResource BeamWall_Glacier}"> + BorderBrush="{StaticResource BeamWall_Glacier}" + Visibility="{Binding ForcedStrategyBTL_Visibility}"> + diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLVM.vb b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLVM.vb index 29b07854..98754208 100644 --- a/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLVM.vb +++ b/EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLVM.vb @@ -31,6 +31,12 @@ Public Class ForcedStrategyBTLVM End Set End Property + Public ReadOnly Property ForcedStrategyBTL_Visibility As Visibility + Get + Return If(Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed) + End Get + End Property + Private m_CurrentFeature As BTLFeatureM ' Definizione Comandi diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml index edf7f9d0..6652c48e 100644 --- a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml +++ b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml @@ -8,11 +8,11 @@ - + + Style="{StaticResource OnlyProdPage_Border}"> + BorderBrush="{StaticResource BeamWall_Glacier}" + Visibility="{Binding ForcedStrategy_Visibility}"> 5, Visibility.Visible, Visibility.Collapsed) + End Get + End Property + Private m_CurrentFeature As BTLFeatureM ' Definizione Comandi