-aggiunto controllo modifica configurazione strategie in chiusura programma

-spostato pulsante aggiorna strategie

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -155,7 +155,7 @@ Public Module CalcIntegration
                      Else
                         vProc(j).Proc.StartInfo.Arguments = """" & vBar(nCurrBar).sBarPath & """ " &
                                                             """" & vBar(nCurrBar).nProjType & """ " &
-                                                            """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType
+                                                            """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType & " " & vBar(nCurrBar).nBarState
                      End If
                      vProc(j).Proc.StartInfo.UseShellExecute = False
 
@@ -475,7 +475,7 @@ Public Module CalcIntegration
 End Module
 
 Public Class Bar
-   Public nBarState As Integer
+   Public nBarState As Integer = -1
    Public nBarId As Integer
    Public sBarPath As String
    Public bBarOk As Boolean

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.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>

EgtBEAMWALL.Core/Themes/Generic.xaml

@@ -302,11 +302,7 @@
 
    <!--#region Colori ComboBox-->
 
-   <!--<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>-->
-   <LinearGradientBrush x:Key="ComboBox.Static.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="{StaticResource BeamWall_Gallery_Color}" Offset="0.0"/>
-      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1.0"/>
-   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
@@ -1925,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}}">

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.2")]
-[assembly: AssemblyFileVersion("3.1.5.2")]
+[assembly: AssemblyVersion("3.1.6.4")]
+[assembly: AssemblyFileVersion("3.1.6.4")]

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -106,7 +106,11 @@ Public Class AddFeatureWndVM
                GetMacroListDefault(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
                ' ricavo lista file Macro Custom
                GetMacroListCustom(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
-               MacroList_IsEnabled = If(MacroCustomList.Count > 0, True, False)
+               If MacroCustomList.Count > 0 Then
+                  MacroList_IsEnabled = True
+               Else
+                  MacroList_IsEnabled = False
+               End If
             End If
          End If
          NotifyPropertyChanged(NameOf(nSelPRC))

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb

@@ -147,7 +147,7 @@ Public Class AddPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok_Command"
+#Region "Ok"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -169,7 +169,7 @@ Public Class AddPartWndVM
       End If
    End Sub
 
-#End Region ' Ok_Command
+#End Region ' Ok
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -143,7 +143,7 @@ Public Class AddRawPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok_Command"
+#Region "Ok"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -167,7 +167,7 @@ Public Class AddRawPartWndVM
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok_Command
+#End Region ' Ok
 
 #End Region    ' COMMANDS
 

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,116 +68,123 @@
             <TextBlock Text="{Binding PROJNUM_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sPROJNUM, UpdateSourceTrigger=Explicit}"
+                                   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 sPROJNAME, UpdateSourceTrigger=Explicit}"
+                                   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 sPROJPART, UpdateSourceTrigger=Explicit}"
+                                   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 sPROJGUID, UpdateSourceTrigger=Explicit}"
+                                   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 sLISTNAME, UpdateSourceTrigger=Explicit}"
+                                   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 sCUSTOMER, UpdateSourceTrigger=Explicit}"
+                                   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 sARCHITECT, UpdateSourceTrigger=Explicit}"
+                                   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 sEDITOR, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding CurrBTLStructure.sEDITOR, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding DELIVDATE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sDELIVDATE, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding sDELIVDATE, UpdateSourceTrigger=Explicit,
+                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding EXPDATE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEXPDATE, UpdateSourceTrigger=Explicit}"
+                                   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 sEXPTIME, UpdateSourceTrigger=Explicit}"
+                                   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 sEXPRELEASE, UpdateSourceTrigger=Explicit}"
+                                   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 sLANGUAGE, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding CurrBTLStructure.sLANGUAGE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding RANGE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocRANGE,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocRANGE,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelRANGE,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelRANGE,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocPROCESSINGQUALITY,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocPROCESSINGQUALITY,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelPROCESSINGQUALITY,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelPROCESSINGQUALITY,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <TextBlock Text="{Binding COMPUTERNAME_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sCOMPUTERNAME, UpdateSourceTrigger=Explicit}"
+                                   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 sUSER, UpdateSourceTrigger=Explicit}"
+                                   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 sSRCFILE, UpdateSourceTrigger=Explicit}"
+                                   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 sEXPFILE, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding CurrBTLStructure.sEXPFILE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
             <TextBlock Text="{Binding RECESS_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocRECESS,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocRECESS,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelRECESS,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelRECESS,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sUSERATTRIBUTE, UpdateSourceTrigger=Explicit}"
+                                   Text="{Binding CurrBTLStructure.sUSERATTRIBUTE, UpdateSourceTrigger=LostFocus}"
                                    Style="{StaticResource PartParam_TextBox}"/>
 
          </UniformGrid>

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb

@@ -6,6 +6,7 @@
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BTLDataWndVM
+      Me.Tag = Map.refProjectVM.BTLStructureVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_BTLDataWndVM = BTLDataWndVM
    End Sub
@@ -19,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

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
@@ -80,6 +81,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 +573,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()
@@ -829,7 +838,7 @@ Public Class BTLDataWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok_Command"
+#Region "Ok"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -856,9 +865,9 @@ Public Class BTLDataWndVM
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok_Command
+#End Region ' Ok
 
-#Region "Cancel_Command"
+#Region "Cancel"
 
    Public ReadOnly Property Cancel_Command As ICommand
       Get
@@ -873,7 +882,7 @@ Public Class BTLDataWndVM
       RaiseEvent m_CloseWindow(False)
    End Sub
 
-#End Region ' Cancel_Command
+#End Region ' Cancel
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml

@@ -1,66 +1,4 @@
-<dxb:PopupMenu x:Class="BTLPartManagerV"
-               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-               xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-               xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
-               xmlns:dxi="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
-               xmlns:dxt="http://schemas.devexpress.com/winfx/2008/xaml/core/themekeys"
-               DataContext="{StaticResource BTLPartManagerVM}"
-               Background="{StaticResource Border.BTLPartManager.Background}"
-               BorderBrush="{StaticResource Border.BTLPartManager.Border}"
-               BorderThickness="2"
-               CornerRadius="5"
-               Margin="0"
-               Padding="0">
-   
-   <dxb:BarItemMenuHeader ShowContentHeader="False" 
-                          ItemsOrientation="Horizontal"
-                          Margin="0"
-                          Padding="0">
-      <dxb:BarButtonItem Command="{Binding CopyPart_Command}"
-                         ToolTip="{Binding CopyPart_ToolTip}"
-                         IsEnabled="{Binding CopyPart_IsEnabled}"
-                         Glyph="{StaticResource CopyPart_Image}"
-                         Style="{StaticResource DropDownButton_BarButtonItem}">
-         <!--<Image Source="{StaticResource CopyPart_Image}" 
-                  Style="{StaticResource BTLDataWnd_Image}"/>-->
-      </dxb:BarButtonItem>
-      <dxb:BarButtonItem Command="{Binding RemovePart_Command}"
-                         ToolTip="{Binding RemovePart_ToolTip}"
-                         IsEnabled="{Binding RemovePart_IsEnabled}"
-                         Glyph="{StaticResource Remove_Image}"
-                         Style="{StaticResource DropDownButton_BarButtonItem}">
-         <!--<Image Source="{StaticResource Remove_Image}"
-                  Style="{StaticResource BTLDataWnd_Image}"/>-->
-      </dxb:BarButtonItem>
-      <dxb:BarButtonItem ToolTip="{Binding Simulate_ToolTip}"
-                         Command="{Binding Simulate_Command}"
-                         IsEnabled="{Binding Simulate_IsEnabled}"
-                         Glyph="{StaticResource Simulate_Image}"
-                         Style="{StaticResource DropDownButton_BarButtonItem}">
-         <!--<Image Source="{StaticResource Simulate_Image}" 
-                  Style="{StaticResource BTLDataWnd_Image}"/>-->
-      </dxb:BarButtonItem>
-      <dxb:BarButtonItem ToolTip="{Binding Edit_ToolTip}"
-                         Command="{Binding Edit_Command}"
-                         IsEnabled="{Binding Edit_IsEnabled}"
-                         Glyph="{StaticResource Edit_Image}"
-                         Style="{StaticResource DropDownButton_BarButtonItem}">
-         <!--<Image Source="{StaticResource Edit_Image}" 
-                  Style="{StaticResource BTLDataWnd_Image}"/>-->
-      </dxb:BarButtonItem>
-      <dxb:BarButtonItem Command="{Binding ResetCalc_Command}"
-                         ToolTip="{Binding ResetCalc_ToolTip}"
-                         IsEnabled="{Binding CALCPanel_IsEnabled}"
-                         Glyph="{StaticResource ResetCalc_Image}"
-                         Style="{StaticResource DropDownButton_BarButtonItem}">
-         <!--<Image Source="{StaticResource ResetCalc_Image}" 
-                  Style="{StaticResource BTLDataWnd_Image}"/>-->
-      </dxb:BarButtonItem>
-   </dxb:BarItemMenuHeader>
-
-</dxb:PopupMenu>
-<!--<Border x:Class="BTLPartManagerV"
+<Border x:Class="BTLPartManagerV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         DataContext="{StaticResource BTLPartManagerVM}"
@@ -68,6 +6,7 @@
 
    <StackPanel Style="{StaticResource PartManager_StackPanel}">
       <Button Command="{Binding CopyPart_Command}"
+              Click="ClosePopUp_Click"
               ToolTip="{Binding CopyPart_ToolTip}"
               IsEnabled="{Binding CopyPart_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -75,6 +14,7 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
+              Click="ClosePopUp_Click"
               ToolTip="{Binding RemovePart_ToolTip}"
               IsEnabled="{Binding RemovePart_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -82,6 +22,7 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
+              Click="ClosePopUp_Click"
               Command="{Binding Simulate_Command}"
               IsEnabled="{Binding Simulate_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -89,6 +30,7 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
+              Click="ClosePopUp_Click"
               Command="{Binding Edit_Command}"
               IsEnabled="{Binding Edit_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -96,6 +38,7 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
+              Click="ClosePopUp_Click"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -104,4 +47,4 @@
       </Button>
    </StackPanel>
 
-</Border>-->
+</Border>

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -176,7 +176,7 @@ Public Class BTLPartManagerVM
 
 #Region "COMMANDS"
 
-#Region "CopyPart_Command"
+#Region "CopyPart"
 
    Public ReadOnly Property CopyPart_Command As ICommand
       Get
@@ -194,15 +194,15 @@ Public Class BTLPartManagerVM
       ' creo copia
       Dim NewPart As BTLPartM = SelPart.Copy()
       If Not IsNothing(NewPart) Then
-         Map.refProjectVM.UpdatePart(NewPart.nPartId)
+         If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then Map.refProjectVM.UpdatePart(NewPart.nPartId)
          ' selezione ultimo che e' quello appena creato
          Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1), False, True)
       End If
    End Sub
 
-#End Region    ' CopyPart_Command
+#End Region    ' CopyPart
 
-#Region "RemovePart_Command"
+#Region "RemovePart"
 
    Public ReadOnly Property RemovePart_Command As ICommand
       Get
@@ -242,7 +242,7 @@ Public Class BTLPartManagerVM
       End If
       ' Eseguo cancellazione
       EgtBeamSetPart(BTLPartToDelete.nPartId)
-      RemoveScenePart(BTLPartToDelete)
+      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)
@@ -272,23 +272,27 @@ Public Class BTLPartManagerVM
 
    Private Sub RemoveScenePart(BTLPartToDelete As BTLPartVM)
       ' Rimuovo pezzo dalla scena
-      Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(BTLPartToDelete.nPROJ)
-      If IdAsseBase < 0 Then Return
+      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)
-      Dim DeletePartId As Integer = Map.refSceneShowBuldingVM.MapInfo(BTLPartToDelete.nPartId)
-      EgtErase(DeletePartId)
-      Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
+      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    ' RemovePart_Command
+#End Region    ' RemovePart
 
-#Region "Simulate_Command"
+#Region "SimulateCommand"
 
    Public ReadOnly Property Simulate_Command As ICommand
       Get
@@ -333,9 +337,9 @@ Public Class BTLPartManagerVM
       Return True
    End Function
 
-#End Region ' Simulate_Command
+#End Region ' SimulateCommand
 
-#Region "Edit_Command"
+#Region "Edit"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -369,9 +373,9 @@ Public Class BTLPartManagerVM
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)
    End Sub
 
-#End Region ' Edit_Command
+#End Region ' Edit
 
-#Region "ResetCalc_Command"
+#Region "ResetCalc"
 
    Public ReadOnly Property ResetCalc_Command As ICommand
       Get
@@ -400,7 +404,7 @@ Public Class BTLPartManagerVM
       End If
    End Sub
 
-#End Region    ' ResetCalc_Command
+#End Region    ' ResetCalc
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb

@@ -293,12 +293,6 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
-   Public ReadOnly Property sFeature_Name As String
-      Get
-         Return $"[{nSelGRP}-{nPRC:000}] {sName}"
-      End Get
-   End Property
-
 #Region "Messages"
 
    Public ReadOnly Property Edit_ToolTip As String
@@ -487,7 +481,7 @@ Public Class BTLFeatureVM
 
 #Region "COMMANDS"
 
-#Region "DeleteFeature_Command"
+#Region "DeleteFeature"
 
    Public ReadOnly Property DeleteFeature_Command As ICommand
       Get
@@ -502,9 +496,9 @@ Public Class BTLFeatureVM
       Map.refFeatureListManagerVM.RemoveFeature()
    End Sub
 
-#End Region ' DeleteFeature_Command
+#End Region ' DeleteFeature
 
-#Region "Edit_Command"
+#Region "Edit"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -520,9 +514,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Open()
    End Sub
 
-#End Region ' Edit_Command
+#End Region ' Edit
 
-#Region "Save_Command"
+#Region "Save"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -543,9 +537,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Close(True)
    End Sub
 
-#End Region ' Save_Command
+#End Region ' Save
 
-#Region "Cancel_Command"
+#Region "Cancel"
 
    Public ReadOnly Property Cancel_Command As ICommand
       Get
@@ -561,9 +555,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Close(False)
    End Sub
 
-#End Region ' Cancel_Command
+#End Region ' Cancel
 
-#Region "Strategy_Command"
+#Region "Strategy"
 
    Public ReadOnly Property Strategy_Command As ICommand
       Get
@@ -582,9 +576,9 @@ Public Class BTLFeatureVM
       Map.refForcedStrategyPanelVM.Init(BTLFeatureM)
    End Sub
 
-#End Region ' Strategy_Command
+#End Region ' Strategy
 
-#Region "EditFeature_Command"
+#Region "EditFeature"
 
    Public ReadOnly Property EditFeature_Command As ICommand
       Get
@@ -613,7 +607,7 @@ Public Class BTLFeatureVM
       EgtDraw()
    End Sub
 
-#End Region ' EditFeature_Command
+#End Region ' EditFeature
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb

@@ -18,7 +18,6 @@ Public Class BTLPartVM
          Return m_BTLPartM
       End Get
    End Property
-
    Private m_BTLStructureM As BTLStructureM
 
    Public ReadOnly Property nPartId As Integer
@@ -188,7 +187,9 @@ Public Class BTLPartVM
       Get
          Dim nOrigGroupId As Integer = nPartId
          If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
          End If
          If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -249,7 +250,9 @@ Public Class BTLPartVM
       Get
          Dim nOrigGroupId As Integer = nPartId
          If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
          End If
          If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -310,7 +313,9 @@ Public Class BTLPartVM
       Get
          Dim nOrigGroupId As Integer = nPartId
          If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
-            nOrigGroupId = Map.refSceneShowBuldingVM.MapInfo(nPartId)
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
          End If
          If EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
@@ -1370,13 +1375,13 @@ Public Class BTLPartVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
+         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
    Public ReadOnly Property CALC_FALL_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
+         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
@@ -2228,26 +2233,11 @@ Public Class BTLPartVM
       Return True
    End Function
 
-   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
-      ' salvo sezione impostata
-      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-      ' ruoto
-      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
-      ' imposto lock
-      bLockRotation = True
-      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
-      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
-         ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
-         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
-      End If
-   End Sub
-
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
-#Region "Invert_Command"
+#Region "Invert"
 
    Public ReadOnly Property Invert_Command As ICommand
       Get
@@ -2269,9 +2259,41 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(sINVERTED))
    End Sub
 
-#End Region ' Invert_Command
+#End Region ' Invert
 
-#Region "ForwardRotation_Command"
+#Region "BackRotation"
+
+   Public ReadOnly Property BackRotation_Command As ICommand
+      Get
+         If m_cmdBackRotation Is Nothing Then
+            m_cmdBackRotation = New Command(AddressOf BackRotationCmd)
+         End If
+         Return m_cmdBackRotation
+      End Get
+   End Property
+
+   Public Sub BackRotationCmd()
+      BackRotation(True)
+   End Sub
+
+   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
+      ' salvo sezione impostata
+      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
+      ' ruoto
+      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
+      ' imposto lock
+      bLockRotation = True
+      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
+      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
+         ' se esiste, imposto sezione inversa
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
+         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
+      End If
+   End Sub
+
+#End Region ' BackRotation
+
+#Region "ForwardRotation"
 
    Public ReadOnly Property ForwardRotation_Command As ICommand
       Get
@@ -2300,7 +2322,7 @@ Public Class BTLPartVM
       End If
    End Sub
 
-#End Region ' ForwardRotation_Command
+#End Region ' ForwardRotation
 
    ' Comando inutilizzato ma conservato per eventuale rotazione a causa di importazione con rotazione sbagliata
 #Region "XRotation"
@@ -2343,7 +2365,7 @@ Public Class BTLPartVM
 
 #End Region ' XRotation
 
-#Region "PartColour_Command"
+#Region "PartColour"
 
    Public ReadOnly Property PartColour_Command As ICommand
       Get
@@ -2375,9 +2397,9 @@ Public Class BTLPartVM
       Return True
    End Function
 
-#End Region ' PartColour_Command
+#End Region ' PartColour
 
-#Region "Verify_Command"
+#Region "Verify"
 
    Public ReadOnly Property Verify_Command As ICommand
       Get
@@ -2395,9 +2417,9 @@ Public Class BTLPartVM
       Return
    End Sub
 
-#End Region ' Verify_Command
+#End Region ' Verify
 
-#Region "AddToRawPart_Command"
+#Region "AddToRawPart"
 
    Public ReadOnly Property AddToRawPart_Command As ICommand
       Get
@@ -2692,9 +2714,9 @@ Public Class BTLPartVM
       Return True
    End Function
 
-#End Region   ' AddToRawPart_Command
+#End Region    ' AddToRawPart
 
-#Region "SelectAllFeature_Command"
+#Region "SelectAllFeature"
 
    Public ReadOnly Property SelectAllFeature_Command As ICommand
       Get
@@ -2710,9 +2732,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
-#End Region ' SelectAllFeature_Command
+#End Region ' SelectAllFeature
 
-#Region "DeselectAllFeature_Command"
+#Region "DeselectAllFeature"
 
    Public ReadOnly Property DeselectAllFeature_Command As ICommand
       Get
@@ -2728,9 +2750,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
-#End Region ' DeselectAllFeature_Command
+#End Region ' DeselectAllFeature
 
-#Region "SelectItemFeature_Command"
+#Region "SelectItemFeature"
 
    Public ReadOnly Property SelectItemFeature_Command As ICommand
       Get
@@ -2752,9 +2774,9 @@ Public Class BTLPartVM
       Next
    End Sub
 
-#End Region ' SelectItemFeature_Command
+#End Region ' SelectItemFeature
 
-#Region "DeselectItemFeature_Command"
+#Region "DeselectItemFeature"
 
    Public ReadOnly Property DeselectItemFeature_Command As ICommand
       Get
@@ -2776,7 +2798,7 @@ Public Class BTLPartVM
       Next
    End Sub
 
-#End Region ' DeselectItemFeature_Command
+#End Region ' DeselectItemFeature
 
 #End Region    ' COMMANDS
 

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()
@@ -1239,13 +1238,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_Command"
+#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,12 +1317,22 @@ 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_Command
+#End Region ' DeletePart
 
-#Region "Data_Command"
+#Region "Data"
 
    Public ReadOnly Property Data_Command As ICommand
       Get
@@ -1272,13 +1344,13 @@ 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
 
-#End Region ' Data_Command
+#End Region ' Data
 
-#Region "AddPart_Command"
+#Region "AddPart"
 
    Public ReadOnly Property AddPart_Command As ICommand
       Get
@@ -1330,9 +1402,9 @@ Public Class BTLStructureVM
       End If
    End Sub
 
-#End Region    ' AddPart_Command
+#End Region    ' AddPart
 
-#Region "UpdateBTL_Command"
+#Region "UpdateBTL"
 
    Public ReadOnly Property UpdateBTL_Command As ICommand
       Get
@@ -1872,7 +1944,7 @@ Public Class BTLStructureVM
       EgtZoom(ZM.ALL)
    End Sub
 
-#End Region ' UpdateBTL_Command
+#End Region ' UpdateBTL
 
 #End Region    ' Commands
 

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb

@@ -112,7 +112,7 @@ Public Class BlockedWndVM
 
 #Region "COMMANDS"
 
-#Region "Save_Command"
+#Region "Save"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -130,9 +130,9 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' Save_Command
+#End Region    ' Save
 
-#Region "DoNotSave_Command"
+#Region "DoNotSave"
 
    Public ReadOnly Property DoNotSave_Command As ICommand
       Get
@@ -148,7 +148,7 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' DoNotSave_Command
+#End Region    ' DoNotSave
 
 #End Region    ' COMMANDS
 

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
 

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,9 @@ 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
@@ -198,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

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}"/>

EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj

@@ -66,6 +66,17 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\EgtBEAMWALL.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x86\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Optimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtBEAMWALL.Core">
       <HintPath>..\EgtBEAMWALL.Core\bin\Debug\EgtBEAMWALL.Core.dll</HintPath>
@@ -996,9 +1007,6 @@
     <PackageReference Include="BouncyCastle">
       <Version>1.8.5</Version>
     </PackageReference>
-    <PackageReference Include="DevExpress.Wpf">
-      <Version>25.2.5</Version>
-    </PackageReference>
     <PackageReference Include="EgwMultiEngineManager.Core">
       <Version>3.1.1.2</Version>
     </PackageReference>
@@ -1220,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>

EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb

@@ -44,6 +44,7 @@ Module MyExecProcessManager
       Dim sEnvironment As String = ""
       Dim sPipeLuaFile As String = ""
       Dim nMaxCamInstances As Integer = 0
+      Dim bDebug As Boolean = False
       While GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_ENVIRONMENT, "", sEnvironment) > 0 AndAlso
             GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_PIPELUAFILE, "", sPipeLuaFile) AndAlso
             GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_MAXCAMINSTANCES, "", nMaxCamInstances)
@@ -64,7 +65,10 @@ Module MyExecProcessManager
             nGroupIndex += 1
             Continue While
          End If
-         Dim NewExecProcessManager As New ExecProcessManager(nGroupIndex, Environment, sCamExePath, PipeLuaPath, nMaxCamInstances, ExecProcessManager.ReturnModes.EVENT_, False)
+         ' leggo se modalita' debug
+         Dim nDebug As Integer = GetMainPrivateProfileInt(S_EXECGROUP & nGroupIndex.ToString(), K_DEBUG, 0)
+         bDebug = (nDebug = 1)
+         Dim NewExecProcessManager As New ExecProcessManager(nGroupIndex, Environment, sCamExePath, PipeLuaPath, nMaxCamInstances, ExecProcessManager.ReturnModes.EVENT_, bDebug)
          AddHandler NewExecProcessManager.m_AnswerReceived, AddressOf ExecProcessManager_AnswerReceived
          NewExecProcessManager.StartExecutionThread()
          m_ExecProcessManagerList.Add(Environment, NewExecProcessManager)
@@ -101,7 +105,9 @@ Module MyExecProcessManager
          End If
          If nPreRotate > 0 Then
             Dim dAng As Integer = nPreRotate * 90
-            PartItem.ForwardRotation(True, True, dAng, False)
+            Application.Current.Dispatcher.BeginInvoke(Sub()
+                                                          PartItem.ForwardRotation(True, True, dAng, False)
+                                                       End Sub)
          End If
 
          Dim prefix As String = "INFONGEPART_"

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb

@@ -145,6 +145,21 @@ Public Class ForcedStrategyPanelVM
          m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
                                                                  Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
       End If
+      If File.Exists(sAvailableStrategiesFilePath) Then
+         sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
+         Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
+         Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
+         If IsNothing(JsonAvailableStrategyFeature) Then Return False
+         Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
+         If IsNothing(JsonAvailableTopology) Then
+            ' ricavo topologia da feature
+            FindTopologyFromFeature(nFeatureId, sTopologyName)
+            JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
+         End If
+         If IsNothing(JsonAvailableTopology) Then Return False
+         m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
+                                                                 Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
+      End If
       ' recupero custom
       Dim nPartId As Integer = EgtGetParent(EgtGetParent(nFeatureId))
       Dim nPartProjId As Integer = 0

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
@@ -465,7 +489,6 @@ Public MustInherit Class ProjectParameters
          End Select
       End If
    End Sub
-
 #End Region    ' Methods
 
 End Class
@@ -751,6 +774,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

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

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

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml

@@ -4,13 +4,7 @@
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
              xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
-             xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-             xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
-             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-             xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
-             xmlns:dxfui="http://schemas.devexpress.com/winfx/2008/xaml/core/filteringui"
-             xmlns:i="http://schemas.devexpress.com/winfx/2008/xaml/mvvm">
+             PreviewKeyDown="Root_PreviewKeyDown">
    <UserControl.Resources>
       <OPTIMIZER:DataGridCellBorderThicknessConverter x:Key="DataGridCellBorderThicknessConverter"/>
       <OPTIMIZER:ProjIdToBtlFileName x:Key="ProjIdToBtlFileName"/>
@@ -18,286 +12,110 @@
       <OPTIMIZER:FractionHeightConverter x:Key="FractionHeightConverter"/>
       <OPTIMIZER:ExpanderWidthConverter x:Key="ExpanderWidthConverter"/>
       <sys:Double x:Key="FeatureWrapPanelHeight">0.6</sys:Double>
-      <!--stile che modifica il popup del DropDownButton-->
-      <!--<Style TargetType="dxb:PopupControlContainer">
-         <Setter Property="Background" Value="{StaticResource Border.BTLPartManager.Background}" />
-         <Setter Property="BorderBrush" Value="{StaticResource Border.BTLPartManager.Border}" />
-         <Setter Property="BorderThickness" Value="2" />
-         <Setter Property="CornerRadius" Value="5" />
-         <Setter Property="Padding" Value="0" />
-         <Setter Property="Margin" Value="0" />
-      </Style>-->
-      <DataTemplate x:Key="SectMat_Filter">
-         <dxfui:CheckedListFilterElement Context="{Binding FilteringContext, ElementName=BTLPart_GridControl}" 
-                                         FieldName="Section.sSectionXMaterial"/>
-      </DataTemplate>
    </UserControl.Resources>
-   <Grid>
-      <dxg:GridControl x:Name="BTLPart_GridControl"
-                       Grid.Column="1"
-                       ItemsSource="{Binding Tag.BTLPartVMList,
-                                             RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                       AutoExpandAllGroups="True"
-                       SelectionMode="Row"
-                       SelectedItems="{Binding Tag.SelBTLParts,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}">
-         <dxg:GridControl.View>
-            <dxg:TableView x:Name="BTLPart_TableView"  
-                           ShowGridMenu="OnShowGridMenu"                         
-                                                      
-                           ColumnHeaderStyle="{StaticResource HeaderStyle}"
-                           ColumnHeaderImageStyle="{StaticResource HeaderImageStyle}"
-                           
-                           RowStyle="{StaticResource RowStyle}"
-                           
-                           Style="{StaticResource TableViewStyle}">
-               <dxg:TableView.GroupRowTemplate>
-                  <DataTemplate>
-                     <Border Style="{StaticResource TableView_Border}">
-                           <Grid Style="{StaticResource TableView_Grid}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition/>
-                                 <ColumnDefinition Width="Auto"/>
-                              </Grid.ColumnDefinitions>
-                              <dxg:GridGroupExpandButton IsChecked="{Binding IsRowExpanded}"
-                                                         Command="{Binding View.Commands.ChangeGroupExpanded}"
-                                                         CommandParameter="{Binding RowHandle.Value}"/>
-                              <TextBlock Grid.Column="1"
-                                         Text="{Binding GroupValue.Value, Converter={StaticResource ProjIdToBtlFileName}}"
-                                         Style="{StaticResource BTLPartList_TextBlock}"/>
-                              <StackPanel Grid.Column="2"
-                                          Style="{StaticResource TableView_StackPanel}">
-                                 <Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         CommandParameter="{Binding Path=Name}"
-                                         ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         Style="{StaticResource BTLPartList_Button}">
-                                    <Image Source="{StaticResource Adjustment_Image}"
-                                           Style="{StaticResource BTLDataWnd_Image}"/>
-                                 </Button>
-                                 <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         CommandParameter="{Binding Path=Name}"
-                                         ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         Style="{StaticResource BTLPartList_Button}">
-                                    <Image Source="{StaticResource AddPart_Image}"
-                                           Style="{StaticResource BTLDataWnd_Image}"/>
-                                 </Button>
-                                 <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         CommandParameter="{Binding Path=Name}"
-                                         ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                                         Style="{StaticResource BTLPartList_Button}">
-                                    <Image Source="{StaticResource UpdateBTL_Image}"
-                                           Style="{StaticResource BTLDataWnd_Image}"/>
-                                 </Button>
-                              </StackPanel>
-                           </Grid>
-                     </Border>
-                  </DataTemplate>
-               </dxg:TableView.GroupRowTemplate>
-            </dxg:TableView>
-         </dxg:GridControl.View>
-         <dxg:GridControl.TotalSummary>
-            <dxg:GridSummaryItem SummaryType="Count"
-                                 FieldName="nPDN"
-                                 DisplayFormat="{}{0}"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="sCNT" 
-                                 DisplayFormat="{}{0}"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="sADDED"
-                                 DisplayFormat="{}{0}"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="nINPROD"
-                                 DisplayFormat="{}{0}"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="nDONE"
-                                 DisplayFormat="{}{0}"/>
-         </dxg:GridControl.TotalSummary>
-         <dxg:GridControl.GroupSummary>
-            <dxg:GridSummaryItem SummaryType="Count" 
-                                 FieldName="nPDN"
-                                 DisplayFormat="{}{0}"
-                                 ShowInGroupColumnFooter="nPDN"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="sCNT" 
-                                 DisplayFormat="{}{0}"
-                                 ShowInGroupColumnFooter="sCNT"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="sADDED"
-                                 DisplayFormat="{}{0}"
-                                 ShowInGroupColumnFooter="sADDED"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="nINPROD"
-                                 DisplayFormat="{}{0}"
-                                 ShowInGroupColumnFooter="nINPROD"/>
-            <dxg:GridSummaryItem SummaryType="Sum" 
-                                 FieldName="nDONE"
-                                 DisplayFormat="{}{0}"
-                                 ShowInGroupColumnFooter="nDONE"/>
-         </dxg:GridControl.GroupSummary>
-         <dxg:GridControl.DetailDescriptor>
-            <!--<dxg:DataControlDetailDescriptor ItemsSourceBinding="{Binding BTLFeatureVMList}">
-               <dxg:DataControlDetailDescriptor.DataControl>
-                  <dxg:GridControl>
-                     <dxg:GridControl.View>
-                        <dxg:TableView AutoWidth="False"/>
-                     </dxg:GridControl.View>
-                     <dxg:GridColumn FieldName="nPRID" AllowSorting="False"/>
-                     <dxg:GridColumn FieldName="bDO" AllowSorting="False"/>
-                     <dxg:GridColumn FieldName="nSelGRP" AllowSorting="False"/>
-                     <dxg:GridColumn FieldName="nPRC" AllowSorting="False"/>
-                     <dxg:GridColumn FieldName="sName" AllowSorting="False"/>
-                     <dxg:GridColumn FieldName="sName" AllowSorting="False" Width="Auto">
-                        <dxg:GridColumn.CellTemplate>
-                           <DataTemplate>
-                              <dx:DropDownButton Content="⋮">
-                                 <StackPanel>
-                                    <Button Content="Modifica" />
-                                    <Button Content="Elimina" />
-                                 </StackPanel>
-                              </dx:DropDownButton>
-                           </DataTemplate>
-                        </dxg:GridColumn.CellTemplate>
-                     </dxg:GridColumn>
-                  </dxg:GridControl>
-               </dxg:DataControlDetailDescriptor.DataControl>
-               
-            </dxg:DataControlDetailDescriptor>-->
-            <dxg:ContentDetailDescriptor>
-               <dxg:ContentDetailDescriptor.ContentTemplate>
-                  <DataTemplate>
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <OPTIMIZER:FeatureListManagerV/>
-                        <ListBox Grid.Column="1"
-                                 ItemsSource="{Binding BTLFeatureVMList}"
-                                 SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
-                                 Style="{StaticResource BTLPartList_ListBox}">
-                           <ListBox.ItemsPanel>
-                              <ItemsPanelTemplate>
-                                 <WrapPanel Orientation="Vertical" 
-                                            MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
-                                                                                                             Converter={StaticResource FractionHeightConverter},
-                                                                                                             ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
-                                            MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
-                              </ItemsPanelTemplate>
-                           </ListBox.ItemsPanel>
-                           <ListBox.ContextMenu>
-                              <ContextMenu>
-                                 <MenuItem Command="{Binding SelectAllFeature_Command}">
-                                    <MenuItem.Header>
-                                       <TextBlock Text="{Binding SelectAll_Msg}"/>
-                                    </MenuItem.Header>
-                                 </MenuItem>
-                                 <MenuItem Command="{Binding DeselectAllFeature_Command}">
-                                    <MenuItem.Header>
-                                       <TextBlock Text="{Binding DeselectAll_Msg}"/>
-                                    </MenuItem.Header>
-                                 </MenuItem>
-                                 <MenuItem Command="{Binding SelectItemFeature_Command}">
-                                    <MenuItem.Header>
-                                       <TextBlock Text="{Binding SelFeatureMsg, UpdateSourceTrigger=PropertyChanged}"/>
-                                    </MenuItem.Header>
-                                 </MenuItem>
-                                 <MenuItem Command="{Binding DeselectItemFeature_Command}">
-                                    <MenuItem.Header>
-                                       <TextBlock Text="{Binding DeselFeatureMsg, UpdateSourceTrigger=PropertyChanged}"/>
-                                    </MenuItem.Header>
-                                 </MenuItem>
-                              </ContextMenu>
-                           </ListBox.ContextMenu>
-                           <ListBox.ItemTemplate>
-                              <DataTemplate>
-                                 <Grid Style="{StaticResource BTLPartList_Grid}">
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="50"/>
-                                       <ColumnDefinition Width="40"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding nPRID}"
-                                         Style="{StaticResource Prod_TextBlock}"/>
-                                    <Grid Grid.Column="1">
-                                       <Grid.ColumnDefinitions>
-                                          <ColumnDefinition Width="1*"/>
-                                          <ColumnDefinition Width="18"/>
-                                          <ColumnDefinition Width="Auto"/>
-                                       </Grid.ColumnDefinitions>
-                                       <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
-                                               Background="{Binding Calc_Background}"/>
-                                       <Grid Grid.Column="1">
-                                          <Grid.ColumnDefinitions>
-                                             <ColumnDefinition Width="1*"/>
-                                             <ColumnDefinition Width="Auto"/>
-                                          </Grid.ColumnDefinitions>
-                                          <TextBlock Grid.ColumnSpan="2"
-                                                     Visibility="{Binding CALC_ROT_Visibility}"
-                                                     Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
-
-                                          <TextBlock Grid.Column="1"
-                                                     Text="{Binding CALC_ERR_Letter}"
-                                                     Foreground="{Binding CALC_ERR_Foreground}"
-                                                     Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
-                                       </Grid>
-                                       <TextBlock Grid.Column="2"
-                                                  Visibility="{Binding bStrategy_Visibility}"
-                                                  Style="{StaticResource bStrategy_TextBlock}"/>
-                                    </Grid>
-                                    <CheckBox Grid.Column="2"
-                                              IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                                              Style="{StaticResource BTLPartList_CheckBox}"/>
-                                    <TextBlock Grid.Column="3"
-                                               Text="{Binding sFeature_Name}"
-                                               Style="{StaticResource Prod_TextBlock}"/>
-                                    <Button Grid.Column="4" 
-                                            Command="{Binding EditFeature_Command}"
-                                            Click="SelectButton_Click"
-                                            Style="{StaticResource EditFeature_Button}">
-                                       <Image Source="{StaticResource Edit_Image}"
+   <EgwWPFBaseLib:EgwDataGrid ItemsSource="{Binding Tag.BTLPartVMList,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                              SelectionMode="Extended"
+                              PreviewMouseMove="DataGrid_PreviewMouseMove"
+                              Margin="0,0,0,5"
+                              OPTIMIZER:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
+                                                                                                    RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                              ColumnLayouts="{Binding PartColumns}"
+                              IsEnabled="{Binding PartList_IsEnabled}"
+                              AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                              AlternationCount="2"
+                              AreRowDetailsFrozen="True"
+                              VirtualizingPanel.IsVirtualizingWhenGrouping="True"
+                              VirtualizingPanel.ScrollUnit="Pixel"
+                              RenderOptions.CachingHint="Cache"
+                              VirtualizingPanel.CacheLength="2"
+                              VirtualizingPanel.CacheLengthUnit="Page"                         
+                              RowBackground="{StaticResource BeamWall_BLackSqueeze}"
+                              ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
+                              Style="{StaticResource Optimizer_DataGrid}">
+      <DataGrid.GroupStyle>
+         <GroupStyle>
+            <GroupStyle.ContainerStyle>
+               <Style TargetType="{x:Type GroupItem}">
+                  <Setter Property="Template">
+                     <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type GroupItem}">
+                           <Expander Style="{StaticResource BTLPartList_Expander}">
+                              <Expander.Header>
+                                 <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                                    <TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
+                                               Style="{StaticResource BTLPartList_TextBlock}"/>
+                                    <Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            CommandParameter="{Binding Path=Name}"
+                                            ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            Style="{StaticResource BTLPartList_Button}">
+                                       <Image Source="{StaticResource Adjustment_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
-                                 </Grid>
-                              </DataTemplate>
-                           </ListBox.ItemTemplate>
-                        </ListBox>
-                        <StackPanel Grid.Row="1"
-                                    Grid.Column="1"
-                                    Style="{StaticResource BTLPartList_StackPanel}">
-                           <TextBlock Text="STATUS:" 
-                                      Style="{StaticResource Status_TextBlock}"/>
-
-                           <TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource SelBTLPart_TextBlock}"/>
-
-                           <TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
-                                      Style="{StaticResource SelBTLPart_TextBlock}"/>
-                        </StackPanel>
-                     </Grid>
-                  </DataTemplate>
-               </dxg:ContentDetailDescriptor.ContentTemplate>
-            </dxg:ContentDetailDescriptor>
-         </dxg:GridControl.DetailDescriptor>
-         <dxg:GridColumn FieldName="nPROJ"
-                         GroupIndex="0"/>
-         <dxg:GridColumn FieldName="Section.sSectionXMaterial"
-                         Visible="False"/>
-         <dxg:GridColumn FieldName="nPDN"
-                         Header="{Binding PDN_Msg}"
-                         Style="{StaticResource ColumnPDNStyle}"/>
-         <dxg:GridColumn FieldName="GlobalState"
-                         Header=""
-                         SortFieldName="nGlobalState"
-                         AllowColumnFiltering="False">
-            <dxg:GridColumn.CellTemplate>
+                                    <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            CommandParameter="{Binding Path=Name}"
+                                            ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            Style="{StaticResource BTLPartList_Button}">
+                                       <Image Source="{StaticResource AddPart_Image}"
+                                              Style="{StaticResource BTLDataWnd_Image}"/>
+                                    </Button>
+                                    <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            CommandParameter="{Binding Path=Name}"
+                                            ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                                            Style="{StaticResource BTLPartList_Button}">
+                                       <Image Source="{StaticResource UpdateBTL_Image}"
+                                              Style="{StaticResource BTLDataWnd_Image}"/>
+                                    </Button>
+                                 </StackPanel>
+                              </Expander.Header>
+                              <Expander.Content>
+                                 <ItemsPresenter/>
+                              </Expander.Content>
+                           </Expander>
+                        </ControlTemplate>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+            </GroupStyle.ContainerStyle>
+         </GroupStyle>
+      </DataGrid.GroupStyle>
+      <DataGrid.CellStyle>
+         <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
+            <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
+            <Setter Property="BorderThickness">
+               <Setter.Value>
+                  <MultiBinding Converter="{StaticResource DataGridCellBorderThicknessConverter}"
+                                ConverterParameter="3">
+                     <Binding Path="Column.DisplayIndex" RelativeSource="{RelativeSource Self}"/>
+                  </MultiBinding>
+               </Setter.Value>
+            </Setter>
+         </Style>
+      </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"/>
+            <Style.Triggers>
+               <DataTrigger Binding="{Binding IsRowEnabled}" Value="False">
+                  <Setter Property="IsEnabled" Value="False"/>
+               </DataTrigger>
+            </Style.Triggers>
+         </Style>
+      </DataGrid.RowStyle>
+      <EgwWPFBaseLib:EgwDataGrid.Resources>
+         <!--PDN - Nome-->
+         <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.PDN_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn x:Key="colCALC" CanUserResize="False"
+                                 SortMemberPath="nGlobalState">
+            <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <Grid Style="{StaticResource GlobalState_Grid}">
                      <Grid.ColumnDefinitions>
@@ -307,171 +125,402 @@
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Text="↓"
-                                Visibility="{Binding RowData.Row.CALC_FALL_Visibility}"
+                                Visibility="{Binding CALC_FALL_Visibility}"
                                 Style="{StaticResource RawPartList_TextBlock}"/>
                      <Border Grid.Column="1"
-                             Background="{Binding RowData.Row.Calc_BorderBrush}"
-                             Style="{StaticResource Calc_Border}"/>
+                             Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                             Background="{Binding Calc_BorderBrush}">
+                     </Border>
                      <Grid Grid.Column="2"
                            Style="{StaticResource FeatureInPartInRawPartList_Grid}">
                         <Grid.RowDefinitions>
                            <RowDefinition Height="1*"/>
                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Text="&#11119;"
-                                   Visibility="{Binding RowData.Row.CALC_ROT_Visibility}"
+                        <TextBlock Text="&#11119;" 
+                                   Visibility="{Binding CALC_ROT_Visibility}"
                                    Style="{StaticResource CALC_ROT_TextBlock}"/>
 
                         <TextBlock Grid.Row="1"
-                                   Text="{Binding RowData.Row.CALC_ERR_Letter}"
-                                   Foreground="{Binding RowData.Row.CALC_ERR_Foreground}"
+                                   Text="{Binding CALC_ERR_Letter}"
+                                   Foreground="{Binding CALC_ERR_Foreground}"
                                    Style="{StaticResource CALC_ERR_TextBlock}"/>
                      </Grid>
                      <TextBlock Grid.Column="3"
                                 Text="&#9999;"
-                                Visibility="{Binding RowData.Row.StrategyModify_Visibility}"
+                                Visibility="{Binding StrategyModify_Visibility}"
                                 Style="{StaticResource StrategyModify_TextBlock}"/>
                   </Grid>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="bDO" 
-                         SortFieldName="bDO"
-                         Header=""
-                         Style="{StaticResource ColumnInfoStyle}">
-            <dxg:GridColumn.HeaderTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--DO - Abilitazione-->
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"/>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                            Style="{StaticResource PParameters_CheckBox}"/>
                </DataTemplate>
-            </dxg:GridColumn.HeaderTemplate>
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
-                  <dxe:CheckEdit IsChecked="{Binding RowData.Row.bDO}"
-                                 Style="{StaticResource bDoCheckEditStyle}"/>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="sW" 
-                         SortFieldName="dW"
-                         Header="{Binding W_Msg}"
-                         CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoCustomStyle}"/>
-         <dxg:GridColumn FieldName="sH" 
-                         SortFieldName="dH"
-                         Header="{Binding H_Msg}"
-                         CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoCustomStyle}"/>
-         <dxg:GridColumn FieldName="sL" 
-                         SortFieldName="dL"
-                         Header="{Binding L_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
-         <dxg:GridColumn FieldName="sNAM"
-                         Header="{Binding NAM_Msg}"
-                         Style="{StaticResource ColumnInfoCheckedListStyle}"/>
-         <dxg:GridColumn FieldName="sMATERIAL" 
-                         Header="{Binding MAT_Msg}"
-                         CustomColumnFilterPopupTemplate="{StaticResource SectMat_Filter}"
-                         Style="{StaticResource ColumnInfoCustomStyle}"/>
-         <dxg:GridColumn FieldName="sCNT" 
-                         Header="{Binding CNT_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
-         <dxg:GridColumn FieldName="sADDED" 
-                         Header="{Binding ADDED_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
-         <dxg:GridColumn FieldName="nINPROD" 
-                         Header="{Binding INPROD_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
-         <dxg:GridColumn FieldName="nDONE" 
-                         Header="{Binding DONE_Msg}"
-                         Style="{StaticResource ColumnInfoStyle}"/>
-         <dxg:GridColumn FieldName="sGROUP" 
-                         Header="{Binding GRP_Msg}"
-                         Style="{StaticResource ColumnInfoCheckedListStyle}"/>
-         <dxg:GridColumn FieldName="sSTOREY" 
-                         Header="{Binding STOREY_Msg}"
-                         Style="{StaticResource ColumnInfoCheckedListStyle}"/>
-         <dxg:GridColumn FieldName="sROTATED" 
-                         Image="{StaticResource HeaderRotate_Image}"
-                         HeaderToolTip="{Binding ForwardRotation_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.W_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn x:Key="colH" Binding="{Binding sH}" SortMemberPath="dH">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.H_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn x:Key="colL" Binding="{Binding sL}" SortMemberPath="dL">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.L_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--NAM - Descrizione-->
+         <DataGridTextColumn x:Key="colNAM" Binding="{Binding sNAM}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.MAT_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--CNT - Richiesti da BTL-->
+         <DataGridTextColumn x:Key="colCNT" Binding="{Binding sCNT}" SortMemberPath="nCNT">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="QTY"
+                             ToolTip="{Binding DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--ADDED - Aggiunti-->
+         <DataGridTextColumn x:Key="colADDED" Binding="{Binding sADDED}" SortMemberPath="nADDED">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.ShortADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                             ToolTip="{Binding DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--INPROD - IN OTTIMIZZAZIONE-->
+         <DataGridTextColumn x:Key="colINPROD" Binding="{Binding nINPROD}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.ShortINPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                             ToolTip="{Binding DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--DONE - PRODOTTI-->
+         <DataGridTextColumn x:Key="colDONE" Binding="{Binding nDONE}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.ShortDONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                             ToolTip="{Binding DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--ROT - Rotazione-->
+         <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <Image Source="{StaticResource HeaderRotate_Image}"
+                         Style="{StaticResource BTLPartList_Image}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <Grid>
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding RowData.Row.sROTATED}"
+                     <TextBlock Text="{Binding sROTATED}"
                                 Style="{StaticResource Rotate_TextBlock}"/>
                      <Button Grid.Column="1"
-                             Command="{Binding RowData.Row.ForwardRotation_Command}"
-                             ToolTip="{Binding RowData.Row.ForwardRotation_ToolTip}"
-                             IsEnabled="{Binding RowData.Row.RotatePart_IsEnabled}">
+                             Command="{Binding ForwardRotation_Command}"
+                             ToolTip="{Binding ForwardRotation_ToolTip}"
+                             IsEnabled="{Binding RotatePart_IsEnabled}"
+                             Style="{StaticResource BTLPanel_Button}">
                         <Image Source="{StaticResource Rotate_Image}"
-                               Style="{StaticResource PDF_Image}"/>
+                               Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                   </Grid>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="IsInverted" 
-                         Image="{StaticResource HeaderInversion_Image}"
-                         Style="{StaticResource ColumnButtonStyle}">
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--INV - Inversione-->
+         <DataGridTemplateColumn x:Key="colFLIP">
+            <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <dxe:CheckEdit IsChecked="{Binding RowData.Row.IsInverted}"
-                                 Style="{StaticResource bDoCheckEditStyle}"/>
+                  <Image Source="{StaticResource HeaderInversion_Image}"
+                         Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="Verify"
-                         Image="{StaticResource HeaderVerify_Image}"
-                         HeaderToolTip="{Binding Verify_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
-                  <Button IsEnabled="{Binding RowData.Row.Verify_IsEnabled}"
-                          Command="{Binding RowData.Row.Verify_Command}"
-                          ToolTip="{Binding RowData.Row.Verify_ToolTip}">
+                  <CheckBox IsChecked="{Binding IsInverted, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--VER - Verifica-->
+         <DataGridTemplateColumn x:Key="colVERIFY">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <Image Source="{StaticResource HeaderVerify_Image}"
+                         Style="{StaticResource BTLPartList_Image}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Button ToolTip="{Binding Verify_ToolTip}"
+                          Command="{Binding Verify_Command}"
+                          IsEnabled="{Binding Verify_IsEnabled}"
+                          Style="{StaticResource BTLPanel_Button}">
                      <Image Source="{StaticResource Verify_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="AddToRaw"
-                         Image="{StaticResource HeaderAddToRawPart_Image}"
-                         HeaderToolTip="{Binding AddToRawPart_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--ADD - Aggiungi al grezzo-->
+         <DataGridTemplateColumn x:Key="colADD">
+            <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Button IsEnabled="{Binding RowData.Row.BTLPartManager_IsEnabled}"
-                          Command="{Binding RowData.Row.AddToRawPart_Command}"
-                          ToolTip="{Binding RowData.Row.AddToRawPart_ToolTip}">
+                  <Image Source="{StaticResource HeaderAddToRawPart_Image}"
+                         Style="{StaticResource BTLPartList_Image}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Button Command="{Binding AddToRawPart_Command}"
+                          Visibility="{Binding MachiningPage_Visibility}"
+                          ToolTip="{Binding AddToRawPart_ToolTip}"
+                          IsEnabled="{Binding BTLPartManager_IsEnabled}"
+                          Style="{StaticResource BTLPanel_Button}">
                      <Image Source="{StaticResource AddToRawPart_Image}"
-                            Style="{StaticResource PDF_Image}"/>
+                            Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-         <dxg:GridColumn FieldName="Setting" 
-                         Image="{StaticResource HeaderSetting_Image}"
-                         HeaderToolTip="{Binding Settings_Command_ToolTip}"
-                         Style="{StaticResource ColumnButtonStyle}">
-            <dxg:GridColumn.CellTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--SET - Opzioni-->
+         <DataGridTemplateColumn x:Key="colSETTING">
+            <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <dx:DropDownButton Glyph="{StaticResource Setting_Image}"
-                                     ToolTip="{Binding RowData.Row.Settings_Command_ToolTip}"
-                                     Style="{StaticResource DropDownButtonStyle}">
-                     <dx:DropDownButton.ArrowGlyph>
-                        <DrawingImage/>
-                     </dx:DropDownButton.ArrowGlyph>
-                     <OPTIMIZER:BTLPartManagerV/>
-                  </dx:DropDownButton>
+                  <Image Source="{StaticResource HeaderSetting_Image}"
+                         Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
-            </dxg:GridColumn.CellTemplate>
-         </dxg:GridColumn>
-      </dxg:GridControl>
-   </Grid>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <StackPanel>
+                     <Button ToolTip="{Binding Settings_Command_ToolTip}"
+                             Style="{StaticResource BTLPanel_Button}"                             
+                             Click="OpenPopUp_Click">
+                        <Image Source="{StaticResource Setting_Image}"
+                               Style="{StaticResource BTLDataWnd_Image}"/>
+                     </Button>
+                  </StackPanel>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+      </EgwWPFBaseLib:EgwDataGrid.Resources>
+      <EgwWPFBaseLib:EgwDataGrid.RowDetailsTemplate>
+         <DataTemplate>
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <OPTIMIZER:FeatureListManagerV/>
+               <ListBox Grid.Column="1"
+                        ItemsSource="{Binding BTLFeatureVMList}"
+                        SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
+                        PreviewMouseWheel="ListBox_PreviewMouseWheel"
+                        VirtualizingPanel.IsVirtualizing="True"
+                        VirtualizingPanel.VirtualizationMode="Recycling"
+                        ScrollViewer.CanContentScroll="True"
+                        PreviewMouseDown="ListBox_PreviewMouseDown"
+                        Style="{StaticResource BTLPartList_ListBox}">
+                  <ListBox.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Vertical" 
+                                   MaxHeight="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type EgwWPFBaseLib:EgwDataGrid}},
+                                                                                                    Converter={StaticResource FractionHeightConverter},
+                                                                                                    ConverterParameter={StaticResource FeatureWrapPanelHeight}}"
+                                   MinHeight="{Binding Parent.Children[0].ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"/>
+                     </ItemsPanelTemplate>
+                  </ListBox.ItemsPanel>
+                  <ListBox.ContextMenu>
+                     <ContextMenu>
+                        <MenuItem Command="{Binding SelectAllFeature_Command}">
+                           <MenuItem.Header>
+                              <TextBlock Text="{Binding SelectAll_Msg}"/>
+                           </MenuItem.Header>
+                        </MenuItem>
+                        <MenuItem Command="{Binding DeselectAllFeature_Command}">
+                           <MenuItem.Header>
+                              <TextBlock Text="{Binding DeselectAll_Msg}"/>
+                           </MenuItem.Header>
+                        </MenuItem>
+                        <MenuItem Command="{Binding SelectItemFeature_Command}">
+                           <MenuItem.Header>
+                              <TextBlock Text="{Binding SelFeatureMsg, UpdateSourceTrigger=PropertyChanged}"/>
+                           </MenuItem.Header>
+                        </MenuItem>
+                        <MenuItem Command="{Binding DeselectItemFeature_Command}">
+                           <MenuItem.Header>
+                              <TextBlock Text="{Binding DeselFeatureMsg, UpdateSourceTrigger=PropertyChanged}"/>
+                           </MenuItem.Header>
+                        </MenuItem>
+                     </ContextMenu>
+                  </ListBox.ContextMenu>
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <Grid Style="{StaticResource BTLPartList_Grid}">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="50"/>
+                              <ColumnDefinition Width="40"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Grp"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Prc"/>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Name"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding nPRID}"
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <Grid Grid.Column="1">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="18"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                                      Background="{Binding Calc_Background}"/>
+                              <Grid Grid.Column="1">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                 </Grid.ColumnDefinitions>
+                                 <TextBlock Grid.ColumnSpan="2"
+                                            Text="&#11119;" 
+                                            Visibility="{Binding CALC_ROT_Visibility}"
+                                            Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
+
+                                 <TextBlock Grid.Column="1"
+                                            Text="{Binding CALC_ERR_Letter}"
+                                            Foreground="{Binding CALC_ERR_Foreground}"
+                                            Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
+                              </Grid>
+                              <TextBlock Grid.Column="2"
+                                         Text="&#9999;"
+                                         Visibility="{Binding bStrategy_Visibility}"
+                                         Style="{StaticResource bStrategy_TextBlock}"/>
+                           </Grid>
+                           <CheckBox Grid.Column="2"
+                                     IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                                     Style="{StaticResource BTLPartList_CheckBox}"/>
+                           <TextBlock Grid.Column="3"
+                                      Text="[" 
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <TextBlock Grid.Column="4"
+                                      Text="{Binding nSelGRP}" 
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <TextBlock Grid.Column="5"
+                                      Text="-" 
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <TextBlock Grid.Column="6"
+                                      Text="{Binding nPRC, StringFormat={}{0:000}}" 
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <TextBlock Grid.Column="7"
+                                      Text="] " 
+                                      Style="{StaticResource Prod_TextBlock}"/>
+                           <TextBlock Grid.Column="8"
+                                      Text="{Binding sName}"
+                                      Style="{StaticResource Name_TextBlock}"/>
+                           <Button Grid.Column="9" 
+                                   Command="{Binding EditFeature_Command}"
+                                   Click="SelectButton_Click"
+                                   Style="{StaticResource EditFeature_Button}">
+                              <Image Source="{StaticResource Edit_Image}"
+                                     Style="{StaticResource BTLDataWnd_Image}"/>
+                           </Button>
+                        </Grid>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+               </ListBox>
+               <StackPanel Grid.Row="1"
+                           Grid.Column="1"
+                           Style="{StaticResource BTLPartList_StackPanel}">
+                  <TextBlock Text="STATUS:" 
+                             Style="{StaticResource Status_TextBlock}"/>
+
+                  <TextBlock Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                             Visibility="{Binding Tag.SelBTLPart.CALC_MSG_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                             Style="{StaticResource SelBTLPart_TextBlock}"/>
+
+                  <TextBlock Text="{Binding Tag.SelBTLPart.SelBTLFeatureVM.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLPartListV}}}"
+                             Style="{StaticResource SelBTLPart_TextBlock}"/>
+               </StackPanel>
+            </Grid>
+         </DataTemplate>
+      </EgwWPFBaseLib:EgwDataGrid.RowDetailsTemplate>
+
+   </EgwWPFBaseLib:EgwDataGrid>
 
 </UserControl>

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb

@@ -1,10 +1,4 @@
-Imports System.IO
-Imports System.Reflection
-Imports DevExpress.Data
-Imports DevExpress.Xpf.Bars
-Imports DevExpress.Xpf.Core.Serialization
-Imports DevExpress.Xpf.Grid
-Imports EgtBEAMWALL.Core
+Imports System.Reflection
 
 Public Class BTLPartListV
 
@@ -14,127 +8,16 @@ Public Class BTLPartListV
    Private m_isDraggingSelectionField As FieldInfo
    Private m_endDraggingMethod As MethodInfo
 
-   Private m_sDataGridLayoutPath As String = ""
+   Private bSelOnFeature As Boolean = False
 
    Sub New()
       ' This call is required by the designer.
       InitializeComponent()
       ' Add any initialization after the InitializeComponent() call.
-      ' Evita il drag sulla selezione multipla
-      'm_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
-      'm_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
-
-      m_sDataGridLayoutPath = Path.GetDirectoryName(DataGridColumnsIniFile.m_sDataGridColumnsIniFile) & "\NewDataGridLayoutFile.json"
-
-      For Each Column In BTLPart_GridControl.Columns
-         Column.[AddHandler](DXSerializer.AllowPropertyEvent,
-            New AllowPropertyEventHandler(AddressOf OnAllowProperty))
-      Next
-   End Sub
-
-   ' imposto parametri aggiuntivi da scrivere in Json colonne tabella
-   Private Sub OnAllowProperty(ByVal sender As Object, ByVal e As AllowPropertyEventArgs)
-      If e.DependencyProperty Is GridColumn.AllowResizingProperty Then
-         e.Allow = True
-      End If
-   End Sub
-
-   ' salvataggio del layout colonne
-   Public Sub SaveBTLPartGridControlLayout()
-      BTLPart_GridControl.SaveLayoutToJson(m_sDataGridLayoutPath)
-   End Sub
-
-   Public Sub IsVisibleGroupSummary(bValue As Boolean)
-      If bValue AndAlso BTLPart_GridControl.GroupSummary.Count = 0 Then
-         BTLPart_GridControl.GroupSummary.Clear()
-         Dim PDNGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nPDN",
-                                                                  .DisplayFormat = "{0}",
-                                                                  .SummaryType = SummaryItemType.Count,
-                                                                  .ShowInGroupColumnFooter = "nPDN"}
-         BTLPart_GridControl.GroupSummary.Add(PDNGroupSummaryItem)
-         Dim CNTGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sCNT",
-                                                                  .DisplayFormat = "{0}",
-                                                                  .SummaryType = SummaryItemType.Sum,
-                                                                  .ShowInGroupColumnFooter = "sCNT"}
-         BTLPart_GridControl.GroupSummary.Add(CNTGroupSummaryItem)
-         Dim ADDEDGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sADDED",
-                                                                  .DisplayFormat = "{0}",
-                                                                  .SummaryType = SummaryItemType.Sum,
-                                                                  .ShowInGroupColumnFooter = "sADDED"}
-         BTLPart_GridControl.GroupSummary.Add(ADDEDGroupSummaryItem)
-         Dim INPRODGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nINPROD",
-                                                                  .DisplayFormat = "{0}",
-                                                                  .SummaryType = SummaryItemType.Sum,
-                                                                  .ShowInGroupColumnFooter = "nINPROD"}
-         BTLPart_GridControl.GroupSummary.Add(INPRODGroupSummaryItem)
-         Dim DONEGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nDONE",
-                                                                  .DisplayFormat = "{0}",
-                                                                  .SummaryType = SummaryItemType.Sum,
-                                                                  .ShowInGroupColumnFooter = "nDONE"}
-         BTLPart_GridControl.GroupSummary.Add(DONEGroupSummaryItem)
-      End If
-      BTLPart_TableView.ShowGroupFooters = bValue
-   End Sub
-
-   Public Sub Me_Loaded() Handles Me.Loaded
-      ' imposto DataContext
       m_BTLPartListVM = DataContext
-      ' imposto riferimento ad action per salvataggio layout tabella
-      m_BTLPartListVM.refSaveBTLPartGridControlLayout = AddressOf SaveBTLPartGridControlLayout
-      ' rispristino layout tabella
-      If Not IsNothing(m_sDataGridLayoutPath) AndAlso File.Exists(m_sDataGridLayoutPath) Then
-         BTLPart_GridControl.RestoreLayoutFromJson(m_sDataGridLayoutPath)
-      End If
-      ' da gestire chiamandolo quando viene aperto un progetto o aggiunto/rimosso un btl, per evitare che ci sia il GroupSummary se c'e' un solo gruppo
-      IsVisibleGroupSummary(False)
-   End Sub
-
-   ' customizzazione ContextMenu del GridControl
-   Private Sub OnShowGridMenu(sender As Object, e As DevExpress.Xpf.Grid.GridMenuEventArgs)
-      If e.MenuType = GridMenuType.Column Then
-         ' rimozione bottoni
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupBox})
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupColumn})
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.ColumnChooser})
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFit})
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFitColumns})
-         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.FilterEditor})
-
-         Dim info As GridColumnMenuInfo = CType(e.MenuInfo, GridColumnMenuInfo)
-         Dim item As ColumnBase = CType(info.Column, ColumnBase)
-         ' aggiunta separatore
-         Dim separator As BarItemLinkSeparator = New BarItemLinkSeparator()
-         e.Customizations.Add(separator)
-         ' aggiunta bottone AllowResize e Auto Fit
-         Dim AllowResize As BarCheckItem = New BarCheckItem() With {.Content = "Allow Resize", .IsChecked = (BTLPart_TableView.AllowResizing AndAlso (item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default))}
-         AddHandler AllowResize.CheckedChanged, AddressOf AllowResize_CheckedChanged
-         e.Customizations.Add(AllowResize)
-         If item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default Then
-            Dim FixAuto As BarButtonItem = New BarCheckItem() With {.Content = "Auto Fit"}
-            AddHandler FixAuto.ItemClick, AddressOf FixAuto_ItemClick
-            e.Customizations.Add(FixAuto)
-         End If
-      End If
-   End Sub
-
-   ' gestore evento Allow Resize
-   Private Sub AllowResize_CheckedChanged(sender As Object, e As ItemClickEventArgs)
-      Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
-      Dim item As ColumnBase = CType(info.Column, ColumnBase)
-      If item.AllowResizing = DevExpress.Utils.DefaultBoolean.False Then
-         item.AllowResizing = DevExpress.Utils.DefaultBoolean.True
-      Else
-         item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
-      End If
-   End Sub
-   ' gestore evento Auto Fit
-   Private Sub FixAuto_ItemClick(sender As Object, e As ItemClickEventArgs)
-      Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
-      Dim item As ColumnBase = CType(info.Column, ColumnBase)
-      item.Width = New GridColumnWidth(1, GridColumnUnitType.Auto)
-      BTLPart_TableView.UpdateLayout()
-      item.Width = item.ActualWidth
-      item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
+      ' Evita il drag sulla selezione multipla
+      m_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
+      m_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
    End Sub
 
    Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
@@ -147,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
@@ -221,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

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb

@@ -9,8 +9,6 @@ Public Class BTLPartListVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Friend refSaveBTLPartGridControlLayout As Action
-
    Private m_colPart_Do As EgwWPFBaseLib.ColumnLayout
    Public ReadOnly Property colPart_Do As EgwWPFBaseLib.ColumnLayout
       Get
@@ -209,12 +207,6 @@ Public Class BTLPartListVM
 
 #End Region    ' Constructor
 
-   Friend Sub Close()
-      If Not IsNothing(refSaveBTLPartGridControlLayout) Then
-         refSaveBTLPartGridControlLayout()
-      End If
-   End Sub
-
 End Class
 
 Class DataGridCellBorderThicknessConverter
@@ -248,7 +240,7 @@ Class ProjIdToBtlFileName
    Implements IValueConverter
 
    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
-      If TypeOf value IsNot String Then Return ""
+      If TypeOf value IsNot Integer Then Return ""
       Dim nProjId As Integer = CInt(value)
       Dim ProjModel As EgtBEAMWALL.DataLayer.DatabaseModels.ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId)
       If IsNothing(ProjModel) Then Return ""

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"

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}">

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)

EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -160,11 +160,11 @@ Public Class MyMachGroupPanelVM
                      Dim Beam As PartVM = BeamMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
                      EgtSetCurrMachGroup(BeamMachGroup.Id)
                      Beam.DeletePart()
+                     ' reset necessario per poter ottenere nMachGroupId corretto
+                     EgtResetCurrMachGroup()
+                     ' aggiorno dati utilizzo barra
+                     BeamMachGroup.UpdateUsage()
                   End If
-                  ' reset necessario per poter ottenere nMachGroupId corretto
-                  EgtResetCurrMachGroup()
-                  ' aggiorno dati utilizzo barra
-                  BeamMachGroup.UpdateUsage()
                Next
                ' aggiorno quantita' in prod
                Dim BTLPart As BTLPartVM = CALCPanelVM.GetBTLPartVMFromBTLPartId(nPartId)
@@ -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

EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -803,6 +803,10 @@ Public Class MyMachGroupVM
          End If
          Part.nProduction_State = ItemState.ND
          Part.NotifyPropertyChanged(NameOf(Part.Background))
+         Part.NotifyPropertyChanged(NameOf(Part.ButtonIsEnabled))
+         For Each Feature As BTLFeatureVM In Part.FeatureVMList
+            Feature.NotifyPropertyChanged(NameOf(Feature.IsEnabled))
+         Next
          If bDuploToUpdate Then
             Dim Duplo As PartVM = CALCPanelVM.GetPartVMFromPartId(Part.nPartId)
             Duplo.ResetCalcTotalPart()
@@ -818,6 +822,7 @@ Public Class MyMachGroupVM
       End If
       NotifyPropertyChanged(NameOf(IsReadOnly))
       NotifyPropertyChanged(NameOf(Background))
+      NotifyPropertyChanged(NameOf(ButtonIsEnabled))
    End Sub
 
    Private Sub RefreshPartList_Tick()
@@ -940,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
@@ -980,6 +985,7 @@ Public Class MyMachGroupVM
                                                   .bBarOk = True,
                                                   .nMachineName = MachineName,
                                                   .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
+                                                  .nBarState = SelMachGroup.nProduction_State,
                                                   .nGlobState = SelMachGroup.nGlobalState}
          If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
             Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"

EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml

@@ -88,7 +88,9 @@
       </TabControl.ItemContainerStyle>
       <TabItem Header="EMPTY"/>
       <TabItem Header="STRATEGIES">
-         <OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}" Margin="0,0,0,-25"/>
+         <StackPanel>
+            <OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}"/>
+         </StackPanel>
       </TabItem>
       <TabItem Header="PARAMETERS">
          <StackPanel Style="{StaticResource PartManager_StackPanel}">

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
@@ -637,7 +641,7 @@ Public Class MainMenuVM
       Dim bEx As Boolean = False
       Try
          Dim sAddressArray As String() = sSupportAddress.Split(CType(",", Char()))
-         Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("AEdifica Feedback - " & sKey)
+         Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("Aedifica Feedback - " & sKey)
          SendFeedbackWindow.Recipients.Add(sAddressArray(0))
          For index As Integer = 1 To sAddressArray.Length() - 1
             SendFeedbackWindow.Recipients.Add(sAddressArray(index), EgtWPFLib5.MapiMailMessage.RecipientType.CC)

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())
@@ -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

EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb

@@ -43,6 +43,14 @@ 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 Map.refStrategyManagerVM.bIsModifyStrategy Then
+         Map.refStrategyManagerVM.SaveCustomConfigJson()
+      End If
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          e.Cancel = True
          Return

EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb

@@ -269,7 +269,7 @@ Public Class MainWindowVM
             ' recupero secondo parametro
             Dim sProdId As String = Environment.GetCommandLineArgs(2)
             If Not Integer.TryParse(sProdId, nProdId) OrElse nProdId <= 0 Then Return False
-            nPage = Pages.MACHINING
+            nPage = Pages.OPTIMIZERPAGE
             Return True
          Case 2         ' apri pagina specifica senza progetto specifico
             ' recupero secondo parametro
@@ -427,8 +427,6 @@ Public Class MainWindowVM
                                                                                                                              {S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
                                                                                                                              {S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
          EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
-         Map.refPartListVM.Close()
-
       End If
       ' Termino il Model
       m_MainWindowM.Close()

EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb

@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.5.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>

EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml

@@ -16,7 +16,8 @@
               Style="{StaticResource Bottom_WrapPanel}">
       <OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
       <OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
-      <OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"/>
+      <OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
+                                Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelBottomV}}}"/>
       <OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
    </WrapPanel>
 

EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml

@@ -9,6 +9,7 @@
    </Grid.ColumnDefinitions>
    <OPTIMIZER:LeftPanelV DataContext="{StaticResource LeftPanelVM}"
                          Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
+                         Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
                          IsEnabled="{Binding DataContext.LeftPanel_IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
                          Opacity="{Binding DataContext.LeftPanel_Opacity, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"/>
 

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

EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml

@@ -11,7 +11,8 @@
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
    <Border Style="{StaticResource TopPanel_Border}">
-      <OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"/>
+      <OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"
+                              Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
    </Border>
    
    <OPTIMIZER:CalcPanelV Grid.Column="1" 

EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml

@@ -25,68 +25,57 @@
          <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}"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
-                                               RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:PartParametersWndV}}}"
+                                Text="{Binding CurrPart.sMATERIAL, UpdateSourceTrigger=LostFocus}"
                                 Style="{StaticResource PartParam_TextBox}"/>
       </UniformGrid>
 
@@ -114,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>
@@ -126,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}"/>
@@ -192,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>
 
@@ -275,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}"
@@ -317,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>
@@ -350,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>
@@ -383,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>
@@ -455,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>

EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndV.xaml.vb

@@ -14,4 +14,5 @@
    Private Sub CloseWindow(bDialogResult As Boolean) Handles m_PartParametersWndVM.m_CloseWindow
       Me.DialogResult = bDialogResult
    End Sub
+
 End Class

EgtBEAMWALL.Optimizer/PartParametersWnd/PartParametersWndVM.vb

@@ -8,6 +8,13 @@ Public Class PartParametersWndVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
+   Private m_CurrPart As BTLPartVM
+   Public ReadOnly Property CurrPart As BTLPartVM
+      Get
+         Return m_CurrPart
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
 
@@ -271,8 +278,8 @@ Public Class PartParametersWndVM
 
 #Region "CONSTRUCTOR"
 
-   Sub New()
-
+   Sub New(CurrPart As BTLPartVM)
+      m_CurrPart = CurrPart
    End Sub
 
 #End Region    ' CONSTRUCTOR

EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb

@@ -4,6 +4,7 @@ Imports System.IO.Compression
 Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
+Imports EgtBEAMWALL.Optimizer.MainMenuVM
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports Newtonsoft.Json
@@ -850,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
@@ -992,15 +994,6 @@ Public Class ProdManagerVM
 
       ' Apro finestra parametri generali
       Dim GeneralParametersWndVM As New GeneralParametersWndVM(nType)
-
-      ' Controllo se la cartella AiSetUp è presente
-      GetFirstAiSetUp(nType)
-
-      Dim sDefaultConfigFile As String = String.Empty
-      If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) = 0 Then
-         SetFirstStrategy(GeneralParametersWndVM, sDefaultConfigFile)
-      End If
-
       GeneralParametersWndVM.SetbSaveGeneralParameters(True)
       GeneralParametersWndVM.SaveProjectParameters()
 
@@ -1120,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
@@ -1327,7 +1320,7 @@ Public Class ProdManagerVM
    End Sub
 
    Public Sub OpenProjectFromSupervisor(ProjIdToOpen As Integer)
-      If Not IsNothing(ProjectManagerVM.CurrProd) Then
+      If (Not IsNothing(ProjectManagerVM.CurrProd) AndAlso ProjIdToOpen <> ProjectManagerVM.CurrProd.nProdId) OrElse Map.refMainMenuVM.SelPage <> Pages.OPTIMIZERPAGE Then
          m_nProjIdToOpen = ProjIdToOpen
          m_bOpenProj = True
       End If
@@ -1365,7 +1358,9 @@ Public Class ProdManagerVM
       While nPartLayerId <> GDB_ID.NULL
          Dim nNewId As Integer = EgtCopyEx(Map.refSceneHostVM.MainScene.GetCtx(), nPartLayerId, Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx(), nRef)
          ' Salvo le info dei pezzi per associarli in modo corretto
-         Map.refSceneShowBuldingVM.MapInfo.Add(nPartLayerId, nNewId)
+         If nNewId > 0 AndAlso Not Map.refSceneShowBuldingVM.MapInfo.ContainsKey(nPartLayerId) Then
+            Map.refSceneShowBuldingVM.MapInfo.Add(nPartLayerId, nNewId)
+         End If
          nPartLayerId = EgtGetNextPart(nPartLayerId)
       End While
 
@@ -1378,14 +1373,17 @@ Public Class ProdManagerVM
          While nIdF <> GDB_ID.NULL
             Dim Sou As Integer = 0
             EgtGetInfo(nIdF, "!SOU", Sou)
-            EgtSetInfo(nIdF, "!SOU", Map.refSceneShowBuldingVM.MapInfo(Sou))
+            If EgtGetInfo(nIdF, "!SOU", Sou) AndAlso Map.refSceneShowBuldingVM.MapInfo.ContainsKey(Sou) Then
+               EgtSetInfo(nIdF, "!SOU", Map.refSceneShowBuldingVM.MapInfo(Sou))
+            End If
             nIdF = EgtGetNext(nIdF)
          End While
          Map.refProjectVM.BTLStructureVM.ShowBuilding(nListAsseBase(IdAsseBase), True)
          If IdAsseBase > 0 Then EgtSetStatus(nListAsseBase(IdAsseBase), GDB_ST.OFF)
          Dim nProj As Integer = 0
-         EgtGetInfo(nListAsseBase(IdAsseBase), PROJ, nProj)
-         m_nListProjAsseBase.Add(nProj, nListAsseBase(IdAsseBase))
+         If EgtGetInfo(nListAsseBase(IdAsseBase), PROJ, nProj) AndAlso Not m_nListProjAsseBase.ContainsKey(nProj) Then
+            m_nListProjAsseBase.Add(nProj, nListAsseBase(IdAsseBase))
+         End If
       Next
 
       EgtZoom(ZM.ALL)

EgtBEAMWALL.Optimizer/Project/ProjectVM.vb

@@ -60,6 +60,32 @@ Public Class ProjectVM
    End Property
    Private m_bLockUX As Boolean = False
 
+   Private m_FeatureManager_Visibility As Boolean = True
+   Public Property FeatureManager_Visibility As Visibility
+      Get
+         Return If(m_FeatureManager_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+      Set(value As Visibility)
+         m_FeatureManager_Visibility = (value = Visibility.Visible)
+      End Set
+   End Property
+   Friend Sub SetFeatureManager_Visibility(IsVisible As Boolean)
+      m_FeatureManager_Visibility = IsVisible
+   End Sub
+
+   Private m_ShowBeamPanel_Visibility As Boolean = True
+   Public Property ShowBeamPanel_Visibility As Visibility
+      Get
+         Return If(m_ShowBeamPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+      Set(value As Visibility)
+         m_ShowBeamPanel_Visibility = (value = Visibility.Visible)
+      End Set
+   End Property
+   Friend Sub SetShowBeamPanel_Visibility(IsVisible As Boolean)
+      m_ShowBeamPanel_Visibility = IsVisible
+   End Sub
+
    Private m_FreeContourManager_Visibility As Boolean = False
    Public Property FreeContourManager_Visibility As Visibility
       Get
@@ -74,6 +100,32 @@ Public Class ProjectVM
       NotifyPropertyChanged(NameOf(FreeContourManager_Visibility))
    End Sub
 
+   Private m_ProdManager_Visibility As Boolean = True
+   Public Property ProdManager_Visibility As Visibility
+      Get
+         Return If(m_ProdManager_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+      Set(value As Visibility)
+         m_ProdManager_Visibility = (value = Visibility.Visible)
+      End Set
+   End Property
+   Friend Sub SetProdManager_Visibility(IsVisible As Boolean)
+      m_ProdManager_Visibility = IsVisible
+   End Sub
+
+   Private m_LeftPanel_Visibility As Boolean = True
+   Public Property LeftPanel_Visibility As Visibility
+      Get
+         Return If(m_LeftPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
+      End Get
+      Set(value As Visibility)
+         m_LeftPanel_Visibility = (value = Visibility.Visible)
+      End Set
+   End Property
+   Friend Sub SetLeftPanel_Visibility(IsVisible As Boolean)
+      m_LeftPanel_Visibility = IsVisible
+   End Sub
+
    Private m_LeftPanel_IsEnabled As Boolean = True
    Public Property LeftPanel_IsEnabled As Boolean
       Get
@@ -202,7 +254,7 @@ Public Class ProjectVM
          Return m_FeatureList_Visibility
       End Get
    End Property
-   Friend Sub SetFeatureListVisibility(bVisible As Boolean)
+   Sub SetFeatureListVisibility(bVisible As Boolean)
       m_FeatureList_Visibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(FeatureList_Visibility))
    End Sub
@@ -213,7 +265,7 @@ Public Class ProjectVM
          Return m_RawPartManagerVisibility
       End Get
    End Property
-   Friend Sub SetRawPartManagerVisibility(bVisible As Boolean)
+   Sub SetRawPartManagerVisibility(bVisible As Boolean)
       m_RawPartManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(RawPartManagerVisibility))
    End Sub
@@ -224,7 +276,7 @@ Public Class ProjectVM
          Return m_StrategyManagerVisibility
       End Get
    End Property
-   Friend Sub SetStrategyManagerVisibility(bVisible As Boolean)
+   Sub SetStrategyManagerVisibility(bVisible As Boolean)
       m_StrategyManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(StrategyManagerVisibility))
    End Sub
@@ -235,7 +287,7 @@ Public Class ProjectVM
          Return m_SceneShowBuldingVisibility
       End Get
    End Property
-   Friend Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
+   Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
       m_SceneShowBuldingVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(SceneShowBuldingVisibility))
    End Sub
@@ -246,7 +298,7 @@ Public Class ProjectVM
          Return m_ManagerTabVisibility
       End Get
    End Property
-   Friend Sub SetManagerTabVisibility(bVisible As Boolean)
+   Sub SetManagerTabVisibility(bVisible As Boolean)
       m_ManagerTabVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(ManagerTabVisibility))
    End Sub
@@ -319,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
@@ -328,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
@@ -493,12 +547,17 @@ Public Class ProjectVM
 
    End Sub
 
+   Friend Sub NotifyAllPanelVisibility()
+      NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
+      NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
+   End Sub
+
    ''' <summary>
    ''' Funzione che permette di eliminare un pezzo modificato e reinserirlo nell'assemblato
    ''' </summary>
    Friend Sub UpdatePart(nPartId As Integer)
-      Dim IdAsseBase As Integer = Map.refProdManagerVM.ListProjAsseBase(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPROJ)
-      If IdAsseBase < 0 Then Return
+      Dim IdAsseBase As Integer = 0
+      If Not Map.refProdManagerVM.ListProjAsseBase.TryGetValue(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPROJ, IdAsseBase) Then Return
       Dim IdPart As Integer = 0
       Dim NewId As Integer = 0
       ' Setto il nuovo contesto
@@ -540,26 +599,31 @@ Public Class ProjectVM
          For Each GeneralParameter In m_GeneralParametersList
             Select Case GeneralParameter.GetType()
                Case GetType(BooleanGenericParameter)
-                  SetGeneralParameters(False)
+                  SetbSaveGeneralParameters(False)
+                  SetGeneralParametersIsEnable(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(DoubleGenericParameter)
-                  SetGeneralParameters(False)
+                  SetbSaveGeneralParameters(False)
+                  SetGeneralParametersIsEnable(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(ComboGenericParameter)
-                  SetGeneralParameters(False)
+                  SetbSaveGeneralParameters(False)
+                  SetGeneralParametersIsEnable(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(StringGenericParameter)
-                  SetGeneralParameters(False)
+                  SetbSaveGeneralParameters(False)
+                  SetGeneralParametersIsEnable(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(ListGenericParameter)
                   For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
                      If Item.bIsActive Then
                         sInfo &= Item.sUUID & "," & Item.sName & ";"
-                        SetGeneralParameters(False)
+                        SetbSaveGeneralParameters(False)
+                        SetGeneralParametersIsEnable(False)
                         EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                      End If
                   Next
@@ -895,12 +959,11 @@ Public Class ProjectVM
          EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
       End If
    End Sub
-
 #End Region    ' Methods
 
 #Region "COMMAND"
 
-#Region "Optimizer_Command"
+#Region "Ottimization"
 
    Public ReadOnly Property Optimizer_Command As ICommand
       Get
@@ -916,9 +979,9 @@ Public Class ProjectVM
       StatisticWndV.ShowDialog()
    End Sub
 
-#End Region ' Optimizer_Command
+#End Region ' Ottimization
 
-#Region "Parameter_Command"
+#Region "Parameter"
 
    Public ReadOnly Property Parameter_Command As ICommand
       Get
@@ -930,11 +993,11 @@ Public Class ProjectVM
    End Property
 
    Friend Sub Parameter()
-      Dim PartParametersWnd As New PartParametersWndV(Application.Current.MainWindow, New PartParametersWndVM())
+      Dim PartParametersWnd As New PartParametersWndV(Application.Current.MainWindow, New PartParametersWndVM(m_BTLStructureVM.SelBTLPart))
       PartParametersWnd.ShowDialog()
    End Sub
 
-#End Region ' Parameter_Command
+#End Region ' Parameter
 
 #Region "Back_Command"
 

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),

EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb

@@ -61,7 +61,6 @@ Public Class PDFEditorVM
       m_nViewButton = value
       NotifyPropertyChanged(NameOf(nViewButton))
    End Sub
-
    ' Definizione comandi
    Private m_cmdCreatePDFPreviewVis As ICommand
    Private m_cmdCreatePDFPreviewOtt As ICommand
@@ -196,7 +195,7 @@ Public Class PDFEditorVM
       SetWebAddress("")
    End Sub
 
-#End Region    ' CreatePreviewVis
+#End Region    ' ClosePreview
 
 #End Region    '  Commands
 

EgtBEAMWALL.Optimizer/Statistics/PDFHelper.vb

@@ -384,6 +384,7 @@ Module PDFHelper
       Dim paragraph As Paragraph = section.AddParagraph(EgtMsg(62590), "Heading2")
       paragraph.Format.SpaceAfter = Unit.FromMillimeter(3.0)
 
+      ' Controllo se bPreview è true mostra il PDF di preview se no il PDF completo
       If bPreview Then
          CreateRawPartPage(section, sMachGroupList, sPDN, sW, sH, sL, sDesc, sMaterial, Nothing, bPreview)
       Else

EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml.vb

@@ -12,7 +12,11 @@
    End Sub
 
    Private Sub Statistic_TabControl_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
-      Me.Tag = If(Statistic_TabControl.SelectedIndex = 0, Map.refProjectVM.BTLStructureVM, Map.refProjectVM)
+      If Statistic_TabControl.SelectedIndex = 0 Then
+         Me.Tag = Map.refProjectVM.BTLStructureVM
+      Else
+         Me.Tag = Map.refProjectVM
+      End If
    End Sub
 
    Private Sub CloseWindow(bDialogResult As Boolean) Handles m_StatisticsVM.m_CloseWindow

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
 

EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml

@@ -4,137 +4,151 @@
              xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
              VerticalAlignment="Top"
              Margin="5,10,0,0">
-   <ItemsControl ItemsSource="{Binding Tag.ParameterList,
-                                       RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-                 Style="{StaticResource ParameterStrategy_ItemsControl}">
-      <ItemsControl.Resources>
-         <DataTemplate DataType="{x:Type OPTIMIZER:BooleanStrategyParameter}">
-            <UniformGrid Columns="2"
-                         Visibility="{Binding bBooleanVisibility}"
-                         Style="{StaticResource ParamStrategy_UniformGrid}">
-               <TextBlock Text="{Binding sDescriptionShort}" 
-                          Style="{StaticResource ParamStrategy_TextBlock}"/>
-               <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
-                         Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
-            </UniformGrid>
-         </DataTemplate>
-         <DataTemplate DataType="{x:Type OPTIMIZER:DoubleStrategyParameter}">
-            <UniformGrid Columns="2"
-                         Visibility="{Binding bDoubleVisibility}"
-                         Style="{StaticResource ParamStrategy_UniformGrid}">
-               <TextBlock Text="{Binding sDescriptionShort}" 
-                          Style="{StaticResource ParamStrategy_TextBlock}"/>
-               <TextBox Text="{Binding sValue}"
-                        Style="{StaticResource ColorPicker_TextBox}"/>
-            </UniformGrid>
-         </DataTemplate>
-         <DataTemplate DataType="{x:Type OPTIMIZER:ComboStrategyParameter}">
-            <UniformGrid Columns="2" 
-                         Visibility="{Binding bComboBoxVisibility}"
-                         Style="{StaticResource ParamStrategy_UniformGrid}">
-               <TextBlock Text="{Binding sDescriptionShort}" 
-                          Style="{StaticResource ParamStrategy_TextBlock}"/>
-               <ComboBox ItemsSource="{Binding ComboList}"
-                         SelectedItem="{Binding SelValue}"
-                         DisplayMemberPath="sValue"
-                         Style="{StaticResource ProjectParameters_ComboBox}">
-               </ComboBox>
-            </UniformGrid>
-         </DataTemplate>
-         <DataTemplate DataType="{x:Type OPTIMIZER:StringStrategyParameter}">
-            <UniformGrid Columns="2" 
-                         Visibility="{Binding bStringVisibility}"
-                         Style="{StaticResource ParamStrategy_UniformGrid}">
-               <TextBlock Text="{Binding sDescriptionShort}" 
-                          Style="{StaticResource ParamStrategy_TextBlock}"/>
-               <TextBox Text="{Binding sValue}"
-                        Style="{StaticResource ColorPicker_TextBox}"/>
-            </UniformGrid>
-         </DataTemplate>
-         <DataTemplate DataType="{x:Type OPTIMIZER:ListStrategyParameter}">
-            <Grid Visibility="{Binding bListBoxVisibility}"
-                  Style="{StaticResource AddRawPartWnd_Grid}">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="Auto"/>
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1.3*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="{Binding sDescriptionShort}" 
-                          Style="{StaticResource ParamStrategyDescription_TextBlock}"/>
-               <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
-                  <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
-                     <Button ToolTip="{Binding OpenToolListToolTip}"
-                             IsEnabled="{Binding OpenToolListIsEnable}"
-                             Command="{Binding OpenToolListCommand}"
-                             Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="{StaticResource Plus_Image}"
-                               Style="{StaticResource BTLDataWnd_Image}"/>
-                     </Button>
-                     <Button ToolTip="{Binding DeselectAllToolTip}"
-                             IsEnabled="{Binding ActiveToolListIsEnable}"
-                             Command="{Binding DeselectAllCommand}"
-                             Style="{StaticResource CloseProjectParameters_Button}">
-                        <Image Source="{StaticResource DeselectAll_Image}" 
-                               Style="{StaticResource BTLDataWnd_Image}"/>
-                     </Button>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <ItemsControl ItemsSource="{Binding Tag.ParameterList,
+                                          RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
+                    Style="{StaticResource ParameterStrategy_ItemsControl}">
+         <ItemsControl.Resources>
+            <DataTemplate DataType="{x:Type OPTIMIZER:BooleanStrategyParameter}">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding bBooleanVisibility}"
+                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                  <TextBlock Text="{Binding sDescriptionShort}" 
+                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                  <CheckBox IsChecked="{Binding bValue, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+               </UniformGrid>
+            </DataTemplate>
+            <DataTemplate DataType="{x:Type OPTIMIZER:DoubleStrategyParameter}">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding bDoubleVisibility}"
+                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                  <TextBlock Text="{Binding sDescriptionShort}" 
+                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                  <TextBox Text="{Binding sValue}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               </UniformGrid>
+            </DataTemplate>
+            <DataTemplate DataType="{x:Type OPTIMIZER:ComboStrategyParameter}">
+               <UniformGrid Columns="2" 
+                            Visibility="{Binding bComboBoxVisibility}"
+                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                  <TextBlock Text="{Binding sDescriptionShort}" 
+                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                  <ComboBox ItemsSource="{Binding ComboList}"
+                            SelectedItem="{Binding SelValue}"
+                            DisplayMemberPath="sValue"
+                            Style="{StaticResource ProjectParameters_ComboBox}">
+                  </ComboBox>
+               </UniformGrid>
+            </DataTemplate>
+            <DataTemplate DataType="{x:Type OPTIMIZER:StringStrategyParameter}">
+               <UniformGrid Columns="2" 
+                            Visibility="{Binding bStringVisibility}"
+                            Style="{StaticResource ParamStrategy_UniformGrid}">
+                  <TextBlock Text="{Binding sDescriptionShort}" 
+                             Style="{StaticResource ParamStrategy_TextBlock}"/>
+                  <TextBox Text="{Binding sValue}"
+                           Style="{StaticResource ColorPicker_TextBox}"/>
+               </UniformGrid>
+            </DataTemplate>
+            <DataTemplate DataType="{x:Type OPTIMIZER:ListStrategyParameter}">
+               <Grid Visibility="{Binding bListBoxVisibility}"
+                     Style="{StaticResource AddRawPartWnd_Grid}">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1.3*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="{Binding sDescriptionShort}" 
+                             Style="{StaticResource ParamStrategyDescription_TextBlock}"/>
+                  <StackPanel Grid.Column="1" 
+                              Style="{StaticResource PartManager_StackPanel}">
+                     <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
+                        <Button ToolTip="{Binding OpenToolListToolTip}"
+                                IsEnabled="{Binding OpenToolListIsEnable}"
+                                Command="{Binding OpenToolListCommand}"
+                                Style="{StaticResource ProjectParameters_Button}">
+                           <Image Source="{StaticResource Plus_Image}"
+                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                        </Button>
+                        <Button ToolTip="{Binding DeselectAllToolTip}"
+                                IsEnabled="{Binding ActiveToolListIsEnable}"
+                                Command="{Binding DeselectAllCommand}"
+                                Style="{StaticResource CloseProjectParameters_Button}">
+                           <Image Source="{StaticResource DeselectAll_Image}" 
+                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                        </Button>
+                     </StackPanel>
+                     <Border Style="{StaticResource ForcedStrategyBTL_Border}">
+                        <ItemsControl ItemsSource="{Binding ActiveToolList_View}"
+                                      Style="{StaticResource ProjectParameters_ItemsControl}">
+                           <ItemsControl.ItemTemplate>
+                              <DataTemplate>
+                                 <StackPanel Style="{StaticResource ExpanderElemen_StackPanel}">
+                                    <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
+                                              Style="{StaticResource FreeContourInput_CheckBox}"/>
+                                    <TextBlock Text="{Binding sName}"
+                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 </StackPanel>
+                              </DataTemplate>
+                           </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                     </Border>
                   </StackPanel>
-                  <Border Style="{StaticResource ForcedStrategyBTL_Border}">
-                     <ItemsControl ItemsSource="{Binding ActiveToolList_View}"
-                                   Style="{StaticResource ProjectParameters_ItemsControl}">
-                        <ItemsControl.ItemTemplate>
-                           <DataTemplate>
-                              <StackPanel Style="{StaticResource ExpanderElemen_StackPanel}">
-                                 <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
-                                           Style="{StaticResource FreeContourInput_CheckBox}"/>
-                                 <TextBlock Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </StackPanel>
-                           </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                     </ItemsControl>
-                  </Border>
-               </StackPanel>
-               <StackPanel Grid.Row="1" 
-                           Grid.Column="1" 
-                           Visibility="{Binding AvailableToolListVisibility}"
-                           Style="{StaticResource PartManager_StackPanel}">
-                  <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
-                     <Button ToolTip="{Binding CloseToolListToolTip}"
-                             Command="{Binding CloseToolListCommand}"
-                             Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="{StaticResource Delete_Image}" 
-                               Style="{StaticResource BTLDataWnd_Image}"/>
-                     </Button>
-                     <Button ToolTip="{Binding SelectAllToolTip}"
-                             IsEnabled="{Binding AvailableToolListIsEnable}"
-                             Command="{Binding SelectAllCommand}"
-                             Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="{StaticResource SelectAll_Image}" 
-                               Style="{StaticResource BTLDataWnd_Image}"/>
-                     </Button>
+                  <StackPanel Grid.Row="1" 
+                              Grid.Column="1" 
+                              Visibility="{Binding AvailableToolListVisibility}"
+                              Style="{StaticResource PartManager_StackPanel}">
+                     <StackPanel Style="{StaticResource ProjectParameters_StackPanel}">
+                        <Button ToolTip="{Binding CloseToolListToolTip}"
+                                Command="{Binding CloseToolListCommand}"
+                                Style="{StaticResource ProjectParameters_Button}">
+                           <Image Source="{StaticResource Delete_Image}" 
+                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                        </Button>
+                        <Button ToolTip="{Binding SelectAllToolTip}"
+                                IsEnabled="{Binding AvailableToolListIsEnable}"
+                                Command="{Binding SelectAllCommand}"
+                                Style="{StaticResource ProjectParameters_Button}">
+                           <Image Source="{StaticResource SelectAll_Image}" 
+                                  Style="{StaticResource BTLDataWnd_Image}"/>
+                        </Button>
+                     </StackPanel>
+                     <Border Style="{StaticResource ProjectParamters_Border}">
+                        <ItemsControl ItemsSource="{Binding AvailableToolList_View}"                                   
+                                      Style="{StaticResource AvailableToolList_ItemsControl}">
+                           <ItemsControl.ItemTemplate>
+                              <DataTemplate>
+                                 <StackPanel Style="{StaticResource ExpanderElemen_StackPanel}">
+                                    <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
+                                              Style="{StaticResource FreeContourInput_CheckBox}"/>
+                                    <TextBlock Text="{Binding sName}"
+                                               Style="{StaticResource DialogWindow_TextBlock}"/>
+                                 </StackPanel>
+                              </DataTemplate>
+                           </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                     </Border>
                   </StackPanel>
-                  <Border Style="{StaticResource ProjectParamters_Border}">
-                     <ItemsControl ItemsSource="{Binding AvailableToolList_View}"                                   
-                                   Style="{StaticResource AvailableToolList_ItemsControl}">
-                        <ItemsControl.ItemTemplate>
-                           <DataTemplate>
-                              <StackPanel Style="{StaticResource ExpanderElemen_StackPanel}">
-                                 <CheckBox IsChecked="{Binding bIsActive, UpdateSourceTrigger=PropertyChanged}"
-                                           Style="{StaticResource FreeContourInput_CheckBox}"/>
-                                 <TextBlock Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </StackPanel>
-                           </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                     </ItemsControl>
-                  </Border>
-               </StackPanel>
-            </Grid>
-         </DataTemplate>
-      </ItemsControl.Resources>
-   </ItemsControl>
+               </Grid>
+            </DataTemplate>
+         </ItemsControl.Resources>
+      </ItemsControl>
+      <Button Grid.Row="1" Margin="5,135,0,0"
+              Command="{Binding UpdateFeatureCommand}"
+              Visibility="{Binding Update_Visibility}" 
+              Style="{StaticResource Update_Button}">
+         <Image Source="{StaticResource Update_Image}"
+                Style="{StaticResource BTLDataWnd_Image}"/>
+      </Button>
+   </Grid>
+
 </UserControl>

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,7 +142,7 @@
                </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
+                  <!--<ColumnDefinition Width="1*"/>-->
                </Grid.ColumnDefinitions>
                <TextBlock Text="{Binding SelTreeItem.sName}" 
                           Style="{StaticResource TreeItemName_TextBlock}"/>

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
@@ -105,6 +107,7 @@ Public Class StrategyManagerVM
          Item.sImage = TmpImage
       End If
       m_SelTreeItem = Item
+      SetUpdate_Visibility(False)
       NotifyPropertyChanged(NameOf(SelTreeItem))
    End Sub
 
@@ -207,6 +210,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
@@ -252,6 +266,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
 
@@ -270,15 +285,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 +357,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"
@@ -493,11 +531,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 +570,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
@@ -599,6 +649,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
@@ -973,6 +1085,8 @@ Public Class Topology
       End Get
       Set(value As Strategy)
          m_SelParamStrategy = value
+         ' Gestisco visibilita' pulsante Update Feature
+         Map.refStrategyManagerVM.SetUpdate_Visibility(If(Map.refStrategyManagerVM.SelTreeItem.sName <> "Feature", True, False))
          NotifyPropertyChanged(NameOf(SelParamStrategy))
       End Set
    End Property
@@ -990,10 +1104,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,13 +1123,16 @@ 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
       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 As Strategy In mOrderStrategyList
          JsonTopology.StrategyList.Add(Strategy.Serialize())
       Next
       Return JsonTopology
@@ -1262,6 +1376,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
@@ -1300,6 +1436,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
@@ -2022,6 +2160,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
@@ -2046,6 +2206,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

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"/>
@@ -70,7 +70,7 @@
          </ListBox.ItemContainerStyle>
       </ListBox>
    </Border>
-
+   
    <StackPanel Grid.Column="3"
                Style="{StaticResource Strategy_StackPanel}">
       <Button Command="{Binding MoveUpSelectedStrategyCommand}"

EgtBEAMWALL.Optimizer/SupervisorCommThread/SupervisorComm.vb

@@ -33,10 +33,10 @@ Public Class SupervisorComm
                Select Case Message.ItemType
                   Case StatusMapItemType.Comm
                      Select Case Message.Operation
-                        Case StatusMapOpType.OpenPageInViewOptimRequest
-                           Map.refMainMenuVM.OpenPageFromSupervisor(Math.Abs(Message.ItemId))
                         Case StatusMapOpType.ChangeProdInOptimizerRequest
                            Map.refProdManagerVM.OpenProjectFromSupervisor(Message.ItemId)
+                        Case StatusMapOpType.OpenPageInViewOptimRequest
+                           Map.refMainMenuVM.OpenPageFromSupervisor(Math.Abs(Message.ItemId))
                      End Select
                End Select
             Next

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

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml

@@ -3,10 +3,6 @@
                     xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
                     xmlns:EgtBEAMWALLCore="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                     xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                    xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
-                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                     xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
 
    <!--#region Panel ViewModel-->
@@ -74,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"/>
@@ -104,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"/>
@@ -149,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-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -398,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-->
@@ -473,7 +482,7 @@
    <!--#endregion CALC_ROT-->
 
    <Style x:Key="Prod_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="TextAlignment" Value="Justify"/>
+      <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
       <Style.Triggers>
          <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSelected}" Value="True">
@@ -518,7 +527,6 @@
 
    <Style x:Key="Rotate_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="TextAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Width" Value="25"/>
       <Setter Property="Margin" Value="2,0,2,0"/>
    </Style>
@@ -745,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"/>
@@ -841,14 +854,6 @@
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
    </Style>
 
-   <Style x:Key="DropDownButton_BarButtonItem" TargetType="{x:Type dxb:BarButtonItem}">
-      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
-      <Setter Property="BorderThickness" Value="0.5"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="GlyphSize" Value="Medium"/>
-   </Style>
-
    <Style x:Key="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
@@ -1409,9 +1414,6 @@
       <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
       <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
       <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-      <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
-      <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True"/>
-      <Setter Property="VirtualizingPanel.VirtualizationMode" Value="Recycling"/>
       <Style.Resources>
          <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource Optimizer_ScrollBar}"/>
          <Style TargetType="{x:Type ListBoxItem}">
@@ -2063,10 +2065,6 @@
       <Setter Property="Margin" Value="5"/>
    </Style>
 
-   <Style x:Key="TableView_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
-      <Setter Property="Margin" Value="0,0,5,0"/>
-   </Style>
-
    <!--#endregion PartManager-->
 
    <!--#region OptStatistics-->
@@ -2249,10 +2247,6 @@
       <Setter Property="Margin" Value="5,5,5,0"/>
    </Style>
 
-   <Style x:Key="TableView_Grid" TargetType="{x:Type Grid}">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
-
    <!--#endregion Grid-->
 
    <!--#region GridSplitter-->
@@ -2498,11 +2492,6 @@
       <Setter Property="Margin" Value="2,2,2,0"/>
    </Style>
 
-   <Style x:Key="Calc_Border" TargetType="{x:Type Border}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Width" Value="20"/>
-   </Style>
-
    <!--#endregion Optimizer-->
 
    <!--#region TotalTime_Border-->
@@ -2590,7 +2579,7 @@
       <Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
       <Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
       <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="BorderThickness" Value="2"/>
    </Style>
 
    <Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
@@ -2604,10 +2593,6 @@
       </Style.Triggers>
    </Style>
 
-   <Style x:Key="TableView_Border" TargetType="{x:Type Border}">
-      <Setter Property="Background" Value="{StaticResource Grid.Static.ExpanderDown.Background}"/>
-   </Style>
-
    <!--#region TopPanel_Border-->
 
    <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
@@ -2691,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}">
@@ -2737,145 +2722,4 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!--#region DevExpress-->
-
-   <Style x:Key="TableViewStyle" TargetType="{x:Type dxg:TableView}">
-      <Setter Property="AllowPerPixelScrolling" Value="True"/>
-      <Setter Property="AllowEditing" Value="False"/>
-      <Setter Property="AllowSorting" Value="True"/>
-      <Setter Property="AllowGrouping" Value="True"/>
-      <Setter Property="AllowColumnFiltering" Value="True"/>
-      <Setter Property="AllowFilterEditor" Value="False"/>
-      <Setter Property="AllowFilterPanelNavigation" Value="False"/>
-      <Setter Property="AlternationCount" Value="2"/>
-      <Setter Property="AlternateRowBackground" Value="{StaticResource BeamWall_LinkWater}"/>
-      <Setter Property="AutoWidth" Value="False"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="ExtendScrollBarToFixedColumns" Value="True"/>
-      <Setter Property="EvenRowBackground" Value="{StaticResource BeamWall_BLackSqueeze}"/>
-      <Setter Property="FixedLineWidth" Value="2"/>
-      <Setter Property="Focusable" Value="False"/>
-      <Setter Property="GroupSummaryDisplayMode" Value="AlignByColumns"/>
-      <Setter Property="IsTotalSummaryMenuEnabled" Value="False"/>
-      <Setter Property="IsGroupFooterMenuEnabled" Value="True"/>
-      <Setter Property="LeftGroupAreaIndent" Value="0"/>
-      <Setter Property="NavigationStyle" Value="Row"/>
-      <Setter Property="RowMinHeight" Value="28"/>
-      <Setter Property="ShowGroupPanel" Value="False"/>
-      <Setter Property="ShowTotalSummary" Value="True"/>
-      <Setter Property="ShowSearchPanelMode" Value="Default"/>
-      <Setter Property="ShowFilterPanelMode" Value="Never"/>
-      <Setter Property="ShowIndicator" Value="False"/>
-      <Setter Property="ShowColumnHeaders" Value="True"/>
-      <Setter Property="ShowHorizontalLines" Value="True"/>
-      <Setter Property="ShowVerticalLines" Value="False"/>
-      <Setter Property="ShowFocusedRectangle" Value="True"/>
-      <Setter Property="ShowGroupFooters" Value="True"/>
-      <Setter Property="ShowSearchPanelResultInfo" Value="True"/>
-      <Setter Property="ShowSearchPanelNavigationButtons" Value="True"/>
-      <Setter Property="UseEvenRowBackground" Value="True"/>
-   </Style>
-   
-   <Style x:Key="HeaderStyle" TargetType="{x:Type dxg:BaseGridHeader}">
-      <Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.Main.Background}"/>
-      <Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.Main.Foreground}"/>
-      <Setter Property="FontWeight" Value="Bold"/>
-      <Setter Property="FontSize" Value="15"/>
-      <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="VerticalContentAlignment" Value="Center"/>
-      <!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
-   </Style>
-
-   <Style x:Key="HeaderImageStyle" TargetType="{x:Type Image}">
-      <Setter Property="Height" Value="20"/>
-      <Setter Property="Stretch" Value="Uniform"/>
-   </Style>
-
-   <Style x:Key="RowStyle" TargetType="{x:Type dxg:RowControl}">
-      <Setter Property="IsEnabled" Value="{Binding Row.IsRowEnabled}"/>
-      <Style.Triggers>
-         <Trigger Property="SelectionState" Value="Selected">
-            <Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
-            <Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
-            <Setter Property="FontWeight" Value="Bold"/>
-         </Trigger>
-         <Trigger Property="dxg:GridViewBase.IsFocusedRow" Value="True">
-            <Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
-            <Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
-            <Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
-            <Setter Property="FontWeight" Value="Bold"/>
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="DropDownButtonStyle" TargetType="{x:Type dx:DropDownButton}">
-      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
-      <Setter Property="GlyphHeight" Value="20"/>
-      <Setter Property="GlyphWidth" Value="20"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="3"/>
-   </Style>
-
-   <Style x:Key="ColumnButtonStyle" TargetType="{x:Type dxg:GridColumn}">
-      <Setter Property="Header" Value=""/>
-      <Setter Property="AllowSorting" Value="False"/>
-      <Setter Property="ImageAlignment" Value="Center"/>
-      <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
-      <Setter Property="Fixed" Value="Right"/>
-      <Setter Property="AllowColumnFiltering" Value="False"/>
-   </Style>
-
-   <Style x:Key="ColumnPDNStyle" TargetType="{x:Type dxg:GridColumn}">
-      <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
-      <Setter Property="Fixed" Value="Left"/>
-      <Setter Property="DefaultSortOrder" Value="Ascending"/>
-      <Setter Property="SortOrder" Value="Ascending"/>
-      <Setter Property="FilterPopupMode" Value="CheckedList"/>
-      <Setter Property="EditSettings">
-         <Setter.Value>
-            <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="ColumnInfoStyle" TargetType="{x:Type dxg:GridColumn}">
-      <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
-      <Setter Property="AllowColumnFiltering" Value="False"/>
-      <Setter Property="EditSettings">
-         <Setter.Value>
-            <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="ColumnInfoCustomStyle" TargetType="{x:Type dxg:GridColumn}">
-      <Setter Property="AllowSorting" Value="False"/>
-      <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
-      <Setter Property="FilterPopupMode" Value="Custom"/>
-      <Setter Property="EditSettings">
-         <Setter.Value>
-            <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="ColumnInfoCheckedListStyle" TargetType="{x:Type dxg:GridColumn}">
-      <Setter Property="AllowSorting" Value="False"/>
-      <Setter Property="HorizontalHeaderContentAlignment" Value="Center"/>
-      <Setter Property="FilterPopupMode" Value="CheckedList"/>
-      <Setter Property="EditSettings">
-         <Setter.Value>
-            <dxe:TextEditSettings HorizontalContentAlignment="Center"/>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="bDoCheckEditStyle" TargetType="{x:Type dxe:CheckEdit}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-   </Style>
-
-   <!--#endregion DevExpress-->
-
 </ResourceDictionary>

EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb

@@ -439,6 +439,13 @@ Public Class WarehouseWndVM
       ' Creo riferimento a questa classe in Map
       Map.SetRefWarehouseWndVM(Me)
 
+      ' Ricavo il tipo di Warehouse settato nell'INI
+      Dim nDefault As Integer = 2
+      If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM Then
+         ' Se di tipo Medium confronto le Sezioni del BTL importato con quelle in Warehouse
+         WarehouseWndVM.UpdateSectionXMaterial()
+      End If
+
       ' setto il tipo in base alla macchina selezionata come macchina corrente
       Dim nMachType As MachineType = Map.refProjectVM.BTLStructureVM.nPROJTYPE
       SectionXMaterial.SetType(nMachType)

EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb

@@ -496,7 +496,8 @@ Public Class CALCPanelVM
                                                    .nProjType = ProjType,
                                                    .bBarOk = True,
                                                    .nMachineName = MachineName,
-                                                   .nCmdType = CalcIntegration.CmdTypes.SIMULATE}
+                                                   .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
+                                                   .nBarState = SelMachGroup.nProduction_State}
          If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
             Dim sMachGroupFilePath As String = Map.refSupervisorManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
             If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)

EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb

@@ -0,0 +1,522 @@
+Imports System.Buffers.Binary
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports Sharp7
+
+Public Class SIEMENSSharp7Comm
+
+   Private m_DBVariableList As New List(Of DBBuffer) ' Buffer list
+
+   Private IntBuffer() As Byte = {0, 0}
+   Private BoolBuffer() As Byte = {0}
+   Private DIntBuffer() As Byte = {0, 0, 0, 0}
+   Private RealBuffer() As Byte = {0, 0, 0, 0}
+   Private StringBuffer(65536) As Byte       ' Buffer  
+   Private Client As New S7Client                ' Client Object
+
+   ' lista variabili in lettura
+   Private Shared m_ReadingVars(100) As CommVar
+
+   ' lista dei messaggi di errore attivi
+   Private m_ActiveMessages As New List(Of SiemensReadMessages)
+
+   Private m_MachManaging As MachManaging
+   Friend ReadOnly Property MachManaging As MachManaging
+      Get
+         Return m_MachManaging
+      End Get
+   End Property
+
+   Private m_RefreshTime As Integer = 10
+   Private m_WaitingRefreshTime As Integer = 20
+   Private m_RefreshCounter As Integer = 0
+   Private m_IsRefreshing As Boolean = False
+
+   Public Sub New(MachManaging As MachManaging)
+      m_MachManaging = MachManaging
+   End Sub
+
+   Public Shared Function InitVar(Variable As CommVar) As CommVar
+      Dim Index As Integer = Array.IndexOf(m_ReadingVars, Nothing)
+      m_ReadingVars(Index) = Variable
+      Return m_ReadingVars(Index)
+   End Function
+
+   ' Avvio la connessione Hardware-Client
+   Friend Function InitConnection() As Boolean
+      ' Ip del PLC
+      Dim sIp As String = ""
+      GetPrivateProfileString(S_GENERAL, K_IP, "", sIp, CurrentMachine.sMachIniFile)
+      ' unità usate dal PLC (Rack e Slot)
+      Dim nRack As Integer = GetPrivateProfileInt(S_GENERAL, K_RACK, 0, CurrentMachine.sMachIniFile)
+      Dim nSlot As Integer = GetPrivateProfileInt(S_GENERAL, K_SLOT, 0, CurrentMachine.sMachIniFile)
+      Map.refMachManaging.DebugMessage(1, "Tentativo di connessione a CN Siemens con Sharp7")
+      Map.refMachManaging.DebugMessage(1, "IP: " & sIp)
+      Map.refMachManaging.DebugMessage(1, "Rack: " & nRack)
+      Map.refMachManaging.DebugMessage(1, "Slot: " & nSlot)
+      Dim nResult As Integer = Client.ConnectTo(sIp, nRack, nSlot)
+      If nResult = 0 Then
+         Map.refMachManaging.DebugMessage(1, "Connessione effettuata")
+      Else
+         Map.refMachManaging.DebugMessage(1, "Connessione fallita con codice di errore: " & nResult)
+      End If
+      ' se la connessione è restituisce 0
+      Return nResult = 0
+   End Function
+
+   ' chiudo la connessione
+   Friend Sub CloseConnection()
+      Dim nResult As Integer = Client.Disconnect()
+      If Map.refMachManaging.Debug > 0 Then
+         If nResult = 0 Then
+            EgtOutLog("Disconnessione effettuata")
+         Else
+            EgtOutLog("Disconnessione fallita con codice di errore: " & nResult)
+         End If
+      End If
+
+   End Sub
+
+   Friend Sub RefreshConnection()
+      If m_RefreshCounter < m_RefreshTime Then
+         m_RefreshCounter += 1
+      Else
+         ' riavvio connessione
+         m_IsRefreshing = True
+         CloseConnection()
+         InitConnection()
+         m_IsRefreshing = False
+         m_RefreshCounter = 0
+      End If
+   End Sub
+
+   Private Function WaitingRefresh() As Boolean
+      If Not m_IsRefreshing Then Return True
+      Dim WaitingCounter As Integer = 0
+      While m_IsRefreshing < m_WaitingRefreshTime
+         If Not m_IsRefreshing Then Return True
+         Threading.Thread.Sleep(100)
+      End While
+      EgtOutLog("Waiting reconnection timeout!")
+      Return False
+   End Function
+
+#Region "Read Variables"
+
+   Public Sub RefreshAllVars()
+      WaitingRefresh()
+      m_DBVariableList.Clear()
+      For Each Var In m_ReadingVars
+         ' rileggo solo variabili continue
+         If Not IsNothing(Var) AndAlso Var.nReadType = CommVar.ReadTypes.CONTINUOUS Then
+            Dim CompleteAddressSplit() As String = Var.sAddress.Split(":"c)
+            Dim nDBAddress As Integer = 0
+            Integer.TryParse(CompleteAddressSplit(0), nDBAddress)
+            If nDBAddress = 0 Then Return
+            Dim DBBuffer As DBBuffer = m_DBVariableList.FirstOrDefault(Function(x) x.DBAddress = nDBAddress)
+            If IsNothing(DBBuffer) Then
+               Dim Buffer(65536) As Byte
+               Dim nAddressByte As Integer = 0
+               Select Case nDBAddress
+                  Case 301
+                     nAddressByte = 8
+                  Case 302
+                     nAddressByte = 46
+               End Select
+               Map.refMachManaging.DebugMessage(1, "Lettura di " & nAddressByte & " byte dalla variabile " & nDBAddress)
+               Dim nResult As Integer = 1234567890
+               Try
+                  nResult = Client.DBRead(nDBAddress, 0, nAddressByte, Buffer)
+               Catch ex As Exception
+                  nResult = 1234567890
+                  Map.refMachManaging.DebugMessage(1, "Lettura di " & nDBAddress & " ha generato un'eccezione")
+                  Map.refMachManaging.DebugMessage(1, ex.ToString())
+               End Try
+               If nResult = 0 Then
+                  Map.refMachManaging.DebugMessage(1, "Lettura di " & nDBAddress & " effettuata")
+                  If Map.refMachManaging.Debug > 1 Then
+                     'For Index = 0 To Buffer.Count - 1
+                     '   Map.refMachManaging.DebugMessage(2, Index & ": " & Buffer(Index))
+                     'Next
+                  End If
+               Else
+                  Map.refMachManaging.DebugMessage(2, "Lettura fallita con codice di errore: " & nResult)
+               End If
+               If nResult = 0 Then
+                  DBBuffer = New DBBuffer(nDBAddress, Buffer)
+                  m_DBVariableList.Add(DBBuffer)
+               End If
+            End If
+            If Not IsNothing(DBBuffer) Then
+               Dim PositionAddressSplit() As String = CompleteAddressSplit(1).Split("."c)
+               Dim nStartIndex As Integer = 0
+               Integer.TryParse(PositionAddressSplit(0), nStartIndex)
+               Select Case CompleteAddressSplit(2)
+                  Case 1
+                     Dim nBytePositionIndex As Integer = 0
+                     Integer.TryParse(PositionAddressSplit(1), nBytePositionIndex)
+                     Dim nPower As Integer = Math.Pow(2, nBytePositionIndex)
+                     '  Dim bValue As Boolean = (TestBuffer(nStartIndex) And nPower) = nPower
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex & "." & nBytePositionIndex)
+                     Var.SetValue(If((DBBuffer.DBValue(nStartIndex) And nPower) = nPower, 1, 0))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & "." & nBytePositionIndex & " (Tipo 1) = " & Var.sValue)
+                  Case 2
+                     'Dim x = BitConverter.ToInt16(TestBuffer, nStartIndex)
+                     Dim nValue As Int16 = BitConverter.ToInt16(DBBuffer.DBValue, nStartIndex)
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex)
+                     Var.SetValue(BinaryPrimitives.ReverseEndianness(nValue))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & " (Tipo 2) = " & Var.sValue)
+                  Case 3
+                     ' Dim x = BitConverter.ToInt32(TestBuffer, nStartIndex)
+                     Dim nValue As Integer = BitConverter.ToInt32(DBBuffer.DBValue, nStartIndex)
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex)
+                     Var.SetValue(BinaryPrimitives.ReverseEndianness(nValue))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & " (Tipo 3) = " & Var.sValue)
+               End Select
+            End If
+         End If
+      Next
+   End Sub
+
+   Friend Function WriteVariable(Address As String, Value As String) As Boolean
+      WaitingRefresh()
+      Dim CompleteAddressSplit() As String = Address.Split(":"c)
+      Dim nDBAddress As Integer = 0
+      Integer.TryParse(CompleteAddressSplit(0), nDBAddress)
+      If nDBAddress = 0 Then Return False
+      Dim PositionAddressSplit() As String = CompleteAddressSplit(1).Split("."c)
+      Dim nStartIndex As Integer = 0
+      Integer.TryParse(PositionAddressSplit(0), nStartIndex)
+      Select Case CompleteAddressSplit(2)
+         Case 1
+            ' rileggo int16
+            Dim Buffer(1) As Byte
+            Client.DBRead(nDBAddress, nStartIndex, 1, Buffer)
+            Dim nBytePositionIndex As Integer = 0
+            Integer.TryParse(PositionAddressSplit(1), nBytePositionIndex)
+            Dim nPower As Integer = Math.Pow(2, nBytePositionIndex)
+            Dim nNewValue As Integer = 0
+            If Not Integer.TryParse(Value, nNewValue) Then Return False
+            Dim nOldValue As Integer = If((Buffer(0) And nPower) = nPower, 1, 0)
+            If nOldValue = nNewValue Then
+               Return True
+            ElseIf nOldValue = 0 Then
+               Buffer(0) = Buffer(0) Or nPower
+            ElseIf nOldValue = 1 Then
+               Buffer(0) = Buffer(0) Xor nPower
+            Else
+               Return False
+            End If
+            ' Buffer(0) = Buffer(0) And nPower
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 1) con valore " & Value)
+               'For Index = 0 To Buffer.Count - 1
+               '   EgtOutLog(Index & ": " & Buffer(Index))
+               'Next
+            End If
+            Dim nResult As Integer = Client.DBWrite(nDBAddress, nStartIndex, 1, Buffer)     ' DbNumber, Start, Amount, Buffer
+            '    Return WriteBool(nDBAddress, nStartIndex, bValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If nResult <> 0 Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return nResult = 0
+         Case 2
+            Dim nValue As Int16 = 0
+            If Not Int16.TryParse(Value, nValue) Then Return False
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 2) con valore " & Value)
+            End If
+            Dim bResult As Boolean = WriteInt(nDBAddress, nStartIndex, nValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If bResult Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return bResult
+         Case 3
+            Dim nValue As Integer = 0
+            If Not Integer.TryParse(Value, nValue) Then Return False
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 3) con valore " & Value)
+            End If
+            Dim bResult As Boolean = WriteDInt(nDBAddress, nStartIndex, nValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If bResult Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return bResult
+         Case 4
+            Dim dValue As Single = 0
+            If Not StringToDoubleAdv(Value, dValue) Then Return False
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 4) con valore " & Value)
+            End If
+            Dim bResult As Boolean = WriteReal(nDBAddress, nStartIndex, dValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If bResult Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return bResult
+      End Select
+      Return False
+   End Function
+
+#End Region    ' Read Variables
+
+   Friend Function ReadInt(DBNumber As Integer, Start As Integer, ByRef Value As Integer) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 2, IntBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetIntAt(IntBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteInt(DBNumber As Integer, Start As Integer, Value As Int16) As Boolean
+      WaitingRefresh()
+      S7.SetIntAt(IntBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 2, IntBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadBool(DBNumber As Integer, Start As Integer, ByRef Value As Boolean) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 1, BoolBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = BitConverter.ToBoolean(BoolBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteBool(DBNumber As Integer, Start As Integer, Value As Boolean) As Boolean
+      WaitingRefresh()
+
+      If Value Then
+         BoolBuffer(0) = &H1
+      Else
+         BoolBuffer(0) = &H0
+      End If
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 1, BoolBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadDInt(DBNumber As Integer, Start As Integer, ByRef Value As Integer) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 4, DIntBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetDIntAt(DIntBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteDInt(DBNumber As Integer, Start As Integer, Value As Integer) As Boolean
+      WaitingRefresh()
+      S7.SetDIntAt(DIntBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 4, DIntBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadReal(DBNumber As Integer, Start As Integer, ByRef Value As Double) As Boolean
+      WaitingRefresh()
+      ' Read 4 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 4, RealBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetRealAt(RealBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteReal(DBNumber As Integer, Start As Integer, Value As Single) As Boolean
+      WaitingRefresh()
+      S7.SetRealAt(RealBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 4, RealBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadString(DBNumber As Integer, Start As Integer, Length As Integer, ByRef Value As String) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, Length, StringBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetStringAt(StringBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteString(DBNumber As Integer, Start As Integer, Value As String) As Boolean
+      WaitingRefresh()
+
+      If Value.Length > 65535 Then
+         Return False
+      End If
+      S7.SetStringAt(StringBuffer, 0, 65535, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, Value.Length + 2, StringBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ResetStep(bReset As Boolean) As Boolean
+      WaitingRefresh()
+      Dim varResetStep As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList(19)  ' Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STEP)
+      If bReset Then
+         Map.refMachManaging.DebugMessage(1, "Imposto variabile ResetStep a 1")
+         varResetStep.sValue = 1
+         Threading.Thread.Sleep(100)
+         Dim nResetStepOk As Integer = 0
+         Dim ResetStepOk As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STEP_OK)
+         Dim ResetMachine As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STATE)
+         While nResetStepOk <> 1
+            If ResetMachine.sValue = "1" Then
+               Return False
+            End If
+            Map.refMachManaging.DebugMessage(1, "Rileggo variabili")
+            RefreshAllVars()
+            Map.refMachManaging.DebugMessage(1, "Leggo valore ResetStepOk")
+            Integer.TryParse(ResetStepOk.sValue, nResetStepOk)
+            Threading.Thread.Sleep(1000)
+         End While
+      End If
+      varResetStep.sValue = 0
+      Map.refMachManaging.DebugMessage(1, "Imposto variabile ResetStep a 0")
+      Return True
+   End Function
+
+   Friend Sub ReadPLCMessages()
+      WaitingRefresh()
+
+      Dim nPlc_Msg As New List(Of Byte)
+      For Index As Integer = 1 To 6
+         Dim nIndex As Integer = Index
+         Dim PLCMessagesVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = PLC_MESSAGES & nIndex)
+         If IsNothing(PLCMessagesVariable) OrElse IsNothing(PLCMessagesVariable.sValue) Then Return
+         Dim nTemp As Int16 = 0
+         Int16.TryParse(PLCMessagesVariable.sValue, nTemp)
+         nTemp = BinaryPrimitives.ReverseEndianness(nTemp)
+         Dim Bytes As Byte() = BitConverter.GetBytes(nTemp)
+         nPlc_Msg.AddRange(Bytes)
+      Next
+      Dim BitArray As New BitArray(nPlc_Msg.ToArray())
+      Dim ErrorList As New List(Of Integer)
+      For BitIndex = 0 To BitArray.Count - 1
+         If BitIndex <= 169 AndAlso BitArray(BitIndex) Then
+            ErrorList.Add(BitIndex)
+         End If
+      Next
+      ShowPLCError(ErrorList)
+   End Sub
+
+   Friend Sub ShowPLCError(ErrorNumber As List(Of Integer))
+      ' resetto stati bFound
+      For Each Message In m_ActiveMessages
+         Message.bFound = False
+      Next
+
+      For index As Integer = 0 To ErrorNumber.Count - 1
+         Dim nIndex As Integer = index
+         Dim NewMessageInList As SiemensReadMessages = m_ActiveMessages.FirstOrDefault(Function(x) x.nIndex = 0.ToString())
+         ' se il messaggio e' gia' in lista
+         If Not IsNothing(NewMessageInList) Then
+            ' lo segno come trovato
+            NewMessageInList.bFound = True
+         Else
+            ' lo aggiungo
+            Dim NewMessage As SiemensReadMessages = New SiemensReadMessages(0.ToString())
+            NewMessage.bFound = True
+            m_ActiveMessages.Add(NewMessage)
+            m_SiemensAlarmCallbackDlg(0, 0)
+         End If
+      Next
+
+      ' cancello messaggi non trovati
+      For Index = m_ActiveMessages.Count - 1 To 0 Step -1
+         Dim Message As SiemensReadMessages = m_ActiveMessages(Index)
+         If Not Message.bFound Then
+            m_SiemensAlarmCallbackDlg(Message.nIndex, 1)
+            m_ActiveMessages.RemoveAt(Index)
+         End If
+      Next
+
+   End Sub
+
+End Class
+
+Friend Class DBBuffer
+
+   Private m_DBAddress As Integer
+   Public ReadOnly Property DBAddress As Integer
+      Get
+         Return m_DBAddress
+      End Get
+   End Property
+
+   Private m_DBValue(65536) As Byte
+   Public ReadOnly Property DBValue As Byte()
+      Get
+         Return m_DBValue
+      End Get
+   End Property
+
+   Sub New(DBAddress As Integer, DBValue As Byte())
+      m_DBAddress = DBAddress
+      m_DBValue = DBValue
+   End Sub
+
+End Class
+
+Public Class SiemensReadMessages
+
+   Private m_nIndex As Integer
+   Public ReadOnly Property nIndex As Integer
+      Get
+         Return m_nIndex
+      End Get
+   End Property
+   Private m_sMessage As String
+   Public ReadOnly Property sMessage As String
+      Get
+         Return m_sMessage
+      End Get
+   End Property
+   Friend Sub SetMessage(sValue As String)
+      m_sMessage = sValue
+   End Sub
+
+   Private m_bFound As Boolean = False
+   Friend Property bFound As Boolean
+      Get
+         Return m_bFound
+      End Get
+      Set(value As Boolean)
+         m_bFound = value
+      End Set
+   End Property
+   Public Sub New(nIndex As Integer)
+      m_nIndex = nIndex
+      m_sMessage = sMessage
+   End Sub
+
+End Class

EgtBEAMWALL.Supervisor/Constants/ConstCommVar.vb

@@ -19,6 +19,7 @@ Module ConstCommVar
       NUM_FLEXIUM = 2
       NUM_AXIUM_APSERVER = 3
       NUM_AXIUM_PCTOOLKIT = 4
+      SIEMENS_SHARP7 = 5
    End Enum
 
    ' Assi
@@ -54,6 +55,42 @@ Module ConstCommVar
    Public Const PLC_MESSAGES As String = "PLC_Messages"
    ' variabile per leggere e scrivere permesso invio cn a macchina
    Public Const SENDPERMISSION As String = "SendPermission"
+   ' variabile per confermare lettura dati di stato pezzo
+   Public Const DATAREADED As String = "Data_Readed"
+   ' variabile per confermare lettura stato reset
+   Public Const RESETREADED As String = "Reset_Readed"
+   ' variabile per confermare lettura stato reset
+   Public Const DATATOREAD As String = "Data_ToRead"
+   ' variabile per confermare lettura stato reset
+   Public Const RESET_STEP As String = "Reset_Step"
+   ' variabile per confermare lettura stato reset
+   Public Const RESET_STEP_OK As String = "Reset_Step_Ok"
+   ' variabile per stato CN
+   Public Const NC_STATUS As String = "NC_Status"
+   ' variabile per modo CN
+   Public Const NC_MODE As String = "NC_Mode"
+   ' variabile per apertura pinze manuale
+   Public Const OPEN_CLAMP As String = "Open_Clamp"
+   ' variabile per larghezza barra al carico
+   Public Const W_CARICO As String = "W_Carico"
+   ' variabile per lunghezza prossima barra
+   Public Const NEXTPART_L As String = "NextPartL"
+   ' variabile per larghezza prossima barra
+   Public Const NEXTPART_W As String = "NextPartW"
+   ' variabile per altezza prossima barra
+   Public Const NEXTPART_H As String = "NextPartH"
+   ' variabile per PressX1 prossima barra
+   Public Const NEXTPART_PRESSX1 As String = "NextPartPressX1"
+   ' variabile per Feed prossima barra
+   Public Const NEXTPART_FEED As String = "NextPartFeed"
+   ' variabile per Accelerazione prossima barra
+   Public Const NEXTPART_ACC As String = "NextPartAcc"
+   ' variabile per Ref1 prossima barra
+   Public Const NEXTPART_REF1 As String = "NextPartRef1"
+   ' variabile per Ref2 prossima barra
+   Public Const NEXTPART_REF2 As String = "NextPartRef2"
+   ' variabile per Ref2 prossima barra
+   Public Const STOP_WORKING As String = "Stop_Working"
 
    Public Enum OPStates
       Start = 1
@@ -72,4 +109,11 @@ Module ConstCommVar
       Home = 8
    End Enum
 
+   ' Variabili Siemens
+   Public Const K_IP As String = "Ip"
+   Public Const K_RACK As String = "Rack"
+   Public Const K_SLOT As String = "Slot"
+   Public Const K_TIMERINTERVAL As String = "TimerInterval"
+   Public Const K_ISOFILEDIR As String = "IsoFileDir"
+
 End Module

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -117,7 +117,8 @@
       <HintPath>..\ExtLibs\Interop.FXServer.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="ISOCNC.Remoting">
+    <Reference Include="ISOCNC.Remoting, Version=3.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\ISOCNC.Remoting.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
@@ -167,6 +168,9 @@
     <Reference Include="SdkApi.Desktop.Usb, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Desktop.Usb.dll</HintPath>
     </Reference>
+    <Reference Include="Sharp7.net">
+      <HintPath>..\ExtLibs\Sharp7.net.dll</HintPath>
+    </Reference>
     <Reference Include="SharpSnmpLib, Version=10.0.9.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL">
       <HintPath>..\packages\Lextm.SharpSnmpLib.10.0.9\lib\net452\SharpSnmpLib.dll</HintPath>
     </Reference>
@@ -280,6 +284,7 @@
     <Compile Include="Comms\NUMAxiumComm.vb" />
     <Compile Include="Comms\NUMAxiumPcToolkitComm.vb" />
     <Compile Include="Comms\NUMFlexiumComm.vb" />
+    <Compile Include="Comms\SIEMENSSharp7Comm.vb" />
     <Compile Include="Comms\TPAComm.vb" />
     <Compile Include="ConfigurationPage\ConfigurationPageV.xaml.vb">
       <DependentUpon>ConfigurationPageV.xaml</DependentUpon>

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -147,6 +147,17 @@ Public Class LeftPanelVM
       End Get
    End Property
 
+   Public Property m_Axis_Visibility As Visibility
+   Public ReadOnly Property Axis_Visibility As Visibility
+      Get
+         Return m_Axis_Visibility
+      End Get
+   End Property
+   Friend Sub SetAxisVisibility()
+      m_Axis_Visibility = If(CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Collapsed, Visibility.Visible)
+      NotifyPropertyChanged(NameOf(Axis_Visibility))
+   End Sub
+
    Private m_bRestart As Boolean = False
    Public Property bRestart As Boolean
       Get
@@ -268,7 +279,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property OPMode_Visibility As Visibility
       Get
-         Return If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Visibility.Visible, Visibility.Collapsed)
+         Return If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT Or CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
@@ -428,7 +439,7 @@ Public Class LeftPanelVM
                                                        New OPState("Pending", OPStates.Pending),
                                                        New OPState("Unspecified", OPStates.Unspecified)
          }
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             m_OPStateList = New List(Of OPState) From {New OPState("Start", OPStates.Start),
                                                        New OPState("Stop", OPStates.Stop),
                                                        New OPState("Reset", OPStates.End),
@@ -454,6 +465,13 @@ Public Class LeftPanelVM
                                                       New OPState("Manual", OPModes.Manual),
                                                       New OPState("Home", OPModes.Home)
             }
+         Case NCTypes.SIEMENS_SHARP7
+            m_OPModeList = New List(Of OPState) From {
+                                                         New OPState("Auto", OPModes.Auto),
+                                                         New OPState("Mdi", OPModes.Mdi),
+                                                         New OPState("Manual", OPModes.Manual),
+                                                         New OPState("Reference Point", OPModes.Home)
+            }
       End Select
    End Sub
 

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelV.xaml

@@ -20,10 +20,12 @@
                  Style="{StaticResource MachCommandMessagePanel_Button}"/>
          <Button Content="START"
                  Command="{Binding Start_Command}"
+                 Visibility="{Binding Start_Visibility}"
                  IsEnabled="{Binding CommBtn_IsEnabled}"
                  Style="{StaticResource MachCommandMessagePanel_Button}"/>
          <Button Content="STOP"
                  Command="{Binding Stop_Command}"
+                 Visibility="{Binding Stop_Visibility}"
                  IsEnabled="{Binding CommBtn_IsEnabled}"
                  Style="{StaticResource MachCommandMessagePanel_Button}"/>
          <Button Content="RESET"
@@ -32,6 +34,7 @@
                  Style="{StaticResource MachCommandMessagePanel_Button}"/>
          <Button Content="SET POINT"
                  Command="{Binding SetPoint_Command}"
+                 Visibility="{Binding SetPoint_Visibility}"
                  IsEnabled="{Binding CommBtn_IsEnabled}"
                  Style="{StaticResource MachCommandMessagePanel_Button}"/>
          <Button Content="DELETE ALARMS"

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelVM.vb

@@ -204,6 +204,24 @@ Public Class MachCommandMessagePanelVM
       End Get
    End Property
 
+   Public ReadOnly Property Start_Visibility As Visibility
+      Get
+         Return If(CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
+   Public ReadOnly Property Stop_Visibility As Visibility
+      Get
+         Return If(CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
+   Public ReadOnly Property SetPoint_Visibility As Visibility
+      Get
+         Return If(CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
    Public ReadOnly Property DeleteAlarm_Visibility As Visibility
       Get
          Return If(CurrentMachine.NCType = NCTypes.TPA, Visibility.Visible, Visibility.Collapsed)
@@ -296,7 +314,7 @@ Public Class MachCommandMessagePanelVM
       m_MachManagingThread = New Thread(Sub()
                                            MachineCommThread.MachManagingThreadFunction(AddressOf ResultCallbackDlg, AddressOf CloseCallbackDlg,
                                                                                         AddressOf UpdateCallbackDlg, AddressOf TPAAlarmCallbackDlg, AddressOf NUMAlarmCallbackDlg,
-                                                                                        AddressOf AxisCoordinatesCallbackDlg, AddressOf OpStateCallbackDlg,
+                                                                                          AddressOf SiemensAlarmCallbackDlg, AddressOf AxisCoordinatesCallbackDlg, AddressOf OpStateCallbackDlg,
                                                                                         AddressOf OpModeCallbackDlg, AddressOf ChannelCallbackDlg, AddressOf ReadVarCallbackDlg)
                                         End Sub)
       ' avvio thread di gestione della macchina che avvia la connessione
@@ -680,6 +698,42 @@ Public Class MachCommandMessagePanelVM
       DbControllers.m_LogMachineController.Create(LogEvent.CreateAlarmLog(DateTime.Now(), AlarmOperation & LogEvent.cSeparator & ErrorTyp & LogEvent.cSeparator & AlarmMessage & LogEvent.cSeparator & AlarmCode & LogEvent.cSeparator, DbControllers.m_SupervisorId))
    End Sub
 
+   Friend Sub SiemensAlarmCallbackDlg(nIndex As Integer, AlarmOperation As Integer)
+
+      ' se aggiungo allarme e non ce ne erano
+      If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) AndAlso m_ErrCycle.Count = 0 AndAlso m_Iso.Count = 0 AndAlso m_Message.Count = 0 AndAlso m_ErrSystem.Count = 0 Then
+         ' avvio il timer degli allarmi
+         m_AlarmTimer.Start()
+      End If
+      Dim AlarmMessage As String = nIndex
+
+      ' costruisco messaggio errore in base al tipo
+      Dim sErrorMessage As String = AlarmMessage
+      If bMsgTranslationActive Then
+         Dim sTranslatedMsg = MachMsg(MsgParagraphs.PLC, nIndex)
+         If Not String.IsNullOrWhiteSpace(sTranslatedMsg) Then
+            sErrorMessage = sTranslatedMsg
+         End If
+      End If
+      AlarmMessage = If(Not String.IsNullOrWhiteSpace(sErrorMessage), sErrorMessage, "")
+
+      If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
+         m_ErrCycle.Add(Alarm.CreateAlarm(nIndex, AlarmMessage))
+      Else
+         m_ErrCycle.RemoveAll(Function(x) x.sCode = nIndex)
+      End If
+
+      ' forzo aggiornamento allarmi
+      AlarmTimer_Tick()
+      ' se non ci sono errori
+      If m_ErrCycle.Count = 0 AndAlso m_Iso.Count = 0 AndAlso m_Message.Count = 0 AndAlso m_ErrSystem.Count = 0 Then
+         ' fermo timer degli allarmi
+         m_AlarmTimer.Stop()
+      End If
+      'DbControllers.m_LogMachineController.Create(MachLog.CreateAlarmLog(AlarmOperation, ErrorTyp, AlarmMessage, AlarmCode, DateTime.Now))
+      DbControllers.m_LogMachineController.Create(LogEvent.CreateAlarmLog(DateTime.Now(), AlarmOperation & LogEvent.cSeparator & nIndex & LogEvent.cSeparator & sErrorMessage, DbControllers.m_SupervisorId))
+   End Sub
+
    Friend Sub AxisCoordinatesCallbackDlg(AxisValue As Double, AxisIndex As Integer)
       Map.refAxesPanelVM.AxisCoordinatesCallbackDlg(AxisValue, AxisIndex)
    End Sub
@@ -697,7 +751,7 @@ Public Class MachCommandMessagePanelVM
                   Next
                End If
             End If
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             Map.refLeftPanelVM.SetOPState(NewState)
       End Select
       DbControllers.m_LogMachineController.Create(LogEvent.CreateMachineStateLog(newOpState, DbControllers.m_SupervisorId))
@@ -710,7 +764,7 @@ Public Class MachCommandMessagePanelVM
          Return
       End If
       Select Case CurrentMachine.NCType
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             Map.refLeftPanelVM.SetOPMode(NewState)
       End Select
       DbControllers.m_LogMachineController.Create(LogEvent.CreateMachineModeLog(newOpState, DbControllers.m_SupervisorId))

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandPanelVM.vb

@@ -0,0 +1,58 @@
+Imports System.Collections.ObjectModel
+Imports ISOCNC.Remoting
+
+Public Class MachCommandPanelVM
+
+   Private m_AxisList As ObservableCollection(Of Axis)
+
+   Public ReadOnly Property AxisList As ObservableCollection(Of Axis)
+      Get
+         Return m_AxisList
+      End Get
+   End Property
+
+   Private m_OPState As MachineOperatingState
+
+   'Public ReadOnly Property OPState As MachineOperatingState
+   '   Get
+   '      Return m_OPState
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property sOPState As String
+   '   Get
+   '      Select Case m_OPState
+   '         Case MachineOperatingState.Start
+   '            Return "START"
+   '         Case MachineOperatingState.Stop
+   '            Return "STOP"
+   '         Case MachineOperatingState.End
+   '            Return "RESET"
+   '         Case MachineOperatingState.SetPoint
+   '            Return "SETPOINT"
+   '         Case MachineOperatingState.Pending
+   '            Return "PENDING"
+   '         Case Else
+   '            Return "UNSPECIFIED"
+   '      End Select
+   '   End Get
+   'End Property
+
+   Public Sub New()
+      Map.SetRefMachCommandMessagePanelVM(Me)
+      '' impostazioni timer degli allarmi
+      'm_AlarmTimer.Interval = TimeSpan.FromMilliseconds(1500)
+      'AddHandler m_AlarmTimer.Tick, AddressOf AlarmTimer_Tick
+      '' impostazione assi (leggerli da conf macchina)
+      'm_AxisList = New ObservableCollection(Of Axis)({New Axis(ASSE_X),
+      '                                                New Axis(ASSE_Y),
+      '                                                New Axis(ASSE_Z),
+      '                                                New Axis(ASSE_C),
+      '                                                New Axis(ASSE_B)})
+      '' connetto stampante etichette
+      'LabelPrinter.ConnectPrinter()
+
+      'NotifyPropertyChanged(NameOf(Connect_Background))
+   End Sub
+
+End Class

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/Support classes.vb

@@ -0,0 +1,55 @@
+Public Class Axis
+   Inherits VMBase
+
+   Private m_Name As String
+   Public ReadOnly Property sName As String
+      Get
+         Return m_Name
+      End Get
+   End Property
+
+   Private m_Value As Double
+   Public ReadOnly Property sValue As Double
+      Get
+         Return m_Value
+      End Get
+   End Property
+
+   Friend Sub SetValue(value As Double)
+      m_Value = value
+      NotifyPropertyChanged(NameOf(sValue))
+   End Sub
+
+   Public Sub New(Name As String)
+      m_Name = Name
+   End Sub
+
+End Class
+
+Class Alarm
+
+   Private m_sCode As String
+   Public ReadOnly Property sCode As String
+      Get
+         Return m_sCode
+      End Get
+   End Property
+
+   Private m_sMessage As String
+   Public ReadOnly Property sMessage As String
+      Get
+         Return m_sMessage
+      End Get
+   End Property
+
+   Protected Sub New()
+   End Sub
+
+   Public Shared Function CreateAlarm(Code As String, Message As String) As Alarm
+      Dim NewAlarm As New Alarm
+      NewAlarm.m_sCode = Code
+      NewAlarm.m_sMessage = Message
+      Return NewAlarm
+   End Function
+
+End Class

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -20,13 +20,14 @@ Public Class MyMachGroupVM
          ElseIf m_bToBeProduced OrElse m_bSentToMachine Then
             Return False
             ' se la macchina e' ferma
-         ElseIf IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
-                (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified) Then
+         ElseIf CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                (IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
+                 (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified)) Then
             ' verifico se c'e' un pezzo non finito
-            Dim ToBeRestartedPart As MyMachGroupVM = Map.refSupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x As MyMachGroupVM) x.nProduction_State = Global.EgtBEAMWALL.Core.ItemState.WIP And Not m_bToBeProduced)
+            Dim ToBeRestartedPart As MyMachGroupVM = Map.refSupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x As MyMachGroupVM) x.nProduction_State = Global.EgtBEAMWALL.Core.ItemState.WIP And Not x.m_bToBeProduced)
             ' se c'e', attivo solo il pezzo non finito
             Return Not (Not IsNothing(ToBeRestartedPart) AndAlso Not ToBeRestartedPart Is Me)
          Else
@@ -46,11 +47,12 @@ Public Class MyMachGroupVM
                   Case ItemState.WIP
                      If Not m_bToBeProduced AndAlso Not m_bSentToMachine Then
                         Return True
-                     ElseIf IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
-                            (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified) Then
+                     ElseIf CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                            (IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
+                             (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified)) Then
                         Return True
                      Else
                         Return False
@@ -221,24 +223,43 @@ Public Class MyMachGroupVM
       End If
       ' se progetto travi e lavorazione interrotta da reset
       If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM AndAlso (bResetWhileCutting OrElse dtStartTime <> DateTime.MinValue) And Not Map.refLeftPanelVM.bRestart Then
-         ' chiedo se riprendere o rifare la barra da zero
-         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+         Dim bRedo As MessageBoxResult = MessageBoxResult.No
+         If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso Not IsNothing(Map.refMachManaging) Then
+            ' leggo pinze aperte
+            Dim Open_ClampVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = OPEN_CLAMP)
+            Map.refMachManaging.Siemens_Sharp7.RefreshAllVars()
+            Map.refMachManaging.DebugMessage(1, "Leggo variabile pinze aperte " & Open_ClampVariable.sValue)
+            If Open_ClampVariable.sValue = 1 Then
+               Map.refMachManaging.DebugMessage(1, "Pinze aperte, ripartenza impossibile")
+               bRedo = MessageBoxResult.No
+               MessageBox.Show("Pinze aperte, ripartenza impossibile!!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+            Else
+               ' chiedo se riprendere o rifare la barra da zero
+               bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+            End If
+         Else
+            ' chiedo se riprendere o rifare la barra da zero
+            bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+         End If
+         Select Case bRedo
             Case MessageBoxResult.Yes
-               ' segno da rifare pezzi non completamente lavorati 
-               For Each Part As PartVM In PartVMList
-                  If Part.dtEndTime <> DateTime.MinValue Then
-                     Part.bDO = False
-                  Else
-                     Part.SetDo(True)
-                  End If
-               Next
-               ' se ripresa, mostro lista feature e colonne Redo
-               Map.refLeftPanelVM.bRestart = True
-               ' blocco produzione di tutti gli altri
-               MyMachGroupVM.UpdateProduceIsEnabledForAll()
-               ' riabilito bottoni di comunicazione a fine invio programma
-               Map.refMachCommandMessagePanelVM.SetCommBtnIsEnabled(True)
-               Return
+               If CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 Then
+                  ' segno da rifare pezzi non completamente lavorati 
+                  For Each Part As PartVM In PartVMList
+                     If Part.dtEndTime <> DateTime.MinValue Then
+                        Part.bDO = False
+                     Else
+                        Part.SetDo(True)
+                     End If
+                  Next
+                  ' se ripresa, mostro lista feature e colonne Redo
+                  Map.refLeftPanelVM.bRestart = True
+                  ' blocco produzione di tutti gli altri
+                  MyMachGroupVM.UpdateProduceIsEnabledForAll()
+                  ' riabilito bottoni di comunicazione a fine invio programma
+                  Map.refMachCommandMessagePanelVM.SetCommBtnIsEnabled(True)
+                  Return
+               End If
             Case MessageBoxResult.No
                ' annullo stati dei pezzi gia' fatti
                For Each Part In PartVMList
@@ -273,8 +294,9 @@ Public Class MyMachGroupVM
       ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL AndAlso (bResetWhileCutting OrElse dtStartTime <> DateTime.MinValue) Then
          If False Then
             ' chiedo se riprendere o rifare il pannello da zero
+            Dim bRedo As MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
             Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
-            Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+            Select Case bRedo
                ' se ripresa
                Case MessageBoxResult.Yes
                   ' ripristino indice di lavorazione precedente a reset

EgtBEAMWALL.Supervisor/MachManagingThread/MachCommConst.vb

@@ -21,6 +21,7 @@ Module MachCommConst
    Public Delegate Sub UpdateCallbackDlg(Param As String, Params As String)
    Public Delegate Sub TPAAlarmCallbackDlg(ByVal AlarmOperation As Integer, ByVal AlarmType As Integer, ByVal AlarmMessage As String, ByVal AlarmCode As String, ByVal AlarmDateTime As String)
    Public Delegate Sub NUMAlarmCallbackDlg(ByVal CncNumber As Integer, ByVal numberOfError As Integer, ByVal ErrorTyp As String, ByVal ErrorIndex As String, ByVal ErrorNumber As String, ByVal ErrorLine As String, ByVal ErrorMessage As String, ByVal ErrorAdditional As String)
+   Public Delegate Sub SiemensAlarmCallbackDlg(nIndex As Integer, AlarmOperation As Integer)
    Public Delegate Sub AxisCoordinatesCallbackDlg(ByVal AxisValue As Double, ByVal AxisIndex As Integer)
    Public Delegate Sub OpStateCallbackDlg(ByVal newOpState As Integer)
    Public Delegate Sub OpModeCallbackDlg(ByVal newOpState As Integer)
@@ -32,6 +33,7 @@ Module MachCommConst
    Friend m_UpdateCallbackDlg As UpdateCallbackDlg
    Friend m_TPAAlarmCallbackDlg As TPAAlarmCallbackDlg
    Friend m_NUMAlarmCallbackDlg As NUMAlarmCallbackDlg
+   Friend m_SiemensAlarmCallbackDlg As SiemensAlarmCallbackDlg
    Friend m_AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg
    Friend m_OpStateCallbackDlg As OpStateCallbackDlg
    Friend m_OpModeCallbackDlg As OpModeCallbackDlg

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -49,6 +49,11 @@ Public Class MachManaging
          Return m_CN
       End Get
    End Property
+   Public ReadOnly Property Siemens_Sharp7 As SIEMENSSharp7Comm
+      Get
+         Return m_CN
+      End Get
+   End Property
 
    Private Shared WithEvents m_CommandList As New ObservableCollection(Of ThreadCommand)
    Public Shared ReadOnly Property CommandList As ObservableCollection(Of ThreadCommand)
@@ -92,7 +97,20 @@ Public Class MachManaging
       End Get
    End Property
 
+   ' variabile che indica prima barra dopo start (Siemens)
+   Private m_bFirstRaw As Boolean = True
+
+   ' variabile che indica se emettere ii messaggi di debug
+   Private m_Debug As Integer = 0
+   Public ReadOnly Property Debug As Integer
+      Get
+         Return m_Debug
+      End Get
+   End Property
+
    Sub New()
+      ' leggo variabile debug da ini
+      m_Debug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, CurrentMachine.sMachIniFile)
       ' imposto in Map
       Map.SetRefMachManaging(Me)
       AddHandler m_CommandList.CollectionChanged, AddressOf CommandList_CollectionChanged
@@ -106,7 +124,7 @@ Public Class MachManaging
 
    Friend Sub Timer_Tick()
       Select Case CurrentMachine.NCType
-         Case NCTypes.NUM_FLEXIUM, NCTypes.TPA, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.TPA, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             ' eseguo ciclo principale
             Dim nReset_State As Integer
             Dim nStart_State As Boolean
@@ -119,6 +137,9 @@ Public Class MachManaging
             Dim nISO_Sent As Integer
             Dim nRunning As Integer
             Dim nCurrMachIndex As Integer
+            Dim nDataWrite As Integer
+            Dim nNCStatus As Integer
+            Dim nNCMode As Integer
             Dim ResetVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STATE)
             Dim StartVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = START_STATE)
             Dim StopVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = STOP_STATE)
@@ -130,6 +151,11 @@ Public Class MachManaging
             Dim ISOSentVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_SENT)
             Dim RunningVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RUNNING)
             Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
+            Dim DataReadedVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = DATAREADED)
+            Dim ResetReadedVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESETREADED)
+            Dim DataToReadVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = DATATOREAD)
+            Dim NCStatusVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NC_STATUS)
+            Dim NCModeVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NC_MODE)
             Select Case CurrentMachine.NCType
                Case NCTypes.TPA
                   ' leggo tutte le variabili
@@ -302,7 +328,74 @@ Public Class MachManaging
                   ReadPLCMessages()
                   Num_Axium_PCToolkit.ReadCncMode()
                   Num_Axium_PCToolkit.ReadPosition()
+
+               Case NCTypes.SIEMENS_SHARP7
+                  ' leggo tutte le variabili
+                  Map.refMachManaging.DebugMessage(1, "Leggo tutte le variabili")
+                  Siemens_Sharp7.RefreshAllVars()
+                  If Not IsNothing(ResetVariable.sValue) Then
+                     Integer.TryParse(ResetVariable.sValue, nReset_State)
+                  Else
+                     nReset_State = 1
+                  End If
+                  If Not IsNothing(ProdVariable.sValue) Then
+                     Integer.TryParse(ProdVariable.sValue, nP_Prod)
+                  Else
+                     nP_Prod = -1
+                  End If
+                  If Not IsNothing(MachGroupVariable.sValue) Then
+                     Integer.TryParse(MachGroupVariable.sValue, nP_Machgroup)
+                  Else
+                     nP_Machgroup = -1
+                  End If
+                  If Not IsNothing(PartVariable.sValue) Then
+                     Integer.TryParse(PartVariable.sValue, nP_Part)
+                  Else
+                     nP_Part = -1
+                  End If
+                  If Not IsNothing(StateVariable.sValue) Then
+                     Integer.TryParse(StateVariable.sValue, nP_State)
+                  Else
+                     nP_State = -1
+                  End If
+                  If Not IsNothing(ISONumVariable.sValue) Then
+                     Integer.TryParse(ISONumVariable.sValue, nISO_Num)
+                  Else
+                     nISO_Num = -1
+                  End If
+                  If Not IsNothing(RunningVariable.sValue) Then
+                     Integer.TryParse(RunningVariable.sValue, nRunning)
+                  Else
+                     nRunning = -1
+                  End If
+                  If Not IsNothing(DataReadedVariable.sValue) Then
+                     Integer.TryParse(DataReadedVariable.sValue, nDataWrite)
+                  Else
+                     nDataWrite = -1
+                  End If
+                  If Not IsNothing(NCStatusVariable.sValue) Then
+                     Integer.TryParse(NCStatusVariable.sValue, nNCStatus)
+                  Else
+                     nNCStatus = -1
+                  End If
+                  If Not IsNothing(NCModeVariable.sValue) Then
+                     Integer.TryParse(NCModeVariable.sValue, nNCMode)
+                  Else
+                     nNCMode = -1
+                  End If
+                  ' leggo messaggi plc
+                  Siemens_Sharp7.ReadPLCMessages()
             End Select
+            ' se SiemensSharp7 e reset a 0, verifico che conferma lettura reset sia a zero
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 And ResetReadedVariable.sValue = "1" And ResetVariable.sValue = "0" Then
+               Map.refMachManaging.DebugMessage(1, "Azzero lettura reset")
+               ResetReadedVariable.sValue = "0"
+            End If
+            ' se SiemensSharp7 e dati letti a 1 e dati scritti a 0, verifico che dati letti sia a zero
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 And DataReadedVariable.sValue = "1" And DataToReadVariable.sValue = "0" Then
+               Map.refMachManaging.DebugMessage(1, "Azzero lettura dati")
+               DataReadedVariable.sValue = "0"
+            End If
             ' se NUM aggiorno stato della macchina
             If CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Then
                Dim OpState As OPStates
@@ -330,10 +423,45 @@ Public Class MachManaging
                If IsNothing(Map.refLeftPanelVM.SelOPState) OrElse OpState <> Map.refLeftPanelVM.SelOPState.Id Then
                   m_OpStateCallbackDlg(OpState)
                End If
+            ElseIf CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+               Dim OpState As OPStates
+               If nNCStatus > 0 Then
+                  Select Case nNCStatus
+                     Case 1
+                        OpState = OPStates.End
+                     Case 2
+                        OpState = OPStates.Stop
+                     Case 3
+                        OpState = OPStates.Start
+                     Case Else
+                        OpState = OPStates.Unspecified
+                  End Select
+               End If
+               If IsNothing(Map.refLeftPanelVM.SelOPState) OrElse OpState <> Map.refLeftPanelVM.SelOPState.Id Then
+                  Map.refMachManaging.DebugMessage(1, "Imposto stato CN: " & OpState)
+                  m_OpStateCallbackDlg(OpState)
+               End If
+               Dim OpMode As OPModes
+               If nNCMode > 0 Then
+                  Select Case nNCMode
+                     Case 1
+                        OpMode = OPModes.Manual
+                     Case 2
+                        OpMode = OPModes.Auto
+                     Case 3
+                        OpMode = OPModes.Mdi
+                     Case 4      ' Reference Point
+                        OpMode = OPModes.Home
+                  End Select
+               End If
+               If IsNothing(Map.refLeftPanelVM.SelOPMode) OrElse OpMode <> Map.refLeftPanelVM.SelOPMode.Id Then
+                  Map.refMachManaging.DebugMessage(1, "Imposto modo CN: " & OpMode)
+                  m_OpModeCallbackDlg(OpMode)
+               End If
             End If
             ' se TPA e non ancora fatto, preparo variabili barra successiva
             If CurrentMachine.NCType = NCTypes.TPA AndAlso CurrentMachine.Flow = FlowTypes.CONTINUOUS AndAlso m_NextBarId = 0 Then
-               SetNextBarVars()
+               SetNextBarVars(nRunning)
                ' se macchina NUM, non sto gia' spedendo e variabile spedizione me lo permette
             ElseIf (CurrentMachine.NCType = NCTypes.NUM_FLEXIUM AndAlso
                    Not Num_Flexium.bIsTransferActive AndAlso
@@ -343,30 +471,54 @@ Public Class MachManaging
                    nISO_Sent = 1) OrElse
                    (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso
                    Not Num_Axium_PCToolkit.bIsTransferActive AndAlso
-                   nISO_Sent = 1) Then
+                   nISO_Sent = 1) OrElse
+                   (CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso
+                    (nISO_Num = 0 OrElse
+                     nISO_Num = nRunning)) Then
                ' verifico se c'e' un programma da lanciare
+               Map.refMachManaging.DebugMessage(1, "Entro in SendNextProgram")
                SendNextProgram()
+            ElseIf CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso m_NextBarId = 0 Then
+               SetNextBarVars(nRunning)
             End If
             ' verifico se scattato stato reset
             If nReset_State <> 0 Then
+               Map.refMachManaging.DebugMessage(1, "Scattato Reset")
                ' resetto tutti i programmi
                If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then Map.refProjectVM.SupervisorMachGroupPanelVM.ResetAllMachGroups()
+               If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                  'resetto programma corrente
+                  Map.refMachManaging.DebugMessage(1, "Resetto programma corrente")
+                  ISONumVariable.sValue = "0"
+                  m_bFirstRaw = True
+               Else
                ' resetto variabili P
                ProdVariable.sValue = "0"
                MachGroupVariable.sValue = "0"
                PartVariable.sValue = "0"
                StateVariable.sValue = "0"
+                  If CurrentMachine.NCType = NCTypes.TPA Then
+                     RemoveAllProgram() ' rimuovo programma default per pending
+                  End If
+               End If
+               ' cancello tutti i programmi da memoria CN
                If CurrentMachine.NCType = NCTypes.TPA Then
                   RemoveAllProgram() ' rimuovo programma default per pending
                End If
                ' azzero variabile reset
-               ResetVariable.sValue = "0"
+               If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                  Map.refMachManaging.DebugMessage(1, "Confermo lettura reset")
+                  ResetReadedVariable.sValue = "1"
+               Else
+                  ResetVariable.sValue = "0"
+               End If
                ' resetto prossima barra e variabili V
                If CurrentMachine.NCType = NCTypes.TPA AndAlso CurrentMachine.Flow = FlowTypes.CONTINUOUS Then
                   m_NextBarId = 0
-                  For Index As Integer = 1 To 6
-                     Tpa.RWVariableManager.WriteVarByName(VPAR & Index.ToString(), 0)
-                  Next
+                  'For Index As Integer = 1 To 6
+                  '   Tpa.RWVariableManager.WriteVarByName(VPAR & Index.ToString(), 0)
+                  'Next
+                  ResetNextBarVars()
                End If
                Return
                ' se macchina TPA, e' in pending e non sta tagliando alcun pezzo
@@ -382,10 +534,17 @@ Public Class MachManaging
                ' attesa per essere sicuro che abbia scritto e riletto variabili
                Threading.Thread.Sleep(300)
                ' verifico stati inizio e fine pezzi
-            ElseIf nP_Prod <> 0 AndAlso
-                   nP_Machgroup <> 0 AndAlso
-                   nP_Part <> 0 Then
+            ElseIf (CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                    nP_Prod <> 0 AndAlso
+                    nP_Machgroup <> 0 AndAlso
+                    nP_Part <> 0) OrElse
+                   (CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso
+                    DataToReadVariable.sValue = "1" AndAlso
+                    nP_Prod <> 0 AndAlso
+                    nP_Machgroup <> 0 AndAlso
+                    nP_Part <> 0) Then
                If nP_State = PartState.START Then
+                  Map.refMachManaging.DebugMessage(1, "Leggo dati start")
                   Dim dtStart As DateTime = DateTime.Now()
                   ' recupero gruppo di lavorazione del pezzo
                   Dim MachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nP_Machgroup)
@@ -427,6 +586,9 @@ Public Class MachManaging
                         Tpa.RWVariableManager.WriteVarByName(P_STATE, 0)
                      Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
                         StateVariable.sValue = "0"
+                     Case NCTypes.SIEMENS_SHARP7
+                        Map.refMachManaging.DebugMessage(1, "Confermo lettura dati start")
+                        DataReadedVariable.sValue = "1"
                   End Select
                   ' se nessun pezzo della barra diverso da quello corrente e' in start
                   If Not MachGroup.PartVMList.Any(Function(x) x.nPartId <> nP_Part AndAlso x.nProduction_State = 1) Then
@@ -444,9 +606,11 @@ Public Class MachManaging
                   End If
                   ' flag di aggiornamento log macchina
                   Map.refMachineLogPageVM.UpdateMachineLogList(False)
+                  DebugMessage(1, "Fine lettura dati start")
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                ElseIf nP_State = PartState.END_ Then
+                  DebugMessage(1, "Leggo dati end")
                   Dim dtEnd As DateTime = DateTime.Now()
                   ' recupero gruppo di lavorazione del pezzo
                   Dim MachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nP_Machgroup)
@@ -506,10 +670,16 @@ Public Class MachManaging
                      ' scrivo evento fine MachGroup su DB
                      DbControllers.m_LogMachineController.Create(LogEvent.CreateMachGroupStateLog(dtEnd, nP_Prod, nP_Machgroup, nP_State, DbControllers.SupervisorId))
                      ' azzero tutte le variabilli per iniziare barra successiva
-                     ProdVariable.sValue = "0"
-                     MachGroupVariable.sValue = "0"
-                     PartVariable.sValue = "0"
-                     StateVariable.sValue = "0"
+                     ' azzero variabile per far ripartire macchina
+                     If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                        DebugMessage(1, "Confermo lettura dati end")
+                        DataReadedVariable.sValue = "1"
+                     Else
+                        ProdVariable.sValue = "0"
+                        MachGroupVariable.sValue = "0"
+                        PartVariable.sValue = "0"
+                        StateVariable.sValue = "0"
+                     End If
 
                      ' se non impostata data start
                      If MachGroup.dtStartTime = DateTime.MinValue Then
@@ -536,7 +706,11 @@ Public Class MachManaging
                      End If
                   Else
                      ' azzero variabile per far ripartire macchina
-                     StateVariable.sValue = "0"
+                     If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                        DataReadedVariable.sValue = "1"
+                     Else
+                        StateVariable.sValue = "0"
+                     End If
                   End If
                   ' se pezzo = -1 stampo etichette di tutti i pezzi del MachGroup
                   If nP_Part = -1 Then
@@ -554,22 +728,26 @@ Public Class MachManaging
                   End If
                   ' flag di aggiornamento log macchina
                   Map.refMachineLogPageVM.UpdateMachineLogList(False)
+                  DebugMessage(1, "Fine lettura dati end")
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                End If
             End If
 
       End Select
-
+      ' funzione che riavvia comunicazione Siemens se necessario
+      If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+         Siemens_Sharp7.RefreshConnection()
+      End If
    End Sub
 
    Private m_Lock_SendProgram As New Object
 
-   Private Function SetNextBarVars() As Boolean
+   Private Function SetNextBarVars(nRunning As Integer) As Boolean
       ' verifico se c'e' un programma da lanciare
       If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
          For Each MyMachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
-            If Not MyMachGroup.bSentToMachine AndAlso MyMachGroup.dtStartTime = DateTime.MinValue Then
+            If If(CurrentMachine.NCType = NCTypes.TPA, Not MyMachGroup.bSentToMachine, MyMachGroup.bSentToMachine AndAlso nRunning <> 0 AndAlso MyMachGroup.nName <> nRunning) AndAlso MyMachGroup.dtStartTime = DateTime.MinValue Then
                If MyMachGroup.bReadyForMachining Then
                   ' leggo valori parametri V da file
                   Dim dVPars(10) As Double
@@ -581,41 +759,109 @@ Public Class MachManaging
                      StringToDoubleAdv(VPar(1), dVPars(VParIndex - 1))
                   Next
                   ' li scrivo nel CN
-                  For Index As Integer = 1 To 10
-                     Dim sValue As String = ""
-                     sValue = DoubleToString(dVPars(Index - 1), 2)
-                     Tpa.RWVariableManager.WriteVarByName(VPAR & Index.ToString(), sValue)
-                  Next
+                  Select Case CurrentMachine.NCType
+                     Case NCTypes.TPA
+                        For Index As Integer = 1 To 10
+                           Dim sValue As String = ""
+                           sValue = DoubleToString(dVPars(Index - 1), 2)
+                           Tpa.RWVariableManager.WriteVarByName(VPAR & Index.ToString(), sValue)
+                        Next
+                     Case NCTypes.SIEMENS_SHARP7
+                        ' imposto larghezza barra
+                        Dim NextPartL As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_L)
+                        NextPartL.sValue = DoubleToString(Math.Ceiling(dVPars(0)), 2)
+                        Dim NextPartW As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_W)
+                        NextPartW.sValue = DoubleToString(dVPars(1), 2)
+                        Dim NextPartH As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_H)
+                        NextPartH.sValue = DoubleToString(dVPars(2), 2)
+                        Dim NextPartPressX1 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_PRESSX1)
+                        NextPartPressX1.sValue = DoubleToString(dVPars(3), 2)
+                        Dim NextPartFeed As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_FEED)
+                        NextPartFeed.sValue = DoubleToString(dVPars(4), 2)
+                        Dim NextPartAcc As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_ACC)
+                        NextPartAcc.sValue = DoubleToString(dVPars(5), 2)
+                        Dim NextPartRef1 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_REF1)
+                        NextPartRef1.sValue = DoubleToString(dVPars(6), 2)
+                        Dim NextPartRef2 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_REF2)
+                        NextPartRef2.sValue = DoubleToString(dVPars(7), 2)
+                        'DebugMessage(1, "Imposto larghezza: " & MyMachGroup.dW)
+                  End Select
                   m_NextBarId = MyMachGroup.Id
                   Return True
                Else
+                  If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                     ' metto tutti i valori a 0
+                     ResetNextBarVars()
+                  End If
                   Return False
                End If
             End If
          Next
+         ' se ho passato tutte le barre della lista, resetto valori carico barra successiva
+         If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+            ' metto tutti i valori a 0
+            ResetNextBarVars()
+         End If
       End If
       Return False
    End Function
 
+   Private Function ResetNextBarVars() As Boolean
+      ' li scrivo nel CN
+      Select Case CurrentMachine.NCType
+         Case NCTypes.TPA
+            For Index As Integer = 1 To 10
+               Dim sValue As String = ""
+               sValue = DoubleToString(0, 2)
+               Tpa.RWVariableManager.WriteVarByName(VPAR & Index.ToString(), sValue)
+            Next
+         Case NCTypes.SIEMENS_SHARP7
+            ' imposto larghezza barra
+            Dim NextPartL As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_L)
+            NextPartL.sValue = DoubleToString(0, 2)
+            Dim NextPartW As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_W)
+            NextPartW.sValue = DoubleToString(0, 2)
+            Dim NextPartH As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_H)
+            NextPartH.sValue = DoubleToString(0, 2)
+            Dim NextPartPressX1 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_PRESSX1)
+            NextPartPressX1.sValue = DoubleToString(0, 2)
+            Dim NextPartFeed As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_FEED)
+            NextPartFeed.sValue = DoubleToString(0, 2)
+            Dim NextPartAcc As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_ACC)
+            NextPartAcc.sValue = DoubleToString(0, 2)
+            Dim NextPartRef1 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_REF1)
+            NextPartRef1.sValue = DoubleToString(0, 2)
+            Dim NextPartRef2 As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NEXTPART_REF2)
+            NextPartRef2.sValue = DoubleToString(0, 2)
+            'DebugMessage(1, "Imposto larghezza: " & MyMachGroup.dW)
+      End Select
+      Return False
+   End Function
+
    Private Function SendNextProgram() As Boolean
       Dim bSent As Boolean = False
       If (CurrentMachine.NCType = NCTypes.TPA AndAlso Not m_bStartPending AndAlso Tpa.opState = MachineOperatingState.Pending) OrElse
          (CurrentMachine.NCType = NCTypes.NUM_FLEXIUM AndAlso Not Num_Flexium.bIsTransferActive) OrElse
          (CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER AndAlso Not Num_Axium_APServer.bIsTransferActive) OrElse
-         (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) Then ' Or Tpa.opState = MachineOperatingState.Start) Then
+         (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) OrElse
+         CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then ' Or Tpa.opState = MachineOperatingState.Start) Then
          ' verifico se c'e' un programma da lanciare
          If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             Dim bMachGroupNotReady As Boolean = False
             SyncLock m_Lock_SendProgram
                For Each MyMachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
-                  If Not MyMachGroup.bSentToMachine AndAlso (MyMachGroup.dtStartTime = DateTime.MinValue OrElse
+                  DebugMessage(1, "Ciclo alla ricerca di un programma da mandare")
+                  ' EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id)
+                  If Not MyMachGroup.bSentToMachine AndAlso (If(CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7, MyMachGroup.dtStartTime = DateTime.MinValue, MyMachGroup.dtEndTime = DateTime.MinValue) OrElse
                      (Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL AndAlso MyMachGroup.bResetWhileCutting)) Then
                      ' verifico se ricalcolo finito
                      If MyMachGroup.bReadyForMachining AndAlso If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER OrElse CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Not MyMachGroup.bSendingToMachine, True) Then
                         ' lo lancio
-                        bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name)
+                        DebugMessage(1, "Eseguo SendProgram")
+                        bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name, MyMachGroup)
+                        ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString())
                         Select Case CurrentMachine.NCType
-                           Case NCTypes.TPA
+                           Case NCTypes.TPA, NCTypes.SIEMENS_SHARP7
                               MyMachGroup.SetSentToMachine(bSent)
                            Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
                               MyMachGroup.SetSendingToMachine(bSent)
@@ -631,9 +877,25 @@ Public Class MachManaging
                   End If
                Next
             End SyncLock
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State < ItemState.WIP And x.bReadyForMachining) Then
+               Dim ISONumVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_NUM)
+               Dim nISONum As Integer = 0
+               If Not Integer.TryParse(ISONumVariable.sValue, nISONum) Or nISONum <> 0 Then
+                  DebugMessage(1, "Resetto programma da inviare")
+                  ISONumVariable.sValue = 0
+                  ' resetto variabili per prossima barra
+                  ResetNextBarVars()
+                  ' do stop working
+                  Dim StopWorking As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = STOP_WORKING)
+                  StopWorking.sValue = "1"
+               End If
+            End If
+            'If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+            '   SetNextBarVars()
+            'End If
             If bMachGroupNotReady Then Return False
+            End If
          End If
-      End If
       Return bSent
    End Function
 
@@ -744,6 +1006,24 @@ Public Class MachManaging
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
                Return
             End Try
+         Case NCTypes.SIEMENS_SHARP7
+            Try
+               m_CN = New SIEMENSSharp7Comm(Me)
+               If Siemens_Sharp7.InitConnection() Then
+                  m_bConnected = True
+                  ' imposto stato manuale
+                  Dim ManualMode As OPState = Map.refLeftPanelVM.OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
+                  Map.refLeftPanelVM.SetOPMode(ManualMode)
+                  m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+               Else
+                  m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
+                  Return
+               End If
+               ' creo classe di gestione variabili
+            Catch ex As Exception
+               m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
+               Return
+            End Try
       End Select
    End Sub
 
@@ -773,6 +1053,14 @@ Public Class MachManaging
             m_ResultCallbackDlg(CommandTypes.DISCONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
             ' chiudo classe Num_Flexium
             Me.OnDispose()
+         Case NCTypes.SIEMENS_SHARP7
+            m_bConnected = False
+            If Not IsNothing(Siemens_Sharp7) Then
+               Siemens_Sharp7.CloseConnection()
+            End If
+            m_ResultCallbackDlg(CommandTypes.DISCONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+            ' chiudo classe Num_Flexium
+            Me.OnDispose()
       End Select
       ' termino thread di comunicazione
       MachineCommThread.StopThread()
@@ -858,6 +1146,9 @@ Public Class MachManaging
             Num_Axium_APServer.Reset()
          Case NCTypes.NUM_AXIUM_PCTOOLKIT
             Num_Axium_PCToolkit.Reset()
+         Case NCTypes.SIEMENS_SHARP7
+            ' annullo solamente step di avanzamento
+            Siemens_Sharp7.ResetStep(True)
       End Select
       ' aggiorno stato bottoni in LeftPanel
       Map.refLeftPanelVM.UpdateButtonIsEnabledState()
@@ -887,7 +1178,7 @@ Public Class MachManaging
       End Select
    End Sub
 
-   Public Function SendProgram(ProgramPath As String, ProgramId As String) As Boolean
+   Public Function SendProgram(ProgramPath As String, ProgramId As String, Optional MyMachGroup As MyMachGroupVM = Nothing) As Boolean
       Select Case CurrentMachine.NCType
          Case NCTypes.TPA
             If Tpa.opState = MachineOperatingState.Pending Then
@@ -917,6 +1208,39 @@ Public Class MachManaging
                Num_Axium_PCToolkit.FileDownload(nFileType * 10, ProgramPath)
             End If
             Return True
+         Case NCTypes.SIEMENS_SHARP7
+            ' EgtOutLog("Pre Download")
+            Dim nFileType As Integer = 0
+            If Integer.TryParse(ProgramId, nFileType) AndAlso nFileType > 0 Then
+               Dim sDestDir As String = ""
+               GetPrivateProfileString(S_GENERAL, K_ISOFILEDIR, "c:/Saomad/ISO", sDestDir, CurrentMachine.sMachIniFile)
+               DebugMessage(1, "Copio programma")
+               File.Copy(ProgramPath, sDestDir & "\" & nFileType & ".mpf", True)
+               ' copio POSIZ file
+               Dim sPosizPath As String = Path.GetDirectoryName(ProgramPath) & "\" & Path.GetFileNameWithoutExtension(ProgramPath) & "_POSIZ.mpf"
+               File.Copy(sPosizPath, sDestDir & "\" & nFileType & "_POSIZ.mpf", True)
+               ' se primo dopo start
+               If m_bFirstRaw Then
+                  m_bFirstRaw = False
+                  DebugMessage(1, "Primo grezzo")
+                  ' annullo step di ripartenza
+                  If Not Map.refMachManaging.Siemens_Sharp7.ResetStep(Not (MyMachGroup.dtStartTime <> DateTime.MinValue OrElse MyMachGroup.nProduction_State = ItemState.WIP)) Then Return False
+               End If
+               ' imposto larghezza barra
+               Dim WCarico As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = W_CARICO)
+               WCarico.sValue = DoubleToString(MyMachGroup.dW, 1)
+               DebugMessage(1, "Imposto larghezza: " & MyMachGroup.dW)
+               ' resetto eventuale stop working
+               Dim StopWorking As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = STOP_WORKING)
+               If StopWorking.sValue = "1" Then
+                  StopWorking.sValue = "0"
+               End If
+               ' imposto numero programma scritto
+               Dim ISONumVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_NUM)
+               DebugMessage(1, "Imposto programma inviato: " & nFileType)
+               ISONumVariable.sValue = nFileType
+            End If
+            Return True
       End Select
       Return False
    End Function
@@ -1009,6 +1333,13 @@ Public Class MachManaging
                Case CommVar.Types.CN
                   Num_Axium_PCToolkit.WriteNCVariables(Address, Value)
             End Select
+         Case NCTypes.SIEMENS_SHARP7
+            Select Case Type
+               Case CommVar.Types.PLC
+                  Siemens_Sharp7.WriteVariable(Address, Value)
+                  'Case CommVar.Types.CN
+                  '   Num_Axium_PCToolkit.WriteNCVariables(Address, Value)
+            End Select
       End Select
    End Sub
 
@@ -1024,6 +1355,8 @@ Public Class MachManaging
             Return NUMAxiumComm.InitVar(NewVar)
          Case NCTypes.NUM_AXIUM_PCTOOLKIT
             Return NUMAxiumPcToolkitComm.InitVar(NewVar)
+         Case NCTypes.SIEMENS_SHARP7
+            Return SIEMENSSharp7Comm.InitVar(NewVar)
       End Select
       Return Nothing
    End Function
@@ -1116,4 +1449,14 @@ Public Class MachManaging
       End Select
    End Sub
 
+#Region "Debug"
+
+   Friend Sub DebugMessage(nLevel As Integer, sMessage As String)
+      If m_Debug >= nLevel Then
+         EgtOutLog(sMessage)
+      End If
+   End Sub
+
+#End Region    ' Debug
+
 End Class

EgtBEAMWALL.Supervisor/MachManagingThread/MachManagingThread.vb

@@ -21,7 +21,7 @@ Class MachineCommThread
    Private Shared sResetVarName As String = "0.FUNM.E80048"
 
    Public Shared Sub MachManagingThreadFunction(ResultCallbackDlg As ResultCallbackDlg, CloseCallbackDlg As CloseCallbackDlg, UpdateCallbackDlg As UpdateCallbackDlg,
-                                                TPAAlarmCallbackDlg As TPAAlarmCallbackDlg, NUMAlarmCallbackDlg As NUMAlarmCallbackDlg, AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg,
+                                                TPAAlarmCallbackDlg As TPAAlarmCallbackDlg, NUMAlarmCallbackDlg As NUMAlarmCallbackDlg, SiemensAlarmCallbackDlg As SiemensAlarmCallbackDlg, AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg,
                                                 OpStateCallbackDlg As OpStateCallbackDlg, OpModeCallbackDlg As OpModeCallbackDlg, ChannelCallbackDlg As ChannelCallbackDlg,
                                                 ReadVarCallbackDlg As ReadVarCallbackDlg)
       ' inizializzo callback
@@ -30,6 +30,7 @@ Class MachineCommThread
       m_UpdateCallbackDlg = UpdateCallbackDlg
       m_TPAAlarmCallbackDlg = TPAAlarmCallbackDlg
       m_NUMAlarmCallbackDlg = NUMAlarmCallbackDlg
+      m_SiemensAlarmCallbackDlg = SiemensAlarmCallbackDlg
       m_AxisCoordinatesCallbackDlg = AxisCoordinatesCallbackDlg
       m_OpStateCallbackDlg = OpStateCallbackDlg
       m_OpModeCallbackDlg = OpModeCallbackDlg

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -169,7 +169,7 @@ Public Class MainMenuVM
 #Region "METHODS"
 
    Friend Sub SetInputOutputVisibility()
-      If CurrentMachine.NCType = NCTypes.TPA Then
+      If CurrentMachine.NCType = NCTypes.TPA OrElse CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
          m_Inputs_Visibility = Visibility.Collapsed
          m_Outputs_Visibility = Visibility.Collapsed
       End If

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())

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.2")>
-<Assembly: AssemblyFileVersion("3.1.5.2")>
+<Assembly: AssemblyVersion("3.1.6.4")>
+<Assembly: AssemblyFileVersion("3.1.6.4")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -10,8 +10,6 @@ Public Class OpenProjectFileDialogVM
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
       m_GoToProd = GoToProd
-      '' carico colonne
-      'LoadColumns()
       NotifyPropertyChanged(NameOf(FilterTypeList))
       m_SelFilterType = m_FilterTypeList(0)
       ' carico lista progetti

EgtBEAMWALL.Supervisor/RestartRawPart/RestartRawPartV.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="RestartRawPartV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:EgtBEAMWALL.Supervisor"
+        mc:Ignorable="d"
+        Title="RestartRawPartV" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

EgtBEAMWALL.Supervisor/RestartRawPart/RestartRawPartV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class RestartRawPartV
+
+End Class

EgtBEAMWALL.Supervisor/RestartRawPart/RestartRawPartVM.vb

@@ -0,0 +1,3 @@
+Public Class RestartRawPartVM
+
+End Class

EgtBEAMWALL.Supervisor/RestartWnd/RestartWndV.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="RestartWndV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:EgtBEAMWALL.Supervisor"
+        mc:Ignorable="d"
+        Title="RestartWndV" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

EgtBEAMWALL.Supervisor/RestartWnd/RestartWndV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class RestartWndV
+
+End Class

EgtBEAMWALL.Supervisor/RestartWnd/RestartWndVM.vb

@@ -0,0 +1,3 @@
+Public Class RestartWndVM
+
+End Class

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -60,7 +60,9 @@ Public Class MySceneHostVM
          ' Imposto direttorio ausiliario per import/gestione BTL
          Dim sBtlAuxDir As String = String.Empty
          GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
-         EgtSetBtlAuxDir(sBtlAuxDir)
+         If Not EgtSetBtlAuxDir(sBtlAuxDir) Then
+            EgtOutLog("Missing BtlAuxDir path! Will be impossible to load Variant!")
+         End If
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -356,7 +356,7 @@ Public Class SupervisorManagerVM
       Else
          Dim sOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sOptimizerName & ".exe"
          Try
-            Process.Start(sOptimizerPath, "2 " & Pages.OPTIMIZERPAGE)
+            Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
          Catch ex As Exception
             EgtOutLog("Error: impossible starting optimizer from path " & sOptimizerPath)
          End Try

EgtBEAMWALL.Supervisor/Utility/CurrentMachine.vb

@@ -1,9 +1,11 @@
 Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL.Core
 Imports System.IO
 Imports System.Text.RegularExpressions
+Imports System.Xml
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports Google.Protobuf.WellKnownTypes
 
 Public Module CurrentMachine
 
@@ -182,6 +184,8 @@ Public Module CurrentMachine
             m_sTs3DataFile = If(File.Exists(sBeamTs3DataFile), sBeamTs3DataFile, sWallTs3DataFile)
          End If
       End If
+      ' leggo tipo di avanzamento pezzi
+      m_Flow = GetPrivateProfileInt(S_GENERAL, K_FLOW, 1, m_sMachIniFile)
       ' Impostazione path Script dir
       m_sMachScriptDir = sMachinesRootDir & "\" & sMachineName & "\" & K_SCRIPT
       ' Impostazione path Setup dir
@@ -297,6 +301,41 @@ Public Module CurrentMachine
                Next
             End If
          End If
+      ElseIf NCType = NCTypes.SIEMENS_SHARP7 Then
+         ' verifico se il file messaggi macchina è da aggiornare
+         Dim sFromMachine As String = sMachinesRootDir & "\" & sMachineName & "\Messages\" & "FromMachine_" & sMsgName
+         If File.Exists(sFromMachine) Then
+            ' se file messaggi macchina piu' nuovo
+            If File.GetLastWriteTime(sFromMachine) > File.GetLastWriteTime(m_sMachMessagesFile) Then
+               Dim messagesDict As New Dictionary(Of String, String)()
+               Try
+                  Dim FromMachineText As String = File.ReadAllText(sFromMachine)
+                  ' Carichiamo il contenuto XML
+                  Dim xmlDoc As New XmlDocument()
+                  xmlDoc.LoadXml(FromMachineText)
+                  ' Selezioniamo tutti i nodi <message>
+                  Dim messageNodes As XmlNodeList = xmlDoc.GetElementsByTagName("message")
+                  For Each node As XmlNode In messageNodes
+                     ' Cerchiamo i sotto-nodi <source> e <translation>
+                     Dim sourceNode As XmlNode = node.SelectSingleNode("source")
+                     Dim translationNode As XmlNode = node.SelectSingleNode("translation")
+                     If sourceNode IsNot Nothing AndAlso translationNode IsNot Nothing Then
+                        Dim sourceText As String = sourceNode.InnerText
+                        Dim translationText As String = translationNode.InnerText
+                        ' Utilizziamo la Regex per estrarre solo la parte numerica da "700000/PLC/PMC"
+                        ' \d+ trova la prima sequenza di numeri consecutivi
+                        Dim match As Match = Regex.Match(sourceText, "\d+")
+                        If match.Success Then
+                           WritePrivateProfileString("PLC", match.Value, translationText, m_sMachMessagesFile)
+                        End If
+                     End If
+                  Next
+               Catch ex As Exception
+                  ' Gestione errori di parsing XML o altri
+                  EgtOutLog("Errore durante la deserializzazione del file TS: " & ex.Message)
+               End Try
+            End If
+         End If
       End If
       ' inizializzo stati e modi
       Map.refLeftPanelVM.LoadChannels()
@@ -304,6 +343,8 @@ Public Module CurrentMachine
       Map.refLeftPanelVM.LoadOPModes()
       ' Imposto visibilità variabili E80000
       Map.refLeftPanelVM.SetE80000Visibility()
+      ' Imposto visibilita' assi
+      Map.refLeftPanelVM.SetAxisVisibility()
    End Sub
 
 #End Region 'Init

EgtBEAMWALL.sln

@@ -44,7 +44,8 @@ Global
 		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.Debug|x86.Build.0 = Debug|x86
 		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.Release|x86.ActiveCfg = Release|x86
 		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.Release|x86.Build.0 = Release|x86
-		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.RemoteDebug|x86.ActiveCfg = Debug|x86
+		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.RemoteDebug|x86.ActiveCfg = RemoteDebug|x86
+		{4BD87FB8-9D12-46E3-ABCB-6576415BCE9A}.RemoteDebug|x86.Build.0 = RemoteDebug|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE