- correzioni del merge

- aggiunta messaggio risultato creazione file senza supervisore

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Globalization
 Imports System.Windows
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -129,6 +130,16 @@ Public Class BTLFeatureM
       End Set
    End Property
 
+   Protected m_VARIANTList As New ObservableCollection(Of Integer)()
+   Public Property VARIANTList As ObservableCollection(Of Integer)
+      Get
+         Return m_VARIANTList
+      End Get
+      Set(value As ObservableCollection(Of Integer))
+         m_VARIANTList = value
+      End Set
+   End Property
+
    Protected m_sDES As String = String.Empty
    Public Property sDES As String
       Get
@@ -139,6 +150,16 @@ Public Class BTLFeatureM
       End Set
    End Property
 
+   Public Overridable Property nSelVARIANT As Integer
+      Get
+         Dim nDes As Integer = 0
+         Return If(Integer.TryParse(m_sDES, nDes), nDes, 0)
+      End Get
+      Set(value As Integer)
+         m_sDES = value.ToString()
+      End Set
+   End Property
+
    Protected m_frFRAME As New Frame3d
    Public Property frFRAME As Frame3d
       Get
@@ -242,6 +263,7 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
+      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
@@ -256,7 +278,7 @@ Public Class BTLFeatureM
       EgtGetInfo(nFeatureId, BTL_FTR_GRP, NewBTLFeature.m_nSelGRP)
       EgtGetInfo(nFeatureId, BTL_FTR_PRC, NewBTLFeature.m_nPRC)
       EgtGetInfo(nFeatureId, BTL_FTR_SIDE, NewBTLFeature.m_nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPRIORITY)
+      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPriority)
       Dim nDO As Integer = 1
       If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
          NewBTLFeature.m_bDO = (nDO <> 0)
@@ -319,13 +341,24 @@ Public Class BTLFeatureM
          .m_nSelGRP = nGRP,
          .m_nSelSIDE = nSIDE,
          .m_nPriority = 0,
-         .m_bDO = True
+         .m_bDO = True,
+         .nSelVARIANT = 0
       }
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
    End Function
 
+   Private Sub CreateVariantList()
+      Dim sMaxIndex As String = ""
+      Dim nMaxIndex As Integer = 0
+      EgtUILib.GetPrivateProfileString([VARIANT], K_MAXINDEX, "", sMaxIndex, m_sBTLIniFile)
+      Integer.TryParse(sMaxIndex, nMaxIndex)
+      For Index As Integer = 0 To nMaxIndex
+         m_VARIANTList.Add(Index)
+      Next
+   End Sub
+
 #End Region    ' CONSTRUCTOR
 
 #Region "METHODS"
@@ -361,15 +394,21 @@ Public Class BTLFeatureM
       Dim TempList As New List(Of BTLParamM)
       Dim NewBTLParam As BTLParamM = Nothing
       ' leggo tutti i P della feature
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, True, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, True, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
+      If TempList.Count <= 0 Then
+         While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, 0, True, ParamIndex, Me, NewBTLParam)
+            TempList.Add(NewBTLParam)
+            ParamIndex += 1
+         End While
+      End If
       NewBTLFeature.PBTLParamMList = TempList
       ' leggo tutti i Q della feature
       ParamIndex = 1
       TempList = New List(Of BTLParamM)
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, False, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, False, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
@@ -540,19 +579,14 @@ Public Class BTLFeatureM
          For Each QPar In QBTLParamMList
             If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
          Next
-         EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, nPriority)
+         EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
          MyMachGroupPanelM.SetDuploModified(ParentPart.nPartId)
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE
-         'MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
-         End If
          nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
                                            Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
          SetFeatureId(nFeatureId)
@@ -598,6 +632,11 @@ Public Class BTLFeatureM
       Return True
    End Function
 
+   ' funzione che restituisce se la feature è un Variant
+   Public Function IsVariant() As Boolean
+      Return m_nPRC = 900
+   End Function
+
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -60,6 +60,15 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public Overridable Property nSelVARIANT As Integer
+      Get
+         Return m_BTLFeatureM.nSelVARIANT
+      End Get
+      Set(value As Integer)
+         m_BTLFeatureM.nSelVARIANT = value
+      End Set
+   End Property
+
    Public ReadOnly Property sName As String
       Get
          Return m_BTLFeatureM.sName

EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml

@@ -0,0 +1,166 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdBeamMachiningsWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            Width="500" Height="450"
+                            IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <TabControl ItemsSource="{Binding MachiningList}"
+                  SelectedItem="{Binding SelMachining}"
+                  IsSynchronizedWithCurrentItem="True"
+                  Margin="5,0,5,0"
+                  Style="{StaticResource OnlyProdTabControl_OnlyHeaders}"/>
+
+      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource OnlyProdPage_Border}">
+
+         <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+                               ItemsSource="{Binding TableRowList}"
+                               SelectedIndex="{Binding SelRowIndex}"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="0.5,0.5,0.5,5"
+                               BindingColumns="{Binding BeamMachiningsColumns}"
+                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                               AlternationCount="2"
+                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
+                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
+                               ColumnHeaderHorizontalContentAlignment="Center"
+                               ColumnHeaderFontWeight="Bold"
+                               ColumnHeaderFontSize="15"
+                               ColumnHeaderPadding="0,2,0,2"
+                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                               Style="{StaticResource DataGrid_OnlyProd}">
+
+            <DataGrid.RowStyle>
+               <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+                  <Setter Property="Height" Value="25"/>
+                  <Setter Property="VerticalContentAlignment" Value="Center"/>
+               </Style>
+            </DataGrid.RowStyle>
+
+            <DataGrid.Resources>
+               <Style x:Key="DataGridCheckBoxColumn_Style"
+                   TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
+                  <Setter Property="Template">
+                     <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type DataGridCell}">
+                           <Grid Background="{TemplateBinding Background}">
+                              <ContentPresenter VerticalAlignment="Center" />
+                           </Grid>
+                        </ControlTemplate>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+
+               <!--Colonna On-->
+               <DataGridCheckBoxColumn x:Key="colON" Binding="{Binding OnPar, UpdateSourceTrigger=PropertyChanged}"
+                                    CellStyle="{StaticResource DataGridCheckBoxColumn_Style}">
+                  <DataGridCheckBoxColumn.Header>
+                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                  </DataGridCheckBoxColumn.Header>
+               </DataGridCheckBoxColumn>
+
+               <!--Colonna Name-->
+               <DataGridTemplateColumn x:Key="colNAME">
+                  <DataGridTemplateColumn.Header>
+                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                  </DataGridTemplateColumn.Header>
+                  <DataGridTemplateColumn.CellEditingTemplate>
+                     <DataTemplate>
+                        <ComboBox IsEditable="False" 
+                               SelectedItem="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                               ItemsSource="{Binding Path=NamesList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellEditingTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                VerticalAlignment="Center"
+                                Margin="5,0,0,0"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+
+               <!--Colonna Style-->
+               <DataGridTemplateColumn x:Key="colTYPE">
+                  <DataGridTemplateColumn.Header>
+                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                  </DataGridTemplateColumn.Header>
+                  <DataGridTemplateColumn.CellEditingTemplate>
+                     <DataTemplate>
+                        <ComboBox IsEditable="False" 
+                               SelectedItem="{Binding Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                               ItemsSource="{Binding Path=TypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellEditingTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Path=Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                VerticalAlignment="Center"
+                                Margin="5,0,0,0"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+
+            </DataGrid.Resources>
+
+         </EgtBEAMWALL:EgtDataGrid>
+      </Border>
+      <Grid Grid.Row="2"
+            Margin="0,0,0,5"
+            HorizontalAlignment="Center">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+
+         <Button Content="/\"
+                 Command="{Binding MoveRowUp_Command}"
+                 Grid.Column="0"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Content="\/"
+                 Command="{Binding MoveRowDown_Command}"
+                 Grid.Column="1"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding AddRowMsg}"
+                 Command="{Binding AddRow_Command}"
+                 Grid.Column="2"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding DeleteRowMsg}"
+                 Command="{Binding DeleteRow_Command}"
+                 Grid.Column="3"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding SaveMsg}"
+                 Command="{Binding Save_Command}"
+                 Grid.Column="4"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+
+      </Grid>
+
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml.vb

@@ -0,0 +1,18 @@
+Public Class OnlyProdBeamMachiningsWindowV
+
+   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
+
+   Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = BeamMachiningsWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -577,4 +577,13 @@ Public Class ProcessResult
       m_nTIME = TIME
    End Sub
 
+   Public Sub ResetTypeFeature()
+      m_Type = ProcessResultTypes.PART
+      m_nTASKID = 0
+   End Sub
+   Public Sub ResetTypePart()
+      m_Type = ProcessResultTypes.BAR
+      m_nCUTID = 0
+   End Sub
+
 End Class

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -199,12 +199,14 @@
    Public Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
 
    Public Const PROCESSINGS As String = "Processings"
+   Public Const [VARIANT] As String = "Variant"
    Public Const OUTLINE As String = "Outline"
    Public Const BTL_FTR_GRP As String = "GRP"
    Public Const BTL_FTR_PRC As String = "PRC"
    Public Const BTL_FTR_DO As String = "DO"
    Public Const BTL_FTR_SIDE As String = "SIDE"
    Public Const BTL_FTR_PRIORITY As String = "PRIORITY"
+   Public Const BTL_FTR_VARIANT As String = "VARIANT"
    Public Const BTL_FTR_NAME As String = "NAME"
    Public Const BTL_FTR_DES As String = "DES"
    Public Const BTL_FTR_PRID As String = "PRID"

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -24,6 +24,7 @@ Public Module ConstGen
    Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
+   Public Const K_MAXINDEX As String = "MaxIndex"
 
    ' Pagine del programma
    Public Enum Pages As Integer

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -116,4 +116,7 @@ Public Module ConstIni
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 
+   ' Server Address
+   Public Const K_SERVERADDRESS As String = "ServerAddressRelease"
+   Public Const K_BEAMWALL As String = "EgtBeamWall"
 End Module

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -7,6 +7,9 @@
 
    Public Const K_NCTYPE As String = "NCType"
    Public Const K_CONNECTIONSTRING As String = "ConnectionString"
+   Public Const K_SUPERVISOR As String = "Supervisor"
+   Public Const K_SAVECNCPATH As String = "SaveCncPath"
+   Public Const K_SAVEEXT As String = "SaveExt"
 
    Public Const S_CHANNELS As String = "Channels"
 

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -53,11 +53,50 @@
     <Reference Include="EgtWPFLib5">
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
+    <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
@@ -81,6 +120,9 @@
       <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
     </Compile>
     <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
+    <Compile Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml.vb">
+      <DependentUpon>OnlyProdBeamMachiningsWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
     <Compile Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml.vb">
@@ -167,6 +209,9 @@
     <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
       <DependentUpon>MachinePanelV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml.vb">
+      <DependentUpon>OnlyProdMachiningDbWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
@@ -177,6 +222,12 @@
     <Compile Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OnlyProdOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SetUpWindow\OnlyProdSetUpWindowV.xaml.vb">
+      <DependentUpon>OnlyProdSetUpWindowV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml.vb">
+      <DependentUpon>OnlyProdToolDbWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utility\Configuration.vb" />
     <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
@@ -238,6 +289,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -247,12 +299,17 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -329,6 +386,10 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
+    <Page Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -345,6 +406,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SetUpWindow\OnlyProdSetUpWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ViewPanel\ViewPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -62,12 +62,7 @@ Public Class EgtDataGrid
                newItems(index).InitColumn(col)
                context.Columns.Add(col)
             Catch ex As Exception
-               'MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+               MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-               End If
             End Try
          Next
 
@@ -90,12 +85,7 @@ Public Class EgtDataGrid
                         CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
                      End If
                   Catch ex As Exception
-                     'MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+                     MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-                     If bOnlyProd Then
-                        EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-                     Else
-                        EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-                     End If
                   End Try
                Next
             End If

EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb

@@ -214,11 +214,7 @@ Public Class NewMachGroupPanelVM
       Dim m_MessageBoxResult As MessageBoxResult
       If MachGroupVMList.Count = 1 Then
          'chiedo conferma prima di resettare il gruppo di lavorazione
-         If bOnlyProd Then
+         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         End If
          Select Case m_MessageBoxResult
             Case MessageBoxResult.Yes
                ' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome
@@ -232,11 +228,7 @@ Public Class NewMachGroupPanelVM
          End Select
       Else
          'chiedo conferma prima di cancellare il gruppo di lavorazione
-         If bOnlyProd Then
+         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         End If
          Select Case m_MessageBoxResult
             Case MessageBoxResult.Yes
                ' cancello quello selezionato (ovvero il corrente)

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -573,7 +573,13 @@ Public MustInherit Class PartVM
    Public Sub CalcGlobalUpdate()
       m_PartM.nCALC_GlobalState = nCALC_State
       For Each Feature In FeatureVMList
-         If Not Feature.bDO Then Continue For
+         If Not Feature.bDO Then
+            If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_PartM.nCALC_GlobalState Then
+               m_PartM.nCALC_GlobalState = Feature.nState
+               m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
+            End If
+            Continue For
+         End If
          If Feature.nState > m_PartM.nCALC_GlobalState Then
             m_PartM.nCALC_GlobalState = Feature.nState
             m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR

EgtBEAMWALL.Core/MachiningDbWindow/OnlyProdMachiningDbWindowV.xaml

@@ -0,0 +1,128 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdMachiningDbWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
+                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.75*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+
+         <UniformGrid Grid.Row="0" Columns="3">
+            <Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
+                   ItemsSource="{Binding Path=MachiningsList}">
+            <TreeView.Style>
+               <Style TargetType="{x:Type TreeView}">
+                  <Setter Property="Background">
+                     <Setter.Value>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+                        </LinearGradientBrush>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+            </TreeView.Style>
+
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
+
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+
+                  <Grid Height="20">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+
+                  </Grid>
+
+               </HierarchicalDataTemplate>
+
+               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                  <Grid Height="20">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+
+                  </Grid>
+               </DataTemplate>
+            </TreeView.Resources>
+
+         </TreeView>
+
+         <UniformGrid Grid.Row="2" Columns="3">
+            <Button Content="{Binding ImportMsg}" Command="{Binding ImportCommand}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ExportMsg}" Command="{Binding ExportCommand}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ResetMsg}" Command="{Binding ReloadMachiningCommand}" 
+                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+
+      </Grid>
+
+      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/MachiningDbWindow/OnlyProdMachiningDbWindowV.xaml.vb

@@ -0,0 +1,30 @@
+Imports EgtWPFLib5
+Imports System.Windows.Input
+
+Public Class OnlyProdMachiningDbWindowV
+
+   Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
+
+   Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = MachiningDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_MachiningDbWindowVM = MachiningDbWindowVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
+      Me.DataContext = Nothing
+      Me.DialogResult = bDialogResult
+      Me.Close()
+   End Sub
+
+   Private Sub MachiningDb_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.1.1")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.7.1.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -104,6 +104,7 @@
                                Margin="5"
                                RowDetailsVisibilityMode="Visible"
                                CellEditEnding="MainDataGrid_CellEditEnding"
+                               ColumnHeaderBackground="{x:Null}"
                                BindingColumns="{Binding ProdColumns}">
          <DataGrid.Resources>
             <!-- ProdId -->
@@ -126,7 +127,7 @@
                      <ToggleButton Grid.Column="1"
                                    Margin="5,0,0,0"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource ToolBar_SmallToggleButton}">
+                                   Style="{StaticResource OldToolBar_SmallToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
                                Style="{StaticResource LockImage}"/>
                      </ToggleButton>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml

@@ -4,7 +4,7 @@
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
                             Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             IsClosable="False"
@@ -47,13 +47,17 @@
                   <StackPanel Orientation="Horizontal" 
                               Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
                      <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Style="{StaticResource Filter_TextBlock}"
+                                Foreground="{StaticResource BeamWall_Corduroy}"/>
                      <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
+                                 Style="{StaticResource Filter_DatePicker}"
+                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
                   </StackPanel>
                </StackPanel>
                <CheckBox Grid.Column="2"
@@ -69,7 +73,9 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
@@ -77,7 +83,8 @@
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"
+                             Foreground="{StaticResource BeamWall_Corduroy}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
                             Style="{StaticResource OnyProd_FeatureComboBox}"/>
@@ -86,21 +93,27 @@
          </Grid>
       </GroupBox>
 
-      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
-                               Grid.Row="1"
+
+      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+                               x:Name="MainDataGrid"
                                ItemsSource="{Binding ProjectList}" 
                                SelectedItem="{Binding SelProject}"
-                               CanUserAddRows="False"
-                               AutoGenerateColumns="False"
-                               CanUserResizeRows="False"
                                SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                Margin="5"
+                               BindingColumns="{Binding ProdColumns}"
                                RowDetailsVisibilityMode="Visible"
                                CellEditEnding="MainDataGrid_CellEditEnding"
-                               BindingColumns="{Binding ProdColumns}">
+                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                               AlternationCount="2"
+                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
+                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
+                               ColumnHeaderHorizontalContentAlignment="Center"
+                               ColumnHeaderFontWeight="Bold"
+                               ColumnHeaderFontSize="15"
+                               ColumnHeaderPadding="0,2,0,2"
+                               Style="{StaticResource DataGrid_OnlyProd}"
+                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <DataGrid.Resources>
             <!-- ProdId -->
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
@@ -155,7 +168,7 @@
             </DataGridTemplateColumn>
          </DataGrid.Resources>
          <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
+            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                <Setter Property="FontWeight" Value="DemiBold"/>
                <Setter Property="VerticalContentAlignment" Value="Center"/>
                <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
@@ -220,18 +233,18 @@
                    Margin="0,0,0,5">
          <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb

@@ -77,4 +77,17 @@ Public Class OnlyProdNewOpenProjectFileDialogV
       'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
+   Public Shared ReadOnly IsSelectedProperty As DependencyProperty = DependencyProperty.Register("IsSelected",
+                                                                                                  GetType(Boolean),
+                                                                                                  GetType(ItemsControl))
+
+   Public Property IsSelected As Boolean
+      Get
+         Return DirectCast(GetValue(IsSelectedProperty), Boolean)
+      End Get
+      Set(value As Boolean)
+         SetValue(IsSelectedProperty, value)
+      End Set
+   End Property
+
 End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml

@@ -76,7 +76,8 @@
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
+                                      Visibility="{Binding SearchText_Visibility}"
+                                      Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
                   <TextBlock Text="Rows"

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -94,6 +94,7 @@
                                ScrollViewer.CanContentScroll="True" 
                                ScrollViewer.VerticalScrollBarVisibility="Auto"
                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               ColumnHeaderBackground="{x:Null}"
                                Margin="5"
                                BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>

EgtBEAMWALL.Core/SetUpWindow/OnlyProdSetUpWindowV.xaml

@@ -0,0 +1,208 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdSetUpWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding TitleMsg}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseSetUpCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <Style x:Key="HorizontalScrollViewerItemsControlStyle" TargetType="{x:Type ItemsControl}">
+         <Setter Property="ItemsPanel">
+            <Setter.Value>
+               <ItemsPanelTemplate>
+                  <WrapPanel Orientation="Vertical"/>
+               </ItemsPanelTemplate>
+            </Setter.Value>
+         </Setter>
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ItemsControl}">
+                  <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" >
+                     <ItemsPresenter/>
+                  </ScrollViewer>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="3*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <UniformGrid Columns="4">
+            <Button Content="{Binding ApplyMsg}" Command="{Binding ApplyCommand}"
+                    IsEnabled="{Binding IsEnabledApplyBtn}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ArchiveMsg}" Command="{Binding ArchiveCommand}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding RetrievesMsg}" Command="{Binding RetrievesCommand}" Height="30" 
+                    CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding AutomaticMsg}" Command="{Binding AutomaticCommand}" Height="30"
+                    CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+
+         <TreeView Grid.Row="1" Name="ToolsTreeView" ItemsSource="{Binding ToolsList}">
+            <TreeView.Style>
+               <Style TargetType="{x:Type TreeView}">
+                  <Setter Property="Background">
+                     <Setter.Value>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+                        </LinearGradientBrush>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+            </TreeView.Style>
+
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <EventSetter Event="MouseDoubleClick" Handler="Tool_DoubleClick"/>
+               </Style>
+            </TreeView.ItemContainerStyle>
+
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolItem}" ItemsSource="{Binding Items}">
+
+                  <Grid Height="20">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+
+                  </Grid>
+
+               </HierarchicalDataTemplate>
+
+               <DataTemplate DataType="{x:Type EgtWPFLib5:ToolItem}">
+                  <Grid Height="20" ToolTip="{Binding ToolTipMsg}">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+
+                  </Grid>
+               </DataTemplate>
+
+            </TreeView.Resources>
+
+         </TreeView>
+
+      </Grid>
+
+      <Grid Grid.Column="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+
+         <Image Source="{Binding SetUpImage}" MaxWidth="300"/>
+
+         <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionGroupList}"
+                       Style="{DynamicResource HorizontalScrollViewerItemsControlStyle}">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <StackPanel Orientation="Horizontal"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+
+                  <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,20,0">
+                     <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                           <WrapPanel Orientation="Vertical"/>
+                        </ItemsPanelTemplate>
+                     </ItemsControl.ItemsPanel>
+                     <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                           <Grid Margin="5,5,15,5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="30"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+
+                              <TextBlock Text="{Binding TcPos}"/>
+                              <ItemsControl Grid.Column="1" ItemsSource="{Binding ExitToolAssociationList}"
+                                            HorizontalAlignment="Left">
+                                 <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                       <!--<WrapPanel Orientation="Horizontal" MaxWidth="200"/>-->
+                                       <UniformGrid Columns="1"/>
+                                    </ItemsPanelTemplate>
+                                 </ItemsControl.ItemsPanel>
+                                 <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                       <Grid Margin="10,0,0,5">
+                                          <Grid.ColumnDefinitions>
+                                             <ColumnDefinition Width="Auto"/>
+                                             <ColumnDefinition Width="1*"/>
+                                          </Grid.ColumnDefinitions>
+
+                                          <ToggleButton Content="{Binding ExitPar}" Name="ExitBtn"
+                                                        CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}"
+                                                        IsChecked="{Binding IsOccupied}" Height="25" Width="25" Margin="0,0,5,0"
+                                                        Command="{Binding SetUpToolCommand}"
+                                                        IsEnabled="{Binding IsEnabledPos}"
+                                                        Background="{Binding ExitBtnBackgroundCol}"/>
+                                          <Border x:Name="ToolBorder" Grid.Column="1" BorderBrush="#4D84C4"
+                                                  BorderThickness="1" ToolTip="{Binding ToolTipMsg}">
+                                             <Border.Style>
+                                                <Style TargetType="{x:Type Border}">
+                                                   <Setter Property="Visibility" Value="Hidden"/>
+                                                   <Style.Triggers>
+                                                      <DataTrigger Binding="{Binding ElementName=ExitBtn, Path=IsChecked}" Value="True">
+                                                         <Setter Property="Visibility" Value="Visible"/>
+                                                      </DataTrigger>
+                                                   </Style.Triggers>
+                                                </Style>
+                                             </Border.Style>
+                                             <TextBlock  Text="{Binding Tool.Name}" Margin="3"/>
+                                          </Border>
+
+                                       </Grid>
+                                    </DataTemplate>
+                                 </ItemsControl.ItemTemplate>
+                              </ItemsControl>
+
+                           </Grid>
+                        </DataTemplate>
+                     </ItemsControl.ItemTemplate>
+                  </ItemsControl>
+
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ItemsControl>
+
+      </Grid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/SetUpWindow/OnlyProdSetUpWindowV.xaml.vb

@@ -0,0 +1,31 @@
+Imports EgtWPFLib5
+Imports System.Windows.Controls
+Imports System.Windows.Input
+
+Public Class OnlyProdSetUpWindowV
+
+   Private WithEvents m_SetUpWindowVM As SetUpWindowVM
+
+   Sub New(Owner As System.Windows.Window, SetUpWindowVM As SetUpWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = SetUpWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_SetUpWindowVM = SetUpWindowVM
+   End Sub
+
+   Private Sub Tool_DoubleClick(sender As Object, e As MouseButtonEventArgs)
+      Dim TreeViewItem As TreeViewItem = DirectCast(sender, TreeViewItem)
+      If TypeOf TreeViewItem.DataContext Is ToolItem Then
+         Dim SelTool As ToolItem = DirectCast(TreeViewItem.DataContext, ToolItem)
+         m_SetUpWindowVM.ToolDoubleClick(SelTool)
+         e.Handled = True
+      End If
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpWindowVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

EgtBEAMWALL.Core/ToolsDbWindow/OnlyProdToolDbWindowV.xaml

@@ -0,0 +1,138 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdToolDbWindowV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
+                  CommandParameter="{Binding Path=SelectedItem,ElementName=ToolsTreeView}"/>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.75*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+
+         <UniformGrid Grid.Row="0" Columns="3">
+            <Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+
+         <TreeView Name="ToolsTreeView" Grid.Row="1" ItemsSource="{Binding ToolsList}">
+            <TreeView.Style>
+               <Style TargetType="{x:Type TreeView}">
+                  <Setter Property="Background">
+                     <Setter.Value>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+                        </LinearGradientBrush>
+                     </Setter.Value>
+                  </Setter>
+               </Style>
+            </TreeView.Style>
+
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
+
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolTreeViewItem}" ItemsSource="{Binding Items}">
+
+                  <Grid Height="20">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+
+                  </Grid>
+
+               </HierarchicalDataTemplate>
+
+               <DataTemplate DataType="{x:Type EgtWPFLib5:ToolTreeViewItem}">
+                  <Grid Height="20">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                     </Grid.ColumnDefinitions>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <CheckBox Name="ActiveTxBx" Grid.Column="0" Height="15" Width="15" Margin="-15,0,5,0" VerticalContentAlignment="Center"
+                               IsChecked="{Binding Active}"
+                               Visibility="{Binding Path=DataContext.Active_Visibility,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
+
+                  </Grid>
+               </DataTemplate>
+
+            </TreeView.Resources>
+
+         </TreeView>
+
+         <UniformGrid Grid.Row="2" Columns="3">
+            <Button Content="{Binding ImportMsg}"
+                    Command="{Binding ImportCommand}" 
+                    IsEnabled="{Binding IsEnabledImpExpBtn, Mode=OneWay}"
+                    Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ExportMsg}"
+                    Command="{Binding ExportCommand}"
+                    IsEnabled="{Binding IsEnabledImpExpBtn, Mode=OneWay}"
+                    Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+            <Button Content="{Binding ResetMsg}" 
+                    Command="{Binding ReloadToolCommand}" 
+                    CommandParameter="{Binding Path=SelectedItem,ElementName=ToolsTreeView}" 
+                    Height="30"
+                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
+         </UniformGrid>
+
+      </Grid>
+
+      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1"/>
+
+      <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
+      <ContentControl Content="{Binding ToolSceneHost}" Grid.Column="2"/>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/ToolsDbWindow/OnlyProdToolDbWindowV.xaml.vb

@@ -0,0 +1,33 @@
+Imports EgtWPFLib5
+Imports System.Windows.Input
+Imports EgtUILib
+
+Public Class OnlyProdToolDbWindowV
+
+   Private WithEvents m_ToolDbWindowVM As ToolDbWindowVM
+
+   Sub New(Owner As System.Windows.Window, ToolDbWindowVM As ToolDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ToolDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ToolDbWindowVM = ToolDbWindowVM
+   End Sub
+
+   Private Sub ToolsDbView_Closed(bDialogResult As Boolean) Handles m_ToolDbWindowVM.m_CloseWindow
+      ' Imposto contesto generale
+      EgtSetCurrentContext(ToolDbWindowVM.ProjectSceneContext)
+      ' Cancello contesto di visualizzazione utensile
+      EgtDeleteContext(ToolDbWindowVM.ToolDbSceneContext)
+      Me.Close()
+   End Sub
+
+   Private Sub ToolsDbView_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles Me.Closing
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -109,7 +109,7 @@ Public Module BTLIniFile
    End Function
 
    ' funzione che ottiene il parametro P/Q usando m_nBTLBWType del modulo
-   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
+   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IpVariant As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
       Dim sBTLParam As String = String.Empty
       Dim sBWQParam As String = String.Empty
       If m_nBTLBWType = BWType.BEAM Then
@@ -117,7 +117,7 @@ Public Module BTLIniFile
       ElseIf m_nBTLBWType = BWType.WALL Then
          sBWQParam = "W"
       End If
-      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
+      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & If(IpPRC = 900 AndAlso IpVariant > 0, IpPRC & "." & IpVariant, IpPRC), If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
          Dim sBTLParamParams() As String = sBTLParam.Split(","c)
          ' verifico numero minimo di parametri
          If sBTLParamParams.Count >= 6 Then

EgtBEAMWALL.Core/Utility/Configuration.vb

@@ -1,7 +1,11 @@
 Imports EgtWPFLib5
+Imports EgwProxy.LiMan
 
 Public Module Configuration
 
+   ' Test per comunicazione
+   Public m_commLib As DataSyncro
+
    ''' <summary>
    ''' Flag per impostare la visualizzazione con la singola pagina
    ''' </summary>
@@ -41,6 +45,26 @@ Public Module Configuration
       m_bMachConfig = value
    End Sub
 
+   ''' <summary>
+   ''' Flag per impostare la visualizzazione con la singola pagina
+   ''' </summary>
+   Private m_sServerAddressRelease As String
+   Public ReadOnly Property sServerAddressRelease As String
+      Get
+         Return m_sServerAddressRelease
+      End Get
+   End Property
+   Public Sub SetServerAddressRelease(value As String)
+      m_sServerAddressRelease = value
+   End Sub
+
+   ' Versione attuale del programma
+   Public ReadOnly Property ActualVersion As String
+      Get
+         Return My.Application.Info.Version.ToString()
+      End Get
+   End Property
+
    ''' <summary>
    ''' Funzione che recupera la directory del file INI
    ''' </summary>
@@ -84,4 +108,18 @@ Public Module Configuration
       Return Default_Value
    End Function
 
+   ''' <summary>
+   ''' Metodo che controlla la comunicazione server
+   ''' </summary>
+   ''' <returns></returns>
+   Public Function GetComunication() As Boolean
+      ' eseguo test per comunicazione server (ping, alive)
+      m_commLib = New DataSyncro(EgtBEAMWALL.Core.Configuration.sServerAddressRelease)
+      If m_commLib.CheckRemote() Then
+         Return True
+      Else
+         Return False
+      End If
+   End Function
+
 End Module

EgtBEAMWALL.Core/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

EgtBEAMWALL.Core/packages.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="RestSharp" version="111.2.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.3" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+</packages>

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Egalware s.r.l.")]
 [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("2.5.12.2")]
+[assembly: AssemblyVersion("2.7.1.1")]
-[assembly: AssemblyFileVersion("2.5.12.2")]
+[assembly: AssemblyFileVersion("2.7.1.1")]

EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml

@@ -13,8 +13,8 @@
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1.75*"/>
-            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.15*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
@@ -31,7 +31,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
+               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -34,7 +34,7 @@ Public Class AboutBoxV
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+      ExitBtn.Content = EgtMsg(10104)          'Ok
    End Sub
 
 End Class

EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb

@@ -91,12 +91,7 @@ Public Class CALCPanelVM
 
    Private Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
       If e.End_ <> CalcEndEventArgs.Results.OK Then
-         'MessageBox.Show("Execution error (all processes are disabled)")
+         MessageBox.Show("Execution error (all processes are disabled)")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
-         End If
       End If
       ' ciclo sui pezzi
       Dim bNotOkFound As Boolean = False

EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb

@@ -474,19 +474,9 @@ Public Class NUMAxiumComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
-         If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         End If
       Else
-         'MessageBox.Show("VariableWritten successfully")
+         MessageBox.Show("VariableWritten successfully")
-         If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         End If
       End If
    End Sub
 

EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb

@@ -741,19 +741,9 @@ Public Class NUMAxiumPcToolkitComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         End If
       Else
-         'MessageBox.Show("VariableWritten successfully")
+         MessageBox.Show("VariableWritten successfully")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         End If
       End If
    End Sub
 

EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb

@@ -446,19 +446,9 @@ Public Class NUMFlexiumComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
-         End If
       Else
-         'MessageBox.Show("VariableWritten successfully")
+         MessageBox.Show("VariableWritten successfully")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
-         End If
       End If
    End Sub
 

EgtBEAMWALL.Supervisor/Comms/TPAComm.vb

@@ -122,12 +122,7 @@ Public Class TPAComm
          AddHandler _remObject.RPCUpdate, m_Rem_RPCUpdateEventHandler
          AddHandler _remObject.VariableCommandExecuted, m_Rem_VariableCommandExecutedEventHandler
       Catch ex As System.Runtime.Remoting.RemotingException
-         Dim dR As MessageBoxResult
+         MessageBox.Show(Application.Current.MainWindow, ex.Message)
-         If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
-            dR = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, ex.Message)
-         Else
-            dR = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ex.Message)
-         End If
       End Try
       ' creo classe che gestisce variabili
       m_RWVariableManager = RWVariableManager.CreateRWVariableManager(Me)
@@ -189,12 +184,7 @@ Public Class TPAComm
 
    Private Sub RemoteObject_ServerError(ByVal sender As Object, ByVal seEA As ISOCNC.Remoting.ServerErrorEventArgs)
       m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, EgtUILib.EgtMsg(62543) & seEA.[Error])
-      Dim dr As MessageBoxResult
+      MessageBox.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
-      If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
-         dr = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
-      Else
-         dr = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
-      End If
    End Sub
 
    Private Sub RemoteObject_AxisCoordinatesUpdate(ByVal axisValue As Double, ByVal axisIndex As Integer)

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -16,31 +16,6 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>true</IncrementalBuild>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>false</IncrementalBuild>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -53,29 +28,6 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -102,27 +54,6 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -160,6 +91,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
+    <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -192,6 +126,9 @@
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
@@ -215,6 +152,9 @@
     <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
       <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
+    <Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="SdkApi.Core, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Core.dll</HintPath>
     </Reference>
@@ -250,6 +190,7 @@
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
       <Private>True</Private>
@@ -274,10 +215,19 @@
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -777,10 +727,15 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Configuration\MachiningsTable.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Egalware.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -18,10 +18,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml

@@ -17,10 +17,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding PartInRawPartColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml

@@ -18,10 +18,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding RawPartColumns}"
                                 Sorting="MachGroupVMList_Sorting"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml

@@ -47,7 +47,7 @@
                  Visibility="{Binding E80002_Visibility}"/>
    </UniformGrid>
    <Expander  Grid.Row="4"
-              Header="Axis">
+              Header="Axis" Style="{x:Null}">
       <EgtBEAMWALL:AxesPanelV DataContext="{StaticResource AxesPanelVM}"/>
    </Expander>
 

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -738,12 +738,7 @@ Public Class LeftPanelVM
       Dim SelMachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup
       ' se gia' prodotto, o in produzione non lo posso eliminare
       If SelMachGroup.dtStartTime <> Date.MinValue OrElse SelMachGroup.dtEndTime <> Date.MinValue OrElse SelMachGroup.bReadyForMachining OrElse SelMachGroup.bSentToMachine OrElse SelMachGroup.bResetWhileCutting Then
-         'MessageBox.Show("Impossibile cancellare il grezzo")
+         MessageBox.Show("Impossibile cancellare il grezzo")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
-         End If
          Return
       End If
       ' rimuovo da Db il MachGroup
@@ -797,12 +792,7 @@ Public Class LeftPanelVM
          If CurrPart Is SelMachGroup.SelPart Then
             Exit For
          ElseIf CurrPart.nProduction_State < ItemState.Produced Then
-            'MessageBox.Show("It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show("It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-            End If
             Return
          End If
       Next

EgtBEAMWALL.Supervisor/LeftPanel/OnlyProdLeftPanelV.xaml

@@ -70,36 +70,36 @@
                   Margin="0,3,5,2">
          <Button Command="{Binding MoveUpRawPart_Command}"
                  IsEnabled="{Binding MoveRawPart_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/MoveUp.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding MoveDownRawPart_Command}"
                  IsEnabled="{Binding MoveRawPart_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/MoveDown.png" Stretch="Uniform"/>
          </Button>
          <Button ToolTip="{Binding ProduceAll_ToolTip}"
                  Command="{Binding ProduceAll_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/ProduceAll.png" Stretch="Uniform"/>
          </Button>
          <Button ToolTip="{Binding DoneRawPart_ToolTip}"
                  Command="{Binding DoneRawPart_Command}"
                  IsEnabled="{Binding DoneRawPart_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/DoneRawPart.png" Stretch="Uniform"/>
          </Button>
          <Button ToolTip="{Binding ResetRawPart_ToolTip}"
                  Command="{Binding ResetRawPart_Command}"
                  IsEnabled="{Binding ResetRawPart_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/ResetRawPart.png" Stretch="Uniform"/>
          </Button>
          <Button ToolTip="{Binding DeleteRawPart_ToolTip}"
                  Command="{Binding DeleteRawPart_Command}"
                  IsEnabled="{Binding DeleteRawPart_IsEnabled}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/DeleteRawPart.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
@@ -133,14 +133,14 @@
                  Command="{Binding PrintLabel_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding PrintLabel_Visibility}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/PrintLabel.png" Stretch="Uniform"/>
          </Button>
          <Button ToolTip="{Binding DonePart_ToolTip}"
                  Command="{Binding DonePart_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding DonePart_Visibility}"
-                 Style="{StaticResource LeftPanel_Button}">
+                 Style="{StaticResource OnlyProdLeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/DonePart.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>

EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml

@@ -19,6 +19,7 @@
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                    Margin="0,0,0,5"
+                                   ColumnHeaderBackground="{x:Null}"
                                    BindingColumns="{Binding MDICommandColumns}"
                                    Style="{StaticResource DataGrid_CustomHighLight}">
          <DataGrid.Resources>

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports System.Windows.Forms
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -189,12 +190,7 @@ Public Class MyMachGroupVM
          ' creo nuova barra
          Dim RedoMachGroupVM As MyMachGroupVM = RedoRawPart()
          If IsNothing(RedoMachGroupVM) Then
-            'MessageBox.Show("New RawPart creation failed!")
+            MessageBox.Show("New RawPart creation failed!")
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
-            End If
             Return
          End If
          ' salvo progetto con nuova barra
@@ -227,13 +223,7 @@ Public Class MyMachGroupVM
       ' 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
-         Dim bRedo As MessageBoxResult
+         Select Case MessageBox.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
-         If bOnlyProd Then
-            bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
-         Else
-            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
@@ -284,14 +274,8 @@ 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
-            If bOnlyProd Then
-               bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
-            Else
-               bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
-            End If
             Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
-            Select Case bRedo
+            Select Case MessageBox.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
                ' se ripresa
                Case MessageBoxResult.Yes
                   ' ripristino indice di lavorazione precedente a reset
@@ -419,12 +403,7 @@ Public Class MyMachGroupVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  'MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  MessageBox.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  End If
                End If
             End If
             Return Nothing

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -810,12 +810,7 @@ Public Class MachManaging
                      bFileOk = True
                   Catch ex As Exception
                      m_ResultCallbackDlg(CommandTypes.START, CommandStates.ERROR_, ResultTypes.NULL, "Error in copying DEFAULT.ISO file")
-                     'MessageBox.Show("Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+                     MessageBox.Show("Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-                     If bOnlyProd Then
-                        EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-                     Else
-                        EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-                     End If
                      Return
                   End Try
                End If

EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml

@@ -72,6 +72,7 @@
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                    Margin="0,0,0,5"
+                                   ColumnHeaderBackground="{x:Null}"
                                    BindingColumns="{Binding MachineLogColumns}">
          <DataGrid.Resources>
             <!-- Data/ora -->

EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb

@@ -80,17 +80,17 @@ Public Class MachinePanelVM
 
    Public ReadOnly Property ToolDBMsg As String
       Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
+         Return EgtMsg(90706)
       End Get
    End Property
    Public ReadOnly Property MachiningDbMsg As String
       Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
+         Return EgtMsg(90707)
       End Get
    End Property
    Public ReadOnly Property SetUpMsg As String
       Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
+         Return EgtMsg(90933)
       End Get
    End Property
    Public ReadOnly Property ParameterMachineMsg As String
@@ -200,12 +200,7 @@ Public Class MachinePanelVM
          BeamMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
-         'MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         End If
       End If
       Return True
    End Function
@@ -224,12 +219,7 @@ Public Class MachinePanelVM
          WallMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
-         'MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         End If
       End If
       Return True
    End Function
@@ -239,17 +229,17 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         'MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
 
       Dim ToolDbWindowVM As New EgtWPFLib5.ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Dim ToolDbWindowV As Object = Nothing
+      If bOnlyProd Then
+         ToolDbWindowV = New OnlyProdToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Else
+         ToolDbWindowV = New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      End If
       If ToolDbWindowVM.MatType <> 0 Then
          ToolDbWindowV.Height = 640
          ToolDbWindowV.Width = 1024
@@ -270,16 +260,17 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
+
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Dim MachDbWindowV As Object = Nothing
+      If bOnlyProd Then
+         MachDbWindowV = New OnlyProdMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Else
+         MachDbWindowV = New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      End If
 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 768
@@ -295,12 +286,7 @@ Public Class MachinePanelVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -319,12 +305,7 @@ Public Class MachinePanelVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               End If
                Return
             End If
          End If
@@ -333,10 +314,19 @@ Public Class MachinePanelVM
       ' Reset lua
       EgtLuaResetGlobVar("STU")
 
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+      Dim SetUpWindow As Object = Nothing
-         .Height = 614,
+      If bOnlyProd Then
-         .Width = 1024
+         SetUpWindow = New OnlyProdSetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
-      }
+            .Height = 614,
+            .Width = 1024
+         }
+      Else
+         SetUpWindow = New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+            .Height = 614,
+            .Width = 1024
+         }
+      End If
+
       SetUpWindow.ShowDialog()
 
    End Sub

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -259,8 +259,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(5327, 2701, 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/MainWindow/MainWindowVM.vb

@@ -214,12 +214,7 @@ Public Class MainWindowVM
       ' se macchina sta funzionando
       If Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso
          (Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified) Then
-         'MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62549), EgtUILib.EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62549), EgtUILib.EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       ' disconnetto comunicazione con macchina

EgtBEAMWALL.Supervisor/MainWindow/OnlyProdMainWindowV.xaml

@@ -19,7 +19,7 @@
 
       <!--StatusBar -->
       <EgtBEAMWALL:StatusBarV DataContext="{StaticResource StatusBarVM}"
-                             DockPanel.Dock="Bottom"/>
+                              DockPanel.Dock="Bottom"/>
       <!--Progetto corrente-->
       <TabControl SelectedIndex="{Binding nSelTabPage}"
                   Padding="0"

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End if
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Supervisor")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.1.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.7.1.2")>

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -4,6 +4,7 @@ Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
+Imports System.Windows.Forms
 
 Public Class MySceneHostVM
    Inherits EgtWPFLib5.SceneHostVM
@@ -57,6 +58,10 @@ Public Class MySceneHostVM
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
          EgtSetCurrentContext(MainScene.GetCtx())
+         ' Imposto direttorio ausiliario per import/gestione BTL
+         Dim sBtlAuxDir As String = String.Empty
+         GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
+         EgtSetBtlAuxDir(sBtlAuxDir)
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni
@@ -70,36 +75,19 @@ Public Class MySceneHostVM
       If Map.refMainWindowVM.MainWindowM.nKeyLevel = -1 Or Map.refMainWindowVM.MainWindowM.nKeyLevel = -2 Then
          EgtOutLog("Missing Dongle")
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
-         Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3)
+         Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sTitle As String = EgtMsg(10101)
-         'MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          ' 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(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6)
+         Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
-         Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1)
+         Dim sTitle As String = EgtMsg(10101)
-         Dim m_MessageBoxResult As MessageBoxResult
+         If MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
-         If bOnlyProd Then
-            m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error)
-         Else
-            m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error)
-         End If
-         If m_MessageBoxResult = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
-            'Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
+            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-            '   .DefaultExt = ".lic",
+               .DefaultExt = ".lic",
-            '   .Filter = "Licences (.lic)|*.lic",
-            '   .CheckFileExists = True,
-            '   .ValidateNames = True
-            '}
-            Dim LicDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-               .Title = EgtMsg(30006),
                .Filter = "Licences (.lic)|*.lic",
                .CheckFileExists = True,
                .ValidateNames = True
@@ -272,12 +260,7 @@ Public Class MySceneHostVM
          EgtNewFile()
          Map.refMainWindowVM.SetTitle(" New - EgtBEAMWALL")
          Dim sMsg As String = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
-         'MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-         End If
       End If
       MainScene.SetStatusNull()
    End Sub
@@ -289,12 +272,7 @@ Public Class MySceneHostVM
       ' Se salvataggio non riuscito, esco subito
       If Not bOk Then
          Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
-         'MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
-         End If
          Return
       End If
       ' Salvo nome ultimo file
@@ -305,12 +283,7 @@ Public Class MySceneHostVM
       If nType = FT.BTL Or nType = FT.BTLX Then
          nFlag = GetMainPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR)
       Else
-         'MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
-         End If
       End If
    End Sub
 

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -82,7 +82,7 @@ Public Class SupervisorManagerVM
    'Proprietà ToolTip
    Public ReadOnly Property OpenToolTip As String
       Get
-         Return EgtMsg(MSG_TOPCOMMANDBAR + 2)
+         Return EgtMsg(30502)
       End Get
    End Property
    Public ReadOnly Property GoToProd_ToolTip As String
@@ -185,12 +185,7 @@ Public Class SupervisorManagerVM
       ' se macchina connessa e non in reset  
       If Not IsNothing(Map.refMachManaging) AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.End Then
          ' impedisco cambio progetto
-         'MessageBox.Show("Press reset before changing program!!")
+         MessageBox.Show("Press reset before changing program!!")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62550))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62550))
-         End If
          Return
       End If
       Dim sFilePath As String = ""
@@ -221,12 +216,7 @@ Public Class SupervisorManagerVM
          If CurrentMachine.sMachineName <> TempCurrProd.sMachine Then
             ' rimuovo il file in apertura dalla lista degli MRU
             m_MruFiles.Remove(sFilePath)
-            'MessageBox.Show(String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+            MessageBox.Show(String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62551), {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62551), {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-            End If
             EgtNewFile()
             EgtDraw()
             Map.refProjectVM.ProdMachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
@@ -245,12 +235,7 @@ Public Class SupervisorManagerVM
             ' inizializzo visibilita' bottone done per i Part
             Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
          Else
-            'MessageBox.Show("Impossibile aprire il file!!")
+            MessageBox.Show("Impossibile aprire il file!!")
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552))
-            End If
             Map.refSceneHostVM.MainController.NewProject()
             Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
             m_bLoadingProd = False
@@ -259,12 +244,7 @@ Public Class SupervisorManagerVM
             Return
          End If
       Else
-         'MessageBox.Show("File non trovato!!")
+         MessageBox.Show("File non trovato!!")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62553))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62553))
-         End If
          Map.refSceneHostVM.MainController.NewProject()
          Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
          m_bLoadingProd = False

EgtBEAMWALL.Supervisor/Utility/DbControllers.vb

@@ -87,12 +87,7 @@ Module DbControllers
          End If
       Catch ex As Exception
          EgtOutLog("InitDb error: " & ex.ToString())
-         'MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
+         MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(91115))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(91115))
-         End If
          End
       End Try
 

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -193,7 +193,61 @@
 
    <!--#region GRAFICA GENERALE-->
 
-   <!--#region Button Style-->
+   <!--#region Button Old Style-->
+
+   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="#FFDDDDDD"/>
+   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="#FF707070"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="#FFBEE6FD"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="#FF3C7FB1"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="#FFC4E5F6"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="#FF2C628B"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="#FFF4F4F4"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="#FFADB2B5"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="#FF838383"/>
+   <Style TargetType="{x:Type Button}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Margin" Value="1"/>
+      <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Border x:Name="border" CornerRadius="3" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsDefaulted" Value="true">
+                     <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.MouseOver.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Pressed.Border}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource ButtonBasic.Disabled.Border}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource ButtonBasic.Disabled.Foreground}"/>
+                     <Setter Property="OpacityMask" Value="#54707070"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion Button Old Style-->
+
+   <!--#region Button New Style-->
 
    <!--#FFDDDDDD-->
    <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
@@ -254,7 +308,7 @@
       </Setter>
    </Style>
 
-   <!--#endregion Button Style-->
+   <!--#endregion Button New Style-->
 
    <!--#region ScrollBar-->
 
@@ -1160,9 +1214,6 @@
    <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
    </Style>
 
    <Style x:Key="LeftPanel_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -2211,6 +2262,14 @@
       </Setter>
    </Style>
 
+   <Style x:Key="OnlyProdLeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+   </Style>
+
    <!--#endregion Button Style-->
 
    <!--#region EgtFloatingPanel-->

EgtBEAMWALL.Supervisor/packages.config

@@ -3,6 +3,7 @@
   <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="Csv" version="1.0.31" targetFramework="net472" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
+  <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="FluentFTP" version="19.2.2" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
@@ -10,6 +11,7 @@
   <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
   <package id="Lextm.SharpSnmpLib" version="10.0.9" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
   <package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyModel" version="2.1.0" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
@@ -17,6 +19,7 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="NLog" version="5.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
+  <package id="RestSharp" version="111.2.0" targetFramework="net472" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net472" />
@@ -27,7 +30,10 @@
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.3" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net472" />
   <package id="Zebra.Printer.SDK" version="2.15.2634" targetFramework="net472" />
 </packages>

EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml

@@ -13,8 +13,8 @@
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1.75*"/>
-            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.15*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
@@ -31,7 +31,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
+               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"

EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -34,7 +34,7 @@ Public Class AboutBoxV
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+      ExitBtn.Content = EgtMsg(10104)          'Ok
    End Sub
 
 End Class

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -329,12 +329,7 @@ Public Class AddFeatureWndVM
       If Not IsNothing(m_nSelPRC) AndAlso m_nSelPRC.nPRC > 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         'MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
-         End If
       End If
    End Sub
 
@@ -369,6 +364,13 @@ Public Class PRC
       End Get
    End Property
 
+   Private m_nVARIANT As Integer = 0
+   Public ReadOnly Property nVARIANT As Integer
+      Get
+         Return m_nVARIANT
+      End Get
+   End Property
+
    ' Nome
    Private m_sName As String
    Public ReadOnly Property sName As String

EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb

@@ -165,12 +165,7 @@ Public Class AddPartWndVM
          Not IsNothing(m_dH) AndAlso m_dH >= 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         'MessageBox.Show(EgtMsg(61853), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61853), EgtMsg(30007))
-         If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61853), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61853), EgtMsg(30007))
-         End If
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -160,12 +160,7 @@ Public Class AddRawPartWndVM
       For Each Variable In m_VariableList
          If (Variable.nType = Variable.VariableType.STRING_ AndAlso IsNothing(Variable.sValue)) OrElse
             ((Variable.nType = Variable.VariableType.DOUBLE_ OrElse Variable.nType = Variable.VariableType.LENGTH) AndAlso IsNothing(Variable.dValue)) Then
-            'MessageBox.Show(If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
+            MessageBox.Show(If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
-            End If
             Return
          End If
       Next

EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml

@@ -25,6 +25,7 @@
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                    Margin="5"
+                                   ColumnHeaderBackground="{x:Null}"
                                    BindingColumns="{Binding SectXMatColumns}">
          <DataGrid.Resources>
             <!-- SectionXMaterial -->

EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb

@@ -191,16 +191,14 @@ Public Class AddSectionXMaterialWndVM
             (Not NewSectionXMaterialList(Index).Alias_IsChecked And NewSectionXMaterialList(Index).dNewL < 0) OrElse
             (NewSectionXMaterialList(Index).Alias_IsChecked And IsNothing(NewSectionXMaterialList(Index).SelMaterialForSameSection)) OrElse
             (Not NewSectionXMaterialList(Index).Alias_IsChecked And (NewSectionXMaterialList(Index).nQuantity < 0 Or NewSectionXMaterialList(Index).nQuantity > 99)) Then
-            'MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+            MessageBox.Show(IncorrectValues_Msg, Error_Msg)
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
             Return
          End If
          If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL AndAlso
             (Not NewSectionXMaterialList(Index).Alias_IsChecked And (NewSectionXMaterialList(Index).dNewW < 0 Or NewSectionXMaterialList(Index).dNewL < 0)) OrElse
             (NewSectionXMaterialList(Index).Alias_IsChecked And IsNothing(NewSectionXMaterialList(Index).SelMaterialForSameSection)) OrElse
             (Not NewSectionXMaterialList(Index).Alias_IsChecked And (NewSectionXMaterialList(Index).nQuantity < 0 Or NewSectionXMaterialList(Index).nQuantity > 99)) Then
-            'MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+            MessageBox.Show(IncorrectValues_Msg, Error_Msg)
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
             Return
          End If
       Next

EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -199,22 +199,12 @@ Public Class BTLPartManagerVM
          If Not IsNothing(Part) Then
             If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
                If Part.dH <> dHSection OrElse Part.dW <> dWSection Then
-                  'MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
-                  End If
                   Return
                End If
             ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
                If Part.dH <> dHSection Then
-                  'MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
-                  End If
                   Return
                End If
             End If
@@ -224,12 +214,7 @@ Public Class BTLPartManagerVM
       Next
       ' se pareti e piu' di uno selezionato, esco
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
-         'MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
-         End If
          Return
       End If
       ' se nessun grezzo, rendo tutti i pezzi visibili
@@ -289,12 +274,7 @@ Public Class BTLPartManagerVM
                      dRawL = SParamlist(0).dL
                      dRawW = SParamlist(0).dW
                   Else
-                     If bOnlyProd Then
+                     MessageBox.Show(EgtMsg(61975), EgtMsg(30007))
-                        EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61975), EgtMsg(30007))
-                     Else
-                        EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61975), EgtMsg(30007))
-                     End If
-                     'MessageBox.Show(EgtMsg(61975), EgtMsg(30007))
                      Return
                   End If
                Else
@@ -341,12 +321,7 @@ Public Class BTLPartManagerVM
             dTotLen += SelParts(PartIndex).dL
          Next
          If dTotLen > dRawL Then
-            'MessageBox.Show(EgtMsg(61972), EgtMsg(30007))
+            MessageBox.Show(EgtMsg(61972), EgtMsg(30007))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61972), EgtMsg(30007))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61972), EgtMsg(30007))
-            End If
             Return
          End If
       End If
@@ -399,20 +374,10 @@ Public Class BTLPartManagerVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  'MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  End If
                End If
             Else
-               'MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               End If
             End If
             ' se nessun grezzo, rimetto tutti i pezzi invisibili
             If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
@@ -453,20 +418,10 @@ Public Class BTLPartManagerVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  'MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  End If
                End If
             Else
-               'MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-               End If
             End If
             ' se nessun grezzo, rimetto tutti i pezzi invisibili
             If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
@@ -606,14 +561,7 @@ Public Class BTLPartManagerVM
          For Each sPart In ToAddList
             sMessage &= " - " & sPart & Environment.NewLine
          Next
-         'If MessageBox.Show(sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If MessageBox.Show(sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-         Dim m_MessageBoxResult As MessageBoxResult
-         If bOnlyProd Then
-            m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Else
-            m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         End If
-         If m_MessageBoxResult = MessageBoxResult.Yes Then
             For Each PartVM In ToAddVM
                PartVM.AddNewPartToAdded()
             Next
@@ -686,12 +634,7 @@ Public Class BTLPartManagerVM
       If IsNothing(SelMachGroup) Then Return
       ' se pareti e piu' di uno selezionato, esco
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
-         'MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
-         End If
          Return
       End If
       ' se MachGroup gia' mandato in produzione, esco
@@ -710,23 +653,13 @@ Public Class BTLPartManagerVM
          ' verifico sezione e materiale
          For Each Part In SelParts
             If Part.Section <> BeamMachGroup.Section Then
-               'MessageBox.Show(EgtMsg(61866), EgtMsg(30007))
+               MessageBox.Show(EgtMsg(61866), EgtMsg(30007))
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61866), EgtMsg(30007))
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61866), EgtMsg(30007))
-               End If
                Return
             End If
          Next
          ' verifico lunghezza totale
          If Not VerifyTotLength(BeamMachGroup, SelParts) Then
-            'MessageBox.Show(EgtMsg(61867), EgtMsg(30007))
+            MessageBox.Show(EgtMsg(61867), EgtMsg(30007))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61867), EgtMsg(30007))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61867), EgtMsg(30007))
-            End If
             Return
          End If
          If AddPartToBeam(BeamMachGroup, SelParts) Then
@@ -744,12 +677,7 @@ Public Class BTLPartManagerVM
          Dim WallMachGroup As MyMachGroupVM = SelMachGroup
          ' verifico spessore
          If SelPart.Section <> WallMachGroup.Section Then
-            'MessageBox.Show(EgtMsg(61868), EgtMsg(30007))
+            MessageBox.Show(EgtMsg(61868), EgtMsg(30007))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61868), EgtMsg(30007))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61868), EgtMsg(30007))
-            End If
             Return
          End If
          If AddPartToWall(WallMachGroup, SelPart) Then
@@ -1099,12 +1027,7 @@ Public Class BTLPartManagerVM
       Dim nDuploCount As Integer = 0
       If EgtDuploCount(BTLPartToDelete.nPartId, nDuploCount) AndAlso nDuploCount > 0 Then
          ' avviso che il pezzo non è cancellabile perchè in produzione
-         'MessageBox.Show(String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
+         MessageBox.Show(String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
-         End If
          Return
       End If
       ' verifico se rimuovere sezione dalla lista

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -1,9 +1,14 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.Globalization
+Imports System.IO
+Imports System.Text.RegularExpressions
+Imports System.Windows.Interop
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports Mysqlx.XDevAPI.Common
 
 Public Class BTLFeatureVM
    Inherits Core.BTLFeatureVM
@@ -78,14 +83,14 @@ Public Class BTLFeatureVM
                If EgtGetInfo(nFeatureId, "AUXID", sAuxId) Then
                   ' verifico se ha uno o due percorsi
                   Dim sAuxIdSplit() As String = sAuxId.Split(","c)
-                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
+                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
                      Dim nAuxId As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(0), nAuxId) Then
                         EgtTransform(nFeatureId + nAuxId, frOld, GDB_RT.GLOB)
                         EgtTransform(nFeatureId + nAuxId, frNew, GDB_RT.GLOB)
                      End If
                   End If
-                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
+                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
                      Dim nAux2Id As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(1), nAux2Id) Then
                         EgtTransform(nFeatureId + nAux2Id, frOld, GDB_RT.GLOB)
@@ -114,6 +119,67 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public Property VARIANTList As ObservableCollection(Of Integer)
+      Get
+         Return m_BTLFeatureM.VARIANTList
+      End Get
+      Set(value As ObservableCollection(Of Integer))
+         m_BTLFeatureM.VARIANTList = value
+      End Set
+   End Property
+
+   Public Overrides Property nSelVARIANT As Integer
+      Get
+         Return m_BTLFeatureM.nSelVARIANT
+      End Get
+      Set(value As Integer)
+         If value <> m_BTLFeatureM.nSelVARIANT Then
+            m_BTLFeatureM.nSelVARIANT = value
+            Dim vPar As Double() = Nothing
+            Dim sPar As String = Nothing
+            Dim vParQ As String() = Nothing
+            CreateFeatureVariant(value, vPar, sPar, vParQ)
+            If IsNothing(vPar) Then
+               m_BTLFeatureM.nSelVARIANT = 0
+               CreateFeatureVariant(value, vPar, sPar, vParQ)
+            End If
+            m_BTLFeatureM.nSelVARIANT = value
+            Dim bOK As Boolean = m_BTLFeatureM.UpdateParams(nSelGRP, m_BTLFeatureM.nPRC, nSelSIDE, sDES, m_BTLFeatureM.nPRID,
+                                                            m_BTLFeatureM.frFRAME, vPar, sPar, vParQ)
+            If bOK Then
+               EgtDuploSetModified(m_BTLPartM.nPartId)
+               ' seleziono feature in disegno
+               SelGeomFeature()
+               ' rendo non calcolata questa feature
+               ResetCalcFeature()
+            End If
+            NotifyPropertyChanged(NameOf(nSelVARIANT))
+            NotifyPropertyChanged(NameOf(PBTLParamVMList))
+            NotifyPropertyChanged(NameOf(QBTLParamVMList))
+            EgtDraw()
+         End If
+      End Set
+   End Property
+
+   Private Sub CreateFeatureVariant(value As Integer, ByRef vPar() As Double, ByRef sPar As String, ByRef vParQ() As String)
+      ' crea parametri per questa feature da file ini
+      m_BTLFeatureM.CreateFeatureParams(m_BTLFeatureM)
+      m_BTLFeatureM.SetDefaultValues()
+      CreatePBTLParamVMList()
+      CreateQBTLParamVMList()
+      ' aggiorno la feature con nuovo valore
+      vPar = Nothing
+      sPar = Nothing
+      vParQ = Nothing
+      m_BTLFeatureM.CalcParamArray(vPar, sPar, vParQ)
+      ' imposto path disegno da mostrare in BottomPanel
+      If value > 0 AndAlso File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png") Then
+         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png")
+      Else
+         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png")
+      End If
+   End Sub
+
    Public Property sPriority As String
       Get
          Return m_BTLFeatureM.nPriority.ToString()
@@ -185,7 +251,11 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property sDrawPath As String
       Get
-         Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
+         If nPRC = 900 AndAlso nSelVARIANT > 0 Then
+            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png"
+         Else
+            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
+         End If
       End Get
    End Property
 
@@ -329,7 +399,7 @@ Public Class BTLFeatureVM
       AddHandler m_QBTLParamVMList.CollectionChanged, AddressOf OnQBTLParamVMListChanged
    End Sub
 
-   ' funzione che aggiorna lo stato e gli errori dopo calcolo
+   ' funzione che aggiorna lo stato, la rotazione e gli errori dopo calcolo
    Friend Sub CalcFeatureUpdate(ERR As Integer, ROT As Integer, MSG As String)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
@@ -356,6 +426,32 @@ Public Class BTLFeatureVM
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub
 
+   ' funzione che resetta gli errori del calcolo
+   Friend Sub ResetFeatureError()
+      Dim ERR As Integer = 0
+      Dim MSG As String = ""
+      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
+      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
+      m_BTLFeatureM.nCALC_ERR = ERR
+      m_BTLFeatureM.sCALC_MSG = MSG
+      Select Case ERR
+         Case 0
+            m_BTLFeatureM.nState = CalcStates.OK
+         Case 22
+            m_BTLFeatureM.nState = CalcStates.COLLISION
+         Case 17, 19
+            m_BTLFeatureM.nState = CalcStates.WARNING
+         Case < 0
+            m_BTLFeatureM.nState = CalcStates.INFO
+         Case > 0
+            m_BTLFeatureM.nState = CalcStates.ERROR_
+      End Select
+      NotifyPropertyChanged(NameOf(Calc_Background))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+   End Sub
+
    Friend Sub ResetCalcFeature()
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_ERR, ITG_PROJ_ERR))
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_MSG, ITG_PROJ_MSG))
@@ -512,11 +608,11 @@ Public Class BTLFeatureVM
 #Region "EVENTS"
 
    Private Sub OnPBTLParamAdded(sender As Object, e As BTLParamAddedEventArgs) Handles m_BTLFeatureM.PBTLParamAdded
-      Dim BTLParamVM As BTLParamVM = New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
+      Dim BTLParamVM As New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
       PBTLParamVMList.Add(BTLParamVM)
    End Sub
    Private Sub OnQBTLParamAdded(sender As Object, e As BTLParamAddedEventArgs) Handles m_BTLFeatureM.QBTLParamAdded
-      Dim BTLParamVM As BTLParamVM = New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
+      Dim BTLParamVM As New BTLParamVM(e.NewBTLParam, m_BTLFeatureM)
       QBTLParamVMList.Add(BTLParamVM)
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -130,12 +130,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  'MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
-                  End If
                   NotifyPropertyChanged(NameOf(sValue))
                   Return
                End If
@@ -150,19 +145,9 @@ Public Class BTLParamVM
                Dim nDoneCnt As Integer = DbControllers.m_ProjController.getCountItemState(ProjectManagerVM.CurrProj.nProjId, nPartId, ItemState.Assigned)
                ' controllo se i pezzi sono lavorati se si messaggio di warning altrimenti messaggio informativo
                If nDoneCnt > 0 Then
-                  'MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+                  MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-                  End If
                ElseIf INPROD > 0 Then
-                  'MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
+                  MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
-                  End If
                End If
                UpdateParamValue(dNewValue, "")
             Case Else
@@ -207,12 +192,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  'MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
-                  End If
                   NotifyPropertyChanged(NameOf(sDefault))
                   Return
                End If
@@ -247,11 +227,9 @@ Public Class BTLParamVM
          Dim bFound As Boolean = False
          If Not value Then
             ' Cerco il parametro Q direttamente nel file ini
-            Dim GRPType As Integer = Me.m_BTLFeatureM.nSelGRP
-            Dim PRC As Integer = Me.m_BTLFeatureM.nPRC
             Dim ParamIndex As String = 1
             Dim NewBTLParam As BTLParamM = Nothing
-            While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, False, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(Me.m_BTLFeatureM.nSelGRP, Me.m_BTLFeatureM.nPRC, Me.m_BTLFeatureM.nSelVARIANT, False, ParamIndex, Nothing, NewBTLParam)
                Dim QBTLParam As BTLParamVM = New BTLParamVM(NewBTLParam)
                If QBTLParam.sName = Me.sName Then
                   Me.sValue = QBTLParam.sDefault

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -93,12 +93,7 @@ Public Class BTLPartVM
                   End If
                Next
                If bDuploInProduction Then
-                  'MessageBox.Show("Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                  MessageBox.Show("Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
-                  End If
                   Return False
                End If
                ' lo impedisco
@@ -1163,12 +1158,7 @@ Public Class BTLPartVM
             If nTempADDED >= nINPROD Then
                m_BTLPartM.nADDED = nTempADDED
             Else
-               'MessageBox.Show(EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
+               MessageBox.Show(EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
-               End If
             End If
          End If
          NotifyPropertyChanged(NameOf(sADDED))
@@ -1550,10 +1540,26 @@ Public Class BTLPartVM
                ' aggiorno stato abilitazione del bottone modifica free contour
                Map.refFeatureManagerVM.SetEditIsEnabled()
                Map.refFeatureManagerVM.NotifyPropertyChanged(NameOf(Map.refFeatureManagerVM.Priority_Visibility))
+               ' Controlo se nPRC è 900 rendo visibile combobox Variant
+               If m_SelBTLFeatureVM.nPRC = 900 Then
+                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible)
+                  Dim nVariant As Integer = 0
+                  If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
+                     m_SelBTLFeatureVM.nSelVARIANT = nVariant
+                  End If
+                  If m_SelBTLFeatureVM.nSelVARIANT > 0 AndAlso
+                     System.IO.File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png") Then
+                     ' imposto path disegno da mostrare in BottomPanel
+                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png")
+                  Else
+                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
+                  End If
+               Else
+                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
+               End If
             Else
                EgtDeselectAll()
             End If
-            'Map.refLeftPanelVM.FeatureSelectionChanged()
             If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
          End If
          If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
@@ -1767,8 +1773,14 @@ Public Class BTLPartVM
       m_BTLPartM.nFeaturesGlobalState = CalcStates.NOTCALCULATED
       If nState > CalcStates.NOTCALCULATED Then
          For Each Feature In BTLFeatureVMList
-            If Not Feature.bDO And Not bFeatureFirst Then Continue For
+            If Not Feature.bDO And Not bFeatureFirst Then
-
+               If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_BTLPartM.nGlobalState Then
+                  m_BTLPartM.nGlobalState = Feature.nState
+                  m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR
+               Else
+                  Continue For
+               End If
+            End If
             If ((Feature.nState = CalcStates.NOTCALCULATED And nState < CalcStates.WARNING) Or Not Feature.bDO) And bFeatureFirst Then
                m_BTLPartM.nGlobalState = Feature.nState
                m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -243,12 +243,7 @@ Public Class CALCPanelVM
 
    Private Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
       If e.End_ = CalcEndEventArgs.Results.ERROR_ OrElse e.End_ = CalcEndEventArgs.Results.NULL Then
-         'MessageBox.Show("Execution error (all processes are disabled)")
+         MessageBox.Show("Execution error (all processes are disabled)")
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
-         End If
       End If
       If e.End_ = CalcEndEventArgs.Results.EDIT Then
          Map.refMyStatusBarVM.SetOutputMessage("Editor closed")
@@ -376,7 +371,7 @@ Public Class CALCPanelVM
                ' Resetto feature in collisione
                For Each Feature In BTLPart.m_BTLFeatureVMList
                   If Feature.nState = CalcStates.COLLISION Then
-                     Feature.CalcFeatureUpdate(0, 0, "")
+                     Feature.ResetFeatureError()
                   End If
                Next
             Else
@@ -387,7 +382,7 @@ Public Class CALCPanelVM
                   ' Resetto feature in collisione
                   For Each Feature As BTLFeatureVM In Part.FeatureVMList
                      If Feature.nState = CalcStates.COLLISION Then
-                        Feature.CalcFeatureUpdate(0, 0, "")
+                        Feature.ResetFeatureError()
                      End If
                   Next
                Next
@@ -408,15 +403,15 @@ Public Class CALCPanelVM
                         ' aggiorno nuovo pezzo
                         CurrBTLPartVM = GetBTLPartVMFromBTLPartId(Line.nCUTID)
                         If IsNothing(CurrBTLPartVM) Then
+                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(BTLPartVM).")
-                           Continue For
                         End If
                      Else
                         ' aggiorno nuovo pezzo
                         CurrPartVM = GetPartVMFromPartId(Line.nCUTID)
                         If IsNothing(CurrPartVM) Then
+                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(PartVM).")
-                           Continue For
                         End If
                      End If
                   End If
@@ -443,14 +438,14 @@ Public Class CALCPanelVM
                   If nProgramPage = ProjectType.PROJ Then
                      CurrBTLFeatureVM = GetBTLFeatureVMFromBTLPartId(CurrBTLPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
+                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in BTLPartVM " & CurrBTLPartVM.nPartId)
-                        Continue For
                      End If
                   Else
                      CurrBTLFeatureVM = GetFeatureVMFromPartId(CurrPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
+                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in PartVM " & CurrPartVM.nPartId)
-                        Continue For
                      End If
                   End If
                Else
@@ -1126,12 +1121,7 @@ Public Class CALCPanelVM
    Friend Sub ChooseMachine()
       ' rendo visibile la CmBx per la scelta e il pulsante di conferma solo se il Proj corrente non ha associato alcun Prod
       If ProjectManagerVM.CurrProj.nProdId > 0 AndAlso Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE Then
-         If bOnlyProd Then
+         MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         End If
-         'MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       Else
          SetChooseMachine_Visibility(True)
       End If

EgtBEAMWALL.ViewerOptimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb

@@ -129,12 +129,7 @@ Public Class ChangeMaterialWndVM
          Not IsNothing(m_SelWhMaterial) AndAlso m_SelWhMaterial <> "" Then
          RaiseEvent m_CloseWindow(True)
       Else
-         If bOnlyProd Then
+         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
-         End If
-         'MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -30,7 +30,7 @@ Public Class ChangeParameterWndVM
             Dim ParamIndex As Integer = 1
             Dim NewBTLParam As BTLParamM = Nothing
             ' leggo tutti i P della feature
-            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, True, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, m_SelPRC.nVARIANT, True, ParamIndex, Nothing, NewBTLParam)
                m_ParamList.Add(New Parameters(NewBTLParam))
                ParamIndex += 1
             End While
@@ -108,12 +108,7 @@ Public Class ChangeParameterWndVM
          Not IsNothing(m_SelParam) AndAlso m_SelParam.sName <> "" Then
          RaiseEvent m_CloseWindow(True)
       Else
-         If bOnlyProd Then
+         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
-         End If
-         'MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -5,6 +5,9 @@ Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
 Imports MS.Internal
 Imports Ionic.Zip
+Imports EgwProxy.LiMan
+Imports Google.Protobuf.WellKnownTypes
+Imports System.Globalization
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -286,11 +289,81 @@ Public Class ConfigurationPageVM
       NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
    End Sub
 
+   ' Lista delle versioni del programma
+   Private m_ProgramVersionList As New List(Of DTO.ReleaseDTO)
+   Public ReadOnly Property ProgramVersionList As List(Of DTO.ReleaseDTO)
+      Get
+         Return m_ProgramVersionList
+      End Get
+   End Property
+   Friend Sub SetProgramVersionList(value As List(Of DTO.ReleaseDTO))
+      m_ProgramVersionList = value
+      NotifyPropertyChanged(NameOf(ProgramVersionList))
+   End Sub
+
+   ' Item selezionato dalla lista delle versioni del programma
+   Private m_ProgramVersionListItem As DTO.ReleaseDTO
+   Public Property ProgramVersionListItem As DTO.ReleaseDTO
+      Get
+         Return m_ProgramVersionListItem
+      End Get
+      Set(value As DTO.ReleaseDTO)
+         m_ProgramVersionListItem = value
+         If Not IsNothing(m_ProgramVersionListItem) Then SetLinkVersionView(m_ProgramVersionListItem.UrlChangelog)
+         NotifyPropertyChanged(NameOf(ProgramVersionListItem))
+      End Set
+   End Property
+
+   ' Link della versione del programma
+   Private m_LinkVersionView As String
+   Public ReadOnly Property LinkVersionView As String
+      Get
+         Return m_LinkVersionView
+      End Get
+   End Property
+   Friend Sub SetLinkVersionView(value As String)
+      m_LinkVersionView = value
+      NotifyPropertyChanged(NameOf(LinkVersionView))
+   End Sub
+
+   ' Gestisce se attivare il pulsante che permette di collegarsi al link della versione
+   Private m_LinkVersionIsEnable As Boolean
+   Public ReadOnly Property LinkVersionIsEnable As Boolean
+      Get
+         Return m_LinkVersionIsEnable
+      End Get
+   End Property
+   Friend Sub SetLinkVersionIsEnable(value As Boolean)
+      m_LinkVersionIsEnable = value
+      NotifyPropertyChanged(NameOf(LinkVersionIsEnable))
+   End Sub
+
+   ' Gestisce la visibilita' della datagrid che mostra le versioni del programma
+   Private m_ProgramVersionListVisibility As Visibility
+   Public ReadOnly Property ProgramVersionListVisibility As Visibility
+      Get
+         Return m_ProgramVersionListVisibility
+      End Get
+   End Property
+   Friend Sub SetProgramVersionListVisibility(value As Visibility)
+      m_ProgramVersionListVisibility = value
+      NotifyPropertyChanged(NameOf(ProgramVersionListVisibility))
+   End Sub
+
+   Public ReadOnly Property ActualVersion As String
+      Get
+         Return EgtBEAMWALL.Core.Configuration.ActualVersion
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdSave As ICommand
    Private m_cmdChooseExternalBackupFolderPath As ICommand
    Private m_cmdBackup As ICommand
    Private m_cmdRestore As ICommand
+   Private m_cmdGetAllRelease As ICommand
+   Private m_cmdLinkVersion As ICommand
+   Private m_cmdGetVersionFrom As ICommand
 
 #Region "Messages"
 
@@ -462,6 +535,56 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   ' Messaggi Versione
+
+   Public ReadOnly Property CtrlVersion_Msg As String
+      Get
+         Return EgtMsg(61739).ToUpper()
+      End Get
+   End Property
+
+   Public ReadOnly Property ActVersion_Msg As String
+      Get
+         Return EgtMsg(61740)
+      End Get
+   End Property
+
+   Public ReadOnly Property AllVersion_Msg As String
+      Get
+         Return EgtMsg(61741)
+      End Get
+   End Property
+
+   Public ReadOnly Property VersionFrom_Msg As String
+      Get
+         Return EgtMsg(61742)
+      End Get
+   End Property
+
+   Public ReadOnly Property NumVersion_Msg As String
+      Get
+         Return EgtMsg(61743)
+      End Get
+   End Property
+
+   Public ReadOnly Property Version_Msg As String
+      Get
+         Return EgtMsg(61744)
+      End Get
+   End Property
+
+   Public ReadOnly Property DateVersion_Msg As String
+      Get
+         Return EgtMsg(61745)
+      End Get
+   End Property
+
+   Public ReadOnly Property StateVersion_Msg As String
+      Get
+         Return EgtMsg(61746)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "Constructor"
@@ -523,6 +646,10 @@ Public Class ConfigurationPageVM
       m_bExternalBackupActive = nExternalBackupActive > 0
       SetMachineParameter_Visibility(Visibility.Collapsed)
       SetMachine_Visibility(Visibility.Collapsed)
+      ' Setto pulsante link versioni a false
+      SetLinkVersionIsEnable(False)
+      ' Setto la datagrid non visibile
+      SetProgramVersionListVisibility(Visibility.Hidden)
       NotifyPropertyChanged(NameOf(bExternalBackupActive))
    End Sub
 
@@ -571,29 +698,13 @@ Public Class ConfigurationPageVM
    ''' Execute the Save.  This method is invoked by the SaveCommand.
    ''' </summary>
    Public Sub ChooseExternalBackupFolderPath()
-      'Dim FileDialog As New Microsoft.Win32.SaveFileDialog() With {.InitialDirectory = m_ExternalBackupFolderPath,
+      Dim FileDialog As New Microsoft.Win32.SaveFileDialog() With {.InitialDirectory = m_ExternalBackupFolderPath,
-      '                                                             .CheckFileExists = False,
+                                                                   .CheckFileExists = False,
-      '                                                             .CheckPathExists = False,
+                                                                   .CheckPathExists = False,
-      '                                                             .DefaultExt = ".folder",
+                                                                   .DefaultExt = ".folder",
-      '                                                             .OverwritePrompt = False,
+                                                                   .OverwritePrompt = False,
-      '                                                             .FileName = "Select this ",
+                                                                   .FileName = "Select this ",
-      '                                                             .Title = "Backup & Restore File Path"}
+                                                                   .Title = "Backup & Restore File Path"}
-      Dim FileDialog As Object
-      If bOnlyProd Then
-         FileDialog = New EgtBEAMWALL.Core.OnlyProdEgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-            .CheckFileExists = False,
-            .OverwritePrompt = False,
-            .FileName = "Select this ",
-            .Title = "Backup & Restore File Path"
-         }
-      Else
-         FileDialog = New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
-            .CheckFileExists = False,
-            .OverwritePrompt = False,
-            .FileName = "Select this ",
-            .Title = "Backup & Restore File Path"
-         }
-      End If
       If FileDialog.ShowDialog() Then
          m_ExternalBackupFolderPath = Path.GetDirectoryName(FileDialog.FileName)
          WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
@@ -683,12 +794,7 @@ Public Class ConfigurationPageVM
       Try
          DataLayer.DbConfig.DataBaseDumpToFile(sBackupZipPath)
       Catch ex As Exception
-         'MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          bOk = False
       End Try
       If bOk AndAlso File.Exists(sBackupZipPath) Then
@@ -716,12 +822,7 @@ Public Class ConfigurationPageVM
                zip.Save()
             End Using
          Catch ex As Exception
-            'MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
-            End If
             bOk = False
          End Try
       End If
@@ -734,12 +835,7 @@ Public Class ConfigurationPageVM
          If Directory.Exists(m_ExternalBackupFolderPath) Then
             CopyForExternalBackup(sBackupFolder, m_ExternalBackupFolderPath)
          Else
-            'MessageBox.Show(EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
+            MessageBox.Show(EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
-            End If
          End If
       End If
       'chiudo finestra di caricamento
@@ -781,12 +877,7 @@ Public Class ConfigurationPageVM
       Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
       ' verifico che sia chiuso
       If localProc.Length > 0 Then
-         'MessageBox.Show(EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
+         MessageBox.Show(EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
-         End If
          Return
       End If
       m_bRestoreRunning = True
@@ -825,44 +916,20 @@ Public Class ConfigurationPageVM
          Next
       End If
       If String.IsNullOrEmpty(sRestorePath) Then
-         'MessageBox.Show(EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
+         MessageBox.Show(EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
-         End If
       End If
-      'If MessageBox.Show(String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
+      If MessageBox.Show(String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
-      Dim m_MessageBoxResult As MessageBoxResult
-      If bOnlyProd Then
-         m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
-      Else
-         m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
-      End If
-      If m_MessageBoxResult <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
          m_bRestoreRunning = False
          Return
       End If
       Dim bDoBackup = False
-      'Select Case MessageBox.Show(EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
+      Select Case MessageBox.Show(EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
-      Dim m_MessageBoxResultCase As MessageBoxResult
-      If bOnlyProd Then
-         m_MessageBoxResultCase = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
-      Else
-         m_MessageBoxResultCase = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
-      End If
-      Select Case m_MessageBoxResultCase                  ' Do you want to do a backup of the current project before proceding with the restore?
          Case MessageBoxResult.Yes
             bDoBackup = True
          Case MessageBoxResult.No
             bDoBackup = False
          Case MessageBoxResult.Cancel
-            'MessageBox.Show(EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+            MessageBox.Show(EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-            End If
             m_bRestoreRunning = False
             Return
       End Select
@@ -901,12 +968,7 @@ Public Class ConfigurationPageVM
       Catch ex1 As Exception
          EgtOutLog("Error! Impossible importing Recovery file " & sRestorePath & "!")
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         'MessageBox.Show(EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
+         MessageBox.Show(EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
-         End If
          bOk = False
       End Try
       Dim sBackupTempPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\DbRestore"
@@ -916,12 +978,7 @@ Public Class ConfigurationPageVM
          Try
             DataLayer.DbConfig.DataBaseRestoreFromFile(sRestoreDir & "\DbBackup.zip", "", sBackupTempPath)
          Catch ex As Exception
-            'MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
+            MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
-            End If
             bOk = False
          End Try
       End If
@@ -941,6 +998,66 @@ Public Class ConfigurationPageVM
 
 #End Region ' Restore
 
+#Region "GetAllReleaseCommand"
+
+   ''' <summary>
+   ''' Comando che restituisce tutte le versioni del programma
+   ''' </summary>
+   Public ReadOnly Property GetAllReleaseCommand As ICommand
+      Get
+         If m_cmdGetAllRelease Is Nothing Then
+            m_cmdGetAllRelease = New Command(AddressOf GetAllRelease)
+         End If
+         Return m_cmdGetAllRelease
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Funzione che restituisce tutte le versioni del programma
+   ''' </summary>
+   Public Async Sub GetAllRelease()
+      Dim bOk As Boolean = EgtBEAMWALL.Core.Configuration.GetComunication()
+      ' Controllo se la comunicazione è avvenuta con successo
+      If bOk Then
+         ' Setto la datagrid visibile
+         SetProgramVersionListVisibility(Visibility.Visible)
+         ' Recupero la lista di tutte le versioni del programma
+         SetProgramVersionList(Await EgtBEAMWALL.Core.Configuration.m_commLib.ReleaseGetAllAsync(K_BEAMWALL))
+      End If
+   End Sub
+
+#End Region ' ReleaseCommand
+
+#Region "GetVersionFromCommand"
+
+   ''' <summary>
+   ''' Comando che restituisce le versioni del programma filtrate
+   ''' </summary>
+   Public ReadOnly Property GetVersionFromCommand As ICommand
+      Get
+         If m_cmdGetVersionFrom Is Nothing Then
+            m_cmdGetVersionFrom = New Command(AddressOf GetVersionFrom)
+         End If
+         Return m_cmdGetVersionFrom
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Funzione che restituisce le versioni del programma filtrate
+   ''' </summary>
+   Public Async Sub GetVersionFrom()
+      Dim bOk As Boolean = EgtBEAMWALL.Core.Configuration.GetComunication()
+      ' Controllo se la comunicazione è avvenuta con successo
+      If bOk Then
+         ' Setto la datagrid visibile
+         SetProgramVersionListVisibility(Visibility.Visible)
+         ' Recupero la lista delle versioni del programma filtrate per quella attuale
+         SetProgramVersionList(Await EgtBEAMWALL.Core.Configuration.m_commLib.ReleaseGetFiltLimitAsync(K_BEAMWALL, EgtBEAMWALL.Core.Configuration.ActualVersion, "2.5.15.0"))
+      End If
+   End Sub
+
+#End Region ' ReleaseCommand
+
 #End Region    ' COMMANDS
 
 #Region "Methods"
@@ -966,12 +1083,7 @@ Public Class ConfigurationPageVM
                Dim MachParamString As String = sMachParamType & "," & MachParamItem.sName & "," & MachParamItem.sValue & "," & MachParamItem.sDescription
                Dim bOk = WriteMachPrivateProfileString(MachParamItem.nParentTable, MachParamItem.nParamIndex, MachParamString)
                If Not bOk Then
-                  'MessageBox.Show(EgtMsg(61859), EgtMsg(30007))
+                  MessageBox.Show(EgtMsg(61859), EgtMsg(30007))
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61859), EgtMsg(30007))
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61859), EgtMsg(30007))
-                  End If
                   Return
                End If
                MachParamItem.IsModifiedReset()
@@ -1155,7 +1267,7 @@ Public Class ConfigurationPageVM
       ParamIndex = 1
       TempList = New List(Of QBTLParamVM)
       If IsP Then
-         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam)
+         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, 0, IsP, ParamIndex, Nothing, NewBTLParam)
             TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
             ParamIndex += 1
          End While
@@ -1208,6 +1320,7 @@ Public Class ConfigurationPageVM
       Next
    End Sub
 
+
 #End Region ' Methods
 
 End Class
@@ -1407,3 +1520,25 @@ Public Enum MachParamType As Integer
    LENGTH = 4
    CHECKBOX = 5
 End Enum
+
+' Converte il parametro isPermitted
+Public Class IsPermittedConverter
+   Implements IValueConverter
+
+   Public Function Convert(value As Object, targetType As System.Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+      Dim isPermitted As DTO.ReleaseDTO = TryCast(value, DTO.ReleaseDTO)
+      Select Case isPermitted.IsPermitted
+         Case 0
+            Return "Versione Acquistata"
+         Case 1
+            Return "Versione da Acquistare"
+         Case Else
+            Return Nothing
+      End Select
+      Return Nothing
+   End Function
+
+   Public Function ConvertBack(value As Object, targetType As System.Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+      Throw New NotImplementedException()
+   End Function
+End Class

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdCheckVersionV.xaml

@@ -0,0 +1,145 @@
+<Grid x:Class="OnlyProdCheckVersionV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+      xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+      xmlns:WebView="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf">
+   <Grid.Resources>
+      <EgtBEAMWALL:IsPermittedConverter x:Key="IsPermittedConverter"/>
+   </Grid.Resources>
+
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto"/>
+      <ColumnDefinition Width="1*"/>
+   </Grid.ColumnDefinitions>
+   <Grid Margin="10" 
+         VerticalAlignment="Top" 
+         HorizontalAlignment="Left">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+         <TextBlock Text="{Binding ActVersion_Msg}"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    FontWeight="Bold"
+                    Margin="10,0,0,0"
+                    Style="{StaticResource OptionTextBlock_OnlyProd}"/>
+         <TextBlock Text="{Binding ActualVersion}"
+                    VerticalAlignment="Center"
+                    FontSize="15"
+                    FontWeight="Bold"
+                    Margin="10,0,0,0"
+                    Style="{StaticResource OptionTextBlock_OnlyProd}"/>
+      </StackPanel>
+      <UniformGrid Grid.Row="1"
+                   Columns="2"
+                   Margin="0,20,0,10">
+         <Button Content="{Binding AllVersion_Msg}"
+                 Width="180"
+                 Command="{Binding GetAllReleaseCommand}"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding VersionFrom_Msg}"
+                 Width="150"
+                 Command="{Binding GetVersionFromCommand}"
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+      <Border Grid.Row="2" 
+              Margin="0,10,10,10"  
+              Visibility="{Binding ProgramVersionListVisibility}"
+              Style="{StaticResource OnlyProdPage_Border}">
+         <DataGrid ItemsSource="{Binding ProgramVersionList}"
+                   SelectedItem="{Binding ProgramVersionListItem}"
+                   AutoGenerateColumns="False"
+                   CanUserSortColumns="False"
+                   CanUserResizeColumns="False"
+                   CanUserResizeRows="False"
+                   CanUserReorderColumns="False"
+                   SelectionMode="Single"
+                   ScrollViewer.CanContentScroll="True" 
+                   ScrollViewer.VerticalScrollBarVisibility="Auto"
+                   ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                   AlternationCount="2"
+                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                   RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
+                   Style="{StaticResource DataGrid_OnlyProd}">
+            <DataGrid.ColumnHeaderStyle>
+               <Style TargetType="{x:Type DataGridColumnHeader}">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="FontSize" Value="15"/>
+               </Style>
+            </DataGrid.ColumnHeaderStyle>
+            <DataGrid.Columns>
+               <!--Numero Versione-->
+               <DataGridTemplateColumn Width="170">
+                  <DataGridTemplateColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.NumVersion_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.HeaderTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding VersNum}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+               <!--Versione-->
+               <DataGridTemplateColumn Width="110">
+                  <DataGridTemplateColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Version_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.HeaderTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding VersText}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+               <!--Data di Rilascio-->
+               <DataGridTemplateColumn Width="160">
+                  <DataGridTemplateColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.DateVersion_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.HeaderTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding ReleaseDate, StringFormat=dd/MM/yyyy}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+               <!--Stato Versione-->
+               <DataGridTemplateColumn Width="150">
+                  <DataGridTemplateColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.StateVersion_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.HeaderTemplate>
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource IsPermittedConverter}}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
+            </DataGrid.Columns>
+         </DataGrid>
+      </Border>
+   </Grid>
+   <Border Grid.Column="1" 
+           Margin="0,10,10,10"  
+           Style="{StaticResource OnlyProdPage_Border}">
+      <WebView:WebView2 Grid.Column="1"
+                        Source="{Binding LinkVersionView}"/>
+   </Border>
+
+</Grid>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdCheckVersionV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml

@@ -3,7 +3,9 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+           xmlns:WebView="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
            DataContext="{StaticResource ConfigurationPageVM}">
+
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
@@ -74,11 +76,21 @@
                   </Button>
                </StackPanel>
             </TabItem.Header>
-
             <TabItem.Content>
                <EgtBEAMWALL:OnlyProdPDFEditorV/>
             </TabItem.Content>
          </TabItem>
+         <TabItem>
+            <TabItem.Header>
+               <StackPanel Orientation="Horizontal" Margin="5">
+                  <TextBlock Text="{Binding CtrlVersion_Msg}"
+                             FontSize="15"/>
+               </StackPanel>
+            </TabItem.Header>
+            <TabItem.Content>
+               <EgtBEAMWALL:OnlyProdCheckVersionV/>
+            </TabItem.Content>
+         </TabItem>
       </TabControl>
    </Grid>
 </DockPanel>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml.vb

@@ -1,3 +1,2 @@
 Public Class OnlyProdConfigurationPageV
-
 End Class

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -15,31 +15,6 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>true</IncrementalBuild>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>false</IncrementalBuild>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -52,29 +27,6 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -104,27 +56,6 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -190,9 +121,6 @@
     <Compile Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml.vb">
       <DependentUpon>OnlyProdAddRawPartWndV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BTLPartList\OnlyProdBTLPartListV.xaml.vb">
-      <DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="BTLPartManager\BTLPartManagerV.xaml.vb">
       <DependentUpon>BTLPartManagerV.xaml</DependentUpon>
     </Compile>
@@ -207,6 +135,9 @@
       <DependentUpon>ChangeMaterialWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ChangeMaterialWnd\ChangeMaterialWndVM.vb" />
+    <Compile Include="ConfigurationPage\OnlyProdCheckVersionV.xaml.vb">
+      <DependentUpon>OnlyProdCheckVersionV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ConfigurationPage\OnlyProdConfigurationPageV.xaml.vb">
       <DependentUpon>OnlyProdConfigurationPageV.xaml</DependentUpon>
     </Compile>
@@ -235,6 +166,9 @@
     <Compile Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml.vb">
       <DependentUpon>OnlyProdInstrumentPanelV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ItemParamList\OnlyProdBTLPartListV.xaml.vb">
+      <DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml.vb">
       <DependentUpon>OnlyProdFeatureInPartInRawPartListV.xaml</DependentUpon>
     </Compile>
@@ -589,10 +523,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="BTLPartList\OnlyProdBTLPartListV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="BTLPartManager\BTLPartManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -609,6 +539,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ConfigurationPage\OnlyProdCheckVersionV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ConfigurationPage\OnlyProdConfigurationPageV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -641,6 +575,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ItemParamList\OnlyProdBTLPartListV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1355,6 +1293,9 @@
     <PackageReference Include="DotNetZip">
       <Version>1.16.0</Version>
     </PackageReference>
+    <PackageReference Include="EgwProxy.LiMan">
+      <Version>1.0.2408.817</Version>
+    </PackageReference>
     <PackageReference Include="EntityFramework">
       <Version>6.4.4</Version>
     </PackageReference>
@@ -1364,6 +1305,9 @@
     <PackageReference Include="K4os.Compression.LZ4.Streams">
       <Version>1.3.5</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Web.WebView2">
+      <Version>1.0.2592.51</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts">
       <Version>10.0.22621.2428</Version>
     </PackageReference>
@@ -1425,6 +1369,12 @@
   <ItemGroup>
     <Resource Include="Resources\EgtMessageBox\Warning.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Egalware.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/FeatureListManagerVM.vb

@@ -135,12 +135,7 @@ Public Class FeatureListManagerVM
          ' Reset lua
          EgtLuaResetGlobVar("MACRO")
          If Not bOk Then
-            'MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
+            MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61869), EgtMsg(30007))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61869), EgtMsg(30007))
-            End If
             Return
          End If
          bMacroFlag = True

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerV.xaml

@@ -32,6 +32,12 @@
                           Width="45"/>
    <TextBlock Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
               Style="{StaticResource OptionTextBlock}"/>
+   <ComboBox ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
+             SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
+             IsEnabled="{Binding FeatureManager_IsEnabled}"
+             Visibility="{Binding Variant_Visibility}"
+             Style="{StaticResource FeatureComboBox}"/>
+
    <Button Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerVM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class FeatureManagerVM
@@ -16,6 +17,18 @@ Public Class FeatureManagerVM
       End Set
    End Property
 
+
+   Private m_Variant_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Variant_Visibility As Visibility
+      Get
+         Return m_Variant_Visibility
+      End Get
+   End Property
+   Public Sub SetVariant_Visibility(value As Visibility)
+      m_Variant_Visibility = value
+      NotifyPropertyChanged(NameOf(Variant_Visibility))
+   End Sub
+
    Public ReadOnly Property Edit_IsEnabled As Boolean
       Get
          Return m_FeatureManager_IsEnabled AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso

EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputVM.vb

@@ -187,12 +187,12 @@ Public Class FreeContourInputVM
 
    Public ReadOnly Property ShowMsg As String
       Get
-         Return EgtMsg(5350 + 14)
+         Return EgtMsg(5364)
       End Get
    End Property
    Public ReadOnly Property OkMsg As String
       Get
-         Return EgtMsg(5350 + 15)
+         Return EgtMsg(5365)
       End Get
    End Property
 
@@ -242,7 +242,7 @@ Public Class FreeContourInputVM
    End Sub
 
    Friend Sub ResetInputBox()
-      Title = EgtMsg(5350 + 5)
+      Title = EgtMsg(5355)
       Text_Visibility = Visibility.Collapsed
       Message_Visibility = Visibility.Collapsed
       Check_Visibility = Visibility.Collapsed

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -83,14 +83,7 @@ Public Class FreeContourManagerVM
                NotifyPropertyChanged(NameOf(TextAngle_Visibility))
             Case FreeContourTypes.TWO
                ' chiedo conferma
-               Dim m_MessageBoxResult As MessageBoxResult
+               If MessageBox.Show(EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
-               If bOnlyProd Then
-                  m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning)
-               Else
-                  m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning)
-               End If
-               'If MessageBox.Show(EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
-               If m_MessageBoxResult <> MessageBoxResult.Yes Then
                   m_SelType = FreeContourTypes.TWO
                   NotifyPropertyChanged(NameOf(SelType))
                   Return
@@ -434,8 +427,8 @@ Public Class FreeContourManagerVM
       ' posiziono la griglia sul riferimento del contorno libero
       Dim frFace As New Frame3d
       EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
-      Dim frFrame As Frame3d = SelFeature.BTLFeatureM.frFRAME
+      Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
-      frFrame.ToGlob(frFace)
+      frFrame.ToGlob( frFace)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)
       Map.refSceneHostVM.MainScene.CPlaneView()

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml

@@ -20,10 +20,7 @@
                                 PreviewMouseUp="DataGrid_PreviewMouseUp"
                                 PreviewMouseMove="DataGrid_PreviewMouseMove"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
                                                                                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
                                 BindingColumns="{Binding PartColumns}"

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -16,10 +16,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
                                 BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml

@@ -16,10 +16,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 IsEnabled="{Binding FeatureList_IsEnabled}"
                                 BindingColumns="{Binding FeatureColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PParameterListV.xaml

@@ -12,10 +12,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PParameterListV}}}"
                                 IsEnabled="{Binding PParameterList_IsEnabled}"    

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml

@@ -18,10 +18,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding PartInRawPartColumns}"
                                 BeginningEdit="PartInRawPartList_BeginningEdit"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml

@@ -12,10 +12,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 ItemsSource="{Binding Tag.QBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
                                 SelectedItem="{Binding Tag.SelQBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:QParameterListV}}}"
                                 BeginningEdit="QParameterList_BeginningEdit"

EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml

@@ -16,10 +16,7 @@
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
-                                ColumnHeaderBackground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                ColumnHeaderBackground="{x:Null}"
-                                ColumnHeaderForeground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                ColumnHeaderFontWeight="Normal"
-                                ColumnHeaderPadding="0,2,0,2"
                                 BindingColumns="{Binding RawPartColumns}"
                                 BeginningEdit="RawPartList_BeginningEdit"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -132,6 +132,10 @@ Public Class MyMachGroupVM
                               EgtMovePartInRawPart(Part.nPartId, New Vector3d(dValue - MyMachGroupM.dL, 0, 0))
                            Next
                         End If
+                        ' ripristino eventuale PosZ
+                        If MyMachGroupM.dPosZ >= 0 Then
+                           EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
+                        End If
                         EgtSetInfo(Id, MGR_RPT_PANELLEN, dValue)
                         EgtDraw()
                         MyMachGroupM.dL = dValue
@@ -184,6 +188,10 @@ Public Class MyMachGroupVM
                            EgtMovePartInRawPart(Part.nPartId, New Vector3d(0, dValue - MyMachGroupM.dW, 0))
                         Next
                      End If
+                     ' ripristino eventuale PosZ
+                     If MyMachGroupM.dPosZ >= 0 Then
+                        EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
+                     End If
                      EgtSetInfo(Id, MGR_RPT_PANELWIDTH, dValue)
                      EgtDraw()
                      MyMachGroupM.dW = dValue
@@ -388,12 +396,7 @@ Public Class MyMachGroupVM
                BeamWallMachGroup.DeleteMachGroup()
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  'MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  End If
                End If
                Return Nothing
             End If
@@ -470,12 +473,7 @@ Public Class MyMachGroupVM
                BeamWallMachGroup.DeleteMachGroup()
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  'MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  If bOnlyProd Then
-                     EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  Else
-                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
-                  End If
                End If
                Return Nothing
             End If
@@ -578,14 +576,7 @@ Public Class MyMachGroupVM
       Next
       sPartToAdd &= Environment.NewLine & "Aggiungerli?"
       If bPartToAdd Then
-         'If MessageBox.Show(sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If MessageBox.Show(sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-         Dim m_MessageBoxResult As MessageBoxResult
-         If bOnlyProd Then
-            m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Else
-            m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         End If
-         If m_MessageBoxResult = MessageBoxResult.Yes Then
             For Each Part In SelParts
                If Not Part.CanAddPartToCount() Then Part.AddNewPartToAdded()
             Next
@@ -907,14 +898,14 @@ Class CopyPart
          Return m_BTLPart
       End Get
    End Property
-   Private m_sPosX As Double
+   Private m_sPosX As String
-   Public ReadOnly Property sPosX As Double
+   Public ReadOnly Property sPosX As String
       Get
          Return m_sPosX
       End Get
    End Property
-   Private m_sPosY As Double
+   Private m_sPosY As String
-   Public ReadOnly Property sPosY As Double
+   Public ReadOnly Property sPosY As String
       Get
          Return m_sPosY
       End Get
@@ -932,7 +923,7 @@ Class CopyPart
       End Get
    End Property
 
-   Sub New(BTLPart As BTLPartVM, sPosX As Double, sPosY As Double, dRot As Double, nFlip As Integer)
+   Sub New(BTLPart As BTLPartVM, sPosX As String, sPosY As String, dRot As Double, nFlip As Integer)
       m_BTLPart = BTLPart
       m_sPosX = sPosX
       m_sPosY = sPosY

EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb

@@ -95,17 +95,17 @@ Public Class MachinePanelVM
 
    Public ReadOnly Property ToolDBMsg As String
       Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
+         Return EgtMsg(90706)
       End Get
    End Property
    Public ReadOnly Property MachiningDbMsg As String
       Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
+         Return EgtMsg(90707)
       End Get
    End Property
    Public ReadOnly Property SetUpMsg As String
       Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
+         Return EgtMsg(90933)
       End Get
    End Property
    Public ReadOnly Property ParameterMachineMsg As String
@@ -210,16 +210,16 @@ Public Class MachinePanelVM
          ' apro finestra di gestione lavorazioni travi
          Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
          Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
-         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         Dim BeamMchsWinV As Object = Nothing
+         If bOnlyProd Then
+            BeamMchsWinV = New OnlyProdBeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         Else
+            BeamMchsWinV = New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
+         End If
          BeamMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
-         'MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         End If
       End If
       Return True
    End Function
@@ -234,16 +234,16 @@ Public Class MachinePanelVM
          ' apro finestra di gestione lavorazioni pareti
          Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
          Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
-         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         Dim WallMchsWinV As Object = Nothing
+         If bOnlyProd Then
+            WallMchsWinV = New OnlyProdBeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         Else
+            WallMchsWinV = New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
+         End If
          WallMchsWinV.ShowDialog()
       Else
          ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
-         'MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
+         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-         End If
       End If
       Return True
    End Function
@@ -253,17 +253,18 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         'MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
 
       Dim ToolDbWindowVM As New MyToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Dim ToolDbWindowV = Nothing
+      If bOnlyProd Then
+         ToolDbWindowV = New OnlyProdToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Else
+         ToolDbWindowV = New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      End If
+
       If ToolDbWindowVM.MatType <> 0 Then
          ToolDbWindowV.Height = 640
          ToolDbWindowV.Width = 1024
@@ -278,16 +279,16 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Dim MachDbWindowV = Nothing
+      If bOnlyProd Then
+         MachDbWindowV = New OnlyProdMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      Else
+         MachDbWindowV = New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      End If
 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
          MachDbWindowV.Height = 768
@@ -302,12 +303,7 @@ Public Class MachinePanelVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -326,12 +322,7 @@ Public Class MachinePanelVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               If bOnlyProd Then
-                  EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               Else
-                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               End If
                Return
             End If
          End If
@@ -340,10 +331,19 @@ Public Class MachinePanelVM
       ' Reset lua
       EgtLuaResetGlobVar("STU")
 
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+      Dim SetUpWindow As Object = Nothing
-         .Height = 614,
+      If bOnlyProd Then
-         .Width = 1024
+         SetUpWindow = New OnlyProdSetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
-      }
+            .Height = 614,
+            .Width = 1024
+         }
+      Else
+         SetUpWindow = New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName)) With {
+            .Height = 614,
+            .Width = 1024
+         }
+      End If
+
       SetUpWindow.ShowDialog()
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MacroFeatureWnd/MacroFeatureWndVM.vb

@@ -132,12 +132,7 @@ Public Class MacroFeatureWndVM
          WriteMacro(sFeatureName)
          RaiseEvent m_CloseWindow(True)
       Else
-         'MessageBox.Show(EgtMsg(61870), EgtMsg(30007))
+         MessageBox.Show(EgtMsg(61870), EgtMsg(30007))
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61870), EgtMsg(30007))
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61870), EgtMsg(30007))
-         End If
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb

@@ -5,6 +5,7 @@ Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgwProxy.LiMan
 
 Public Class MainMenuVM
    Inherits VMBase
@@ -152,6 +153,18 @@ Public Class MainMenuVM
       End Get
    End Property
 
+   ' Testo che mostra il numero di versioni da aggiornare
+   Private m_NumVersion As Integer
+   Public ReadOnly Property NumVersion As Integer
+      Get
+         Return m_NumVersion
+      End Get
+   End Property
+   Friend Sub SetNumVersion(value As Integer)
+      m_NumVersion = value
+      NotifyPropertyChanged(NameOf(NumVersion))
+   End Sub
+
 #Region "Messages"
 
    Public ReadOnly Property Viewer_Msg As String
@@ -184,12 +197,18 @@ Public Class MainMenuVM
       End Get
    End Property
 
+   Public ReadOnly Property NVersion_Msg As String
+      Get
+         Return EgtMsg(61747)
+      End Get
+   End Property
+
 #Region "ToolTip"
 
    'Proprietà ToolTip
    Public ReadOnly Property SendFeedbackToolTip As String
       Get
-         Return EgtMsg(MSG_TOPCOMMANDBAR + 13)
+         Return EgtMsg(30513)
       End Get
    End Property
 
@@ -214,6 +233,8 @@ Public Class MainMenuVM
       Else
          m_Supervisor_Visibility = Visibility.Collapsed
       End If
+      ' imposto numero di versioni da aggiornare
+      SetNumVersion(GetNumVersion())
       ' imposto timer di apertura da ottimizzatore
       m_OpenPage_Timer.Interval = TimeSpan.FromMilliseconds(500)
       AddHandler m_OpenPage_Timer.Tick, AddressOf OpenPage_Tick
@@ -224,6 +245,22 @@ Public Class MainMenuVM
 
 #Region "METHODS"
 
+   ''' <summary>
+   ''' Funzione che restituisce il numero di versioni del programma che sono da aggiornare
+   ''' </summary>
+   ''' <returns></returns>
+   Friend Function GetNumVersion() As Integer
+      Dim bOk As Boolean = EgtBEAMWALL.Core.Configuration.GetComunication()
+      ' Controllo se la comunicazione è avvenuta con successo
+      If bOk Then
+         ' Recupero la lista delle versioni del programma filtrate per quella attuale
+         Dim ReleaseList As List(Of DTO.ReleaseDTO) = EgtBEAMWALL.Core.Configuration.m_commLib.ReleaseGetFiltLimit(K_BEAMWALL, EgtBEAMWALL.Core.Configuration.ActualVersion, "2.5.15.0")
+         Return ReleaseList.Where(Function(r) r.IsPermitted).Count
+      Else
+         Return 0
+      End If
+   End Function
+
    Friend Sub SetMainMenuIsEnabled(bIsEnabled As Boolean)
       m_MainMenu_IsEnabled = bIsEnabled
       NotifyPropertyChanged(NameOf(MainMenu_IsEnabled))
@@ -434,12 +471,7 @@ Public Class MainMenuVM
             ' seleziono prima barra
             Map.refProjectVM.MachGroupPanelVM.SelFirstMachGroup()
          Else
-            'MessageBox.Show(EgtMsg(61871))
+            MessageBox.Show(EgtMsg(61871))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61871))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61871))
-            End If
          End If
       Else
          Map.refSceneHostVM.MainController.NewProject()
@@ -664,12 +696,7 @@ Public Class MainMenuVM
             ' seleziono prima barra
             Map.refProjectVM.MachGroupPanelVM.SelFirstMachGroup()
          Else
-            'MessageBox.Show(EgtMsg(61871))
+            MessageBox.Show(EgtMsg(61871))
-            If bOnlyProd Then
-               EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61871))
-            Else
-               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61871))
-            End If
          End If
       Else
          Map.refSceneHostVM.MainController.NewProject()
@@ -780,12 +807,7 @@ Public Class MainMenuVM
    ''' </summary>
    Public Sub SendFeedback(ByVal param As Object)
       If (SelPage = Pages.MACHINING OrElse SelPage = Pages.ONLYPRODPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
-         'MessageBox.Show(EgtMsg(61891), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(61891), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61891), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61891), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       ' Recupero indirizzo a cui spedire la mail
@@ -793,12 +815,7 @@ Public Class MainMenuVM
       GetMainPrivateProfileString(S_GENERAL, K_SUPPORT, "support@egaltech.com", sSupportAddress)
       ' se vuoto do messaggio di errore ed esco
       If String.IsNullOrWhiteSpace(sSupportAddress) Then
-         'MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         End If
          Return
       End If
       ' Recupero numero chiave
@@ -886,14 +903,9 @@ Public Class MainMenuVM
          bEx = True
       End Try
       If bEx OrElse EgtWPFLib5.MapiMailMessage.m_ErrorCode <> 0 Then
-         'MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+         MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
-         If bOnlyProd Then
-            EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
-         Else
-            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
-         End If
       Else
-         Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(MSG_TOPCOMMANDBAR + 14))
+         Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(30514))
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MainMenu/OnlyProdMainMenuV.xaml

@@ -16,11 +16,11 @@
               Command="{Binding Supervisor_Command}"
               Visibility="{Binding Supervisor_Visibility}"
               Style="{StaticResource OnlyProdMainMenu_Button}"
-              Margin="-30,0,0,0"/>
+              Margin="-42.5,0,0,0"/>
       <RadioButton Content="{Binding Configuration_Msg}"
                    IsChecked="{Binding Config_IsChecked}"
                    Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
-                   Margin="-60,0,0,0"
+                   Margin="-89.5,0,0,0"
                    Width="120"/>
       <Button Command="{Binding SendFeedbackCommand}"
               ToolTip="{Binding SendFeedbackToolTip}"
@@ -28,8 +28,15 @@
               IsEnabled="{Binding SendFeedbackIsEnabled}"
               HorizontalAlignment="Left" 
               Width="40"
-              Margin="-28,0,0,0">
+              Margin="-46.5,0,0,0">
          <Image Source="/Resources/MainMenu/Send.png" Stretch="Uniform"/>
       </Button>
+      <StackPanel Orientation="Horizontal" Margin="-130,0,0,0">
+         <TextBlock Text="{Binding NVersion_Msg}"
+                    Style="{StaticResource OptionTextBlockVersion_OnlyProd}"/>
+         <TextBlock Text="{Binding NumVersion}"
+                    Style="{StaticResource OptionTextBlockVersion_OnlyProd}"
+                    Margin="5,0,0,0"/>
+      </StackPanel>
    </UniformGrid>
 </StackPanel>

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -191,6 +191,14 @@ Public Class MainWindowM
       End Get
    End Property
 
+   ' Indirizzo server (DEBUG) 
+   Private m_sServerAddressRelease As String
+   Friend ReadOnly Property sServerAddressRelease As String
+      Get
+         Return m_sServerAddressRelease
+      End Get
+   End Property
+
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -269,8 +277,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(5327, 2701, 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())
@@ -339,6 +347,10 @@ Public Class MainWindowM
       m_bMachConfig = GetMainPrivateProfileInt(S_MACH, K_MACHCONFIG, 0) = 1
       ' e lo imposto nel core
       Core.Configuration.SetModifySetup(m_bMachConfig)
+      ' Recupero Server Address
+      GetMainPrivateProfileString(S_GENERAL, K_SERVERADDRESS, "", m_sServerAddressRelease)
+      ' e lo imposto nel core
+      Core.Configuration.SetServerAddressRelease(m_sServerAddressRelease)
 
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString())