From 2fda49f4efd1967f43921a9a47770d24baa00049 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Thu, 4 Jun 2026 07:27:21 +0200
Subject: [PATCH 01/10] -aggiunti controlli su BTLdataWnd e PartParamters

---
 .../BTLDataWnd/BTLDataWndV.xaml               | 53 +++++--------
 .../BTLDataWnd/BTLDataWndVM.vb                | 10 ++-
 .../BTLViewModel/BTLStructureVM.vb            |  2 +-
 .../PartParametersWnd/PartParametersWndV.xaml | 78 +++++++------------
 .../ProdManager/ProdManagerVM.vb              |  9 ++-
 5 files changed, 59 insertions(+), 93 deletions(-)

diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
index cf81b6be..25902e6a 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
@@ -18,7 +18,7 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <StackPanel Style="{StaticResource MachinePanel_StackPanel}">
                <ComboBox ItemsSource="{Binding StrategySetupList}" 
                          SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
                          Style="{StaticResource BTLDataWnd_ComboBox}">
@@ -68,50 +68,42 @@
             <TextBlock Text="{Binding PROJNUM_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sPROJNUM, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding PROJNAME_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sPROJNAME, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding PROJPART_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sPROJPART, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding PROJGUID_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sPROJGUID, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding LISTNAME_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sLISTNAME, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding CUSTOMER_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sCUSTOMER, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding ARCHITECT_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sARCHITECT, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding EDITOR_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sEDITOR, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding DELIVDATE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
@@ -122,26 +114,22 @@
             <TextBlock Text="{Binding EXPDATE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sEXPDATE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding EXPTIME_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sEXPTIME, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding EXPRELEASE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sEXPRELEASE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding LANGUAGE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sLANGUAGE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding RANGE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
@@ -166,26 +154,22 @@
             <TextBlock Text="{Binding COMPUTERNAME_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sCOMPUTERNAME, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding USER_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sUSER, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding SRCFILE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sSRCFILE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding EXPFILE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sEXPFILE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding RECESS_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
@@ -200,8 +184,7 @@
             <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   Text="{Binding CurrBTLStructure.sUSERATTRIBUTE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
 
          </UniformGrid>
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
index 8862e38c..81013789 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
@@ -80,6 +80,13 @@ Public Class BTLDataWndVM
       NotifyPropertyChanged(NameOf(ErrText))
    End Sub
 
+   Private m_CurrBTLStructure As BTLStructureVM
+   Public ReadOnly Property CurrBTLStructure As BTLStructureVM
+      Get
+         Return m_CurrBTLStructure
+      End Get
+   End Property
+
 #Region "Parametri generici"
 
    Public m_sPROJNUM As String
@@ -565,8 +572,9 @@ Public Class BTLDataWndVM
       Map.refMainWindowVM.MainWindowM.GetDefaultConfigDirPath(nType, True)
    End Sub
 
-   Sub New()
+   Sub New(BTLStructure As BTLStructureVM)
       Map.SetRefBTLDataWndVM(Me)
+      m_CurrBTLStructure = BTLStructure
       SetIsBTLDataWnd(True)
       ' leggo parametri Btl
       ReadBtlParams()
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
index a7d1422b..f5f32808 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
@@ -1272,7 +1272,7 @@ Public Class BTLStructureVM
    End Property
 
    Friend Sub Data(nProjId As Integer)
-      Dim BTLDataWnd As New BTLDataWndV(Application.Current.MainWindow, New BTLDataWndVM())
+      Dim BTLDataWnd As New BTLDataWndV(Application.Current.MainWindow, New BTLDataWndVM(Map.refProjectVM.BTLStructureVM))
       BTLDataWnd.ShowDialog()
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml b/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
index b2d862ee..5c4e2d97 100644
--- a/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml
@@ -25,62 +25,52 @@
          <TextBlock Text="{Binding NAM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sNAM, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COUNT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sCNT, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ORDERNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.nORDERNUM, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PLANINGLEN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.dPLANINGLEN, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STARTOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.dSTARTOFFSET, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ENDOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.dENDOFFSET, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding DESIGN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sDESIGN, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding GROUP_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sGROUP, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STOREY_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sSTOREY, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ANNOT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sANNOT, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MATERIAL_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
@@ -113,8 +103,7 @@
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                    Grid.Column="1"
-                                   Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
-                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                   Text="{Binding CurrPart.nCOLA, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
          </Grid>
       </GroupBox>
@@ -125,38 +114,32 @@
          <TextBlock Text="{Binding TIMBERGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sTIMBERGRADE, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding QUALITYGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sQUALITYGRADE, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PACKAGE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sPACKAGE, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sASSEMBLYNUM, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ELEMENTNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sELEMENTNUM, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MODULENUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sMODULENUM, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
@@ -191,14 +174,12 @@
          <TextBlock Text="{Binding LAYER_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.nLAYER, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COMMENT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sCOMMENT, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
       </UniformGrid>
 
@@ -274,8 +255,7 @@
                <TextBlock Text="{Binding GRAINDIRECTION_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.GrainDirection, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
                <TextBlock Grid.Row="1"
                           Text="{Binding GRAINDIRALIGN_MSG}"
@@ -316,8 +296,7 @@
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.CamberParams, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
@@ -349,8 +328,7 @@
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.PartOffsetParams, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
@@ -382,8 +360,7 @@
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.sMATERIALTYPESPEC, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
@@ -454,24 +431,21 @@
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.TransfOrig, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
                <TextBlock Grid.Row="2"
                           Text="{Binding TRANSFVERSX_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="2"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.TransfVersX, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
                <TextBlock Grid.Row="3"
                           Text="{Binding TRANSFVERSY_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="3"
                                       Grid.Column="1"
-                                      Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
-                                                     RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                      Text="{Binding CurrPart.TransfVersY, UpdateSourceTrigger=LostFocus}"
                                       Style="{StaticResource PartParam_TextBox}"/>
             </Grid>
          </GroupBox>
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
index f2450648..27ba7b4b 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
@@ -851,12 +851,13 @@ Public Class ProdManagerVM
       GeneralParametersWndVM.SetbSaveGeneralParameters(True)
       GeneralParametersWndVM.SaveProjectParameters()
 
-      m_BTLDataWnd = New BTLDataWndVM()
+      ' leggo struttura BTL per liste
+      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
+
+      m_BTLDataWnd = New BTLDataWndVM(Map.refProjectVM.BTLStructureVM)
       m_BTLDataWnd.Read(nType)
       m_BTLDataWnd.SaveInfoBTL(nType)
 
-      ' leggo struttura BTL per liste
-      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
       CopyBuilding()
       Dim sProjFileName As String = sProjDir & "\" & nProjId.ToString("0000") & ".nge"
       Dim bFirstPart As Boolean = EgtGetFirstPart() <> GDB_ID.NULL
@@ -1112,7 +1113,7 @@ Public Class ProdManagerVM
       ' imposto progetto corrente
       Dim OldProd As ProdFileVM = ProjectManagerVM.CurrProd
       ProjectManagerVM.CurrProd = TempCurrProd
-      m_BTLDataWnd = New BTLDataWndVM()
+      m_BTLDataWnd = New BTLDataWndVM(Map.refProjectVM.BTLStructureVM)
       DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
       ' recupero indice di modifica progetto quando caricato
       Dim CommIndex As Integer = -1

From 709ccc19dd4536e2f82840940fea14789efd959e Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Tue, 9 Jun 2026 08:41:13 +0200
Subject: [PATCH 02/10] EgtBEAMWALL 3.1.6.1: -cambio versione -aggiunto
 controllo su parametri generali

---
 EgtBEAMWALL.Core/My Project/AssemblyInfo.vb                 | 6 +++---
 EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs            | 4 ++--
 .../GeneralParametersStrategyVM.vb                          | 1 +
 EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb             | 4 ++--
 EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb            | 4 ++--
 EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb           | 1 +
 EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb            | 4 ++--
 EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb           | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index a7df1fac..d32dd49b 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -17,7 +17,7 @@ Imports System.Windows
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("Aedifica.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2026 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.5.3")>
-<Assembly: AssemblyFileVersion("3.1.5.3")>
+<Assembly: AssemblyVersion("3.1.6.1")>
+<Assembly: AssemblyFileVersion("3.1.6.1")>
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 3f080980..17cbe859 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.5.3")]
-[assembly: AssemblyFileVersion("3.1.5.3")]
+[assembly: AssemblyVersion("3.1.6.1")]
+[assembly: AssemblyFileVersion("3.1.6.1")]
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
index 2949f119..c74d385a 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
@@ -750,6 +750,7 @@ Public Class ComboGenericParameter
    End Property
    Friend Sub SetSelValue(sValue As String)
       m_SelValue = m_ComboList.FirstOrDefault(Function(x) x.sValue = sValue)
+      If IsNothing(m_SelValue) Then m_SelValue = m_ComboList(0)
    End Sub
 
    Private m_bComboBoxVisibility As Visibility = Visibility.Collapsed
diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
index f80fbca0..ba054e8d 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
@@ -269,8 +269,8 @@ Public Class MainWindowM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 3106, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 3106, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index 0373d2d4..a984e93b 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.5.3")>
-<Assembly: AssemblyFileVersion("3.1.5.3")>
+<Assembly: AssemblyVersion("3.1.6.1")>
+<Assembly: AssemblyFileVersion("3.1.6.1")>
diff --git a/EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb b/EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb
index 155bb877..8f14c101 100644
--- a/EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb
@@ -270,6 +270,7 @@ Public Class SIEMENSSharp7Comm
             End If
             Return bResult
       End Select
+      Return False
    End Function
 
 #End Region    ' Read Variables
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb
index 2c2fa9d5..8bb07b74 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb
@@ -252,8 +252,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 3106, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 3106, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 0863e09e..34f7b2a0 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.5.3")>
-<Assembly: AssemblyFileVersion("3.1.5.3")>
+<Assembly: AssemblyVersion("3.1.6.1")>
+<Assembly: AssemblyFileVersion("3.1.6.1")>

From 9c907c96cedb5e14cd5b28bbd64455d8a292ba8d Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Tue, 9 Jun 2026 16:07:55 +0200
Subject: [PATCH 03/10] -ripristinato messagebox per errore licenza

---
 EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
index f49bdf07..fd133730 100644
--- a/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
@@ -78,14 +78,15 @@ Public Class MySceneHostVM
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
          Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
          Dim sTitle As String = EgtMsg(10101)
-         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
-         Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
+         Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo)
+         Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106)
          Dim sTitle As String = EgtMsg(10101)
-         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
             Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
                .Title = EgtMsg(110026),

From 29d68b3d21d26ab10cbafc3b8ad9c385c22b310f Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 12 Jun 2026 12:11:28 +0200
Subject: [PATCH 04/10] EgtBEAMWALL 3.1.6.2: -aggiornato tasto CANC per btlpart
 e selbtlfeature

---
 EgtBEAMWALL.Core/My Project/AssemblyInfo.vb   |  4 +-
 EgtBEAMWALL.Core/Themes/Generic.xaml          |  1 +
 .../Properties/AssemblyInfo.cs                |  4 +-
 .../BTLPartManager/BTLPartManagerVM.vb        |  2 -
 .../BTLViewModel/BTLStructureVM.vb            | 77 ++++++++++++++++++-
 .../ItemParamList/BTLPartListV.xaml           | 22 +++---
 .../ItemParamList/BTLPartListV.xaml.vb        | 31 ++++++++
 .../My Project/AssemblyInfo.vb                |  4 +-
 .../My Project/AssemblyInfo.vb                |  4 +-
 9 files changed, 125 insertions(+), 24 deletions(-)

diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index d32dd49b..3a6f6d5a 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.1")>
-<Assembly: AssemblyFileVersion("3.1.6.1")>
+<Assembly: AssemblyVersion("3.1.6.2")>
+<Assembly: AssemblyFileVersion("3.1.6.2")>
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index 6898b18c..00a42d9b 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -1921,6 +1921,7 @@
 
    <Style x:Key="EgtMessageBox_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
       <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="0,0,0,10"/>
    </Style>
 
    <Style x:Key="UsersControl_ItemsControl" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 17cbe859..f8a2648d 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.6.1")]
-[assembly: AssemblyFileVersion("3.1.6.1")]
+[assembly: AssemblyVersion("3.1.6.2")]
+[assembly: AssemblyFileVersion("3.1.6.2")]
diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
index a428e4a2..88b89b1c 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
@@ -8,8 +8,6 @@ Public Class BTLPartManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
-
    Private m_BTLPartManager_IsEnabled As Boolean = True
    Public ReadOnly Property BTLPartManager_IsEnabled As Boolean
       Get
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
index f5f32808..80bf4cc8 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
@@ -1239,13 +1239,76 @@ Public Class BTLStructureVM
       End If
    End Sub
 
+   Public Sub RemovePart(BTLPartToDelete As BTLPartVM, bSelPrevious As Boolean)
+      ' verifico se ci sono già copie in grezzi
+      Dim nDuploCount As Integer = 0
+      If EgtDuploCount(BTLPartToDelete.nPartId, nDuploCount) AndAlso nDuploCount > 0 Then
+         ' avviso che il pezzo non è cancellabile perchè in produzione
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      ' verifico se rimuovere sezione dalla lista
+      If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x IsNot BTLPartToDelete AndAlso x.Section = BTLPartToDelete.Section) Then
+         Map.refProjectVM.BTLStructureVM.SectionList.Remove(BTLPartToDelete.Section)
+         Map.refProjectVM.BTLStructureVM.SelSection = SectionXMaterial.Empty
+      End If
+      ' Eseguo cancellazione
+      EgtBeamSetPart(BTLPartToDelete.nPartId)
+      If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then RemoveScenePart(BTLPartToDelete)
+      ' 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
+         If bSelPrevious Then
+            If FilteredIndex = 0 Then
+               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(1))
+               Else
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
+               End If
+            ElseIf FilteredIndex = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 1 Then
+               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 2))
+               Else
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
+               End If
+            Else
+               Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(FilteredIndex - 1))
+            End If
+         End If
+         ' rimuovo dalla lista pezzi
+         Map.refProjectVM.BTLStructureVM.BTLPartVMList.RemoveAt(Index)
+      End If
+   End Sub
+
+   Private Sub RemoveScenePart(BTLPartToDelete As BTLPartVM)
+      ' Rimuovo pezzo dalla scena
+      Dim IdAsseBase As Integer = 0
+      Dim DeletePartId As Integer = 0
+      If Not Map.refProdManagerVM.ListProjAsseBase.TryGetValue(BTLPartToDelete.nPROJ, IdAsseBase) Then
+         Return
+      End If
+      ' Setto il nuovo contesto
+      EgtSetCurrentContext(Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx())
+      If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
+      If Map.refSceneShowBuldingVM.MapInfo.TryGetValue(BTLPartToDelete.nPartId, DeletePartId) Then
+         EgtErase(DeletePartId)
+         Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
+      End If
+      EgtBeamShowBuilding(IdAsseBase, True)
+      EgtZoom(ZM.ALL)
+      ' Ritorno al contesto corrente
+      EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
 
 #Region "DeletePart"
 
-   Public ReadOnly Property DeletePart_Command As ICommand
+   Public ReadOnly Property DeletePart_Command() As ICommand
       Get
          If m_cmdDeletePart Is Nothing Then
             m_cmdDeletePart = New Command(AddressOf DeletePart)
@@ -1255,7 +1318,17 @@ Public Class BTLStructureVM
    End Property
 
    Public Sub DeletePart()
-      Map.refBTLPartManagerVM.RemovePartCmd()
+      If IsNothing(ProjectManagerVM.CurrProd) Then Return
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62573), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+         If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
+            Dim CurrSelBTLParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
+            For RemoveIndex = CurrSelBTLParts.Count - 1 To 0 Step -1
+               RemovePart(CurrSelBTLParts(RemoveIndex), RemoveIndex = 0)
+            Next
+         End If
+      Else
+         Return
+      End If
    End Sub
 
 #End Region ' DeletePart
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index 1583aeca..48d73bdb 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-             xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
+             xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+             PreviewKeyDown="Root_PreviewKeyDown">
    <UserControl.Resources>
       <OPTIMIZER:DataGridCellBorderThicknessConverter x:Key="DataGridCellBorderThicknessConverter"/>
       <OPTIMIZER:ProjIdToBtlFileName x:Key="ProjIdToBtlFileName"/>
@@ -28,15 +29,11 @@
                               VirtualizingPanel.ScrollUnit="Pixel"
                               RenderOptions.CachingHint="Cache"
                               VirtualizingPanel.CacheLength="2"
-                              VirtualizingPanel.CacheLengthUnit="Page"
+                              VirtualizingPanel.CacheLengthUnit="Page"                         
                               RowBackground="{StaticResource BeamWall_BLackSqueeze}"
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               Style="{StaticResource Optimizer_DataGrid}">
-      <EgwWPFBaseLib:EgwDataGrid.InputBindings>
-         <KeyBinding Key="Delete" Command="{Binding Tag.DeletePart_Command,
-                                                    RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}" />
-      </EgwWPFBaseLib:EgwDataGrid.InputBindings>
-      <EgwWPFBaseLib:EgwDataGrid.GroupStyle>
+      <DataGrid.GroupStyle>
          <GroupStyle>
             <GroupStyle.ContainerStyle>
                <Style TargetType="{x:Type GroupItem}">
@@ -81,8 +78,8 @@
                </Style>
             </GroupStyle.ContainerStyle>
          </GroupStyle>
-      </EgwWPFBaseLib:EgwDataGrid.GroupStyle>
-      <EgwWPFBaseLib:EgwDataGrid.CellStyle>
+      </DataGrid.GroupStyle>
+      <DataGrid.CellStyle>
          <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
             <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
             <Setter Property="BorderThickness">
@@ -94,8 +91,8 @@
                </Setter.Value>
             </Setter>
          </Style>
-      </EgwWPFBaseLib:EgwDataGrid.CellStyle>
-      <EgwWPFBaseLib:EgwDataGrid.RowStyle>
+      </DataGrid.CellStyle>
+      <DataGrid.RowStyle>
          <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
             <Setter Property="DetailsVisibility" Value="{Binding bOpenFeatureList, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <EventSetter Event="PreviewMouseDown" Handler="PartList_PreviewMouseDown"/>
@@ -105,7 +102,7 @@
                </DataTrigger>
             </Style.Triggers>
          </Style>
-      </EgwWPFBaseLib:EgwDataGrid.RowStyle>
+      </DataGrid.RowStyle>
       <EgwWPFBaseLib:EgwDataGrid.Resources>
          <!--PDN - Nome-->
          <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
@@ -395,6 +392,7 @@
                         VirtualizingPanel.IsVirtualizing="True"
                         VirtualizingPanel.VirtualizationMode="Recycling"
                         ScrollViewer.CanContentScroll="True"
+                        PreviewMouseDown="ListBox_PreviewMouseDown"
                         Style="{StaticResource BTLPartList_ListBox}">
                   <ListBox.ItemsPanel>
                      <ItemsPanelTemplate>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
index 509df953..e1e62e80 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
@@ -8,6 +8,8 @@ Public Class BTLPartListV
    Private m_isDraggingSelectionField As FieldInfo
    Private m_endDraggingMethod As MethodInfo
 
+   Private bSelOnFeature As Boolean = False
+
    Sub New()
       ' This call is required by the designer.
       InitializeComponent()
@@ -28,6 +30,8 @@ Public Class BTLPartListV
    Private Sub PartList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
       If e.ChangedButton = MouseButton.Left Then
          If TypeOf sender Is DataGridRow Then
+            ' Metto la selezione della feature a false
+            bSelOnFeature = False
             If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count <> 1 Then Return
             Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
             If TypeOf Row.DataContext IsNot BTLPartVM Then Return
@@ -102,6 +106,33 @@ Public Class BTLPartListV
       Return Nothing
    End Function
 
+   Private Sub Root_PreviewKeyDown(sender As Object, e As KeyEventArgs)
+      If e.Key <> Key.Delete Then Return
+
+      Dim BTLStructureVM As BTLStructureVM = TryCast(Me.Tag, BTLStructureVM)
+      If IsNothing(BTLStructureVM) Then Return
+
+      Dim BTLPartVM As BTLPartVM = BTLStructureVM.SelBTLPart
+      Dim BTLFeatureVM As BTLFeatureVM = BTLPartVM?.SelBTLFeatureVM
+
+      If bSelOnFeature AndAlso Not IsNothing(BTLFeatureVM) Then
+         If Not IsNothing(BTLFeatureVM.DeleteFeature_Command) AndAlso BTLFeatureVM.DeleteFeature_Command.CanExecute(Nothing) Then
+            BTLFeatureVM.DeleteFeature_Command.Execute(Nothing)
+            e.Handled = True
+         End If
+         Return
+      End If
+
+      If Not IsNothing(BTLStructureVM.DeletePart_Command) AndAlso BTLStructureVM.DeletePart_Command.CanExecute(Nothing) Then
+         BTLStructureVM.DeletePart_Command.Execute(Nothing)
+         e.Handled = True
+      End If
+   End Sub
+
+   Private Sub ListBox_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      bSelOnFeature = True
+   End Sub
+
 End Class
 
 Public Class SettingsBtnVerticalOffsetMultiConverter
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index a984e93b..9bec1b8f 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.6.1")>
-<Assembly: AssemblyFileVersion("3.1.6.1")>
+<Assembly: AssemblyVersion("3.1.6.2")>
+<Assembly: AssemblyFileVersion("3.1.6.2")>
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 34f7b2a0..e29976d3 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.1")>
-<Assembly: AssemblyFileVersion("3.1.6.1")>
+<Assembly: AssemblyVersion("3.1.6.2")>
+<Assembly: AssemblyFileVersion("3.1.6.2")>

From 4e42c09b82a23610fc0a00f088f68b645c85bb22 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Tue, 16 Jun 2026 09:37:42 +0200
Subject: [PATCH 05/10] -aggiunto messaggio di errore di chiusura software con
 cam5 aperto -aggiunto ordine strategie

---
 .../MainWindow/MainWindowV.xaml.vb            |  5 +++++
 .../StrategyManager/StrategyManagerVM.vb      | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
index f1dcb384..2dd746a6 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
@@ -43,6 +43,11 @@ Public Class MainWindowV
          e.Cancel = True
          Return
       End If
+      If Map.refProjectVM.bCalcRunning Then
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(63047), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         e.Cancel = True
+         Return
+      End If
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          e.Cancel = True
          Return
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 7827302c..d7e4be1f 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -493,11 +493,17 @@ Public Class StrategyManagerVM
       Dim IndexActiveStrategy As Integer = m_SelTreeItem.StrategyList.IndexOf(m_SelTreeItem.SelActiveStrategy)
       ' Recupero indice elemento selezionato in lista
       Dim NewIndexActiveStrategy As Integer = IndexActiveStrategy - 1
+      ' Setto indice per capire che la strategia è stata spostata in StrategyList
+      m_SelTreeItem.SelActiveStrategy.nIndexInList = NewIndexActiveStrategy
       ' Se l'indice è maggiore di 0
       If IndexActiveStrategy > 0 Then
          ' Muovo l'elemento selezionato sopra di 1
          m_SelTreeItem.StrategyList.Move(IndexActiveStrategy, NewIndexActiveStrategy)
       End If
+      ' Riallinea tutti gli indici
+      For Index As Integer = 0 To m_SelTreeItem.StrategyList.Count - 1
+         m_SelTreeItem.StrategyList(Index).nIndexInList = Index
+      Next
       ' Setto a true booleano per modifica
       SetbIsModifyStrategy(True)
       ' Aggiorno la lista
@@ -526,11 +532,17 @@ Public Class StrategyManagerVM
       Dim IndexActiveStrategy As Integer = m_SelTreeItem.StrategyList.IndexOf(m_SelTreeItem.SelActiveStrategy)
       ' Recupero indice elemento selezionato in lista
       Dim NewIndexActiveStrategy As Integer = IndexActiveStrategy + 1
+      ' Setto indice per capire che la strategia è stata spostata in StrategyList
+      m_SelTreeItem.SelActiveStrategy.nIndexInList = NewIndexActiveStrategy
       ' Se l'indice è maggiore di 0
       If IndexActiveStrategy >= 0 Then
          ' Muovo l'elemento selezionato sopra di 1
          m_SelTreeItem.StrategyList.Move(IndexActiveStrategy, NewIndexActiveStrategy)
       End If
+      ' Riallinea tutti gli indici
+      For Index As Integer = 0 To m_SelTreeItem.StrategyList.Count - 1
+         m_SelTreeItem.StrategyList(Index).nIndexInList = Index
+      Next
       ' Setto a true booleano per modifica
       SetbIsModifyStrategy(True)
       ' Aggiorno la lista
@@ -990,10 +1002,7 @@ Public Class Topology
       m_sName = JsonTopology.sName
       m_sImage = JsonTopology.sImage
       m_StrategyList = New ObservableCollection(Of Strategy)(JsonTopology.StrategyList.Select(Function(jsonStrategy) New Strategy(jsonStrategy)))
-      m_AvailableStrategyList_View = New ListCollectionView(StrategyList)
-      m_AvailableStrategyList_View.Filter = AddressOf AvailableStrategyFilter
-      m_ActiveStrategyList_View = New ListCollectionView(StrategyList)
-      m_ActiveStrategyList_View.Filter = AddressOf ActiveStrategyFilter
+      CreateStrategyViews()
       NotifyPropertyChanged(NameOf(StrategyList))
    End Sub
 
@@ -1012,8 +1021,10 @@ Public Class Topology
    Friend Sub CreateStrategyViews()
       m_AvailableStrategyList_View = New ListCollectionView(StrategyList)
       m_AvailableStrategyList_View.Filter = AddressOf AvailableStrategyFilter
+      m_AvailableStrategyList_View.SortDescriptions.Add(New SortDescription("nIndexInList", ListSortDirection.Ascending))
       m_ActiveStrategyList_View = New ListCollectionView(StrategyList)
       m_ActiveStrategyList_View.Filter = AddressOf ActiveStrategyFilter
+      m_ActiveStrategyList_View.SortDescriptions.Add(New SortDescription("nIndexInList", ListSortDirection.Ascending))
    End Sub
 
    Friend Function Serialize() As JsonTopology

From 8b69683620071f74d43986a2806f9fae1f55c5e0 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Thu, 18 Jun 2026 11:28:18 +0200
Subject: [PATCH 06/10] -corretto salvataggio json strategie con ordinamento

---
 EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index d7e4be1f..76806935 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -1029,7 +1029,8 @@ Public Class Topology
 
    Friend Function Serialize() As JsonTopology
       Dim JsonTopology As New JsonTopology(m_sName)
-      For Each Strategy In m_StrategyList
+      Dim mOrderStrategyList As IOrderedEnumerable(Of Strategy) = m_StrategyList.OrderBy(Function(s) s.nIndexInList)
+      For Each Strategy In mOrderStrategyList
          JsonTopology.StrategyList.Add(Strategy.Serialize())
       Next
       Return JsonTopology

From fb7a7fcb2aa3a13305dbb882afed1ceca4878413 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Fri, 19 Jun 2026 15:13:25 +0200
Subject: [PATCH 07/10] EgtBEAMWALL 3.1.6.3: -aggiunto ordinamento strategie
 per nIndexInList -ripristinato valori in tabelle

---
 EgtBEAMWALL.Core/My Project/AssemblyInfo.vb   |  4 +-
 .../Properties/AssemblyInfo.cs                |  4 +-
 .../BTLDataWnd/BTLDataWndV.xaml.vb            |  1 +
 .../BTLDataWnd/BTLDataWndVM.vb                |  1 +
 .../ConfigurationPage/ConfigurationPageVM.vb  | 13 -----
 .../ItemParamList/BTLPartListV.xaml           |  2 +
 .../ItemParamList/RawPartListV.xaml           |  4 +-
 .../MachGroupPanel/MyMachGroupVM.vb           |  2 +-
 EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb  |  8 +++-
 .../My Project/AssemblyInfo.vb                |  4 +-
 .../Panel/RightPanelTopV.xaml.vb              |  1 +
 EgtBEAMWALL.Optimizer/Project/ProjectVM.vb    |  2 +
 .../StrategyManager/StrategyManagerVM.vb      | 47 ++++++++++++++-----
 .../My Project/AssemblyInfo.vb                |  4 +-
 14 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index 3a6f6d5a..c42f229d 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.2")>
-<Assembly: AssemblyFileVersion("3.1.6.2")>
+<Assembly: AssemblyVersion("3.1.6.3")>
+<Assembly: AssemblyFileVersion("3.1.6.3")>
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index f8a2648d..feba8b6d 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.6.2")]
-[assembly: AssemblyFileVersion("3.1.6.2")]
+[assembly: AssemblyVersion("3.1.6.3")]
+[assembly: AssemblyFileVersion("3.1.6.3")]
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb
index 133addef..83c9149a 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb
@@ -20,6 +20,7 @@
       If Not IsNothing(Map.refBTLDataWndVM.SelStrategySetup) AndAlso Map.refBTLDataWndVM.SelStrategySetup.Equals(SelStrategy.Content) Then
          Map.refStrategyManagerVM.SelStrategySetup.sName = SelStrategy.Content
          Map.refStrategyManagerVM.SelStrategySetup.Read()
+         Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
          Map.refBTLDataWndVM.ReadCustomGeneralParameters(SelStrategy.Content)
          Map.refBTLDataWndVM.SelStrategySetup = SelStrategy.Content
       End If
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
index 81013789..2a325287 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
@@ -33,6 +33,7 @@ Public Class BTLDataWndVM
          If m_SelStrategySetup <> value Then
             Map.refStrategyManagerVM.SelStrategySetup.sName = value
             Map.refStrategyManagerVM.SelStrategySetup.Read()
+            Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
             ReadCustomGeneralParameters(value)
          End If
          m_SelStrategySetup = value
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
index cd2d6253..acb1ce37 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
 Imports System.IO.Compression
-Imports System.Reflection
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -25,22 +24,10 @@ Public Class ConfigurationPageVM
       Set(value As Integer)
          m_SelConfigSubPage = value
          If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
             SetGeneral_Visibility(True)
-            SetStrategyManager_Visibility(False)
-            SetPDFEditor_Visibility(False)
-         ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
-            SetGeneral_Visibility(False)
-            SetStrategyManager_Visibility(False)
             SetPDFEditor_Visibility(False)
          ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
             SetPDFEditor_Visibility(True)
-            SetGeneral_Visibility(False)
             SetStrategyManager_Visibility(False)
          End If
       End Set
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index 48d73bdb..00e8b407 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -458,6 +458,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                  </Grid.ColumnDefinitions>
                                  <TextBlock Grid.ColumnSpan="2"
+                                            Text="&#11119;" 
                                             Visibility="{Binding CALC_ROT_Visibility}"
                                             Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
 
@@ -467,6 +468,7 @@
                                             Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
                               </Grid>
                               <TextBlock Grid.Column="2"
+                                         Text="&#9999;"
                                          Visibility="{Binding bStrategy_Visibility}"
                                          Style="{StaticResource bStrategy_TextBlock}"/>
                            </Grid>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
index fb63b317..0cfeed91 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
@@ -76,7 +76,8 @@
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Visibility="{Binding CALC_ROT_Visibility}"
+                        <TextBlock Text="&#11119;"
+                                   Visibility="{Binding CALC_ROT_Visibility}"
                                    Style="{StaticResource CALC_ROTRawPartList_TextBlock}"/>
                         <TextBlock Grid.Row="1"
                                    Text="{Binding CALC_ERR_Letter}"
@@ -340,6 +341,7 @@
                                        <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
                                     <TextBlock Grid.ColumnSpan="2"
+                                               Text="&#11119;"
                                                Visibility="{Binding CALC_ROT_Visibility}"
                                                Style="{StaticResource CALC_ROTFeatureRawPartList_TextBlock}"/>
                                     <TextBlock Grid.Column="1"
diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
index 51e08c2f..c19a89d8 100644
--- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
@@ -945,7 +945,7 @@ Public Class MyMachGroupVM
 
    Friend Sub Verify()
       If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
-      Map.refProjectVM.BTLStructureVM.SelBTLPart.SetIsRowEnabled(False)
+      Map.refMachGroupPanelVM.SelectedMachGroup.SetIsRowEnabled(False)
       Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN)
       Return
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
index 00acb679..42804d52 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
@@ -40,8 +40,12 @@ Public Class MainMenuVM
       End Get
       Set(value As Boolean)
          If value Then
-            SelPage = Pages.OPTIMIZERPAGE
-            SetConfigurationImagePath(CONFIGURATION_IMAGE)
+            Dim bModify As Boolean = True
+            If Map.refStrategyManagerVM.bIsModifyStrategy Then bModify = Map.refStrategyManagerVM.SaveCustomConfigJson()
+            If bModify Then
+               SelPage = Pages.OPTIMIZERPAGE
+               SetConfigurationImagePath(CONFIGURATION_IMAGE)
+            End If
          End If
       End Set
    End Property
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index 9bec1b8f..c014908c 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.6.2")>
-<Assembly: AssemblyFileVersion("3.1.6.2")>
+<Assembly: AssemblyVersion("3.1.6.3")>
+<Assembly: AssemblyFileVersion("3.1.6.3")>
diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb
index 61d0cd54..6c8c7e51 100644
--- a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb
@@ -5,6 +5,7 @@
       If Not IsNothing(Map.refProjectVM.SelStrategySetup) AndAlso Map.refProjectVM.SelStrategySetup.Equals(SelStrategy.Content) Then
          Map.refStrategyManagerVM.SelStrategySetup.sName = SelStrategy.Content
          Map.refStrategyManagerVM.SelStrategySetup.Read()
+         Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
          Map.refProjectVM.CustomGeneralParameters(SelStrategy.Content)
          Map.refProjectVM.SelStrategySetup = SelStrategy.Content
       End If
diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
index b3acb6b3..f20b598f 100644
--- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
@@ -371,6 +371,7 @@ Public Class ProjectVM
          If Not IsNothing(value) Then
             Map.refStrategyManagerVM.SelStrategySetup.sName = value
             Map.refStrategyManagerVM.SelStrategySetup.Read()
+            Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
             CustomGeneralParameters(value)
          End If
          m_SelStrategySetup = value
@@ -380,6 +381,7 @@ Public Class ProjectVM
    Friend Sub SetSelStrategy(value As String)
       m_SelStrategySetup = value
       Map.refStrategyManagerVM.SelStrategySetup.Read()
+      Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
       Map.refSceneHostVM.SaveProject()
       NotifyPropertyChanged(NameOf(SelStrategySetup))
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 76806935..0e483706 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -66,8 +66,9 @@ Public Class StrategyManagerVM
                End If
             End If
             m_SelStrategySetup.Read()
-            End If
-            SetSaveImage(MODIFY_IMAGE)
+            OrderStrategyList(m_SelStrategySetup.StrategyFeatureList)
+         End If
+         SetSaveImage(MODIFY_IMAGE)
          NotifyPropertyChanged(NameOf(SelStrategySetup))
       End Set
    End Property
@@ -77,6 +78,7 @@ Public Class StrategyManagerVM
          ' Scrivo file defaultconfig nell'ini
          EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig)
          m_SelStrategySetup.Read()
+         OrderStrategyList(m_SelStrategySetup.StrategyFeatureList)
       End If
       NotifyPropertyChanged(NameOf(SelStrategySetup))
    End Sub
@@ -270,15 +272,26 @@ Public Class StrategyManagerVM
 
    ''' <summary>
    ''' Funzione che salva il file customconfig se sono presenti modifiche
-   ''' </summary>
-   Friend Sub SaveCustomConfigJson()
+   ''' </summary> 
+   Friend Function SaveCustomConfigJson() As Boolean
       ' Controlla se il file JSON è stato modificato
-      If Not m_bIsModifyStrategy Then Return
-      ' Chiede conferma per il salvataggio
-      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
-         m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList, False)
-      End If
-   End Sub
+      If Not m_bIsModifyStrategy Then Return False
+      ' Chiedo conferma per il salvataggio
+      Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
+         Case MessageBoxResult.Yes
+            If IsNothing(Map.refGeneralParametersStrategyVM) Then
+               Dim GeneralParametersVM As New GeneralParametersStrategyVM()
+               Map.refGeneralParametersStrategyVM.GeneralParametersList = GeneralParametersVM.GeneralParametersList
+            End If
+            m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList, False)
+            SetbIsModifyStrategy(False)
+         Case MessageBoxResult.No
+            Update()
+         Case MessageBoxResult.Cancel
+            Return False
+      End Select
+      Return True
+   End Function
 
    Friend Sub Update()
       m_StrategySetupList.Clear()
@@ -331,6 +344,18 @@ Public Class StrategyManagerVM
       End If
    End Sub
 
+   Friend Sub OrderStrategyList(StrategyFeatureList As ObservableCollection(Of StrategyFeature))
+      For Each StrategySetupItem As StrategyFeature In StrategyFeatureList
+         For Each StrategyFeatureItem As Topology In StrategySetupItem.TopologyList
+            Dim OrderStrategyList As List(Of Strategy) = StrategyFeatureItem.StrategyList.OrderBy(Function(s) s.nIndexInList).ToList()
+            StrategyFeatureItem.StrategyList.Clear()
+            For Each OrderStrategyItem As Strategy In OrderStrategyList
+               StrategyFeatureItem.StrategyList.Add(OrderStrategyItem)
+            Next
+         Next
+      Next
+   End Sub
+
 #End Region ' Methods
 
 #Region "COMMANDS"
@@ -1030,7 +1055,7 @@ Public Class Topology
    Friend Function Serialize() As JsonTopology
       Dim JsonTopology As New JsonTopology(m_sName)
       Dim mOrderStrategyList As IOrderedEnumerable(Of Strategy) = m_StrategyList.OrderBy(Function(s) s.nIndexInList)
-      For Each Strategy In mOrderStrategyList
+      For Each Strategy As Strategy In mOrderStrategyList
          JsonTopology.StrategyList.Add(Strategy.Serialize())
       Next
       Return JsonTopology
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index e29976d3..3bb553a5 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.2")>
-<Assembly: AssemblyFileVersion("3.1.6.2")>
+<Assembly: AssemblyVersion("3.1.6.3")>
+<Assembly: AssemblyFileVersion("3.1.6.3")>

From 15c919b0c61f4f93d949960e0a06924664ab20a2 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Wed, 24 Jun 2026 11:50:43 +0200
Subject: [PATCH 08/10] EgtBEAMWALL 3.1.6.4: -cambiato immagine bottone
 verifica tutti con rotazione -aggiunto pulsante aggiorna feature strategie in
 configurazione

---
 EgtBEAMWALL.Core/My Project/AssemblyInfo.vb   |   4 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../BTLViewModel/BTLStructureVM.vb            |   1 -
 .../CALCPanel/CALCPanelVM.vb                  |   1 +
 .../EgtBEAMWALL.Optimizer.vbproj              |   8 +-
 .../ItemParamList/BTLPartListV.xaml.vb        |   1 +
 .../LeftPanel/LeftPanelV.xaml                 |   2 +-
 .../LeftPanel/LeftPanelVM.vb                  |   6 ++
 .../MachGroupPanel/MyMachGroupPanelVM.vb      |   2 +-
 .../My Project/AssemblyInfo.vb                |   4 +-
 .../Resources/NewPage/VerifyAllR.png          | Bin 1169 -> 0 bytes
 .../Resources/NewPage/VerifyAllRotation.png   | Bin 0 -> 1870 bytes
 .../Resources/NewPage/arrow.png               | Bin 0 -> 1307 bytes
 .../Resources/NewPage/reset.png               | Bin 0 -> 2267 bytes
 .../Statistics/PDFEditorVM.vb                 |   2 +-
 .../StrategyManager/StrategyManagerV.xaml     |  25 ++++--
 .../StrategyManager/StrategyManagerVM.vb      |  78 +++++++++++++++++-
 .../StrategyManager/StrategyV.xaml            |  10 ++-
 .../Utility/Configuration.vb                  |  49 -----------
 EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml |  32 +++++--
 .../My Project/AssemblyInfo.vb                |   4 +-
 21 files changed, 156 insertions(+), 77 deletions(-)
 delete mode 100644 EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllR.png
 create mode 100644 EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllRotation.png
 create mode 100644 EgtBEAMWALL.Optimizer/Resources/NewPage/arrow.png
 create mode 100644 EgtBEAMWALL.Optimizer/Resources/NewPage/reset.png

diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index c42f229d..3b4061eb 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.3")>
-<Assembly: AssemblyFileVersion("3.1.6.3")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index feba8b6d..acd949f7 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.6.3")]
-[assembly: AssemblyFileVersion("3.1.6.3")]
+[assembly: AssemblyVersion("3.1.6.4")]
+[assembly: AssemblyFileVersion("3.1.6.4")]
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
index 80bf4cc8..6080533a 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
@@ -962,7 +962,6 @@ Public Class BTLStructureVM
          ' tolgo pezzo selezionato
          SelBTLPart.SelBTLFeatureVM = Nothing
       End If
-      ' mostro tutti i pezzi
       ' creo lista id presenti
       Dim BTLPartIdList As List(Of Integer) = (From Part In BTLPartVMList
                                                Select Part.nPartId).ToList()
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
index 54b5bd9f..ef64df64 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
@@ -979,6 +979,7 @@ Public Class CALCPanelVM
       If Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count > 0 Then
          Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(0))
       End If
+      Map.refProjectVM.BTLStructureVM.LoadFilters()
       Map.refMyStatusBarVM.RefreshMachName()
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
index 856046ca..b9410cc9 100644
--- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
@@ -1228,7 +1228,13 @@
     <Resource Include="Resources\EgtDialog\Tiles.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\NewPage\VerifyAllR.png" />
+    <Resource Include="Resources\NewPage\reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\VerifyAllRotation.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\arrow.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
index e1e62e80..eec5d44d 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb
@@ -146,4 +146,5 @@ Public Class SettingsBtnVerticalOffsetMultiConverter
    Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As Globalization.CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
       Throw New NotImplementedException()
    End Function
+
 End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
index ec9fcd15..0fa30927 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
@@ -37,7 +37,7 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Grid.Column="1"
-              ToolTip="{Binding VerifyAll_ToolTip}"
+              ToolTip="{Binding VerifyAllFlipRot_ToolTip}"
               Command="{Binding VerifyAllFlipRot_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
               Style="{StaticResource Verify_Button}">
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
index 1a0293ed..85843efe 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelVM.vb
@@ -145,6 +145,12 @@ Public Class LeftPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property VerifyAllFlipRot_ToolTip As String
+      Get
+         Return EgtMsg(62000)
+      End Get
+   End Property
+
    Public ReadOnly Property FilterAll_ToolTip As String
       Get
          Return EgtMsg(62570)
diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb
index dc0bd4ce..75c0c36e 100644
--- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb
@@ -197,7 +197,7 @@ Public Class MyMachGroupPanelVM
    End Function
 
    Public Overrides Sub AddMachGroup()
-      Dim MyMachGroupM As MyMachGroupM = m_MyMachGroupPanelM.NewMyMachGroup(CurrentMachine.sMachineName, Map.refProjectVM.BTLStructureVM.nPROJTYPE)
+      Dim MyMachGroupM As MyMachGroupM = m_MyMachGroupPanelM.NewMyMachGroup(Map.refMachinePanelVM.SelectedMachine.Name, Map.refProjectVM.BTLStructureVM.nPROJTYPE)
       ' e lo seleziono
       SelectedMachGroup = MachGroupVMList.FirstOrDefault(Function(x) x.MachGroupM Is MyMachGroupM)
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index c014908c..e8c816e1 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.6.3")>
-<Assembly: AssemblyFileVersion("3.1.6.3")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>
diff --git a/EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllR.png b/EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllR.png
deleted file mode 100644
index 6ef8ea6cec32d2a671d41cca7bdc901c41d72002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85p<)L71^VC4M4MP_o1|q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s
z&(KJi(Y*wyXh&*<XPT#{76S*6!^$AV$jZP7WO)IxG?Wc;js_z$SeyySHe_UC09wQl
z1;m-{EMV~*AR7eqB^eoB0G$h?(QRd507_0^XJ7%UH83(ZU|aw(7i1^v0*G1DfNT(8
z0-DSORvBbz0c1gS85$UXWV;MGQx|bndH_wd^>lFziEuwVV}H?Q2Z3Yuffv*krnD8u
zDNKLDnG~gw)TJyNc<+D>qnD#&x)&E)yOC7d6Q#W|K@(#R^2DwYKTy@Q_-1j~YWrz2
zz9-BdOWuD~^LzK+y?ZA!KbMi4J<sEC@`c4MTxOAWvgx-O+!**?D3|)qKO(ht3jg($
z!c+P-D>fK5B>!CFXv`p-9ik<FWu>TyYg!beF?+z%9F7MbH_{jmnN5u5cD?AykTWrp
zQ6Xx(NlvFS1GCX{hPG=fvM=sk;HDv)uGo-&rX;VoYsO(g*Q3nMGRsXS0`0g`D8~5X
zz^^%xi<hm54bTPJ#>}vP#m-p^`!*Y%o!5LtlU*Qkv6@NTsk-tA@r_;@T}O0zCj^`1
zWqvaXzm?$^csDh{vf=J3krk_hgUyurr{r<4{EGE@%yV*^Yn_*tV_?$n*fKvwKZZBm
z>teV1TbA)Yn3Hq-$@&FCB3Bg|A_9W?-wP_PRF+Lo&JJ<eEpg_)SL>WbF~7Xe8h1@N
zzjoi0;Jn@&=k7h+sj6(6bYD2@KKl!{1KtepXXbVv^PSQATi5YtagN`U)^oC@&Z#O(
zizj5eJU+iN*24bvf<G4ny$((L<lybq*;(=K_}4nAg-f1Xie>nrlM^JQvG&H!qB~8m
z7I?AtnrwCJ%@ht<$$KH{s$;G<vnC6J)pnH#eTR&OPp4dehaA5tlDc7?15mljl>4ei
zf;&}i%<gkoal@nau4cFT{#9=}nAA%Xd%0>CGYdo{#))RtO`SM#602?|$5*W+*~X%<
z8GCo!R}vB3B5A6e<-VtX0(&-hOIKm~r(a6StYI(Mtj;NAUug-wr!}{XVb<l={`iTh
ziEH;hQGN5P=)}9=+_~W|+k~p8-_1zBw&GG?n5bre?WdhnE;$@F70kXghw<m!>A!cW
zhe~SN9Fe`dGnnNd=bUJ!0*<ET1@Fw89#razoKj`lyZ5YxxYB`6)8_DdOCG=BIiSu^
zFSW2heB*A(Zy)ZlKUi$~YU_*ttOvLc{EgvmwPxSDSMl}fqvgNLKKR+huN0jU9{*qU
z3)j=5)6y2#$Ck{AJ^57ogyr`K^Y@;<UGToBFm#*#vU5AnDqU?a*~8IzfT54?=>y3I
i`D-iI|L0xh`JZ8zg5dm+x>H@COy%k7=d#Wzp$Pz1-nCNz

diff --git a/EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllRotation.png b/EgtBEAMWALL.Optimizer/Resources/NewPage/VerifyAllRotation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5335bfd515cd5e894ae289ab532fa025eb625a64
GIT binary patch
literal 1870
zcmZ8ic{tST9)D-XuF0e!*_s$6`;z4dgOM5Q%p4w*orB?KIn6kfC6jV3C0k8$2;(?*
z%9d<r#7&k4kv&Vwe#lZdTJBHh+<)%-JfHXT`R?C8-sgFfNcL7pAxR+s0Fp?+Qy^A2
zga99O|K}kF0TGNru`&l$T<K-V;Gvn>nE~)PRrs?vFJue;Ot{DZ;OMhMz{Jj2Ga={6
zFiUFKkD>ly5#Dq^K=KX@2~)SXbi|xf*HYKgJ`S@AgOVEks6>Av@hlL43|=4!;{`BC
zSwoQeM<1?p28Q_VheKKm1_#F=c7YI>!1LW71nI-G6%GSS(7ONQ|DOr~6inj>JW#Ht
zwvHw&|L?wsGkNp>?!|)i;ekV);ombUh6a%Or%Fpx^DufNRzsRTFf;?z{YAu^Ia00u
zbUp}0JE6aFbI0FMIH+h4$38YOF45%9q2=RC@=sqUAtdsa!(BbkJKo+@`od3=wH69<
zjng{ICMOB{C|5II6b7Bb8Wow_UJ1}Oe^#j0th2k<!L_CNN34Fb5^eL%jN(Rcb3^-c
z4kTvvLcG&vV8Ab>3w`X!y-d;t;C0F_hv+#h<^TEpHUiWw+!4Ul;|)6cqCPhD=zPuk
zX5m4087fsGIK|d4Nt3-yGTOFw*J>}78M}@DE`Qpua|xUHjCBe01^2ahRNq?rrRyl~
zTm)bm4vfOQ?)znI@T1<yNE@lo65$+*H8^>{oChyVOdR>yW;DWu{Zq{?mBbcyq%(Jg
zKR}t8dyO0Spg3;H-O#8*_5O{k@>vd11hypQ?z{_QQAajb_MI3nD4hrl)YFc~i{12a
zE-m&ED^I!P%ub`5WKFv57-Ksf<`%eq>YhipKA~%3oGg=@r0_-8j^c!HSSO>GU&@5!
zre0kX5nTnh>)aG=o|2%IH{;>)XPu_61f5r2IdKQGVB=*no2nvSO8qUVXkVA}jjA4h
zbF4}sWB0)Px;YzP;;WXp-s>{e@9)3=ddO<ADce(~tY<%e)JfJ)`2?ad<mvNtlF4Q~
zY+rFCdxDlJdER$2NHTO~Ge8~$B;7#?ZX!ADj;dP~N{<OQU4NLz4Ej#0`qg`!xV-Bg
zQbZunTt31&2sQ)xT`Hl|2BWQ=OU)khokxzBQn4_9TE85-eR1663Ayd#yBl(-HNF6B
zjZ=1YS7GIP)*Q|TdkRw!#E0??)Lq(K{zJZbwO_tq>=_?5TP)JuuR3?J6s^4C=8DQ{
z=2Op|+*n9JsHNxFCf7*eg>gG*!qwh|J}GAr_*C!%1-x#A=8#5m0L$2)RT&$-mov9;
zD_&uV#?<ZV-byrHb9eG%&P5`2-pv{m7nk&%)Xw`rvXsli=xM9$T-kATz%ZJ7C8Mic
zhli2;7GOP0VnLWI!5L0TFn5s~&sWH(Zu}C0M%7WO^V+(l1U2_senLHG>3<ckv9m(|
z`foTU>V<Y~-_+U@LqM|Lpc0dt;?ch}vj|lY3<;M3+Vl(6G0j)p&2E7nTbFu6D|9Jr
z$Z#%+z+-b^Ea!b~sz4gMYDBaf*<kEu25@DPbaB(uYH+jSSQ&C_d07a2Z?pksOHXOP
z5UB<hE95NQi_Yc#)fnBIlt3Vdi&&Awbq!4C>HSivGj(>Jg|)TL%uZYVq3sEIeU2Mq
z_Jk51*`fk3$Ye4~RVXMNKDEiV|IcChWCf#MR$`e_>&)A^A0H>1Xlh&*Mhr?sQ7iIm
z97OnWC9*poy!AIK(Y-N%CY4h{AHGYtm!N?Sl86I1Wf^zmKnH8Qi?YtxmL*4i*{Ssk
z*E>gfEi%=Dw4oxY>tNebFJ*LF@a#-<OIS}+O!ABfyZ!2e-IdLyi~6|?Osy}?>3S!;
z@@e77aj(;2<&EjdmJjt0svTa>52{_01^7qr5;$4SZKK)thEb%(A_i|_jy^|q)KE~I
zUZws*aUBS*_VkPzWR{Ld`AhG1A>%(ZtYer%;CJ}gy|UZ}>ZSE83-fUVMkQmv+_B;<
zZ)}Kt5x_}4*yVhtjj#uQ<GVJTJ@KZzNJ0}tZCpf$EdPKrk6spldwLB~=j|V*J3Bgb
z^lhuYbj~FvJ<pU37!vKyGHnPzy@V}!^sdmlHC8_kRhq6_dXS;lUs$R7{??6etPAOE
zy#&`LmwJ3n<lF4Zr${#}HT!a_I^_d5?@960fM|Cy@yw)|Zo7qMgbqW>wvZf}mA)M)
zJ3S%;1_U|dRQEAKmPV0JdR-oebg!lWYW#{|%ICkKj~UbzeH%=9U9A*b*I{V;=9op_
zA82g&zwC;)V%o%PxAKd<7xo=1d`|xQ{QRS-_d$;U5K7EQHx#>%h~Z=Qvbx(&0advI
zyu0#Ix}pl-#K<RQl+VNZDbvyULG{=pHJ+x&31mfhnn^N;&P=&orQfF;GZj2Fu_w|>
W^y*l3o4$MaBM>d^@m1ztasLIw{2M+1

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.Optimizer/Resources/NewPage/arrow.png b/EgtBEAMWALL.Optimizer/Resources/NewPage/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..16c922d945f19dc5589255e92fd019e49b2f9848
GIT binary patch
literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85pd2L6|X-zu_HFP_o1|q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s
z&(KJi(Y*wyXh&*<XPT#{76S*6!^$AV$jZP7WO)IxG?Wc;js_z$SeyySHe_UC5Cqau
zK%Cjm0v68!vO(bQZB~XCK<C0}bXyr1fRYo~8CZa74UCKp7#Bdy1=-2E0AkiOAR7dj
zfF?76RR&pF09jC7h6V;8*~e*l4N}W;76VN@?&;zf65;-KMr@8qsL1jE&(EFlv)5U;
z%{0kWfvs%zj3g&lgHKIIE=|vJS>)tYs<^dl-wZV&Ig<pJWT$wSTVIkd&sw3_)nqs+
z$w12YmV>5F)+?t)Gd4VQ+z@mtue|J?t=*KRo43Ce+qOCX@7}YP&+q*{ebd^!Tr47i
zv0l;kf%w96n_oxnl4kT^U@&ez!Lq{so7dUGz4yHDEm@`XyuabYn<tmA7_CWpv)(!1
zc8<;E*M6btN?#h{HLh32s;bYM(z$V~*3_OmUIxV<yFw$cpPe;_f8()P+8dXd+E2*T
z6`l51C?b~iGlv7q(l4KQKB=)X9Q@Y!_7Im0+voasH+rkm_OUdry#Dfu@2h12{1S(a
zW>&m<B<=r2Fo31aG0j2$yn=qvOsB_N#p7z<@GvwKNV<H?p8vM|i(y>N^jUgazLi)V
z53*x_mTu(kbNsrp;_M4^AIzQ-?{uMl-=tg9GjHyWm%ex7?S$0<E3|iQ*An_`a-(e3
z0cmxHiWdjIPusd<(M*pVRsn|3+qI_N5zme)z8h^Lypt>O)0Ov3fitH5Nis3}ap)=k
zVXl{ctX}UeT@KygUm)bb*-{bA!qxX;@(Y&R>{2a~FBpqs)ZDJ$?-XF*X<c2uVN$!N
zM6{RF>fM(Mxk`D$CTF@HyrVw(@z-~~4+D4q*~j6rha*hB;YcMz*t3!eYn~J-edO!l
z3HzkL`B<I7HR^86k^?bpi)tCX4zALze0xd{Xoj8dvQm*Xv)T`>=3{VJ@j6D9^Rabp
zTV#TLyhPbtUdg#Z=Ui%E{kj^sdy&!ImERp7UAMGWeR@1a!v5I>P4+cf4oUA*mj9Sh
zBy^jDVU^NFz6m!tpCvK~D?~9po9z7XRqrpIxV(2O^BNu-8HQCSUVps*wdu`>o44XK
zZnVZX9#PxytLDk}eQ!TbQwwKkF#dBsd(9I$hC&AAH6h(aYG$t|zc?b5T{Y#kNyCau
z8hc(ppSt#M|0~nY9}m2fOT6K_S7Br4)Hi=Nmww+?;XRqVR$ph;ZO`)ctA(fEyJu4w
zy~nr6QcSMq{frIoV{dUjxNl!(bLq|5pW7UZ1!wc#U-Dq_jP=`FB9hOlYdtk-2*?7O
z_e+kulxJG2)%mH_$;J;?i#!uhKKw(-#oZW~0LnGb=xmc>IIu(h%+%EA?<sq$p1E>e
zKI*sT$BXHuJUz_{H_ujmJTqTp*^znd7n3&ccp|M7#dd7X{p!q5YN9#v5kfiETO03Q
zxvw?#4O?fCfG*Pv#ZCINZLRrRBrP=FG);C(EZo20&4;xtg1xalX@5U_{yOKA(ft2H
dVi5=O|FL`6-jOgYecS-b-kz?0F6*2UngDOI72yB?

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.Optimizer/Resources/NewPage/reset.png b/EgtBEAMWALL.Optimizer/Resources/NewPage/reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..487a5774eeef5f72cf6dded59f4c516d9b47c4aa
GIT binary patch
literal 2267
zcmZ8ic|6oz7r!%&8ObsYGGhs&EaSyU_AHZ`Y?16*8T&3g3S~$bTNI@tl`=w<dhAP!
zEo)6;?6PDjOBzdQ=>6$=-hbZv`J8*cXSwIx&*$88ZlaZ?F&~d84*-DA)P!se@%`Jx
zjfD2*T&W!pgN0Zd9|on};&YII@FZD~04Ph_#c|<+<efn#P9XsBzu6|3u)J9`q{M|%
z97AmaJwngB1iJ$(7w>>jWlM^!l)AF2vg!drm~klNRORky>S1b10Njwk1w>(700tp5
zh{XQI+t-nY?f9dILs%6C2fHDD0wV7O#2>vMgtyoCFc_GHuKPd!|5*WmjOi$VfP9Gu
z)QGVA|HR$S$#wsqST`ZOz2Hz}_#aPeZ7m4>drFl^+_uKjRK$bd_lyC6N-!mpY#ogk
zZu$BNv4mTH&kQ>aWosS!fO#X68C|d2(X)mu;1adNo5h*r9WhJ#_;`Q!Ad>A>6i+|G
zXJ(pc=#R-y?{`bJC??qD%ll`_rV{q=BTJo$f~D%2cZ%7F1Rd@9#9FK`ko0JIlHkB|
zacbTDV93^bCv9m|d*%yf>sVe}JhRD1nZ779fdeh1DP`ge>8OgK9GFADhS3LPbzbO|
zU+9~2&Q&D6MrAcxYK)q<7r}dC!6g|i${7TGlP1@I@MC|Mh7rux5RF+AMU44D2He_5
ziN1%woni^^SD=O&P2I<a#Am95j5e-id9*Rzis!u_I#ukb?DRX?jBsT;oPki`D9%2-
z^5c%#FWOPx3R<I9Z!Nn!9CT-uX9}{-0Urv`e_Ev!s&3XxN}SU8Wk9-=KFiQ+Y~$&Y
znI@pe1OQrFuH^}MmX#R{Rt~#a4`rz7Y@W+f7cL&Fgf%GwfJZgW+F6D#qevsH=2HJV
z$J#ge=nNPjZ}I1$z(p>pK6{PLcE)^H*GUtnV;~x9^DuI&_B&fRB=T~NZ}fc4O$U0f
zjnmR1lK44^u`Sk<&<`DS67#ZR@AyhvzwkxOOqImH)uOImLZ^N^JafqA_xEz6hMTiu
zk;a&FxM5t4OFW3SeSF1nGbgj0*ntLgtX}$Gw8Yy*{t<|D7fT99;C25hx^Un|t9JNK
zsyZxsZM1~!S)u#6c?r3yS>2X;C9kbTJ|!1UN1xP#dz;vevg1_fvSKpC2!d2Vpp3q5
z5W}_g+DsI&f6x42ixZFqADOIhza?gGnisfLwI<Onp&r2BloA{%qe?$vlkAy4Jj@s3
zydrUC3}MJ?Um{dIM&lv7azqTLu3$G^3+gUp*H>#FeR78+)Role_JM7EW4R>Ef0Ah3
zCrRQ2*<Vb+o}SJWp#`usMvU7Bk?k9ADOcCTeHFRWR8lhB7aAS|dXD>8I(CHr8ZCBK
znOa``sW+|BEiRZ8S}UfRK>2FF`-KGcDggZvgKD9B@%+)e^y%my#sK6U&wUW3T4R@@
zFHhCis_=M#d}Ng3C;af(g|H9Q&{}$(E8m9LEUh0q^6<^i5-Eb!_{Hp70!e*~AMbQN
zw4~Gx^y~n1tBI=`OZN;0*T@$xx=5?O6Dj#UWy*P3HDW4Mt@p06kbWNAa;O^b3Af*(
z3s4@tn0f1&-^$V-U2q7UsQZQ&Zdk>kN8ly~<QlTuvx$rwY(Kw_7#39fW<lDf12jqo
z##6V(O9TrJUbkjj&;tMRS=QTnx{ebY3cjyX@%fc+n19dkJWx>NtGu4XGb7;amHog@
z>I@Q4-CTW4=gwhWVd!Juu+i>KbqY(}J6&O~R#xlat{R3@is)u~Z-j7nV0lKWn#vRx
zNI_U}IpY*oIq%a?IoeKbu|yVxnrHbesncqsO77)(m7q?!<v+ODFNe6m++t6Sk}6w4
z?Y)Eik*A0tZt`T?^S)nmb-tR>qTp$ApKqOKR<q`f7!x^wUXEqD8I4=vq;9X&R6L*S
zxJzb=CD6(Y@#?klGpY5FC!a)($vN+x-j{S{&)tEkBJb-4owd0>irEc+m-uZ27v#Cs
z-eU*<*d>AYP>4B;IG$3H^O9V2z8iTh{$;6SJ=DM}u-Tg{uO=Va3eXwwgO`n}mC80Y
z<qTJpR9MC_9Imj_9R~HkN@j-ERdmZ1<r-XQRP1O$J6fC1P>>nGoHHIt)n{B27L~c(
z86G$(K+Qe+gn?N;^^6cinDC^0<wAQS(8%KmL**t;*UI`921o@X@nBz;qs4yv<M>?3
zy_(wdI9Q>T$gskK**)D6)YH6H?y9cBl%<&3f+S4wHA_mH@(<zDo{U5XW@7I^jEYXB
zWcZr&4v<0nC7^il`&Epp2k&m3oTLk}zu(ld>W#H4({dG$q`{rJo1C{gpU&zt-5UMq
zIhIPfy}6qlS<UL>yxz=72mf)7$ugcQ%wA&#turI;*_>JNs91|o;EYtHw@Wq%;k%%5
zR4`B`&4Ah(C(g4_>!k~eF)fhGCrmCbenL94%54RU3G{)nwW&^Ne}#UJ@9|hnh;`_+
zg{p^oivDe-y1md_Ol>OS39uOxPeEDywCjuekqy*!6Z6Uo_vg<^m-$N7c(30rtGTp<
zDgGSvYo2YH=jCc8LR9ZBd-vL3IQ-E^bEp`SL**9vM&)PknSLGfj11|(ckk4U{wZA*
zpBsjus36L@OBHknw2}{NM}pAotx@i{U_xTAXr*W3ZkfQwS+{9UmhK>Jt$uXAEDL|f
z4{OnW!m!DlBm~WDalwbhrJ;@onrt6Mu>1*{oX8mQa~O)^_};Kg3_Cg2SQ{!Ace(`C
zO+_j}nz8H22ciz|1XC($H}kyV%EB&`-v_xPKJNFI;%s~CJy9X2FMsk3bApB&ie5q>
zjtE#q5f@8Zli7(mSKba$4`k;gRSEK*O-jx<73cNb1zuJo&@{IHjSz5^#tKY}t8SR%
t7r|5&_X+0}xjZ#p8*{U#5wC7`{RTZfW_OTU%z^Fi*_2{QE<Nmg`M*Wb;OYPX

literal 0
HcmV?d00001

diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb
index 7da86f50..1378286e 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb
+++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb
@@ -195,7 +195,7 @@ Public Class PDFEditorVM
       SetWebAddress("")
    End Sub
 
-#End Region    ' CreatePreviewVis
+#End Region    ' ClosePreview
 
 #End Region    '  Commands
 
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
index 0aa30e52..974960f7 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
@@ -97,8 +97,8 @@
                   </CheckBox>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type OPTIMIZER:Topology}">
-                  <TextBlock Text="{Binding sName}" 
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                  <TextBlock Text="{Binding sName}"
+                             Style="{StaticResource TreeView_TextBlock}"/>
                </DataTemplate>
             </TreeView.Resources>
             <TreeView.ItemContainerStyle>
@@ -122,7 +122,7 @@
             <RowDefinition Height="0.93*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         
+
          <GroupBox x:Name="GR"
                    Style="{StaticResource ProjectParameters_GroupBox}">
             <GroupBox.Header>
@@ -142,10 +142,23 @@
                </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
+                  <!--<ColumnDefinition Width="1*"/>-->
                </Grid.ColumnDefinitions>
-               <TextBlock Text="{Binding SelTreeItem.sName}" 
-                          Style="{StaticResource TreeItemName_TextBlock}"/>
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <Button Command="{Binding UpdateFeatureCommand}"
+                          Visibility="{Binding Update_Visibility}"
+                          Style="{StaticResource Update_Button}">
+                     <Image Source="{StaticResource Update_Image}"
+                            Style="{StaticResource BTLDataWnd_Image}"/>
+                  </Button>
+                  <TextBlock Grid.Column="1" 
+                             Text="{Binding SelTreeItem.sName}" 
+                             Style="{StaticResource TreeItemName_TextBlock}"/>
+               </Grid>
                <Image Grid.Row="1" 
                       Source="{Binding SelTreeItem.sImage}"
                       Style="{StaticResource StrategyManager_Image}"/>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 0e483706..57b2b4de 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -106,6 +106,8 @@ Public Class StrategyManagerVM
          TmpImage = ImageRoot & Item.sImage
          Item.sImage = TmpImage
       End If
+      ' Gestisco visibilita' pulsante Update Feature
+      SetUpdate_Visibility(If(Item.sName <> "Feature", True, False))
       m_SelTreeItem = Item
       NotifyPropertyChanged(NameOf(SelTreeItem))
    End Sub
@@ -209,6 +211,17 @@ Public Class StrategyManagerVM
       NotifyPropertyChanged(NameOf(DefaultConfig_IsChecked))
    End Sub
 
+   Private m_bUpdate_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Update_Visibility As Visibility
+      Get
+         Return m_bUpdate_Visibility
+      End Get
+   End Property
+   Friend Sub SetUpdate_Visibility(value As Boolean)
+      m_bUpdate_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(Update_Visibility))
+   End Sub
+
 #Region "Messages"
 
    Public ReadOnly Property SaveToolTip As String
@@ -254,6 +267,7 @@ Public Class StrategyManagerVM
    Private m_cmdOk As ICommand
    Private m_cmdCancel As ICommand
    Private m_cmdConfigurationParametersCommand As ICommand
+   Private m_cmdUpdateFeatureCommand As ICommand
 
 #End Region    ' Field & Properties
 
@@ -636,6 +650,68 @@ Public Class StrategyManagerVM
 
 #End Region    ' ConfigurationParametersCommand
 
+#Region "UpdateFeatureCommand"
+
+   Public ReadOnly Property UpdateFeatureCommand As ICommand
+      Get
+         If m_cmdUpdateFeatureCommand Is Nothing Then
+            m_cmdUpdateFeatureCommand = New Command(AddressOf UpdateFeature)
+         End If
+         Return m_cmdUpdateFeatureCommand
+      End Get
+   End Property
+
+   Public Sub UpdateFeature()
+      Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62591) & " " & m_SelTreeItem.SelParamStrategy.sStrategyName & " " & EgtMsg(62592) & " " & m_SelTreeItem.sName & " ?", EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information)
+         Case MessageBoxResult.Yes
+            For Each StrategyFeatureItem As StrategyFeature In m_SelStrategySetup.StrategyFeatureList
+               For Each TopologyItem As Topology In StrategyFeatureItem.TopologyList
+                  If TopologyItem.sName = m_SelTreeItem.sName Then
+                     For Each StrategyItem As Strategy In TopologyItem.StrategyList
+                        Dim Strategy As Strategy = m_SelTreeItem.StrategyList.FirstOrDefault(Function(s) s.sStrategyId = StrategyItem.sStrategyId AndAlso s.sStrategyName = StrategyItem.sStrategyName)
+                        If IsNothing(Strategy) Then Continue For
+                        For Each ParamItem As StrategyParameter In StrategyItem.ParameterList
+                           Dim StrategyParam As StrategyParameter = Strategy.ParameterList.FirstOrDefault(Function(p) p.sName = ParamItem.sName)
+                           If IsNothing(StrategyParam) Then Continue For
+                           Select Case ParamItem.GetType()
+                              Case GetType(BooleanStrategyParameter)
+                                 Dim bValue As Boolean = DirectCast(StrategyParam, BooleanStrategyParameter).bValue
+                                 DirectCast(ParamItem, BooleanStrategyParameter).SetValue(bValue)
+                              Case GetType(DoubleStrategyParameter)
+                                 Dim sValue As String = DirectCast(StrategyParam, DoubleStrategyParameter).sValue
+                                 DirectCast(ParamItem, DoubleStrategyParameter).SetValue(sValue)
+                              Case GetType(ComboStrategyParameter)
+                                 Dim selValue As ComboParameter = Nothing
+                                 If IsNothing(DirectCast(StrategyParam, ComboStrategyParameter).SelValue) Then
+                                    selValue = DirectCast(ParamItem, ComboStrategyParameter).SelValue
+                                 Else
+                                    selValue = DirectCast(StrategyParam, ComboStrategyParameter).SelValue
+                                 End If
+                                 DirectCast(ParamItem, ComboStrategyParameter).SetSelValue(selValue.sValue)
+                              Case GetType(StringStrategyParameter)
+                                 Dim sValue As String = DirectCast(StrategyParam, StringStrategyParameter).sValue
+                                 DirectCast(ParamItem, StringStrategyParameter).SetValue(sValue)
+                              Case GetType(ListStrategyParameter)
+                                 For Each ToolParamItem In DirectCast(StrategyParam, ListStrategyParameter).ListValue
+                                    Dim NewToolParamItem As ToolParameter = DirectCast(ParamItem, ListStrategyParameter).ListValue.FirstOrDefault(Function(x) x.sName = ToolParamItem.sName)
+                                    NewToolParamItem.bIsActive = ToolParamItem.bIsActive
+                                 Next
+                                 DirectCast(ParamItem, ListStrategyParameter).SelValue = DirectCast(ParamItem, ListStrategyParameter).ListValue.FirstOrDefault(Function(x) x.bIsActive)
+                                 DirectCast(ParamItem, ListStrategyParameter).ActiveToolList_View.Refresh()
+                                 DirectCast(ParamItem, ListStrategyParameter).AvailableToolList_View.Refresh()
+                           End Select
+                        Next
+                     Next
+                  End If
+               Next
+            Next
+         Case MessageBoxResult.No
+            Return
+      End Select
+   End Sub
+
+#End Region    ' UpdateFeatureCommand
+
 #End Region    ' Commands
 
 End Class
@@ -1964,7 +2040,7 @@ Public Class ListStrategyParameter
    End Property
 
    Friend Sub CloseToolList()
-      SetAvailableToolListVisibility(True)
+      SetAvailableToolListVisibility(False)
       SetOpenToolListIsEnable(True)
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
index 618c8023..05410960 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
@@ -4,7 +4,7 @@
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
       Height="{Binding ActualHeight, ElementName=StrategyFeature_TreeView}"
       Style="{StaticResource Strategy_Grid}">
-   
+
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="Auto"/>
@@ -71,6 +71,14 @@
       </ListBox>
    </Border>
 
+   <Button Grid.Column="3" 
+           Command="{Binding UpdateFeatureCommand}"
+           Visibility="{Binding Update_Visibility}"
+           Style="{StaticResource Update_Button}">
+      <Image Source="{StaticResource Update_Image}"
+             Style="{StaticResource BTLDataWnd_Image}"/>
+   </Button>
+   
    <StackPanel Grid.Column="3"
                Style="{StaticResource Strategy_StackPanel}">
       <Button Command="{Binding MoveUpSelectedStrategyCommand}"
diff --git a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
index c88d9747..c883de9d 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
+++ b/EgtBEAMWALL.Optimizer/Utility/Configuration.vb
@@ -1,7 +1,5 @@
 Imports System.IO
 Imports System.Net.Mail
-Imports System.Reflection
-Imports System.Runtime.CompilerServices
 Imports System.Text
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
@@ -67,51 +65,4 @@ Module Configuration
       EgtZoom(ZM.ALL, True)
    End Sub
 
-   Public Sub SaveEml(message As MailMessage, filename As String)
-      Dim boundary As String = "====BOUNDARY_" & Guid.NewGuid().ToString() & "===="
-      Dim sb As New StringBuilder()
-
-      ' Intestazioni principali
-      sb.AppendLine("To: " & String.Join(";", message.To.Select(Function(t) t.Address)))
-      If message.CC.Count > 0 Then
-         sb.AppendLine("Cc: " & String.Join(";", message.CC.Select(Function(t) t.Address)))
-      End If
-      sb.AppendLine("Subject: " & message.Subject)
-
-      sb.AppendLine("X-Unsent: 1")
-      sb.AppendLine("MIME-Version: 1.0")
-      sb.AppendLine("Content-Type: multipart/mixed; boundary=""" & boundary & """")
-      sb.AppendLine()
-
-      ' Corpo HTML
-      sb.AppendLine("--" & boundary)
-      sb.AppendLine("Content-Type: text/html; charset=utf-8")
-      sb.AppendLine("Content-Transfer-Encoding: quoted-printable")
-      sb.AppendLine()
-      sb.AppendLine(message.Body)
-      sb.AppendLine()
-
-      ' Allegati
-      For Each att As Attachment In message.Attachments
-         Dim ms As New MemoryStream()
-         att.ContentStream.Position = 0
-         att.ContentStream.CopyTo(ms)
-         Dim bytes = ms.ToArray()
-         Dim base64 = Convert.ToBase64String(bytes, Base64FormattingOptions.InsertLineBreaks)
-
-         sb.AppendLine("--" & boundary)
-         sb.AppendLine("Content-Type: " & att.ContentType.MediaType & "; name=""" & att.Name & """")
-         sb.AppendLine("Content-Disposition: attachment; filename=""" & att.Name & """")
-         sb.AppendLine("Content-Transfer-Encoding: base64")
-         sb.AppendLine()
-         sb.AppendLine(base64)
-         sb.AppendLine()
-      Next
-
-      ' Fine MIME
-      sb.AppendLine("--" & boundary & "--")
-      ' Salvataggio file
-      File.WriteAllText(filename, sb.ToString(), Encoding.UTF8)
-   End Sub
-
 End Module
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index 62cb53aa..70c049d8 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -70,7 +70,7 @@
    <BitmapImage x:Key="CopyPart_Image" UriSource="/Resources/LeftPanel/CopyPart.png"/>
    <BitmapImage x:Key="Remove_Image" UriSource="/Resources/NewPage/Remove.png"/>
    <BitmapImage x:Key="Simulate_Image" UriSource="/Resources/CALCPanel/Simulate.png"/>
-   <BitmapImage x:Key="ResetCalc_Image" UriSource="/Resources/CALCPanel/ResetCalc.png"/>
+   <BitmapImage x:Key="ResetCalc_Image" UriSource="/Resources/NewPage/reset.png"/>
    <BitmapImage x:Key="ChooseMachine_Image" UriSource="/Resources/CALCPanel/ChooseMachine.png"/>
    <BitmapImage x:Key="Save_Image" UriSource="/Resources/ProjectManager/Save.png"/>
    <BitmapImage x:Key="CopyFeature_Image" UriSource="/Resources/LeftPanel/CopyFeature.png"/>
@@ -100,7 +100,7 @@
    <BitmapImage x:Key="MoveUp_Image" UriSource="/Resources/NewPage/MoveUp.png"/>
    <BitmapImage x:Key="MoveDown_Image" UriSource="/Resources/NewPage/MoveDown.png"/>
    <BitmapImage x:Key="VerifyAll_Image" UriSource="/Resources/CALCPanel/VerifyAll.png"/>
-   <BitmapImage x:Key="VerifyAllR_Image" UriSource="/Resources/NewPage/VerifyAllR.png"/>
+   <BitmapImage x:Key="VerifyAllR_Image" UriSource="/Resources/NewPage/VerifyAllRotation.png"/>
    <BitmapImage x:Key="AllFilter_Image" UriSource="/Resources/LeftPanel/All_Filter.png"/>
    <BitmapImage x:Key="Inversion_Image" UriSource="/Resources/NewPage/Inversion.png"/>
    <BitmapImage x:Key="Send_Image" UriSource="/Resources/MainMenu/Send.png"/>
@@ -145,7 +145,8 @@
    <BitmapImage x:Key="Restore_Image" UriSource="/Resources/EgtDialog/Restore.png"/>
    <BitmapImage x:Key="AboutBox_Image" UriSource="/Resources/AboutBox/EgalwareLogo.png"/>
    <BitmapImage x:Key="Clock_Image" UriSource="/Resources/NewPage/clock.png"/>
-
+   <BitmapImage x:Key="Update_Image" UriSource="/Resources/NewPage/arrow.png"/>
+   
    <!--#endregion Image-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -394,6 +395,18 @@
       <Setter Property="Margin" Value="0,10,0,0"/>
    </Style>
 
+   <Style x:Key="TreeView_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DialogWindow_TextBlock}">
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="True">
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+            <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+         </DataTrigger>
+         <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TreeViewItem}}" Value="False">
+            <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
    <!--#endregion DialogWindow-->
 
    <!--#region ProjectParameters-->
@@ -740,6 +753,11 @@
       <Setter Property="FontSize" Value="20"/>
    </Style>
 
+   <Style x:Key="Update_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Strategy_Button}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="VerticalAlignment" Value="Top"/>
+   </Style>
+
    <Style x:Key="SaveStrategy_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource Optimizer_Button}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
@@ -2477,7 +2495,7 @@
    <!--#endregion Optimizer-->
 
    <!--#region TotalTime_Border-->
-   
+
    <Style x:Key="TotalTime_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{DynamicResource Border.TotalTime.Background}"/>
       <Setter Property="BorderBrush" Value="{DynamicResource Border.TotalTime.Border}"/>
@@ -2576,7 +2594,7 @@
    </Style>
 
    <!--#region TopPanel_Border-->
-   
+
    <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
       <Setter Property="Background" Value="{DynamicResource Border.TopPanel.Background}"/>
       <Setter Property="BorderBrush" Value="{DynamicResource Border.TopPanel.Border}"/>
@@ -2593,7 +2611,7 @@
    </Style>
 
    <!--#endregion TopPanel_Border-->
-   
+
    <!--#endregion Border-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -2658,7 +2676,7 @@
 
    <Style x:Key="StrategyManager_Image" TargetType="{x:Type Image}">
       <Setter Property="Stretch" Value="Uniform"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
+      <Setter Property="Margin" Value="5"/>
    </Style>
 
    <Style x:Key="StrategyProduction_Image" TargetType="{x:Type Image}">
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index 3bb553a5..c6c054bd 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.6.3")>
-<Assembly: AssemblyFileVersion("3.1.6.3")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>

From b885b7d598350fc189ad956b6ce7e3206474b629 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 25 Jun 2026 10:50:43 +0200
Subject: [PATCH 09/10] - aggiunta lettura file messaggi automatismo

---
 .../MainWindow/MainWindowM.vb                 | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
index ba054e8d..5cae3152 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowM.vb
@@ -305,6 +305,37 @@ Public Class MainWindowM
       End While
       ' Leggo file messaggi
       Dim sMsgFilePath As String = sMsgDir & "\" & sMsgName
+      ' leggo messaggi automatismo
+      Dim sAutoMsgFilePath As String = ""
+      Dim sPluginName As String = ""
+      If GetMainPrivateProfileString(S_BEAM, K_BEAMBASEDIR, "", sAutoMsgFilePath) > 0 AndAlso Not String.IsNullOrWhiteSpace(sAutoMsgFilePath) Then
+         ' recupero nome del file messaggi dell'automatismo
+         sAutoMsgFilePath &= "\Messages\" & sMsgName
+         If File.Exists(sAutoMsgFilePath) Then
+            Dim OrigMsgFile As List(Of String) = File.ReadAllLines(sMsgFilePath).ToList()
+            ' elimino eventuali righe vuote o commento di fine
+            While String.IsNullOrWhiteSpace(OrigMsgFile.Last()) OrElse OrigMsgFile.Last().StartsWith("//")
+               OrigMsgFile.RemoveAt(OrigMsgFile.Count - 1)
+            End While
+            Dim AutoMsgFile As List(Of String) = File.ReadAllLines(sAutoMsgFilePath).ToList()
+            ' elimino eventuale riga di inizio file
+            If AutoMsgFile.Count > 2 AndAlso AutoMsgFile(0).StartsWith("//") AndAlso AutoMsgFile(1).StartsWith("0") Then
+               AutoMsgFile.RemoveAt(0)
+               AutoMsgFile.RemoveAt(0)
+            End If
+            OrigMsgFile.AddRange(AutoMsgFile)
+            Dim sNewMsgFilePath As String = sMsgDir & "\Complete" & sMsgName
+            Dim bNewMsgFile As Boolean = False
+            Try
+               File.WriteAllLines(sNewMsgFilePath, OrigMsgFile)
+               bNewMsgFile = True
+            Catch ex As Exception
+            End Try
+            If bNewMsgFile Then
+               sMsgFilePath = sNewMsgFilePath
+            End If
+         End If
+      End If
       If Not EgtLoadMessages(sMsgFilePath) Then
          EgtOutLog("Error in EgtLoadMessages")
       End If

From cdf740cba7080760f7c88a112dd619bc8a9deb9c Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Thu, 25 Jun 2026 12:40:08 +0200
Subject: [PATCH 10/10] -sistemato pulsante salva su configurazione -aggiunto
 parametri strategie per lettura lingua

---
 .../ConfigurationPage/ConfigurationPageVM.vb  | 12 ---
 .../ConfigurationProgramV.xaml                |  1 -
 .../GeneralParametersStrategyVM.vb            | 24 ++++++
 .../JsonGeneralParameters.vb                  | 40 +++++++++-
 .../JsonGenericParametersHelper.vb            | 38 ++++++++-
 .../JsonAvailableStrategyHelper.vb            | 78 +++++++++++++++++--
 .../StrategyManager/StrategyManagerVM.vb      | 48 ++++++++++++
 7 files changed, 216 insertions(+), 25 deletions(-)

diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
index acb1ce37..77663dcf 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -24,7 +24,6 @@ Public Class ConfigurationPageVM
       Set(value As Integer)
          m_SelConfigSubPage = value
          If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
-            SetGeneral_Visibility(True)
             SetPDFEditor_Visibility(False)
          ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
             SetPDFEditor_Visibility(True)
@@ -185,17 +184,6 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   Private m_bGeneral_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property General_Visibility As Visibility
-      Get
-         Return m_bGeneral_Visibility
-      End Get
-   End Property
-   Friend Sub SetGeneral_Visibility(value As Boolean)
-      m_bGeneral_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
-      NotifyPropertyChanged(NameOf(General_Visibility))
-   End Sub
-
    Private m_bStrategyManager_Visibility As Visibility = Visibility.Visible
    Public ReadOnly Property StrategyManager_Visibility As Visibility
       Get
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
index 89642a99..44917fd2 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
@@ -24,7 +24,6 @@
                              Style="{StaticResource ConfigurationProgram_TextBlock}"/>
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
                      <Image Source="{StaticResource Save_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
index c74d385a..ab25cd26 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb
@@ -365,6 +365,28 @@ Public MustInherit Class ProjectParameters
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sValue As String
    Public Property sValue As String
       Get
@@ -421,6 +443,8 @@ Public MustInherit Class ProjectParameters
       If IsNothing(JsonProjectParameters) Then Return
       m_sName = JsonProjectParameters.sName
       m_sNameNge = JsonProjectParameters.sNameNge
+      m_idDescriptionShortMsg = JsonProjectParameters.idDescriptionShortMsg
+      m_idDescriptionLongMsg = JsonProjectParameters.idDescriptionLongMsg
    End Sub
 
 #End Region    ' Constructor
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb
index 28ba573f..a8d9b01b 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb
@@ -64,6 +64,28 @@ Public Class JsonGeneralParameters
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sValue As String
    Public Property sValue As String
       Get
@@ -113,13 +135,15 @@ Public Class JsonGeneralParameters
 #Region "CONSTRUCTOR"
 
    <JsonConstructor>
-   Sub New(nGroup As String, sName As String, sNameNge As String, sValue As String, sDescriptionShort As String, sDescriptionLong As String, sType As String, sMinUserLevel As String)
+   Sub New(nGroup As String, sName As String, sNameNge As String, sValue As String, sDescriptionShort As String, sDescriptionLong As String, idDescriptionLongMsg As Integer, idDescriptionShortMsg As Integer, sType As String, sMinUserLevel As String)
       m_nGroup = nGroup
       m_sName = sName
       m_sNameNge = sNameNge
       m_sValue = sValue
       m_sDescriptionShort = sDescriptionShort
       m_sDescriptionLong = sDescriptionLong
+      m_idDescriptionShortMsg = idDescriptionShortMsg
+      m_idDescriptionLongMsg = idDescriptionLongMsg
       m_sType = sType
       m_sMinUserLevel = sMinUserLevel
    End Sub
@@ -142,6 +166,8 @@ Public Class JsonGeneralParameters
       m_nGroup = ProjectParameters.nGroup
       m_sDescriptionShort = ProjectParameters.sDescriptionShort
       m_sDescriptionLong = ProjectParameters.sDescriptionLong
+      m_idDescriptionShortMsg = ProjectParameters.idDescriptionShortMsg
+      m_idDescriptionLongMsg = ProjectParameters.idDescriptionLongMsg
       m_sMinUserLevel = ProjectParameters.sMinUserLevel
    End Sub
 
@@ -192,8 +218,16 @@ Public Class JsonGeneralParameters
       ProjectParameters.nGroup = m_nGroup
       ProjectParameters.sName = m_sName
       ProjectParameters.sNameNge = m_sNameNge
-      ProjectParameters.sDescriptionShort = m_sDescriptionShort
-      ProjectParameters.sDescriptionLong = m_sDescriptionLong
+      If m_idDescriptionShortMsg < 0 OrElse EgtMsg(m_idDescriptionShortMsg).StartsWith("Msg") Then
+         ProjectParameters.sDescriptionShort = m_sDescriptionShort
+      Else
+         ProjectParameters.sDescriptionShort = EgtMsg(m_idDescriptionShortMsg)
+      End If
+      If m_idDescriptionLongMsg < 0 OrElse EgtMsg(m_idDescriptionLongMsg).StartsWith("Msg") Then
+         ProjectParameters.sDescriptionLong = m_sDescriptionLong
+      Else
+         ProjectParameters.sDescriptionLong = EgtMsg(m_idDescriptionLongMsg)
+      End If
       ProjectParameters.sMinUserLevel = m_sMinUserLevel
       Return ProjectParameters
    End Function
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb
index 526b3420..9b57208a 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb
@@ -64,6 +64,28 @@ Public Class JsonProjectParameters
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sValue As String
    Public Property sValue As String
       Get
@@ -113,7 +135,7 @@ Public Class JsonProjectParameters
 #Region "CONSTRUCTOR"
 
    <JsonConstructor>
-   Sub New(mGroup As String, sName As String, sNameNge As String, sValue As String, sType As String, sDescriptionShort As String, sDescriptionLong As String, sMinUserLevel As String)
+   Sub New(mGroup As String, sName As String, sNameNge As String, sValue As String, sType As String, sDescriptionShort As String, sDescriptionLong As String, idDescriptionShortMsg As Integer, idDescriptionLongMsg As Integer, sMinUserLevel As String)
       m_nGroup = nGroup
       m_sName = sName
       m_sNameNge = sNameNge
@@ -121,6 +143,8 @@ Public Class JsonProjectParameters
       m_sType = sType
       m_sDescriptionShort = sDescriptionShort
       m_sDescriptionLong = sDescriptionLong
+      m_idDescriptionShortMsg = idDescriptionShortMsg
+      m_idDescriptionLongMsg = idDescriptionLongMsg
       m_sMinUserLevel = sMinUserLevel
    End Sub
 
@@ -141,6 +165,8 @@ Public Class JsonProjectParameters
       End Select
       m_sDescriptionShort = ProjectParameters.sDescriptionShort
       m_sDescriptionLong = ProjectParameters.sDescriptionLong
+      m_idDescriptionShortMsg = ProjectParameters.idDescriptionShortMsg
+      m_idDescriptionLongMsg = ProjectParameters.idDescriptionLongMsg
       m_sMinUserLevel = ProjectParameters.sMinUserLevel
    End Sub
 
@@ -191,6 +217,16 @@ Public Class JsonProjectParameters
       ProjectParameters.nGroup = nGroup
       ProjectParameters.sName = m_sName
       ProjectParameters.sNameNge = m_sNameNge
+      If m_idDescriptionShortMsg < 0 OrElse EgtMsg(m_idDescriptionShortMsg).StartsWith("Msg") Then
+         ProjectParameters.sDescriptionShort = m_sDescriptionShort
+      Else
+         ProjectParameters.sDescriptionShort = EgtMsg(m_idDescriptionShortMsg)
+      End If
+      If m_idDescriptionLongMsg < 0 OrElse EgtMsg(m_idDescriptionLongMsg).StartsWith("Msg") Then
+         ProjectParameters.sDescriptionLong = m_sDescriptionLong
+      Else
+         ProjectParameters.sDescriptionLong = EgtMsg(m_idDescriptionLongMsg)
+      End If
       ProjectParameters.sDescriptionShort = m_sDescriptionShort
       ProjectParameters.sDescriptionLong = m_sDescriptionLong
       ProjectParameters.sMinUserLevel = m_sMinUserLevel
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb b/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb
index 3bc1f3a0..c5c3a76d 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb
@@ -1,9 +1,9 @@
-Imports EgtWPFLib5
-Imports EgtUILib
-Imports Newtonsoft.Json
-Imports System.Collections.ObjectModel
+Imports System.Collections.ObjectModel
 Imports System.IO
 Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports Newtonsoft.Json
 
 '----------- Classe che fa riferimento alle Feature del file Json -----------
 Public Class JsonAvailableStrategyFeature
@@ -339,6 +339,28 @@ Public Class JsonDefaultStrategyParameter
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sType As String
    Public Property sType As String
       Get
@@ -410,12 +432,14 @@ Public Class JsonDefaultStrategyParameter
 #Region "CONSTRUCTOR"
 
    <JsonConstructor>
-   Sub New(sName As String, sNameNge As String, sValue As String, sDescriptionShort As String, sDescriptionLong As String, sType As String, sSource As String, sSubType As String, sMessageId As String, sMinUserLevel As Integer)
+   Sub New(sName As String, sNameNge As String, sValue As String, sDescriptionShort As String, sDescriptionLong As String, idDescriptionShortMsg As Integer, idDescriptionLongMsg As Integer, sType As String, sSource As String, sSubType As String, sMessageId As String, sMinUserLevel As Integer)
       m_sName = sName
       m_sNameNge = sNameNge
       m_sValue = sValue
       m_sDescriptionShort = sDescriptionShort
       m_sDescriptionLong = sDescriptionLong
+      m_idDescriptionShortMsg = idDescriptionShortMsg
+      m_idDescriptionLongMsg = idDescriptionLongMsg
       m_sType = sType
       m_sSource = sSource
       m_sSubType = sSubType
@@ -442,6 +466,8 @@ Public Class JsonDefaultStrategyParameter
       m_sSubType = StrategyParameter.sSubType
       m_sDescriptionShort = StrategyParameter.sDescriptionShort
       m_sDescriptionLong = StrategyParameter.sDescriptionLong
+      m_idDescriptionShortMsg = StrategyParameter.idDescriptionShortMsg
+      m_idDescriptionLongMsg = StrategyParameter.idDescriptionLongMsg
       m_sMessageId = StrategyParameter.sMessageId
       m_sMinUserLevel = StrategyParameter.sMinUserLevel
    End Sub
@@ -491,8 +517,18 @@ Public Class JsonDefaultStrategyParameter
       StrategyParameter.sName = m_sName
       StrategyParameter.sNameNge = m_sNameNge
       StrategyParameter.sSubType = m_sSubType
-      StrategyParameter.sDescriptionShort = m_sDescriptionShort
-      StrategyParameter.sDescriptionLong = m_sDescriptionLong
+      If m_idDescriptionShortMsg < 0 OrElse EgtMsg(m_idDescriptionShortMsg).StartsWith("Msg") Then
+         StrategyParameter.sDescriptionShort = m_sDescriptionShort
+      Else
+         StrategyParameter.sDescriptionShort = EgtMsg(m_idDescriptionShortMsg)
+      End If
+      If m_idDescriptionLongMsg < 0 OrElse EgtMsg(m_idDescriptionLongMsg).StartsWith("Msg") Then
+         StrategyParameter.sDescriptionLong = m_sDescriptionLong
+      Else
+         StrategyParameter.sDescriptionLong = EgtMsg(m_idDescriptionLongMsg)
+      End If
+      StrategyParameter.idDescriptionShortMsg = m_idDescriptionShortMsg
+      StrategyParameter.idDescriptionLongMsg = m_idDescriptionLongMsg
       StrategyParameter.sMessageId = m_sMessageId
       StrategyParameter.sMinUserLevel = m_sMinUserLevel
       Return StrategyParameter
@@ -537,6 +573,28 @@ Public Class JsonDefaultComboParameter
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sMessageId As String
    Public Property sMessageId As String
       Get
@@ -551,10 +609,12 @@ Public Class JsonDefaultComboParameter
 #Region "CONSTRUCTOR"
 
    <JsonConstructor>
-   Sub New(sValue As String, sDescriptionShort As String, sDescriptionLong As String, sMessageId As String)
+   Sub New(sValue As String, sDescriptionShort As String, sDescriptionLong As String, idDescriptionShortMsg As Integer, idDescriptionLongMsg As Integer, sMessageId As String)
       m_sValue = sValue
       m_sDescriptionShort = sDescriptionShort
       m_sDescriptionLong = sDescriptionLong
+      m_idDescriptionShortMsg = idDescriptionShortMsg
+      m_idDescriptionLongMsg = idDescriptionLongMsg
       m_sMessageId = sMessageId
    End Sub
 
@@ -562,6 +622,8 @@ Public Class JsonDefaultComboParameter
       m_sValue = ComboParameter.sValue
       m_sDescriptionShort = ComboParameter.sDescriptionShort
       m_sDescriptionLong = ComboParameter.sDescriptionLong
+      m_idDescriptionShortMsg = ComboParameter.idDescriptionShortMsg
+      m_idDescriptionLongMsg = ComboParameter.idDescriptionLongMsg
       m_sMessageId = ComboParameter.sMessageId
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 57b2b4de..ee65396f 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -1375,6 +1375,28 @@ Public MustInherit Class StrategyParameter
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sMessageId As String
    Public Property sMessageId As String
       Get
@@ -1413,6 +1435,8 @@ Public MustInherit Class StrategyParameter
       m_sSubType = JsonGenericParameter.sSubType
       m_sDescriptionShort = JsonGenericParameter.sDescriptionShort
       m_sDescriptionLong = JsonGenericParameter.sDescriptionLong
+      m_idDescriptionShortMsg = JsonGenericParameter.idDescriptionShortMsg
+      m_idDescriptionLongMsg = JsonGenericParameter.idDescriptionLongMsg
       m_sMessageId = JsonGenericParameter.sMessageId
       m_sMinUserLevel = JsonGenericParameter.sMinUserLevel
    End Sub
@@ -2135,6 +2159,28 @@ Public Class ComboParameter
       End Set
    End Property
 
+   Private m_idDescriptionShortMsg As Integer
+   Public Property idDescriptionShortMsg As Integer
+      Get
+         Return m_idDescriptionShortMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionShortMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionShortMsg))
+      End Set
+   End Property
+
+   Private m_idDescriptionLongMsg As Integer
+   Public Property idDescriptionLongMsg As Integer
+      Get
+         Return m_idDescriptionLongMsg
+      End Get
+      Set(value As Integer)
+         m_idDescriptionLongMsg = value
+         NotifyPropertyChanged(NameOf(idDescriptionLongMsg))
+      End Set
+   End Property
+
    Private m_sMessageId As String
    Public Property sMessageId As String
       Get
@@ -2159,6 +2205,8 @@ Public Class ComboParameter
          m_sValue = JsonChoiceParameter.sValue
          m_sDescriptionShort = JsonChoiceParameter.sDescriptionShort
          m_sDescriptionLong = JsonChoiceParameter.sDescriptionLong
+         m_idDescriptionShortMsg = JsonChoiceParameter.idDescriptionShortMsg
+         m_idDescriptionLongMsg = JsonChoiceParameter.idDescriptionLongMsg
          m_sMessageId = JsonChoiceParameter.sMessageId
       End If
    End Sub