- Aggiunto messaggio se cartella Variant non trovata.

- Aggiornati controlli versione a 2.7d1

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Globalization
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
@@ -131,6 +132,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
@@ -141,6 +152,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
@@ -244,6 +265,7 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
+      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
@@ -258,7 +280,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)
@@ -322,11 +344,22 @@ Public Class BTLFeatureM
       NewBTLFeature.m_nSelSIDE = nSIDE
       NewBTLFeature.m_nPriority = 0
       NewBTLFeature.m_bDO = True
+      NewBTLFeature.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"
@@ -362,15 +395,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
@@ -545,10 +584,10 @@ 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)
+         EgtDuploSetModified(ParentPart.nPartId)
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE
@@ -598,6 +637,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/BTLModel/BTLPartM.vb

@@ -1242,7 +1242,7 @@ Public Class BTLPartM
          m_nROTATED = If(dNewRotation >= 0, dNewRotation, 360 + dNewRotation)
          EgtSetInfo(nPartId, BTL_PRT_ROTATED, m_nROTATED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
       ' se era invertito
       If bInverted Then
@@ -1275,7 +1275,7 @@ Public Class BTLPartM
          m_nINVERTED = If(m_nINVERTED = 0, 180, 0)
          EgtSetInfo(nPartId, BTL_PRT_INVERTED, m_nINVERTED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
    End Sub
 

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -64,6 +64,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
@@ -264,9 +273,6 @@ Public Class BTLFeatureVM
       End If
    End Sub
 
-   Public Overridable Sub RefreshFeature()
-   End Sub
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,155 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="BeamMachiningsWindowV"
-                            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}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <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 TabControl_OnlyHeaders}"/>
-
-      <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,0,0,5"
-                               BindingColumns="{Binding BeamMachiningsColumns}">
-         
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="Height" Value="25"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-            </Style>
-         </DataGrid.RowStyle>
-
-         <DataGrid.Resources>
-            <Style x:Key="DataGridCheckBoxColumn_Style"
-                   TargetType="{x:Type DataGridCell}">
-               <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>
-      
-      <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 EgtWPFLib5_InputButton}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-
-      </Grid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,20 +0,0 @@
-Imports System.Windows
-
-Public Class BeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As 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/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb

@@ -1,36 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtBEAMWALL.Core
-Imports EgtWPFLib5
-
-Public Class MyBeamMachiningsWindowVM
-   Inherits BeamMachiningsWindowVM
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_BeamMachiningsColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property BeamMachiningsColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_BeamMachiningsColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_BeamMachiningsColumns = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
-      MyBase.New(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, bIsBeam)
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns)
-      ' aggiorno la visibilità delle colonne
-      For Each col In BeamMachiningsColumns
-         col.ColumnVisibility = If(col.Visible, Windows.Visibility.Visible, Windows.Visibility.Collapsed)
-      Next
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -593,4 +593,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/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<DockPanel x:Class="ConfigurationPageV"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="10*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="6*"/>
-      </Grid.RowDefinitions>
-      <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
-                  SelectedIndex="{Binding SelConfigSubPage}">
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:General_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding ParameterQ_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding ParameterQ_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:QParameter_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem >
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding Machine_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-
-            <TabItem.Content>
-               <EgtBEAMWALL:Machine_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-      </TabControl>
-
-      <!--<Button Command="{Binding SaveCommand}"
-                ToolTip="{Binding SaveToolTip}"
-                Grid.Row="1" 
-                Grid.Column="1"
-                Style="{StaticResource OptionPanel_Button}">
-         <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      </Button>-->
-
-   </Grid>
-</DockPanel>

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -1,118 +0,0 @@
-<Grid x:Class="General_ConfigurationPageV"
-      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">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"
-                          Grid.Row="0" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="0" Grid.Column="1"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding PartTime_Msg}"
-                          Grid.Row="1" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="1" Grid.Column="1"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Width="18"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"/>
-            </Grid>
-            <Grid Grid.Row="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding ReminderList}"
-                         SelectedItem="{Binding SelReminder}"/>
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -1,70 +0,0 @@
-<Grid x:Class="Machine_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="10*"/>
-   </Grid.RowDefinitions>
-
-   <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Margin="0,0,5,5">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="100"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Grid.Column="1"
-                                                     Width="70"/>
-                              <TextBlock Text="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="200"
-                                         Style="{StaticResource MachParamTextBlock}"
-                                         Grid.Column="2"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<Grid x:Class="QParameter_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="2*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
-                            ItemsSource="{Binding QBTLParamVMList}"
-                            SelectedItem="{Binding SelQParam}"
-                            Grid.Column="0"
-                            Margin="5">
-      <DataGrid.GroupStyle>
-         <GroupStyle>
-            <GroupStyle.Panel>
-               <ItemsPanelTemplate>
-                  <DataGridRowsPresenter/>
-               </ItemsPanelTemplate>
-            </GroupStyle.Panel>
-            <GroupStyle.HeaderTemplate>
-               <DataTemplate>
-                  <StackPanel>
-                     <TextBlock Text="{Binding Path=Name}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </GroupStyle.HeaderTemplate>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-         <GroupStyle>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-      </DataGrid.GroupStyle>
-   </EgtBEAMWALL:QParamListV>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -144,8 +144,6 @@
    Public Const BTL_PRT_INVERTED As String = "INVERTED"
    Public Const BTL_PRT_MATERIAL As String = "MATERIAL"
    Public Const BTL_PRT_VOLUME As String = "VOLUME"
-   Public Const BTL_PRT_ROT As String = "ROT"
-   Public Const BTL_PRT_FLIP As String = "FLIP"
    ' parametri pezzo
    Public Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
    Public Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"
@@ -203,12 +201,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/ConstColumns.vb

@@ -1,27 +1,11 @@
 Public Module ConstColumns
 
-   Public Const COL_ID As String = "colID"
    Public Const COL_DO As String = "colDO"
    Public Const COL_VALUE As String = "colVALUE"
    Public Const COL_CUSTOM As String = "colCUSTOM"
-   Public Const COL_NAME As String = "colNAME"
-   Public Const COL_CALC As String = "colCALC"
-   Public Const COL_PDN As String = "colPDN"
    Public Const COL_STARTCUT As String = "colSTARTCUT"
    Public Const COL_W As String = "colW"
-   Public Const COL_H As String = "colH"
    Public Const COL_L As String = "colL"
-   Public Const COL_CNT As String = "colCNT"
-   Public Const COL_ADDED As String = "colADDED"
-   Public Const COL_INPROD As String = "colINPROD"
-   Public Const COL_DONE As String = "colDONE"
-   Public Const COL_MATERIAL As String = "colMATERIAL"
-   Public Const COL_UNITVOLUME As String = "colUNITVOLUME"
-   Public Const COL_TOTVOLUME As String = "colTOTVOLUME"
-   Public Const COL_UNITTIME As String = "colUNITTIME"
-   Public Const COL_TOTTIME As String = "colTOTTIME"
-   Public Const COL_USAGE As String = "colUSAGE"
-   Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_POSZ As String = "colPOSZ"
    Public Const COL_ROT As String = "colROT"
    Public Const COL_FLIP As String = "colFLIP"
@@ -31,10 +15,13 @@
    Public Const COL_REDO As String = "colREDO"
    Public Const COL_TYPE As String = "colTYPE"
    Public Const COL_DESCRIPTION As String = "colDESCRIPTION"
-   Public Const COL_DESC As String = "colDESC"
    Public Const COL_SUPERVISORID As String = "colSUPERVISORID"
    Public Const COL_PRIORITY As String = "colPRIORITY"
-   Public Const COL_QTY As String = "colQTY"
+   Public Const COL_NAME As String = "colNAME"
+   Public Const COL_H As String = "colH"
+   Public Const COL_MATERIAL As String = "colMATERIAL"
+   Public Const COL_USAGE As String = "colUSAGE"
+   Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -19,7 +19,6 @@
    Public Const S_PARTLIST As String = "DG_PartList"
    Public Const S_FEATUREINPARTINRAWPARTLIST As String = "DG_FeatureInPartInRawPartList"
    Public Const S_STATISTICS As String = "DG_Statistics"
-   Public Const S_STATISTICS_PART As String = "DG_Statistics_PART"
    Public Const S_OPTIMIZERSTATISTICS As String = "DG_OptimizerStatistics"
    Public Const S_RAWPARTSTATISTICS As String = "DG_RawPartStatistics"
    Public Const S_BEAMMACHININGS As String = "DG_BeamMachinings"

EgtBEAMWALL.Core/Constants/ConstDims.vb

@@ -9,6 +9,5 @@
    Public Const TOPPANEL_OPTIMIZER As String = "TopPanel_Optimizer"
    Public Const LEFTPANEL_SUPERVISOR As String = "LeftPanel_Supervisor"
    Public Const PROJECT_SUPERVISOR As String = "Project_Supervisor"
-   Public Const PROJECT_ONLYPROD As String = "Project_OnlyProd"
 
 End Class

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -14,9 +14,9 @@
 Public Module ConstGen
 
    ' File con direttorio radice dei dati
-   Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
-   Public Const S_DATA As String = "Data"
-   Public Const K_DATAROOT As String = "DataRoot"
+   'Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
+   'Public Const S_DATA As String = "Data"
+   'Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
@@ -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
@@ -33,7 +34,6 @@ Public Module ConstGen
       CONFIG = 3
       INPUTS = 4
       OUTPUTS = 5
-      ONLYPRODPAGE = 6
    End Enum
 
    ' Abilitazioni licenza
@@ -46,19 +46,12 @@ Public Module ConstGen
       ANY_DB = 32
    End Enum
 
-   ' Selezione Tab Prod / Proj
-   Public Enum ProdProj As Integer
-      NULL = 0
-      PROJ = 1
-      PROD = 2
-   End Enum
-
    ' File di log generale
    Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.ViewerOptimizerLog#.txt"
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
-   Public Const CONF_DIR As String = "Config"
+   'Public Const CONF_DIR As String = "Config"
    ' Sottodirettorio delle risorse
    Public Const RES_DIR As String = "Resources"
    ' Sottodirettorio temporaneo
@@ -78,7 +71,7 @@ Public Module ConstGen
    ' Sottodirettorio di default per il salvataggio con nome
    Public Const SAVE_DFL_NAMEDIR As String = "MyProjects"
    ' Sottodirettorio di default per le macchine
-   Public Const MACHINES_DFL_DIR As String = "Machines"
+   'Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
    ' Nome file Lua con le funzioni di attrezzaggio

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -97,8 +97,8 @@ Public Module ConstIni
    Public Const S_IMPORT As String = "Import"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
-   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
+   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
 
    'Public Const S_MACH As String = "Mach"
    'Public Const K_MACHINESDIR As String = "MachinesDir"
@@ -164,19 +164,11 @@ Public Module ConstIni
    Public Const K_TYPE As String = "Type"
    Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
 
-   Public Const S_SECTION As String = "Section_Checked"
-   Public Const S_IMAGE As String = "Image_Checked"
-
-   Public Const S_PDFEDITOR As String = "PDFEditor"
-   
    Public Const S_BACKUPANDRESTORE As String = "Backup&Restore"
    Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const K_ONLYPROD As String = "OnlyProd"
-   Public Const K_MODIFYSETUP As String = "ModifySetup"
-   
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 

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

@@ -77,21 +77,8 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
-    <Compile Include="ConfigurationPage\General_ConfigurationPageV.xaml.vb">
-      <DependentUpon>General_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
-      <DependentUpon>Machine_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
-      <DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Constants\ConstColumns.vb" />
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
     <Compile Include="Constants\ConstDims.vb" />
@@ -110,9 +97,6 @@
     <Compile Include="CALCPanel\CalcIntegration.vb" />
     <Compile Include="DataAccess\PartAddedEventArgs.vb" />
     <Compile Include="DataAccess\BTLParamAddedEventArgs.vb" />
-    <Compile Include="ItemParamList\QParamListV.xaml.vb">
-      <DependentUpon>QParamListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Lib\MachGroupAddedEventArgs.vb" />
     <Compile Include="Lib\MachGroupVM.vb" />
     <Compile Include="Lib\NewMachGroupPanelVM.vb" />
@@ -128,15 +112,10 @@
       <DependentUpon>LoadingWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="LoadingWnd\LoadingWndVM.vb" />
-    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
-      <DependentUpon>MachinePanelV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="Utility\Configuration.vb" />
-    <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -207,38 +186,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\General_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="EgtDataGrid\EgtDataGrid.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ItemParamList\QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="LoadingWnd\LoadingWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="MachinePanel\MachinePanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -252,10 +207,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\ProjectManager\Save.png" />
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -4,6 +4,9 @@ Imports System.ComponentModel
 Imports System.Windows
 Imports System.Windows.Controls
 Imports System.Windows.Data
+Imports System.Windows.Controls.Primitives
+Imports System.Windows.Input
+Imports System.Windows.Media
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -367,23 +370,9 @@ Public Class EgtDataGrid
 End Class
 
 Public Class EgtDataGridColumn
-   Inherits VMBase
 
    Private m_dgColumn As DataGridColumn
 
-   'Check Box per le singole colonne
-   Private m_bIsCheched As Boolean
-   Public Property bIsChecked As Boolean
-      Get
-         Return m_bIsCheched
-      End Get
-      Set(value As Boolean)
-         m_bIsCheched = value
-         NotifyPropertyChanged(NameOf(bIsChecked))
-         WriteMainPrivateProfileString(S_PDFEDITOR, m_Name, If(m_bIsCheched, 1, 0))
-      End Set
-   End Property
-
    Private Property m_ParentDataGridName As String
    Public Property ParentDataGridName As String
       Get
@@ -585,7 +574,6 @@ Public Class EgtDataGridColumn
       m_Visible = bVisible
       m_CanUserEditVisible = bCanUserEditVisible
       m_SortDirection = nSortDirection
-      m_bIsCheched = GetMainPrivateProfileInt(S_PDFEDITOR, m_Name, 0) <> 0
    End Sub
 
    Friend Sub InitColumn(dgColumn As DataGridColumn)

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml

@@ -1,78 +0,0 @@
-<DataGrid x:Class="QParamListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="True" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5">
-
-   <DataGrid.Columns>
-
-      <!--BWType-->
-      <DataGridTextColumn Binding="{Binding sBWType}"
-                           Width="40"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Nome-->
-      <DataGridTextColumn Binding="{Binding sName}"
-                           Width="50"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Descrizione-->
-      <DataGridTextColumn Binding="{Binding sDescription}"
-                           Width="1*"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Default-->
-      <DataGridTextColumn Binding="{Binding sDefault}"
-                           Width="65">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Minimo-->
-      <DataGridTextColumn Binding="{Binding sMin}"
-                           Width="65"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Massimo-->
-      <DataGridTextColumn Binding="{Binding sMax}"
-                           Width="65"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-   </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml.vb

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

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -22,7 +22,7 @@ Public Class MyMachGroupPanelM
       ' Assegno macchina di default
       NewMyMachGroupPanelM.m_DefaultMachine = ""
       ' aggiorno copie
-      UpdateAllDuplo()
+      UpdateDuplo()
       ' recupero i MachGroup
       NewMyMachGroupPanelM.m_MachGroupMList = LoadMyMachGroups(MachineList)
       Return NewMyMachGroupPanelM
@@ -167,7 +167,7 @@ Public Class MyMachGroupPanelM
    End Function
 
    ' funzione che fa l'update di tutte le copie dei pezzi modificati
-   Public Shared Sub UpdateAllDuplo()
+   Public Shared Sub UpdateDuplo()
       ' verifico tipo di progetto
       Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
       Dim nBWType As Integer = 0
@@ -178,7 +178,161 @@ Public Class MyMachGroupPanelM
       While nPartId <> GDB_ID.NULL
          Dim bIsModified As Boolean = False
          If EgtDuploGetModified(nPartId, bIsModified) AndAlso bIsModified Then
-            UpdateDuplo(nPartId)
+            ' verifico se c'é PRID sugli outline
+            Dim nPRId As Integer = 1
+            Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+            If nOutlineLayer <> GDB_ID.NULL Then
+               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+               While nOutlineId <> GDB_ID.NULL
+                  ' verifico che sia feature
+                  If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
+                     Dim nCurrPrId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
+                        If nCurrPrId < nPRId Then
+                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           nPRId += 1
+                        End If
+                        nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
+                        nOutlineId = EgtGetNext(nOutlineId)
+                        Continue While
+                     Else
+                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                        nPRId += 1
+                     End If
+                  End If
+                  nOutlineId = EgtGetNext(nOutlineId)
+               End While
+            End If
+            bTotIsModified = True
+            Dim DuploList As New List(Of Integer)
+            EgtDuploList(nPartId, DuploList)
+            Dim DuploArray() As Integer
+            Dim RotArray(DuploList.Count) As Integer
+            Dim FlipArray(DuploList.Count) As Integer
+            Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
+            DuploArray = DuploList.ToArray()
+            ' recupero ROT (gradi) e FLIP (0/1) per non perderli
+            For Duploindex = 0 To DuploArray.Length - 1
+               RotArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               FlipArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
+               If nBWType = BWType.WALL Then
+                  ' salvo parametri Q
+                  QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
+                  ' ciclo sugli outline
+                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
+                  If nOutlineLayer <> GDB_ID.NULL Then
+                     Dim nGlobPRId As Integer = 1
+                     Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+                     While nOutlineId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                              If nPRId < nGlobPRId Then
+                                 EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                                 nPRId = nGlobPRId
+                                 nGlobPRId += 1
+                              End If
+                              nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
+                           Else
+                              EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                              nPRId = nGlobPRId
+                              nGlobPRId += 1
+                           End If
+                           Dim sKey As String = nPRId & "." & nPRC
+                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
+                           For QIndex = 1 To 10
+                              Dim QKey As String = "Q" & QIndex.ToString("D2")
+                              Dim QValue As Integer = 0
+                              If EgtGetInfo(nOutlineId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nOutlineId = EgtGetNext(nOutlineId)
+                     End While
+                  End If
+                  ' ciclo sulle feature
+                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
+                  If nFeatureLayer <> GDB_ID.NULL Then
+                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
+                     While nFeatureId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
+                           For QIndex = 1 To 10
+                              Dim QKey As String = "Q" & QIndex.ToString("D2")
+                              Dim QValue As Integer = 0
+                              If EgtGetInfo(nFeatureId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
+               End If
+            Next
+            ' aggiornamento dei Duplo
+            EgtDuploUpdate(nPartId)
+            ' ripristino i valori di ROT e FLIP
+            For Duploindex = 0 To DuploArray.Length - 1
+               ' ripristino info rot e flip
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If nBWType = BWType.WALL Then
+                  ' ciclo sugli outline
+                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
+                  If nOutlineLayer <> GDB_ID.NULL Then
+                     Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+                     While nOutlineId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        nOutlineId = EgtGetNext(nOutlineId)
+                     End While
+                  End If
+                  ' ciclo sulle feature
+                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
+                  If nFeatureLayer <> GDB_ID.NULL Then
+                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
+                     While nFeatureId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
+               End If
+            Next
          End If
          nPartId = EgtGetNextPart(nPartId)
       End While
@@ -189,180 +343,6 @@ Public Class MyMachGroupPanelM
       End If
    End Sub
 
-   Public Shared Sub UpdateDuplo(nPartId As Integer)
-      ' verifico tipo di progetto
-      Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-      Dim nBWType As Integer = 0
-      EgtGetInfo(nBtlInfoId, BTL_GEN_PROJTYPE, nBWType)
-      ' ciclo sui pezzi
-      Dim bTotIsModified As Boolean = False
-      Dim bIsModified As Boolean = False
-      ' verifico se c'é PRID sugli outline
-      Dim nPRId As Integer = 1
-      Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
-      If nOutlineLayer <> GDB_ID.NULL Then
-         Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-         While nOutlineId <> GDB_ID.NULL
-            ' verifico che sia feature
-            If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-               If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
-                  nOutlineId = EgtGetNext(nOutlineId)
-                  Continue While
-               Else
-                  EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                  nPRId += 1
-               End If
-            End If
-            nOutlineId = EgtGetNext(nOutlineId)
-         End While
-      End If
-      bTotIsModified = True
-      Dim DuploList As New List(Of Integer)
-      EgtDuploList(nPartId, DuploList)
-      Dim DuploArray() As Integer
-      Dim RotArray(DuploList.Count) As Integer
-      Dim FlipArray(DuploList.Count) As Integer
-      Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
-      DuploArray = DuploList.ToArray()
-      ' recupero ROT (gradi) e FLIP (0/1) per non perderli
-      For Duploindex = 0 To DuploArray.Length - 1
-         RotArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         FlipArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
-         If nBWType = BWType.WALL Then
-            ' salvo parametri Q
-            QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               Dim nGlobPRId As Integer = 1
-               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-               While nOutlineId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
-                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                        nPRId = nGlobPRId
-                        nGlobPRId += 1
-                     End If
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nOutlineId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  nOutlineId = EgtGetNext(nOutlineId)
-               End While
-            End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nFeatureId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
-      Next
-      ' aggiornamento dei Duplo
-      EgtDuploUpdate(nPartId)
-      ' ripristino i valori di ROT e FLIP
-      For Duploindex = 0 To DuploArray.Length - 1
-         ' ripristino info rot e flip
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If nBWType = BWType.WALL Then
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-               While nOutlineId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nOutlineId = EgtGetNext(nOutlineId)
-               End While
-            End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
-      Next
-   End Sub
-
-   Public Shared Sub SetDuploModified(nPartId As Integer)
-      If Configuration.bOnlyProd Then
-         ' segno modificato e aggiorno duplo
-         EgtDuploSetModified(nPartId)
-         UpdateDuplo(nPartId)
-         ' aggiorno grafica duplo
-         Dim DuploIdList As New List(Of Integer)
-         EgtDuploList(nPartId, DuploIdList)
-         Dim DuploList As List(Of MachGroupVM) = CoreMap.refMachGroupPanelVM.MachGroupVMList.Where(Function(x) tt(x, DuploIdList)).ToList()
-         For Each CurrMachGroup As MyMachGroupVM In DuploList
-            CurrMachGroup.RefreshMachGroup()
-         Next
-      Else
-         EgtDuploSetModified(nPartId)
-      End If
-   End Sub
-
-   Private Shared Function tt(x As MachGroupVM, DuploIdList As List(Of Integer)) As Boolean
-      Dim TempMyMachGroupVM As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
-      Return TempMyMachGroupVM.PartVMList.Any(Function(y) DuploIdList.Contains(y.nPartId))
-   End Function
-
    Class DuploFeature
       ' Id geometrico della feature
       Friend nFeatureId As Integer

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -482,8 +482,6 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
       EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
-      EgtGetInfo(nPartId, BTL_PRT_ROT, NewPartM.m_dROT)
-      EgtGetInfo(nPartId, BTL_PRT_FLIP, NewPartM.m_nFLIP)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0
@@ -641,10 +639,6 @@ Public Class PartM
       Return New List(Of BTLFeatureM)(m_FeatureMList)
    End Function
 
-   Public Sub RefreshBTLFeatures()
-      m_FeatureMList = LoadBTLFeatures(Me, nPartId)
-   End Sub
-
 #End Region    ' Features
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -91,7 +91,7 @@ Public MustInherit Class MyMachGroupPanelVM
       ' Svuoto precedente lista di MachGroup
       MachGroupVMList.Clear()
       ' aggiorno copie
-      MyMachGroupPanelM.UpdateAllDuplo()
+      MyMachGroupPanelM.UpdateDuplo()
       ' verifico se esistono già gruppi di lavorazione o se devo creare il primo
       Dim bOk As Boolean = False
       Dim nId = EgtGetFirstMachGroup()

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -620,10 +620,6 @@ Public MustInherit Class MyMachGroupVM
 
    Public MustOverride Sub RefreshPartList()
 
-   Public Overridable Sub RefreshMachGroup()
-
-   End Sub
-
 #End Region    ' Parts
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -509,10 +509,6 @@ Public MustInherit Class PartVM
 
 #Region "METHODS"
 
-   Public Overridable Sub RefreshPart()
-
-   End Sub
-
 #Region "Feature"
 
    Protected MustOverride Sub CreateBTLFeatureVMList()
@@ -575,7 +571,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/MachinePanel/MachinePanelV.xaml

@@ -1,45 +0,0 @@
-<Grid x:Class="MachinePanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      IsEnabled="{Binding MachPanel_IsEnabled}">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-
-   <Grid Margin="0,0,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center"  Margin="0,0,5,0"/>
-      <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="150"
-                Grid.Row="0" Grid.Column="1"/>
-   </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
-      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding MachiningDbMsg}"/>
-      <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding SetUpMsg}"
-              Visibility="{Binding SetUp_Visibility}"/>
-      <Button ToolTip="{Binding BeamTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}"
-              Command="{Binding BeamTable_Command}"
-              Visibility="{Binding BeamTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button ToolTip="{Binding WallTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}"
-              Command="{Binding WallTable_Command}"
-              Visibility="{Binding WallTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml.vb

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

EgtBEAMWALL.Core/MachinePanel/MachinePanelVM.vb

@@ -1,357 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MachinePanelVM
-   Inherits EgtWPFLib5.MachinePanelVM
-
-#Region "FIELDS & PROPERTIES"
-
-   ' Radice del direttorio delle macchine
-   Private m_sMachinesRoot As String
-
-   ' Macchina correntemente selezionata e quindi attiva
-   Private m_SelectedMachine As Machine = Nothing
-   Public Overrides Property SelectedMachine As Machine
-      Get
-         Return m_SelectedMachine
-      End Get
-      Set(value As Machine)
-         If value IsNot m_SelectedMachine Then
-            ' imposto macchina in DbGeometrico
-            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) Then
-               m_SelectedMachine = value
-            End If
-            ' Salvo impostazione macchina corrente
-            SaveCurrentMachine()
-            NotifyPropertyChanged(NameOf(SelectedMachine))
-            ' inizializzo la macchina selezionata come macchina corrente
-            Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
-            SectionXMaterial.SetType(nMachType)
-            If Not IsNothing(value) Then
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
-            Else
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, m_SelectedMachine.Name, nMachType)
-            End If
-            ' mostro bottone tabella beam o wall a seconda del tipo
-            m_BeamTable_Visibility = If(nMachType = MachineType.BEAM OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            m_WallTable_Visibility = If(nMachType = MachineType.WALL OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            NotifyPropertyChanged(NameOf(BeamTable_Visibility))
-            NotifyPropertyChanged(NameOf(WallTable_Visibility))
-            ' carico i Parametri Q da mostrare (Beam, Wall o entrambi) in base al tipo di macchina selezionata
-            If Not IsNothing(Map.refConfigurationPageVM) Then
-               ' carico i parametri Q dei Process letti dall'ini
-               Map.refConfigurationPageVM.GetQParamsList()
-               ' carico la lista di tutti i parametri Q ciclando su ogni Process di PRCList
-               If Not IsNothing(Map.refConfigurationPageVM.QBTLParamVMList) Then
-                  Map.refConfigurationPageVM.QBTLParamVMList.Clear()
-               End If
-               For Each PRCItem In Map.refConfigurationPageVM.PRCList
-                  For Each QBTLParam In PRCItem.QBTLParamVMList
-                     Map.refConfigurationPageVM.QBTLParamVMList.Add(QBTLParam)
-                  Next
-               Next
-               NotifyPropertyChanged(NameOf(Map.refConfigurationPageVM.QBTLParamVMList))
-            End If
-            ' aggiorno nome macchina in statusbar
-            Map.refMyStatusBarVM.RefreshMachName()
-         End If
-      End Set
-   End Property
-
-   Private m_MachPanel_IsEnabled As Boolean = True
-   Public Property MachPanel_IsEnabled As Boolean
-      Get
-         Return m_MachPanel_IsEnabled
-      End Get
-      Set(value As Boolean)
-         m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged("MachPanel_IsEnabled")
-      End Set
-   End Property
-
-   Private m_BeamTable_Visibility As Visibility
-   Public ReadOnly Property BeamTable_Visibility As Visibility
-      Get
-         Return m_BeamTable_Visibility
-      End Get
-   End Property
-
-   Private m_WallTable_Visibility As Visibility
-   Public ReadOnly Property WallTable_Visibility As Visibility
-      Get
-         Return m_WallTable_Visibility
-      End Get
-   End Property
-
-   Public ReadOnly Property SetUp_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bModifySetup, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-
-#Region "Messages"
-
-   Public ReadOnly Property ToolDBMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpMsg As String
-      Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-#Region "ToolTip"
-
-   Public ReadOnly Property ToolDBToolTip As String
-      Get
-         Return EgtMsg(5003)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbToolTip As String
-      Get
-         Return EgtMsg(5004)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpToolTip As String
-      Get
-         Return EgtMsg(31501)
-      End Get
-   End Property
-
-#End Region   ' ToolTip
-
-   ' Definizione comandi
-   Private m_cmdBeamTable As ICommand
-   Private m_cmdWallTable As ICommand
-
-#End Region    'FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      ' Creo riferimento a questa classe in Map
-      Map.SetRefMachinePanelVM(Me)
-      ' recupero cartella radice delle macchine
-      m_sMachinesRoot = Map.refMainWindowVM.MainWindowM.sMachinesRoot
-      ' Carica macchine da cartella delle macchine
-      MyMachine.MachineListInit(m_sMachinesRoot, MachineList)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Friend Sub LoadCurrentMachine()
-      If MachineList.Count = 0 Then Return
-      Dim CurrMachine As Machine = Nothing
-      Dim CurrMachineName As String = String.Empty
-      GetMainPrivateProfileString(S_MACH, K_CURRMACH, String.Empty, CurrMachineName)
-      Dim bFound As Boolean = False
-      If Not String.IsNullOrEmpty(CurrMachineName) Then
-         For Each Mach In MachineList
-            If Mach.Name = CurrMachineName Then
-               bFound = True
-               CurrMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-      If Not bFound And MachineList.Count > 0 Then
-         CurrMachine = MachineList(0)
-      End If
-      If Not IsNothing(CurrMachine) Then
-         If EgtSetCurrMachine(CurrMachine.Name) Then
-            SelectedMachine = CurrMachine
-         End If
-      End If
-   End Sub
-
-   Friend Sub SaveCurrentMachine()
-      If IsNothing(m_SelectedMachine) Then Return
-      WriteMainPrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name)
-   End Sub
-
-   Friend Sub UpdateCurrentMachine()
-      'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-      Dim sMachName As String = String.Empty
-      If EgtGetCurrMachineName(sMachName) Then
-         For Each Mach In MachineList
-            If Mach.Name = sMachName Then
-               SelectedMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-   End Sub
-
-   Friend Function BeamMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' 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)
-         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)
-      End If
-      Return True
-   End Function
-
-   Friend Function WallMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' 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)
-         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)
-      End If
-      Return True
-   End Function
-
-   Public Overrides Sub ToolDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' 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)
-         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)
-      If ToolDbWindowVM.MatType <> 0 Then
-         ToolDbWindowV.Height = 640
-         ToolDbWindowV.Width = 1024
-         ToolDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub MachDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' 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)
-         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)
-
-      If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 768
-         MachDbWindowV.Width = 1024
-         MachDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub SetUp(ByVal param As Object)
-      ' 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)
-         Return
-      End If
-      ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
-      ' e testa e uscita dell'utensile attrezzato
-      EgtLuaExecFile(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA)
-      ' verifico che le teste riportate in configurazione esistano
-      Dim Index As Integer = 1
-      Dim nErr As Integer = 0
-      While nErr = 0
-         Dim sHead As String = String.Empty
-         nErr = 999
-         EgtLuaSetGlobIntVar("STU.INDEX", Index)
-         EgtLuaCallFunction("STU.GetTcPosHeadGroupFromPos")
-         ' Leggo variabili
-         EgtLuaGetGlobStringVar("STU.HEAD", sHead)
-         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)
-               Return
-            End If
-         End If
-         Index += 1
-      End While
-      ' Reset lua
-      EgtLuaResetGlobVar("STU")
-
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
-      SetUpWindow.Height = 614
-      SetUpWindow.Width = 1024
-      SetUpWindow.ShowDialog()
-
-   End Sub
-
-#End Region
-
-#Region "COMMANDS"
-
-#Region "BeamTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property BeamTable_Command As ICommand
-      Get
-         If m_cmdBeamTable Is Nothing Then
-            m_cmdBeamTable = New Command(AddressOf BeamMachDb)
-         End If
-         Return m_cmdBeamTable
-      End Get
-   End Property
-
-#End Region    ' BeamTable
-
-#Region "WallTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property WallTable_Command As ICommand
-      Get
-         If m_cmdWallTable Is Nothing Then
-            m_cmdWallTable = New Command(AddressOf WallMachDb)
-         End If
-         Return m_cmdWallTable
-      End Get
-   End Property
-
-#End Region    ' WallTable
-
-#End Region    ' COMMANDS
-
-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: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -779,3 +779,94 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 End Class
 
+Public Class ProdItem
+   Inherits VMBase
+
+   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
+
+   Protected m_ProdFileVM As ProdFileVM
+   Public ReadOnly Property ProdFileVM As ProdFileVM
+      Get
+         Return m_ProdFileVM
+      End Get
+   End Property
+
+   Private m_ProjFileList As New List(Of ProjectFileVM)
+   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
+      Get
+         Return m_ProjFileList
+      End Get
+   End Property
+
+   Public ReadOnly Property sProdId As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
+      End Get
+   End Property
+
+   Public Overridable Property sName As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
+      End Get
+      Set(value As String)
+         If Not IsNothing(m_ProdFileVM) Then
+            m_ProdFileVM.sName = value
+         End If
+      End Set
+   End Property
+
+   Public ReadOnly Property dtCreateDate As Date
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
+      End Get
+   End Property
+   Public ReadOnly Property sCreateDate As String
+      Get
+         Return dtCreateDate.ToString()
+      End Get
+   End Property
+
+   Public ReadOnly Property sMachine As String
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.sMachine
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).sMachine
+         Else Return ""
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsArchived As Boolean
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.bIsArchived
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).bIsArchived
+         Else
+            Return True
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property Archived_Visibility As Visibility
+      Get
+         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList.Add(ProjFileVM)
+   End Sub
+
+   Sub New(ProjFileVM As ProjFileVM)
+      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
+   End Sub
+
+   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList = ProjFileVMList
+   End Sub
+
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -42,8 +42,6 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
-   Protected m_GoToProd As Boolean = False
-
    Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -440,7 +438,7 @@ Public MustInherit Class OpenProjectFileDialogVM
 #Region "METHODS"
 
    Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
-   Public Overridable Sub RefreshProjectList()
+   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
    End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -14,13 +14,6 @@ Public Class ProdFileM
       m_nProjIdList = value
    End Sub
 
-   Protected m_ProjMList As List(Of ProjFileM)
-   Public ReadOnly Property ProjMList As List(Of ProjFileM)
-      Get
-         Return m_ProjMList
-      End Get
-   End Property
-
    Protected m_sName As String
    Public Property sName As String
       Get
@@ -67,24 +60,6 @@ Public Class ProdFileM
       Return NewProjectFileM
    End Function
 
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM
-      NewProjectFileM.m_nProdId = nProdId
-      NewProjectFileM.m_nProjIdList = nProjIdList
-      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-      NewProjectFileM.m_sName = sName
-      NewProjectFileM.m_nType = nType
-      NewProjectFileM.m_sMachine = sMachine
-      NewProjectFileM.m_sLockedBy = sLockedBy
-      NewProjectFileM.m_dtLock = dtLock
-      NewProjectFileM.m_bIsActive = bIsActive
-      NewProjectFileM.m_bIsProduced = bIsProduced
-      NewProjectFileM.m_bIsArchived = bIsArchived
-      NewProjectFileM.m_ProjMList = ProjMList
-      Return NewProjectFileM
-   End Function
-
 #End Region    ' CONSTRUCTORS
 
 End Class

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

@@ -1,119 +0,0 @@
-
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class ProdItem
-    Inherits VMBase
-
-   Public Shared m_delUpdateNameInDb As Action(Of Integer, String)
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-    Public ReadOnly Property ProdFileVM As ProdFileVM
-        Get
-            Return m_ProdFileVM
-        End Get
-    End Property
-
-    Private m_ProjFileList As New List(Of ProjectFileVM)
-    Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-        Get
-            Return m_ProjFileList
-        End Get
-    End Property
-
-    Public ReadOnly Property sProdId As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-        End Get
-    End Property
-
-    Public Overridable Property sName As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-        End Get
-        Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            m_delUpdateNameInDb(m_ProdFileVM.nProdId, value)
-            m_ProdFileVM.sName = value
-            m_delIsModifiedSetUp(False)
-         End If
-      End Set
-    End Property
-
-    Public ReadOnly Property dtCreateDate As Date
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-        End Get
-    End Property
-    Public ReadOnly Property sCreateDate As String
-        Get
-            Return dtCreateDate.ToString()
-        End Get
-    End Property
-
-    Public ReadOnly Property sMachine As String
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.sMachine
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).sMachine
-            Else Return ""
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property bIsArchived As Boolean
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.bIsArchived
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).bIsArchived
-            Else
-                Return True
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property Archived_Visibility As Visibility
-        Get
-            Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-        End Get
-    End Property
-
-    Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList.Add(ProjFileVM)
-    End Sub
-
-    Sub New(ProjFileVM As ProjFileVM)
-        m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-    End Sub
-
-    Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList = ProjFileVMList
-    End Sub
-
-
-   Public Shared Function CreateProdItem(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                           sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdItem
-
-
-      Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived)
-      Dim NewProdFileVM = New ProdFileVM(NewProdFileM)
-      Dim NewProjFileVM As IEnumerable(Of ProjectFileVM)
-      NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList
-      Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList)
-
-      Return NewProdItem
-   End Function
-
-   Public Shared Function CreateProdItem(ProjFileM As ProjFileM) As ProdItem
-
-      Dim NewProdItem = New ProdItem(New ProjFileVM(ProjFileM))
-
-      Return NewProdItem
-   End Function
-
-End Class

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -126,7 +126,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
@@ -134,7 +134,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,24 +0,0 @@
-Public Module Configuration
-
-   Private m_bOnlyProd As Boolean
-   Public ReadOnly Property bOnlyProd As Boolean
-      Get
-         Return m_bOnlyProd
-      End Get
-   End Property
-   Public Sub SetOnlyProd(value As Boolean)
-      m_bOnlyProd = value
-   End Sub
-
-   Private m_bModifySetup As Boolean
-   Public ReadOnly Property bModifySetup As Boolean
-      Get
-         Return m_bModifySetup
-      End Get
-   End Property
-   Public Sub SetModifySetup(value As Boolean)
-      m_bModifySetup = value
-   End Sub
-
-
-End Module

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -63,7 +63,6 @@ Public Enum StatusMapOpType
    ChangeProdInProdRequest = 16
    OpenPageInViewOptimRequest = 17
    MachGroupValidationUpdate = 18
-   ChangeProdInOnlyProdRequest = 19
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -2,7 +2,6 @@
 using NLog;
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
 using System.Linq;
 using static EgtBEAMWALL.Core.ConstBeam;
 
@@ -209,11 +208,11 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -221,9 +220,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
+                if (numRecord == 0)
                 {
-                    NumRecord = localDbCtx.ProdList.Count();
+                    numRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
@@ -236,7 +235,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(NumRecord)
+                    .Take(numRecord)
                     .ToList();
             }
 
@@ -248,13 +247,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="dtStart">Inizio periodo estrazione</param>
+        /// <param name="dtEnd">Fine periodo estrazione</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -262,14 +261,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
+                if (numRecord == 0)
                 {
-                    NumRecord = localDbCtx.ProdList.Count();
+                    numRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
                     .ProdList
-                    .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
+                    .Where(x => x.DtCreated >= dtStart && x.DtCreated <= dtEnd && (!x.IsArchived || ShowArchived))
                     // condizione join sui PROJ
                     .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
                         p => p.ProdDbId,
@@ -277,7 +276,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(NumRecord)
+                    .Take(numRecord)
                     .ToList();
             }
 
@@ -286,183 +285,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return result;
         }
 
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(int NumRecord, bool OnlyActive, bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            // elenco prod completi
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // recupero PROD + proj relativi
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x => (!x.IsArchived || ShowArchived))
-                            //.Include(j => j.)
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null)
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            // elenco prod completi
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // retrieve
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd))
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="DtIsCreation">Ture: usa data creazione / False: usa data export</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="Machine">Nome Macchina (default vuoto = non usato)</param>
-        /// <param name="BtlFileName">Nome file BTL  (default vuoto = non usato)</param>
-        /// <param name="ListName">Nome List  (default vuoto = non usato)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, bool DtIsCreation, int NumRecord, bool OnlyActive, string Machine = "", string BtlFileName = "", string ListName = "", bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // retrieve
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x =>  (!x.IsArchived || ShowArchived))
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => 
-                                    (x.IsActive || !OnlyActive)
-                                    && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
-                                    && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains( BtlFileName.ToLower()))
-                                    && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
-                                    && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))) 
-                                    ),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => 
-                            (x.IsActive || !OnlyActive) 
-                            && x.Prod == null
-                            && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
-                            && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains(BtlFileName.ToLower()))
-                            && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
-                            && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))))
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
         /// <summary>
         /// Fornisce nuovo indice VUOTO da usare (allocando sul DB)
         /// </summary>
@@ -1088,29 +910,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         protected Core.ProdFileM coreConv(ProdModel currProd)
         {
             Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
-            //Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli verso prodItem
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        protected Core.ProdItem coreItemConv(ProdModel currProd)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli verso prodItem da singolo proj
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        protected Core.ProdItem coreItemConv(ProjModel currProj)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(Core.ProjFileM.CreateProjFileM(currProj.ProjId, 0, currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsActive));
             return answ;
         }
 

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -33,8 +33,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 var dbResult = localDbCtx
                        .ProjList
                        .Where(x => x.BTLFileName == BTLFileName)
-                       //valutare se usare solo attivi...
-                       //.Where(x => x.BTLFileName == BTLFileName && x.IsActive == true)
                        .FirstOrDefault();
 
                 //se avesse trovato-- > riporto id...
@@ -583,7 +581,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Update record su DB x elenco BTLParts
         /// </summary>
         /// <param name="ProjId"></param>
-        /// <param name="BtlPartList"></param>
+        /// <param name="newBTLFileName"></param>
         /// <returns></returns>
         public ProjModel UpdateBtlParts(int ProjId, List<Core.BTLPartM> BtlPartList)
         {

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -19,11 +19,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        public ProdModel()
-        {
-            ProjListNav = new HashSet<ProjModel>();
-        }
-
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -103,11 +98,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("IsArchived")]
         public bool IsArchived { get; set; } = false;
 
-        /// <summary>
-        /// Collezione oggetti Proj associati (almeno 1 by design)
-        /// </summary>
-        public virtual ICollection<ProjModel> ProjListNav { get; set; }
-
         #endregion Public Properties
     }
 }

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: AssemblyFileVersion("2.5.12.2")]
+[assembly: AssemblyVersion("2.7.4.1")]
+[assembly: AssemblyFileVersion("2.7.4.1")]

EgtBEAMWALL.Supervisor/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,155 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="BeamMachiningsWindowV"
-                            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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <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 TabControl_OnlyHeaders}"/>
-
-      <EgtBEAMWALLCORE: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,0,0,5"
-                BindingColumns="{Binding BeamMachiningsColumns}">
-         
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="Height" Value="25"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-            </Style>
-         </DataGrid.RowStyle>
-
-         <DataGrid.Resources>
-            <Style x:Key="DataGridCheckBoxColumn_Style"
-                   TargetType="{x:Type DataGridCell}">
-               <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>
-         
-      </EgtBEAMWALLCORE:EgtDataGrid>
-      
-      <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 EgtWPFLib5_InputButton}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-
-      </Grid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Supervisor/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,20 +0,0 @@
-Imports EgtBEAMWALL.Core
-
-Public Class BeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As 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.Supervisor/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb

@@ -1,36 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtBEAMWALL.Core
-Imports EgtWPFLib5
-
-Public Class MyBeamMachiningsWindowVM
-   Inherits BeamMachiningsWindowVM
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_BeamMachiningsColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property BeamMachiningsColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_BeamMachiningsColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_BeamMachiningsColumns = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
-      MyBase.New(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, bIsBeam)
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns)
-      ' aggiorno la visibilità delle colonne
-      For Each col In BeamMachiningsColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-End Class

EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,36 +1,24 @@
 <DockPanel x:Class="ConfigurationPageV"
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+           xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="10*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="6*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
-                  SelectedIndex="{Binding SelConfigSubPage}">
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALLCORE:General_ConfigurationPageV/>
-               <!--<Grid>
+    <Grid>
+        <Grid.ColumnDefinitions>
+           <ColumnDefinition Width="10*"/>
+           <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+           <RowDefinition Height="6*"/>
+           <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+        <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
+            <TabItem Header="General">
+                <TabItem.Content>
+                    <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="1*"/>
@@ -59,25 +47,91 @@
                                  Margin="0,5,0,0"/>
                             </UniformGrid>
                         </StackPanel>
-                    </Grid>-->
-            </TabItem.Content>
-         </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding Machine_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALLCORE:Machine_ConfigurationPageV/>
-               <!--<Grid>
+                    </Grid>
+                </TabItem.Content>
+            </TabItem>
+            <!--<TabItem Header="Parametri Q">
+                <TabItem.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                        <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
+                                           ItemsSource="{Binding QBTLParamVMList}"
+                                           SelectedItem="{Binding SelQParam}"
+                                           Grid.Column="0"
+                                           Margin="5">
+                            <DataGrid.GroupStyle>
+                                <GroupStyle>
+                                    <GroupStyle.Panel>
+                                        <ItemsPanelTemplate>
+                                            <DataGridRowsPresenter/>
+                                        </ItemsPanelTemplate>
+                                    </GroupStyle.Panel>
+                                    <GroupStyle.HeaderTemplate>
+                                        <DataTemplate>
+                                            <StackPanel>
+                                                <TextBlock Text="{Binding Path=Name}"/>
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </GroupStyle.HeaderTemplate>
+                                    <GroupStyle.ContainerStyle>
+                                        <Style TargetType="{x:Type GroupItem}">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                                        <Expander IsExpanded="True">
+                                                            <Expander.Background>
+                                                                <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
+                                                            </Expander.Background>
+                                                            <Expander.Header>
+                                                                <StackPanel Orientation="Horizontal">
+                                                                    <TextBlock Text="{Binding Path=Name}" />
+                                                                </StackPanel>
+                                                            </Expander.Header>
+                                                            <ItemsPresenter />
+                                                        </Expander>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </GroupStyle.ContainerStyle>
+                                </GroupStyle>
+                                <GroupStyle>
+                                    <GroupStyle.ContainerStyle>
+                                        <Style TargetType="{x:Type GroupItem}">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                                        <Expander IsExpanded="True">
+                                                            <Expander.Background>
+                                                                <SolidColorBrush Color="LightGray"></SolidColorBrush>
+                                                            </Expander.Background>
+                                                            <Expander.Header>
+                                                                <StackPanel Orientation="Horizontal">
+                                                                    <TextBlock Text="{Binding Path=Name}" />
+                                                                </StackPanel>
+                                                            </Expander.Header>
+                                                            <ItemsPresenter />
+                                                        </Expander>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </GroupStyle.ContainerStyle>
+                                </GroupStyle>
+                            </DataGrid.GroupStyle>
+                        </EgtBEAMWALL:QParamListV>
+                    </Grid>
+                </TabItem.Content>
+            </TabItem>-->
+            <!--<TabItem Header="Macchina">
+                <TabItem.Content>
+                    <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="1*"/>
@@ -140,47 +194,47 @@
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
                         </StackPanel>
-                    </Grid>-->
-            </TabItem.Content>
-         </TabItem>
-         <!--<TabItem Header="Variabili">
-            <TabItem.Content>
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <Grid Grid.Row="0" Margin="5">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid Grid.Column="0" Margin="5">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Button Content="+" 
+                    </Grid>
+                </TabItem.Content>
+            </TabItem>-->
+            <TabItem Header="Variabili">
+                <TabItem.Content>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" Margin="5">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid Grid.Column="0" Margin="5">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Button Content="+" 
                                     Grid.Column="2"
                                     Command="{Binding AddVariable_Command}"
                                     Style="{StaticResource ToolBar_SmallButton}"/>
-                        <Button Content="-" 
+                                <Button Content="-" 
                                         Grid.Column="3"
                                         Command="{Binding RemoveVariable_Command}"
                                         Style="{StaticResource ToolBar_SmallButton}"/>
-                     </Grid>
-                  </Grid>
-                  <Grid Grid.Row="1">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <EgtBEAMWALLCORE:EgtDataGrid 
+                            </Grid>
+                        </Grid>
+                        <Grid Grid.Row="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="1*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="1*"/>
+                            </Grid.RowDefinitions>
+                            <EgtBEAMWALLCORE:EgtDataGrid 
                                        ItemsSource="{Binding VariablesList}" 
                                        SelectedItem="{Binding SelVariable}"
                                        CanUserAddRows="False"
@@ -192,58 +246,58 @@
                                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                        Margin="5"
                                        BindingColumns="{Binding VariablesColumns}">
-                        <DataGrid.Resources>
-                           --><!-- Name --><!--
-                           <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
-                              <DataGridTextColumn.HeaderTemplate>
-                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
-                                 </DataTemplate>
-                              </DataGridTextColumn.HeaderTemplate>
-                           </DataGridTextColumn>
-                           --><!-- VariablePath --><!--
-                           <DataGridTextColumn x:Key="colVARPATH" Binding="{Binding sVarPath}">
-                              <DataGridTextColumn.HeaderTemplate>
-                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Path=DataContext.VarPath_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
-                                 </DataTemplate>
-                              </DataGridTextColumn.HeaderTemplate>
-                           </DataGridTextColumn>
-                           --><!-- Type --><!--
-                           <DataGridComboBoxColumn x:Key="colTYPE">
-                              <DataGridComboBoxColumn.HeaderTemplate>
-                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Path=DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
-                                 </DataTemplate>
-                              </DataGridComboBoxColumn.HeaderTemplate>
-                              <DataGridComboBoxColumn.ElementStyle>
-                                 <Style TargetType="ComboBox">
-                                    <Setter Property="ItemsSource" Value="{Binding TypeList}"/>
-                                    <Setter Property="SelectedItem" Value="{Binding SelType, UpdateSourceTrigger=PropertyChanged}" />
-                                 </Style>
-                              </DataGridComboBoxColumn.ElementStyle>
-                              <DataGridComboBoxColumn.EditingElementStyle>
-                                 <Style TargetType="ComboBox">
-                                    <Setter Property="ItemsSource" Value="{Binding TypeList}"/>
-                                    <Setter Property="SelectedItem" Value="{Binding SelType, UpdateSourceTrigger=PropertyChanged}" />
-                                 </Style>
-                              </DataGridComboBoxColumn.EditingElementStyle>
-                           </DataGridComboBoxColumn>
-                        </DataGrid.Resources>
-                     </EgtBEAMWALLCORE:EgtDataGrid>
-                  </Grid>
-               </Grid>
-            </TabItem.Content>
-         </TabItem>-->
-      </TabControl>
-
-      <!--<Button Command="{Binding SaveCommand}"
+                                <DataGrid.Resources>
+                                    <!-- Name -->
+                                    <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+                                        <DataGridTextColumn.HeaderTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
+                                            </DataTemplate>
+                                        </DataGridTextColumn.HeaderTemplate>
+                                    </DataGridTextColumn>
+                                    <!-- VariablePath -->
+                                    <DataGridTextColumn x:Key="colVARPATH" Binding="{Binding sVarPath}">
+                                        <DataGridTextColumn.HeaderTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding Path=DataContext.VarPath_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
+                                            </DataTemplate>
+                                        </DataGridTextColumn.HeaderTemplate>
+                                    </DataGridTextColumn>
+                                    <!-- Type -->
+                                    <DataGridComboBoxColumn x:Key="colTYPE">
+                                        <DataGridComboBoxColumn.HeaderTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding Path=DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ConfigurationPageV}}}"/>
+                                            </DataTemplate>
+                                        </DataGridComboBoxColumn.HeaderTemplate>
+                                        <DataGridComboBoxColumn.ElementStyle>
+                                            <Style TargetType="ComboBox">
+                                                <Setter Property="ItemsSource" Value="{Binding TypeList}"/>
+                                                <Setter Property="SelectedItem" Value="{Binding SelType, UpdateSourceTrigger=PropertyChanged}" />
+                                            </Style>
+                                        </DataGridComboBoxColumn.ElementStyle>
+                                        <DataGridComboBoxColumn.EditingElementStyle>
+                                            <Style TargetType="ComboBox">
+                                                <Setter Property="ItemsSource" Value="{Binding TypeList}"/>
+                                                <Setter Property="SelectedItem" Value="{Binding SelType, UpdateSourceTrigger=PropertyChanged}" />
+                                            </Style>
+                                        </DataGridComboBoxColumn.EditingElementStyle>
+                                    </DataGridComboBoxColumn>
+                                </DataGrid.Resources>
+                            </EgtBEAMWALLCORE:EgtDataGrid>
+                        </Grid>
+                    </Grid>
+                </TabItem.Content>
+            </TabItem>
+        </TabControl>
+    
+        <Button Command="{Binding SaveCommand}"
                 ToolTip="{Binding SaveToolTip}"
                 Grid.Row="1" 
                 Grid.Column="1"
                 Style="{StaticResource OptionPanel_Button}">
-         <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      </Button>-->
-
-   </Grid>
+           <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+        </Button>
+    
+    </Grid>
 </DockPanel>

EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
@@ -6,37 +7,10 @@ Imports EgtBEAMWALL.Core
 Public Class ConfigurationPageVM
    Inherits VMBase
 
-   Public Enum ConfigSubPages As Integer
-      GENERAL = 0
-      MACHINE = 1
-      VARIABLE = 2
-   End Enum
-
-   Private m_SelConfigSubPage As ConfigSubPages = ConfigSubPages.GENERAL
-   Public Property SelConfigSubPage As Integer
-      Get
-         Return m_SelConfigSubPage
-      End Get
-      Set(value As Integer)
-         m_SelConfigSubPage = value
-         If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
-            m_bGeneral_Visibility = Visibility.Visible
-            m_bMachine_Visibility = Visibility.Collapsed
-         ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
-            m_bMachine_Visibility = Visibility.Visible
-            m_bGeneral_Visibility = Visibility.Collapsed
-         End If
-         NotifyPropertyChanged(NameOf(General_Visibility))
-         NotifyPropertyChanged(NameOf(Machine_Visibility))
-      End Set
-   End Property
-
-   Public ReadOnly Property MachinePanelVM As MachinePanelVM
-      Get
-         Return Map.refMachinePanelVM
-      End Get
-   End Property
-
+   ' Definizione comandi
+   Private m_cmdSave As ICommand
+   Private m_cmdAddVariable As ICommand
+   Private m_cmdRemoveVariable As ICommand
 
    ' Contatore delle variabili rimosse per successiva rimozione dal file INI
    Friend m_RemovedVarsCount As Integer = 0
@@ -111,88 +85,6 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   Private m_bGeneral_Visibility As Visibility = Visibility.Visible
-   Public Property General_Visibility As Visibility
-      Get
-         Return m_bGeneral_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bGeneral_Visibility = value
-         NotifyPropertyChanged(NameOf(General_Visibility))
-      End Set
-   End Property
-
-   Private m_bMachine_Visibility As Visibility = Visibility.Collapsed
-   Public Property Machine_Visibility As Visibility
-      Get
-         Return m_bMachine_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bMachine_Visibility = value
-         NotifyPropertyChanged(NameOf(Machine_Visibility))
-      End Set
-   End Property
-
-   Private m_SectionTime As Double
-   Public Property SectionTime As String
-      Get
-         Return DoubleToString(m_SectionTime, 5)
-      End Get
-      Set(value As String)
-         Dim dVal As Double = 0
-         If StringToDoubleAdv(value, dVal, True) AndAlso dVal > 0 Then
-            m_SectionTime = dVal
-         End If
-      End Set
-   End Property
-
-   Private m_PartTime As Double
-   Public Property PartTime As String
-      Get
-         Return DoubleToString(m_PartTime, 5)
-      End Get
-      Set(value As String)
-         Dim dVal As Double = 0
-         If StringToDoubleAdv(value, dVal, True) AndAlso dVal > 0 Then
-            m_PartTime = dVal
-         End If
-      End Set
-   End Property
-
-   Private m_ReminderList As New List(Of IdNameStruct)({New IdNameStruct(0, EgtMsg(61988)), New IdNameStruct(1, EgtMsg(61989)), New IdNameStruct(2, EgtMsg(61990)), New IdNameStruct(7, EgtMsg(61991)), New IdNameStruct(14, EgtMsg(61992)), New IdNameStruct(30, EgtMsg(61993))})
-   Public ReadOnly Property ReminderList As List(Of IdNameStruct)
-      Get
-         Return m_ReminderList
-      End Get
-   End Property
-
-   Private m_SelReminder As IdNameStruct
-   Public Property SelReminder As IdNameStruct
-      Get
-         Return m_SelReminder
-      End Get
-      Set(value As IdNameStruct)
-         m_SelReminder = value
-         WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, m_SelReminder.Id)
-      End Set
-   End Property
-
-   Private m_ConfigMachTableList As New ObservableCollection(Of MachTable)
-   Public Property ConfigMachTableList As ObservableCollection(Of MachTable)
-      Get
-         Return m_ConfigMachTableList
-      End Get
-      Set(value As ObservableCollection(Of MachTable))
-         m_ConfigMachTableList = value
-      End Set
-   End Property
-
-
-   ' Definizione comandi
-   Private m_cmdSave As ICommand
-   Private m_cmdAddVariable As ICommand
-   Private m_cmdRemoveVariable As ICommand
-
 #Region "Messages"
 
    Public ReadOnly Property L_Msg As String
@@ -317,41 +209,6 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
-   Public ReadOnly Property General_Msg As String
-      Get
-         Return EgtMsg(62535)
-      End Get
-   End Property
-
-   Public ReadOnly Property Machine_Msg As String
-      Get
-         Return EgtMsg(62537)
-      End Get
-   End Property
-
-   Public ReadOnly Property SectionTime_Msg As String
-      Get
-         Return EgtMsg(61806)
-      End Get
-   End Property
-   Public ReadOnly Property PartTime_Msg As String
-      Get
-         Return EgtMsg(61807)
-      End Get
-   End Property
-
-   Public ReadOnly Property Nesting_Msg As String
-      Get
-         Return EgtMsg(61829)
-      End Get
-   End Property
-
-   Public ReadOnly Property PrintLabel_Msg As String
-      Get
-         Return EgtMsg(61894)
-      End Get
-   End Property
-
 #End Region    ' Messages
 
 #Region "Constructor"
@@ -387,13 +244,6 @@ Public Class ConfigurationPageVM
       GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns)
       ' carico le Variables della macchina
       LoadVariables()
-      ' leggo SectionTime e PartTime
-      GetMainPrivateProfileString(S_NEST, K_SECTIONTIME, "", SectionTime)
-      GetMainPrivateProfileString(S_NEST, K_PARTTIME, "", PartTime)
-      ' assegno le liste dei parametri della macchina corrente alla ConfigMachTableList alla pagina di Configurazione
-      ConfigMachTableList = CurrentMachine.MachTableList
-      Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1)
-      SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
    End Sub
 
 #End Region ' Constructor
@@ -557,196 +407,11 @@ Public Class ConfigVariable
 
 End Class
 
-Public Class MachParam
-   Inherits VMBase
-
-   ' table a cui appartiene il parametro
-   Private m_nParentTable As Integer
-   Friend ReadOnly Property nParentTable As Integer
-      Get
-         Return m_nParentTable
-      End Get
-   End Property
-
-   ' indice del parametro
-   Private m_nParamIndex As Integer
-   Friend ReadOnly Property nParamIndex As Integer
-      Get
-         Return m_nParamIndex
-      End Get
-   End Property
-
-   ' tipo della variabile
-   Private m_nType As MachParamType
-   Friend ReadOnly Property nType As MachParamType
-      Get
-         Return m_nType
-      End Get
-   End Property
-
-   ' parametri da struttura
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   ' parametri da geometria
-   Private m_IsModifiedValue As Boolean = False
-   Private m_dValue As Double
-   Private m_sValue As String
-   Public Property sValue As String
-      Get
-         Select Case nType
-            Case MachParamType.DOUBLE_
-               Return DoubleToString(m_dValue, 3)
-            Case MachParamType.LENGTH
-               Return LenToString(m_dValue, 3)
-            Case Else      ' stringhe
-               Return m_sValue
-         End Select
-         Return If(nType = MachParamType.LENGTH, LenToString(m_dValue, 3), DoubleToString(m_dValue, 3))
-      End Get
-      Set(value As String)
-         Dim dNewValue As Double
-         ' verifico se valore immesso è diverso dall'originale
-         If nParentTable > 0 Then
-            ' trasformo valori
-            Select Case nType
-               Case MachParamType.DOUBLE_
-                  StringToDoubleAdv(value, dNewValue, True)
-                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
-               Case MachParamType.LENGTH
-                  StringToLenAdv(value, dNewValue, True)
-                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
-               Case Else
-                  m_IsModifiedValue = String.Compare(value, m_sValue) <> 0
-            End Select
-         End If
-         ' se valore immesso è diverso e password non inserita
-         'If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then
-         '   Map.refConfigurationPageVM.bModifyMachParam = Map.refConfigurationPageVM.VerifyConfigPagePassword()
-         '   If Not Map.refConfigurationPageVM.bModifyMachParam Then
-         '      NotifyPropertyChanged("sValue")
-         '      m_IsModifiedValue = False
-         '      Return
-         '   End If
-         'End If
-
-         Select Case nType
-            Case MachParamType.DOUBLE_, MachParamType.LENGTH
-               UpdateParamValue(dNewValue, "")
-            Case Else
-               UpdateParamValue(0, value)
-         End Select
-      End Set
-   End Property
-   Public Property dValue As Double
-      Get
-         Return m_dValue
-      End Get
-      Set(value As Double)
-         m_dValue = value
-         NotifyPropertyChanged("sValue")
-      End Set
-   End Property
-
-   ' descrizione del parametro
-   Private m_sDescription As String
-   Public Property sDescription As String
-      Get
-         Return m_sDescription
-      End Get
-      Set(value As String)
-         m_sDescription = value
-      End Set
-   End Property
-
-   Private Sub StdInit(nParentTable As Integer, nParamIndex As Integer, Type As MachParamType, sName As String, sDescription As String)
-      m_nParentTable = nParentTable
-      m_nParamIndex = nParamIndex
-      m_nType = Type
-      m_sName = sName
-      m_sDescription = MsgToString(sDescription)
-   End Sub
-
-   ' new per double e length
-   Sub New(nParentTable As Integer, nParamIndex As Integer, nType As MachParamType, sParamName As String, dValue As Double, sDescription As String)
-      StdInit(nParentTable, nParamIndex, nType, sParamName, sDescription)
-      m_dValue = dValue 'sValue = DoubleToString(dValue, 3)
-   End Sub
-
-   ' new per stringhe
-   Sub New(nParentTable As Integer, nParamIndex As Integer, nType As MachParamType, sParamName As String, sDescription As String)
-      StdInit(nParentTable, nParamIndex, nType, sParamName, sDescription)
-   End Sub
-
-   ' new per parametro vuoto
-   Sub New(nType As MachParamType, nParamIndex As Integer, sParamName As String)
-      StdInit(Nothing, nParamIndex, nType, sParamName, "")
-   End Sub
-
-   Friend Sub UpdateParamValue(dNewValue As Double, sNewValue As String, Optional bDraw As Boolean = True)
-      Select Case nType
-         Case MachParamType.DOUBLE_, MachParamType.LENGTH
-            m_dValue = dNewValue
-         Case MachParamType.STRING_
-            m_sValue = sNewValue
-      End Select
-   End Sub
-
-   Public ReadOnly Property IsModified() As Boolean
-      Get
-         Return m_IsModifiedValue
-      End Get
-   End Property
-
-   Public Sub IsModifiedReset()
-      m_IsModifiedValue = False
-   End Sub
-
-End Class
-
-Public Class MachTable
-   Inherits VMBase
-
-   ' nome della table
-   Private m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Private m_MachParamList As New ObservableCollection(Of MachParam)
-   Public Property MachParamList As ObservableCollection(Of MachParam)
-      Get
-         Return m_MachParamList
-      End Get
-      Set(value As ObservableCollection(Of MachParam))
-         m_MachParamList = value
-      End Set
-   End Property
-
-   Sub New(Name As String, ParamList As ObservableCollection(Of MachParam))
-      sName = Name
-      MachParamList = ParamList
-   End Sub
-
-End Class
-
-' Tipo parametro nel file di configurazione Macchina
-Public Enum MachParamType As Integer
-   DOUBLE_ = 1
-   STRING_ = 2
-   COMBO = 3
-   LENGTH = 4
-   CHECKBOX = 5
-End Enum
+'' Tipo parametro nel file di configurazione Macchina
+'Public Enum MachParamType As Integer
+'   DOUBLE_ = 1
+'   STRING_ = 2
+'   COMBO = 3
+'   LENGTH = 4
+'   CHECKBOX = 5
+'End Enum

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>
@@ -332,7 +263,6 @@
       <DependentUpon>MachineLogPageV.xaml</DependentUpon>
     </Compile>
     <Compile Include="MachineLogPage\MachineLogPageVM.vb" />
-    <Compile Include="MachinePanel\MachinePanelVM.vb" />
     <Compile Include="MDIPage\MDIPageV.xaml.vb">
       <DependentUpon>MDIPageV.xaml</DependentUpon>
     </Compile>
@@ -374,6 +304,10 @@
     <Compile Include="MachGroupPanel\PartVM.vb" />
     <Compile Include="MachGroupPanel\SupervisorMachGroupPanelVM.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
+    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
+      <DependentUpon>MachinePanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MachinePanel\MachinePanelVM.vb" />
     <Compile Include="MachManagingThread\MachCommConst.vb" />
     <Compile Include="MachManagingThread\MachManaging.vb" />
     <Compile Include="MachManagingThread\MachManagingThread.vb" />
@@ -413,7 +347,6 @@
     <Compile Include="Utility\DisableModifiedMgr.vb" />
     <Compile Include="Utility\LogEvent.vb" />
     <Compile Include="Utility\LuaExec.vb" />
-    <Compile Include="Utility\MachParamIniFile.vb" />
     <Compile Include="Utility\ManageBTLParts.vb" />
     <Compile Include="Utility\Map.vb" />
     <Compile Include="VariablesList\VariablesListV.xaml.vb">
@@ -482,6 +415,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MachinePanel\MachinePanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MainMenu\MainMenuV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -664,10 +601,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Resource Include="Resources\Configuration\MachiningsTable.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelV.xaml

@@ -16,7 +16,8 @@
    <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
            Style="{StaticResource ToolBar_TextButton}" Width="55" Content="{Binding MachiningDbMsg}"/>
    <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="55" Content="{Binding SetUpMsg}"/>
+           Style="{StaticResource ToolBar_TextButton}" Width="55" Content="{Binding SetUpMsg}"
+           Background="{Binding SetUp_Background}"/>
    <!--<Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
       <Image Source="/Resources/ProjectManager/Options.png" Height="22" />
    </Button>-->

EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb

@@ -1,50 +1,58 @@
-Imports System.IO
+Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class MachinePanelVM
-   Inherits EgtWPFLib5.MachinePanelVM
+   Inherits VMBase
 
 #Region "FIELDS & PROPERTIES"
 
    ' Radice del direttorio delle macchine
    Private m_sMachinesRoot As String
 
+   ' Lista delle macchine disponibili
+   Private m_MachineList As New ObservableCollection(Of Machine)
+   Public Property MachineList As ObservableCollection(Of Machine)
+      Get
+         Return m_MachineList
+      End Get
+      Set(value As ObservableCollection(Of Machine))
+         m_MachineList = value
+      End Set
+   End Property
    ' Macchina correntemente selezionata e quindi attiva
    Private m_SelectedMachine As Machine = Nothing
-   Public Overrides Property SelectedMachine As Machine
+   Public Property SelectedMachine As MyMachine
       Get
          Return m_SelectedMachine
       End Get
-      Set(value As Machine)
+      Set(value As MyMachine)
          If value IsNot m_SelectedMachine Then
-            ' imposto macchina in DbGeometrico
-            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) Then
-               m_SelectedMachine = value
-            End If
-            ' Salvo impostazione macchina corrente
-            SaveCurrentMachine()
-            NotifyPropertyChanged(NameOf(SelectedMachine))
+            'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+            'EgtResetCurrMachGroup()
+            ' se sono in modalità disegno
+            m_SelectedMachine = value
             ' inizializzo la macchina selezionata come macchina corrente
             Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
             SectionXMaterial.SetType(nMachType)
-            If Not IsNothing(value) Then
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
-            Else
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, m_SelectedMachine.Name, nMachType)
-            End If
-            ' mostro bottone tabella beam o wall a seconda del tipo
-            m_BeamTable_Visibility = If(nMachType = MachineType.BEAM OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            m_WallTable_Visibility = If(nMachType = MachineType.WALL OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            NotifyPropertyChanged(NameOf(BeamTable_Visibility))
-            NotifyPropertyChanged(NameOf(WallTable_Visibility))
-            ' aggiorno nome macchina in statusbar
-            Map.refMyStatusBarVM.RefreshMachName()
+            InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
          End If
       End Set
    End Property
 
+   Private m_SetUp_Background As Brush = New BrushConverter().ConvertFrom("#FFDDDDDD")
+   Public Property SetUp_Background As Brush
+      Get
+         Return m_SetUp_Background
+      End Get
+      Set(value As Brush)
+         m_SetUp_Background = value
+         NotifyPropertyChanged("SetUp_Background")
+      End Set
+   End Property
+
    Private m_MachPanel_IsEnabled As Boolean = True
    Public Property MachPanel_IsEnabled As Boolean
       Get
@@ -52,30 +60,10 @@ Public Class MachinePanelVM
       End Get
       Set(value As Boolean)
          m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged(NameOf(MachPanel_IsEnabled))
+         NotifyPropertyChanged("MachPanel_IsEnabled")
       End Set
    End Property
 
-   Private m_BeamTable_Visibility As Visibility
-   Public ReadOnly Property BeamTable_Visibility As Visibility
-      Get
-         Return m_BeamTable_Visibility
-      End Get
-   End Property
-
-   Private m_WallTable_Visibility As Visibility
-   Public ReadOnly Property WallTable_Visibility As Visibility
-      Get
-         Return m_WallTable_Visibility
-      End Get
-   End Property
-
-   Public ReadOnly Property SetUp_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bModifySetup, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
 #Region "Messages"
 
    Public ReadOnly Property ToolDBMsg As String
@@ -100,25 +88,27 @@ Public Class MachinePanelVM
 
    Public ReadOnly Property ToolDBToolTip As String
       Get
-         Return EgtMsg(5003)
+         Return "Tool DB"
       End Get
    End Property
    Public ReadOnly Property MachiningDbToolTip As String
       Get
-         Return EgtMsg(5004)
+         Return "Machining DB"
       End Get
    End Property
    Public ReadOnly Property SetUpToolTip As String
       Get
-         Return EgtMsg(31501)
+         Return "SetUp"
       End Get
    End Property
 
 #End Region   ' ToolTip
 
    ' Definizione comandi
-   Private m_cmdBeamTable As ICommand
-   Private m_cmdWallTable As ICommand
+   Private m_cmdToolDb As ICommand
+   Private m_cmdMachDb As ICommand
+   Private m_cmdSetUp As ICommand
+   Private m_cmdMachOptions As ICommand
 
 #End Region    'FIELDS & PROPERTIES
 
@@ -141,7 +131,7 @@ Public Class MachinePanelVM
       If MachineList.Count = 0 Then Return
       Dim CurrMachine As Machine = Nothing
       Dim CurrMachineName As String = String.Empty
-      GetMainPrivateProfileString(S_MACH, K_CURRMACH, String.Empty, CurrMachineName)
+      GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, String.Empty, CurrMachineName)
       Dim bFound As Boolean = False
       If Not String.IsNullOrEmpty(CurrMachineName) Then
          For Each Mach In MachineList
@@ -180,45 +170,28 @@ Public Class MachinePanelVM
       End If
    End Sub
 
-   Friend Function BeamMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' 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)
-         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)
-      End If
-      Return True
-   End Function
+#End Region
 
-   Friend Function WallMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' 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)
-         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)
-      End If
-      Return True
-   End Function
+#Region "COMMANDS"
 
-   Public Overrides Sub ToolDb(ByVal param As Object)
+#Region "ToolDbCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property ToolDbCommand As ICommand
+      Get
+         If m_cmdToolDb Is Nothing Then
+            m_cmdToolDb = New Command(AddressOf ToolDb)
+         End If
+         Return m_cmdToolDb
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub ToolDb(ByVal param As Object)
       If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
@@ -227,7 +200,7 @@ Public Class MachinePanelVM
          Return
       End If
 
-      Dim ToolDbWindowVM As New EgtWPFLib5.ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
+      Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
       Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
       If ToolDbWindowVM.MatType <> 0 Then
          ToolDbWindowV.Height = 640
@@ -244,7 +217,26 @@ Public Class MachinePanelVM
       End If
    End Sub
 
-   Public Overrides Sub MachDb(ByVal param As Object)
+#End Region    ' ToolDbCommand
+
+#Region "MachDbCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property MachDbCommand As ICommand
+      Get
+         If m_cmdMachDb Is Nothing Then
+            m_cmdMachDb = New Command(AddressOf MachDb)
+         End If
+         Return m_cmdMachDb
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub MachDb(ByVal param As Object)
       If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
@@ -265,7 +257,26 @@ Public Class MachinePanelVM
 
    End Sub
 
-   Public Overrides Sub SetUp(ByVal param As Object)
+#End Region    ' MachDbCommand
+
+#Region "SetUpCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property SetUpCommand As ICommand
+      Get
+         If m_cmdSetUp Is Nothing Then
+            m_cmdSetUp = New Command(AddressOf SetUp)
+         End If
+         Return m_cmdSetUp
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub SetUp(ByVal param As Object)
       ' 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 ")
@@ -304,389 +315,31 @@ Public Class MachinePanelVM
 
    End Sub
 
-#End Region
+#End Region    ' SetUpCommand
 
-#Region "COMMANDS"
-
-#Region "BeamTable"
+#Region "MachOptionsCommand"
 
    ''' <summary>
    ''' Returns a command that do Exec.
    ''' </summary>
-   Public ReadOnly Property BeamTable_Command As ICommand
+   Public ReadOnly Property MachOptionsCommand As ICommand
       Get
-         If m_cmdBeamTable Is Nothing Then
-            m_cmdBeamTable = New Command(AddressOf BeamMachDb)
+         If m_cmdMachOptions Is Nothing Then
+            m_cmdMachOptions = New Command(AddressOf MachOptions)
          End If
-         Return m_cmdBeamTable
+         Return m_cmdMachOptions
       End Get
    End Property
 
-#End Region    ' BeamTable
-
-#Region "WallTable"
-
    ''' <summary>
-   ''' Returns a command that do Exec.
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
-   Public ReadOnly Property WallTable_Command As ICommand
-      Get
-         If m_cmdWallTable Is Nothing Then
-            m_cmdWallTable = New Command(AddressOf WallMachDb)
-         End If
-         Return m_cmdWallTable
-      End Get
-   End Property
+   Public Sub MachOptions(ByVal param As Object)
 
-#End Region    ' WallTable
+   End Sub
+
+#End Region    ' MachOptionsCommand
 
 #End Region    ' COMMANDS
 
 End Class
-
-
-'Imports System.Collections.ObjectModel
-'Imports System.IO
-'Imports EgtBEAMWALL.Core
-'Imports EgtUILib
-'Imports EgtWPFLib5
-
-'Public Class MachinePanelVM
-'   Inherits VMBase
-
-'#Region "FIELDS & PROPERTIES"
-
-'   ' Radice del direttorio delle macchine
-'   Private m_sMachinesRoot As String
-
-'   ' Lista delle macchine disponibili
-'   Private m_MachineList As New ObservableCollection(Of Machine)
-'   Public Property MachineList As ObservableCollection(Of Machine)
-'      Get
-'         Return m_MachineList
-'      End Get
-'      Set(value As ObservableCollection(Of Machine))
-'         m_MachineList = value
-'      End Set
-'   End Property
-'   ' Macchina correntemente selezionata e quindi attiva
-'   Private m_SelectedMachine As Machine = Nothing
-'   Public Property SelectedMachine As MyMachine
-'      Get
-'         Return m_SelectedMachine
-'      End Get
-'      Set(value As MyMachine)
-'         If value IsNot m_SelectedMachine Then
-'            'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
-'            'EgtResetCurrMachGroup()
-'            ' se sono in modalità disegno
-'            m_SelectedMachine = value
-'            ' inizializzo la macchina selezionata come macchina corrente
-'            Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
-'            SectionXMaterial.SetType(nMachType)
-'            InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
-'         End If
-'      End Set
-'   End Property
-
-'   Private m_SetUp_Background As Brush = New BrushConverter().ConvertFrom("#FFDDDDDD")
-'   Public Property SetUp_Background As Brush
-'      Get
-'         Return m_SetUp_Background
-'      End Get
-'      Set(value As Brush)
-'         m_SetUp_Background = value
-'         NotifyPropertyChanged("SetUp_Background")
-'      End Set
-'   End Property
-
-'   Private m_MachPanel_IsEnabled As Boolean = True
-'   Public Property MachPanel_IsEnabled As Boolean
-'      Get
-'         Return m_MachPanel_IsEnabled
-'      End Get
-'      Set(value As Boolean)
-'         m_MachPanel_IsEnabled = value
-'         NotifyPropertyChanged("MachPanel_IsEnabled")
-'      End Set
-'   End Property
-
-'#Region "Messages"
-
-'   Public ReadOnly Property ToolDBMsg As String
-'      Get
-'         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
-'      End Get
-'   End Property
-'   Public ReadOnly Property MachiningDbMsg As String
-'      Get
-'         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
-'      End Get
-'   End Property
-'   Public ReadOnly Property SetUpMsg As String
-'      Get
-'         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
-'      End Get
-'   End Property
-
-'#End Region    ' Messages
-
-'#Region "ToolTip"
-
-'   Public ReadOnly Property ToolDBToolTip As String
-'      Get
-'         Return "Tool DB"
-'      End Get
-'   End Property
-'   Public ReadOnly Property MachiningDbToolTip As String
-'      Get
-'         Return "Machining DB"
-'      End Get
-'   End Property
-'   Public ReadOnly Property SetUpToolTip As String
-'      Get
-'         Return "SetUp"
-'      End Get
-'   End Property
-
-'#End Region   ' ToolTip
-
-'   ' Definizione comandi
-'   Private m_cmdToolDb As ICommand
-'   Private m_cmdMachDb As ICommand
-'   Private m_cmdSetUp As ICommand
-'   Private m_cmdMachOptions As ICommand
-
-'#End Region    'FIELDS & PROPERTIES
-
-'#Region "CONSTRUCTOR"
-
-'   Sub New()
-'      ' Creo riferimento a questa classe in Map
-'      Map.SetRefMachinePanelVM(Me)
-'      ' recupero cartella radice delle macchine
-'      m_sMachinesRoot = Map.refMainWindowVM.MainWindowM.sMachinesRoot
-'      ' Carica macchine da cartella delle macchine
-'      MyMachine.MachineListInit(m_sMachinesRoot, MachineList)
-'   End Sub
-
-'#End Region    ' CONSTRUCTOR
-
-'#Region "METHODS"
-
-'   Friend Sub LoadCurrentMachine()
-'      If MachineList.Count = 0 Then Return
-'      Dim CurrMachine As Machine = Nothing
-'      Dim CurrMachineName As String = String.Empty
-'      GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, String.Empty, CurrMachineName)
-'      Dim bFound As Boolean = False
-'      If Not String.IsNullOrEmpty(CurrMachineName) Then
-'         For Each Mach In MachineList
-'            If Mach.Name = CurrMachineName Then
-'               bFound = True
-'               CurrMachine = Mach
-'               Exit For
-'            End If
-'         Next
-'      End If
-'      If Not bFound And MachineList.Count > 0 Then
-'         CurrMachine = MachineList(0)
-'      End If
-'      If Not IsNothing(CurrMachine) Then
-'         If EgtSetCurrMachine(CurrMachine.Name) Then
-'            SelectedMachine = CurrMachine
-'         End If
-'      End If
-'   End Sub
-
-'   Friend Sub SaveCurrentMachine()
-'      If IsNothing(m_SelectedMachine) Then Return
-'      WriteMainPrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name)
-'   End Sub
-
-'   Friend Sub UpdateCurrentMachine()
-'      'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-'      Dim sMachName As String = String.Empty
-'      If EgtGetCurrMachineName(sMachName) Then
-'         For Each Mach In MachineList
-'            If Mach.Name = sMachName Then
-'               SelectedMachine = Mach
-'               Exit For
-'            End If
-'         Next
-'      End If
-'   End Sub
-
-'#End Region
-
-'#Region "COMMANDS"
-
-'#Region "ToolDbCommand"
-
-'   ''' <summary>
-'   ''' Returns a command that do Exec.
-'   ''' </summary>
-'   Public ReadOnly Property ToolDbCommand As ICommand
-'      Get
-'         If m_cmdToolDb Is Nothing Then
-'            m_cmdToolDb = New Command(AddressOf ToolDb)
-'         End If
-'         Return m_cmdToolDb
-'      End Get
-'   End Property
-
-'   ''' <summary>
-'   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-'   ''' </summary>
-'   Public Sub ToolDb(ByVal param As Object)
-'      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-'      ' 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)
-'         Return
-'      End If
-
-'      Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-'      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
-'      If ToolDbWindowVM.MatType <> 0 Then
-'         ToolDbWindowV.Height = 640
-'         ToolDbWindowV.Width = 1024
-'         ToolDbWindowV.ShowDialog()
-'      Else
-'         Exit Sub
-'      End If
-
-'      If Not SetUpUtility.IsValidToolHeadExitInSetUp() Then
-'         SetUp_Background = Brushes.Red
-'      Else
-'         SetUp_Background = OmagOFFICEDictionary.Button_Static_Background
-'      End If
-'   End Sub
-
-'#End Region    ' ToolDbCommand
-
-'#Region "MachDbCommand"
-
-'   ''' <summary>
-'   ''' Returns a command that do Exec.
-'   ''' </summary>
-'   Public ReadOnly Property MachDbCommand As ICommand
-'      Get
-'         If m_cmdMachDb Is Nothing Then
-'            m_cmdMachDb = New Command(AddressOf MachDb)
-'         End If
-'         Return m_cmdMachDb
-'      End Get
-'   End Property
-
-'   ''' <summary>
-'   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-'   ''' </summary>
-'   Public Sub MachDb(ByVal param As Object)
-'      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-'      ' 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)
-'         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)
-
-'      If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-'         MachDbWindowV.Height = 768
-'         MachDbWindowV.Width = 1024
-'         MachDbWindowV.ShowDialog()
-'      Else
-'         Exit Sub
-'      End If
-
-'   End Sub
-
-'#End Region    ' MachDbCommand
-
-'#Region "SetUpCommand"
-
-'   ''' <summary>
-'   ''' Returns a command that do Exec.
-'   ''' </summary>
-'   Public ReadOnly Property SetUpCommand As ICommand
-'      Get
-'         If m_cmdSetUp Is Nothing Then
-'            m_cmdSetUp = New Command(AddressOf SetUp)
-'         End If
-'         Return m_cmdSetUp
-'      End Get
-'   End Property
-
-'   ''' <summary>
-'   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-'   ''' </summary>
-'   Public Sub SetUp(ByVal param As Object)
-'      ' 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)
-'         Return
-'      End If
-'      ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
-'      ' e testa e uscita dell'utensile attrezzato
-'      EgtLuaExecFile(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA)
-'      ' verifico che le teste riportate in configurazione esistano
-'      Dim Index As Integer = 1
-'      Dim nErr As Integer = 0
-'      While nErr = 0
-'         Dim sHead As String = String.Empty
-'         nErr = 999
-'         EgtLuaSetGlobIntVar("STU.INDEX", Index)
-'         EgtLuaCallFunction("STU.GetTcPosHeadGroupFromPos")
-'         ' Leggo variabili
-'         EgtLuaGetGlobStringVar("STU.HEAD", sHead)
-'         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)
-'               Return
-'            End If
-'         End If
-'         Index += 1
-'      End While
-'      ' Reset lua
-'      EgtLuaResetGlobVar("STU")
-
-'      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
-'      SetUpWindow.Height = 614
-'      SetUpWindow.Width = 1024
-'      SetUpWindow.ShowDialog()
-
-'   End Sub
-
-'#End Region    ' SetUpCommand
-
-'#Region "MachOptionsCommand"
-
-'   ''' <summary>
-'   ''' Returns a command that do Exec.
-'   ''' </summary>
-'   Public ReadOnly Property MachOptionsCommand As ICommand
-'      Get
-'         If m_cmdMachOptions Is Nothing Then
-'            m_cmdMachOptions = New Command(AddressOf MachOptions)
-'         End If
-'         Return m_cmdMachOptions
-'      End Get
-'   End Property
-
-'   ''' <summary>
-'   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-'   ''' </summary>
-'   Public Sub MachOptions(ByVal param As Object)
-
-'   End Sub
-
-'#End Region    ' MachOptionsCommand
-
-'#End Region    ' COMMANDS
-
-'End Class

EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml

@@ -6,18 +6,12 @@
    
    <!--Barra superiore dei comandi-->
    <UniformGrid Rows="1">
-      <Button Content="{Binding OnlyProdPage_Msg}"
-              Command="{Binding OnlyProdPage_Command}"
-              Visibility="{Binding OnlyProdPage_Visibility}"
-              Style="{StaticResource MainMenu_Button}"/>
       <Button Content="{Binding Viewer_Msg}"
-              Command="{Binding Viewer_Command}"
-              Visibility="{Binding ViewerOptimizer_Visibility}"
-              Style="{StaticResource MainMenu_Button}"/>
+                   Command="{Binding Viewer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
       <Button Content="{Binding Optimizer_Msg}"
-              Command="{Binding Optimizer_Command}"
-              Visibility="{Binding ViewerOptimizer_Visibility}"
-              Style="{StaticResource MainMenu_Button}"/>
+                   Command="{Binding Optimizer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
       <RadioButton Content="{Binding Supervisor_Msg}"
                    IsChecked="{Binding Supervisor_IsChecked}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -1,4 +1,5 @@
-Imports System.IO
+Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtUILib
@@ -66,18 +67,6 @@ Public Class MainMenuVM
       End Get
    End Property
 
-   Public ReadOnly Property OnlyProdPage_Visibility As Visibility
-      Get
-         Return If(bOnlyProd, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property ViewerOptimizer_Visibility As Visibility
-      Get
-         Return If(bOnlyProd, Visibility.Collapsed, Visibility.Visible)
-      End Get
-   End Property
-
    Private m_SelPage As Integer = -1
    Public Property SelPage As Integer
       Get
@@ -167,18 +156,11 @@ Public Class MainMenuVM
       End Get
    End Property
 
-   Public ReadOnly Property OnlyProdPage_Msg As String
-      Get
-         Return EgtMsg(61896)
-      End Get
-   End Property
-
 #End Region    ' Messages
 
    ' Definizione comandi
    Private m_cmdViewer As ICommand
    Private m_cmdOptimizer As ICommand
-   Private m_cmdOnlyProdPage As ICommand
 
 #End Region    ' Fields & Properties
 
@@ -393,41 +375,7 @@ Public Class MainMenuVM
       End If
    End Sub
 
-#End Region ' OnlyProdPage
-
-#Region "OnlyProdPage"
-
-   Public ReadOnly Property OnlyProdPage_Command As ICommand
-      Get
-         If m_cmdOnlyProdPage Is Nothing Then
-            m_cmdOnlyProdPage = New Command(AddressOf OnlyProdPage)
-         End If
-         Return m_cmdOnlyProdPage
-      End Get
-   End Property
-
-   Public Sub OnlyProdPage()
-      Dim sViewerOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
-      ' recupero processo del supervisore
-      Dim localProc As Process() = Process.GetProcessesByName(sViewerOptimizerName)
-      If localProc.Length > 0 Then
-         For Each p As Process In localProc
-            ' porto in primo piano il ViewerOptimizer
-            BringWindowToFront(p.MainWindowHandle)
-            DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, -Pages.ONLYPRODPAGE, StatusMapItemType.Comm, StatusMapOpType.OpenPageInViewOptimRequest, "")
-            Exit For
-         Next
-      Else
-         Dim sViewerOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sViewerOptimizerName & ".exe"
-         Try
-            Process.Start(sViewerOptimizerPath, "2 " & Pages.ONLYPRODPAGE)
-         Catch ex As Exception
-            EgtOutLog("Error: impossible starting vieweroptimizer from path " & sViewerOptimizerPath)
-         End Try
-      End If
-   End Sub
-
-#End Region ' OnlyProdPage
+#End Region ' Optimizer
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -170,20 +170,6 @@ Public Class MainWindowM
       End Get
    End Property
 
-   Private m_bOnlyProd As Boolean = False
-   Friend ReadOnly Property bOnlyProd As Boolean
-      Get
-         Return m_bOnlyProd
-      End Get
-   End Property
-
-   Private m_bModifySetup As Boolean = False
-   Friend ReadOnly Property bModifySetup As Boolean
-      Get
-         Return m_bModifySetup
-      End Get
-   End Property
-
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -262,8 +248,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
-                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2704, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2704, 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())
@@ -315,17 +301,9 @@ Public Class MainWindowM
       Dim sLuaLibsDir As String = String.Empty
       GetMainPrivateProfileString(S_LUA, K_LIBSDIR, "", sLuaLibsDir)
       EgtSetLuaLibs(sLuaLibsDir)
-      ' Recupero flag OnlyProd
-      m_bOnlyProd = GetMainPrivateProfileInt(S_GENERAL, K_ONLYPROD, 0) = 1
-      ' e lo imposto nel core
-      Core.Configuration.SetOnlyProd(m_bOnlyProd)
       Dim sLuaBaseLib As String = String.Empty
       GetMainPrivateProfileString(S_LUA, K_BASELIB, "EgtBase", sLuaBaseLib)
       EgtLuaRequire(sLuaBaseLib)
-      ' Recupero flag ModifySetup
-      m_bModifySetup = GetMainPrivateProfileInt(S_GENERAL, K_MODIFYSETUP, 0) = 1
-      ' e lo imposto nel core
-      Core.Configuration.SetModifySetup(m_bModifySetup)
       ' verifico se stampante attiva
       Dim sPrinterLink As String = ""
       Dim nPrinterLink As Integer = 0

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -107,14 +107,8 @@ Public Class MainWindowVM
 
       ' leggo riga di comando
       Dim nCommandType As Integer = 0
-      Dim nPage As Pages = Nothing
+      Dim nPage As Pages = Pages.VIEW
       Dim nProdId As Integer = 0
-      If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
-         nPage = Pages.ONLYPRODPAGE
-      Else
-         nPage = Pages.VIEW
-      End If
-
       If ProcessCommandLine(nCommandType, nProdId) AndAlso nCommandType = 1 Then
          Map.refSupervisorManagerVM.SetCurrProd(nProdId)
       Else

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: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -11,14 +11,13 @@ Public Class OpenProjectFileDialogVM
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
-      m_GoToProd = GoToProd
       ' carico colonne
       LoadColumns(m_ProjectType)
       NotifyPropertyChanged(NameOf(FilterTypeList))
       m_SelFilterType = m_FilterTypeList(0)
       ' carico lista progetti
       If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
-         RefreshProjectList()
+         RefreshProjectList(GoToProd)
       Else
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
          NotifyPropertyChanged(NameOf(ProjectList))
@@ -27,7 +26,7 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
-   Public Overrides Sub RefreshProjectList()
+   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
       m_ProjectList.Clear()
       ' calcolo periodo e righe
       Dim dtStart As DateTime

EgtBEAMWALL.Supervisor/Project/ProjectV.xaml

@@ -2,13 +2,13 @@
                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                 xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                                xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                                xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                                 xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor">
 
    <EgtFloating:EgtFloatingTray x:Name="PROJECTTOPTRAY" DockPanel.Dock="Top">
       <EgtBEAMWALL:SupervisorManagerV DataContext="{StaticResource SupervisorManagerVM}"/>
-      <EgtBEAMWALLCORE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"
-                                     Visibility="Collapsed"/>
+      <EgtBEAMWALL:MachinePanelV DataContext="{StaticResource MachinePanelVM}"
+                                 Visibility="Collapsed"/>
    </EgtFloating:EgtFloatingTray>
 
    <Grid>

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -58,6 +58,12 @@ 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)
+         If Not EgtSetBtlAuxDir(sBtlAuxDir) Then
+            EgtOutLog("Missing BtlAuxDir path! Will be impossible to load Variant!")
+         End If
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -87,14 +87,15 @@ Public Class SupervisorManagerVM
    End Property
    Public ReadOnly Property GoToProd_ToolTip As String
       Get
-         Return If(refMainWindowVM.MainWindowM.bOnlyProd, EgtMsg(61800), EgtMsg(61835))
+         Return EgtMsg(61835)
       End Get
    End Property
 
+
+
+
 #End Region ' ToolTip
-
 #End Region    ' Fields & Properties
-
 #Region "CONSTRUCTOR"
 
    Sub New()
@@ -371,22 +372,13 @@ Public Class SupervisorManagerVM
       Else
          Dim sOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sOptimizerName & ".exe"
          Try
-            If bOnlyProd Then
-               Process.Start(sOptimizerPath, "2 " & Pages.ONLYPRODPAGE)
-            Else
-               Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
-            End If
+            Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
          Catch ex As Exception
             EgtOutLog("Error: impossible starting optimizer from path " & sOptimizerPath)
          End Try
       End If
-      If bOnlyProd Then
-         ' mando richiesta di apertura progetto in progettazione
-         DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Map.refSupervisorManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInOnlyProdRequest, "")
-      Else
-         ' mando richiesta di apertura progetto in ottimizzatore
-         DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Map.refSupervisorManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInProdRequest, "")
-      End If
+      ' mando richiesta di apertura progetto in ottimizzatore
+      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Map.refSupervisorManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInProdRequest, "")
    End Sub
 
 #End Region ' GoToProd

EgtBEAMWALL.Supervisor/Utility/CurrentMachine.vb

@@ -28,15 +28,9 @@ Public Module CurrentMachine
    Private m_sMachIniFile As String = String.Empty
    ' File ini dei parametri macchina
    Private m_sMachParamIniFile As String = String.Empty
-   ' File lettura Ts3Data
-   Private m_sGetTs3DataFile As String = String.Empty
-   ' File Ts3Data
-   Private m_sTs3DataFile As String = String.Empty
    ' Cartella degli script
    Private m_sMachScriptDir As String = String.Empty
-   ' Cartella dei setup
-   Private m_sMachSetupDir As String = String.Empty
-   ' File dei messaggi macchina
+   ' Ffile dei messaggi macchina
    Private m_sMachMessagesFile As String = String.Empty
 
    ' Tipo macchina
@@ -51,6 +45,12 @@ Public Module CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property nType As MachineType
+      Get
+         Return m_nType
+      End Get
+   End Property
+
    ' tipo di CN della macchina
    Private m_NCType As NCTypes = NCTypes.NULL
    Public ReadOnly Property NCType As Integer
@@ -92,41 +92,17 @@ Public Module CurrentMachine
       End Get
    End Property
 
-   Friend ReadOnly Property sTs3DataFile As String
-      Get
-         Return m_sTs3DataFile
-      End Get
-   End Property
-
-   Friend ReadOnly Property sMachScriptDir As String
-      Get
-         Return m_sMachScriptDir
-      End Get
-   End Property
-
-   Friend ReadOnly Property sMachSetupDir As String
-      Get
-         Return m_sMachSetupDir
-      End Get
-   End Property
-
 #End Region
 
-   Friend ReadOnly Property nType As MachineType
-      Get
-         Return m_nType
-      End Get
-   End Property
-
-   Private m_MachTableList As New ObservableCollection(Of MachTable)
-   Public Property MachTableList As ObservableCollection(Of MachTable)
-      Get
-         Return m_MachTableList
-      End Get
-      Set(value As ObservableCollection(Of MachTable))
-         m_MachTableList = value
-      End Set
-   End Property
+   'Private m_MachTableList As New ObservableCollection(Of MachTable)
+   'Public Property MachTableList As ObservableCollection(Of MachTable)
+   '   Get
+   '      Return m_MachTableList
+   '   End Get
+   '   Set(value As ObservableCollection(Of MachTable))
+   '      m_MachTableList = value
+   '   End Set
+   'End Property
 
 #Region "Init"
 
@@ -162,30 +138,21 @@ Public Module CurrentMachine
       ' Impostazione path MachParamIni file
       If nType = MachineType.BEAM Then
          m_sMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & MACH_INI_FILE_NAME
-         m_sGetTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & GETTS3DATA_FILE_NAME
-         m_sTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & TS3DATA_FILE
       ElseIf nType = MachineType.WALL Then
          m_sMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & MACH_INI_FILE_NAME
-         m_sGetTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & GETTS3DATA_FILE_NAME
-         m_sTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & TS3DATA_FILE
       Else
          ' Se macchina di tipo BOTH prendo quello presente in Beam, se esiste, altrimenti prendo quello in Wall
          Dim sBeamMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & MACH_INI_FILE_NAME
          Dim sWallMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & MACH_INI_FILE_NAME
-         Dim sBeamGetTs3File = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & GETTS3DATA_FILE_NAME
-         Dim sWallGetTs3File = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & GETTS3DATA_FILE_NAME
-         Dim sBeamTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & TS3DATA_FILE
-         Dim sWallTs3DataFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & TS3DATA_FILE
          If nType = MachineType.BOTH Then
             m_sMachParamIniFile = If(File.Exists(sBeamMachParamIniFile), sBeamMachParamIniFile, sWallMachParamIniFile)
-            m_sGetTs3DataFile = If(File.Exists(sBeamGetTs3File), sBeamGetTs3File, sWallGetTs3File)
-            m_sTs3DataFile = If(File.Exists(sBeamTs3DataFile), sBeamTs3DataFile, sWallTs3DataFile)
          End If
       End If
+
+      ' leggo tipo di avanzamento pezzi
+      m_Flow = GetPrivateProfileInt(S_GENERAL, K_FLOW, 1, m_sMachIniFile)
       ' Impostazione path Script dir
       m_sMachScriptDir = sMachinesRootDir & "\" & sMachineName & "\" & K_SCRIPT
-      ' Impostazione path Setup dir
-      m_sMachSetupDir = sMachinesRootDir & "\" & sMachineName & "\" & K_SETUP
 
       ' crea l'elenco dei parametri della macchina corrente
       CreateMachParams()
@@ -198,9 +165,8 @@ Public Module CurrentMachine
 
       ' imposto visibilita' input output
       Map.refMainMenuVM.SetInputOutputVisibility()
-
-      ' leggo parametri macchina da BeamData
-      If nType = MachineType.BEAM OrElse nType = MachineType.BOTH Then
+      ' leggo parametri macchina da WallData
+      If nType = MachineType.BEAM Then
          ' Assegno i dati
          EgtLuaCreateGlobTable("GWD")
          EgtLuaSetGlobStringVar("GWD.BASEDIR", Map.refMainWindowVM.MainWindowM.sBeamRoot)
@@ -219,7 +185,7 @@ Public Module CurrentMachine
             EgtOutLog("Error executing GetBeamData script " & sExecPath)
          End If
          If bOk Then
-            Dim nTemp As Integer = 0
+            Dim nTemp As Integer
             EgtLuaGetGlobIntVar("GWD.SIMUL_VIEW_DIR", nTemp)
             Select Case nTemp
                Case 0
@@ -241,7 +207,7 @@ Public Module CurrentMachine
          ' aggiorno parametro in gestore viste
          Core.ViewPanelVM.UpdateMachParam(m_nViewDir)
       End If
-      If nType = MachineType.WALL OrElse nType = MachineType.BOTH Then
+      If nType = MachineType.WALL Then
          ' Assegno i dati
          EgtLuaCreateGlobTable("GWD")
          EgtLuaSetGlobStringVar("GWD.BASEDIR", Map.refMainWindowVM.MainWindowM.sWallRoot)
@@ -260,11 +226,9 @@ Public Module CurrentMachine
             EgtOutLog("Error executing GetWallData script " & sExecPath)
          End If
          If bOk Then
-            Dim nTemp As Integer = 0
+            Dim nTemp As Integer
             EgtLuaGetGlobIntVar("GWD.SIMUL_VIEW_DIR", nTemp)
             Select Case nTemp
-               Case 0
-                  m_nViewDir = VT.ISO_SW
                Case 1
                   m_nViewDir = VT.ISO_NW
                Case 2
@@ -312,41 +276,25 @@ Public Module CurrentMachine
 
    ' funzione che crea l'elenco dei parametri Macchina
    Friend Sub CreateMachParams()
-      MachTableList.Clear()
-      If String.IsNullOrWhiteSpace(m_sMachParamIniFile) OrElse Not File.Exists(m_sMachParamIniFile) Then
-         EgtOutLog("Impossible loading Mach parameters: MachData.ini file not found or not readable")
-         Return
-      End If
-      Dim NewMachParam As MachParam = Nothing
-      Dim MachParamList As New ObservableCollection(Of MachParam)
-      Dim TableIndex = 1
-      Dim ParamIndex As Integer = 1
-      Dim TableName As String = String.Empty
-      ' carico lua ts3data
-      Dim bTs3DataLoaded As Boolean = False
-      EgtLuaCreateGlobTable("GTSD")
-      EgtLuaSetGlobStringVar("GTSD.TS3PATH", m_sTs3DataFile)
-      Dim sExecPath As String = m_sGetTs3DataFile
-      bTs3DataLoaded = File.Exists(m_sTs3DataFile) AndAlso EgtLuaExecFile(sExecPath)
-      If Not bTs3DataLoaded Then
-         EgtOutLog("Error executing Ts3Data file " & m_sTs3DataFile)
-      End If
-
-      ' verifico che ci sia una table con l'indice designato e ne leggo il nome
-      While GetMachPrivateProfileString(TableIndex, K_NAME, "", TableName)
-         ' leggo tutti i parametri della table
-         While MachParamIniFile.GetMachPrivateProfileParam(TableIndex, ParamIndex, NewMachParam, TableName, bTs3DataLoaded)
-            MachParamList.Add(NewMachParam)
-            ParamIndex += 1
-         End While
-         MachTableList.Add(New MachTable(TableName, MachParamList))
-         ' aggiorno indici e resetto lista per lettura dell'eventuale table successiva
-         TableIndex += 1
-         ParamIndex = 1
-         MachParamList = New ObservableCollection(Of MachParam)
-      End While
-      ' Cancello tavola globale
-      EgtLuaResetGlobVar("GTSD")
+      'MachTableList.Clear()
+      'Dim NewMachParam As MachParam = Nothing
+      'Dim MachParamList As New ObservableCollection(Of MachParam)
+      'Dim TableIndex = 1
+      'Dim ParamIndex As Integer = 1
+      'Dim TableName As String = String.Empty
+      '' verifico che ci sia una table con l'indice designato e ne leggo il nome
+      'While GetMachPrivateProfileString(TableIndex, K_NAME, "", TableName)
+      '   ' leggo tutti i parametri della table
+      '   While MachParamIniFile.GetMachPrivateProfileParam(TableIndex, ParamIndex, NewMachParam)
+      '      MachParamList.Add(NewMachParam)
+      '      ParamIndex += 1
+      '   End While
+      '   MachTableList.Add(New MachTable(TableName, MachParamList))
+      '   ' aggiorno indici e resetto lista per lettura dell'eventuale table successiva
+      '   TableIndex += 1
+      '   ParamIndex = 1
+      '   MachParamList = New ObservableCollection(Of MachParam)
+      'End While
    End Sub
 
    Public Function MachMsg(Paragraph As MsgParagraphs, nId As Integer) As String

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -159,11 +159,8 @@
       <Setter Property="Width" Value="80"/>
    </Style>
    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="25"/>
-      <Setter Property="Width" Value="25"/>
-      <Setter Property="Margin" Value="5,0,0,0"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="Height" Value="60"/>
+      <Setter Property="Width" Value="60"/>
    </Style>
    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
@@ -271,8 +268,8 @@
       <Setter Property="Background" Value="{StaticResource Omag_White}"/>
       <Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
       <Setter Property="TextBlock.FontWeight" Value="Normal"/>
-      <!--<Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="90"/>-->
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="90"/>
       <Style.Triggers>
          <Trigger Property="IsChecked" Value="true">
             <Setter Property="TextBlock.FontWeight" Value="ExtraBold"/>
@@ -356,12 +353,6 @@
       <Setter Property="Margin" Value="2.5,0,2.5,0"/>
    </Style>
 
-   <Style x:Key="MachParamTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Left"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Margin" Value="5,0,5,0"/>
-   </Style>
-   
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
@@ -757,38 +748,4 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-   <!-- TabControl that have only Headers and no Pages -->
-
-   <Style x:Key="TabControl_OnlyHeaders"  TargetType="{x:Type TabControl}">
-      <Setter Property="OverridesDefaultStyle" Value="True" />
-      <Setter Property="SnapsToDevicePixels" Value="True" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabControl}">
-               <Grid KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="*"/>
-                  </Grid.RowDefinitions>
-                  <TabPanel Name="HeaderPanel"
-                            Grid.Row="0"
-                            Panel.ZIndex="1" 
-                            Margin="0,0,4,-1" 
-                            IsItemsHost="True"
-                            KeyboardNavigation.TabIndex="1"
-                            Background="Transparent" />
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-
 </ResourceDictionary>

EgtBEAMWALL.Supervisor/Utility/MachParamIniFile.vb

@@ -1,70 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Friend Module MachParamIniFile
-
-   Public Function GetMachPrivateProfileParam(IpParentTable As Integer, IpMachParamIndex As String, ByRef IpMachParam As MachParam, TableName As String, bTs3dataLoaded As Boolean) As Boolean
-      Dim sMachParam As String = String.Empty
-      If EgtUILib.GetPrivateProfileString(IpParentTable, IpMachParamIndex, String.Empty, sMachParam, sMachParamIniFile) > 0 Then
-         Dim sMachParamParams() As String = sMachParam.Split(","c)
-         ' verifico numero minimo di parametri
-         If sMachParamParams.Count >= 4 Then
-            ' cancello spazi
-            For Index = 0 To sMachParamParams.Count - 1
-               sMachParamParams(Index) = sMachParamParams(Index).Trim()
-            Next
-            ' creo parametro
-            If sMachParamParams(0) = "d" OrElse sMachParamParams(0) = "l" Then
-               Dim dDefault As Double
-               StringToDoubleAdv(sMachParamParams(2), dDefault)
-               Dim ParamType As MachParamType
-               If sMachParamParams(0) = "d" Then
-                  ParamType = MachParamType.DOUBLE_
-               Else
-                  ParamType = MachParamType.LENGTH
-               End If
-               If bTs3dataLoaded Then
-                  Dim dTs3DataValue As Double
-                  If EgtLuaGetGlobNumVar(TableName & "." & sMachParamParams(1), dTs3DataValue) Then
-                     dDefault = dTs3DataValue
-                  End If
-               End If
-               IpMachParam = New MachParam(IpParentTable, IpMachParamIndex, ParamType, sMachParamParams(1), dDefault, sMachParamParams(3))
-               Return Not IsNothing(IpMachParam)
-            ElseIf sMachParamParams(0) = "s" Then
-               IpMachParam = New MachParam(IpParentTable, IpMachParamIndex, MachParamType.STRING_, sMachParamParams(1), sMachParamParams(3))
-               Return Not IsNothing(IpMachParam)
-            End If
-         End If
-      End If
-      Return False
-   End Function
-
-   Public Function GetMachPrivateProfileString(IpAppName As String, IpKeyName As String, IpDefault As String, ByRef IpString As String) As Integer
-      Return EgtUILib.GetPrivateProfileString(IpAppName, IpKeyName, IpDefault, IpString, sMachParamIniFile)
-   End Function
-
-   Public Function GetMachPrivateProfileParamValue(IpParentTable As Integer, IpMachParamIndex As String, ByRef IpMachParamValue As String) As Boolean
-      Dim sMachParam As String = String.Empty
-      If EgtUILib.GetPrivateProfileString(IpParentTable, IpMachParamIndex, String.Empty, sMachParam, sMachParamIniFile) > 0 Then
-         Dim sMachParamParams() As String = sMachParam.Split(","c)
-         ' verifico numero minimo di parametri
-         If sMachParamParams.Count >= 4 Then
-            ' cancello spazi
-            For Index = 0 To sMachParamParams.Count - 1
-               sMachParamParams(Index) = sMachParamParams(Index).Trim()
-            Next
-            'restituisco il valore del parametro
-            IpMachParamValue = sMachParamParams(2)
-            Return Not IsNothing(IpMachParamValue)
-         End If
-      End If
-      Return False
-   End Function
-
-   Public Function WriteMachPrivateProfileString(IpAppName As String, IpKeyName As String, ByRef IpString As String) As Boolean
-      Return EgtUILib.WritePrivateProfileString(IpAppName, IpKeyName, IpString, sMachParamIniFile)
-   End Function
-
-End Module

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -221,6 +221,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/App.config

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
-      
+      <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
       <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    </configSections>
    <entityFramework>
       <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
       <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
-      
+      <providers>
+         <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
+         </provider>
+      </providers>
    </entityFramework>
    <connectionStrings>
       <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
@@ -46,10 +49,6 @@
             <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
             <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
          </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-         </dependentAssembly>
       </assemblyBinding>
    </runtime>
    <system.data>

EgtBEAMWALL.ViewerOptimizer/BTLDataWnd/BTLDataWndV.xaml

@@ -14,146 +14,146 @@
                             Name="BTLDataWndV">
 
    <UniformGrid Margin="5"
-                Columns="6" Rows="7">
+                 Columns="6" Rows="7">
 
       <TextBlock Text="{Binding PROJNUM_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNUM, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJNAME, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJPART_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJPART, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding PROJGUID_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPROJGUID, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding LISTNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLISTNAME, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding CUSTOMER_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCUSTOMER, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding ARCHITECT_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sARCHITECT, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EDITOR_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEDITOR, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding DELIVDATE_MSG}"
               Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDELIVDATE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPDATE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPDATE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPTIME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPTIME, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPRELEASE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPRELEASE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding LANGUAGE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sLANGUAGE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding RANGE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                              Path=Tag.ocRANGE,
-                              Mode=OneWay}"
-                SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                                Path=Tag.SelRANGE,
-                                Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Grid.Column="1"
-                Style="{StaticResource BtlData_ComboBox}"/>
+                                        Path=Tag.ocRANGE,
+                                        Mode=OneWay}"
+              SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
+                                        Path=Tag.SelRANGE,
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          Grid.Column="1"
+                          Style="{StaticResource BtlData_ComboBox}"/>
       <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                              Path=Tag.ocPROCESSINGQUALITY,
-                              Mode=OneWay}"
-                SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                                Path=Tag.SelPROCESSINGQUALITY,
-                                Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Grid.Column="1"
-                Style="{StaticResource BtlData_ComboBox}"/>
+                                        Path=Tag.ocPROCESSINGQUALITY,
+                                        Mode=OneWay}"
+              SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
+                                        Path=Tag.SelPROCESSINGQUALITY,
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          Grid.Column="1"
+                          Style="{StaticResource BtlData_ComboBox}"/>
       <TextBlock Text="{Binding COMPUTERNAME_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMPUTERNAME, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding USER_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSER, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding SRCFILE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSRCFILE, UpdateSourceTrigger=Explicit,
-                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding EXPFILE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sEXPFILE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
       <TextBlock Text="{Binding RECESS_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                              Path=Tag.ocRECESS,
-                              Mode=OneWay}"
-                SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
-                                Path=Tag.SelRECESS,
-                                Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                Grid.Column="1"
-                Style="{StaticResource BtlData_ComboBox}"/>
+                                        Path=Tag.ocRECESS,
+                                        Mode=OneWay}"
+              SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}},
+                                        Path=Tag.SelRECESS,
+                                        Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          Grid.Column="1"
+                          Style="{StaticResource BtlData_ComboBox}"/>
       <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
-                 Style="{StaticResource PartParam_TextBlock}"/>
+              Style="{StaticResource PartParam_TextBlock}"/>
       <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sUSERATTRIBUTE, UpdateSourceTrigger=Explicit,
-                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
-                             Grid.Column="1"
-                             Style="{StaticResource PartParam_TextBox}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLDataWndV}}}"
+                          Grid.Column="1"
+                          Style="{StaticResource PartParam_TextBox}"/>
 
    </UniformGrid>
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerV.xaml

@@ -1,79 +0,0 @@
-<StackPanel x:Class="BTLPartManagerV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Orientation="Horizontal"
-            HorizontalAlignment="Right"
-            DataContext="{StaticResource BTLPartManagerVM}">
-   
-   <Button Command="{Binding NewRawPart_Command}"
-           Visibility="{Binding MachiningPage_Visibility}"
-           ToolTip="{Binding NewRawPart_ToolTip}"
-           IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding NewRawPartLast_Command}"
-           Visibility="{Binding MachiningPage_Visibility}"
-           ToolTip="{Binding NewRawPartLast_ToolTip}"
-           IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/NewRawPartAuto.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding AddToRawPart_Command}"
-           Visibility="{Binding MachiningPage_Visibility}"
-           ToolTip="{Binding AddToRawPart_ToolTip}"
-           IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding CopyPart_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding CopyPart_ToolTip}"
-           IsEnabled="{Binding CopyPart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding AddPart_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding AddPart_ToolTip}"
-           IsEnabled="{Binding BTLPartManager_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding RemovePart_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding RemovePart_ToolTip}"
-           IsEnabled="{Binding RemovePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/RemovePart.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding Invert_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding InvertSx_ToolTip}"
-           IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/PartManager/LeftInvert.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding Invert_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding InvertDx_ToolTip}"
-           IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding BackRotation_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding BackRotation_ToolTip}"
-           IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/PartManager/LeftRotate.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding ForwardRotation_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding ForwardRotation_ToolTip}"
-           IsEnabled="{Binding RotatePart_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
-   </Button>
-
-</StackPanel>

EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerV.xaml.vb

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

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()
@@ -126,9 +192,9 @@ Public Class BTLFeatureVM
                ' setto feature da ricalcolare
                ResetCalcFeature()
                ' se in View
-               If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+               If Map.refMainMenuVM.SelPage = Pages.VIEW Then
                   ' imposto modificato per copie
-                  MyMachGroupPanelM.SetDuploModified(m_BTLPartM.nPartId)
+                  EgtDuploSetModified(m_BTLPartM.nPartId)
                End If
             End If
          End If
@@ -163,10 +229,9 @@ Public Class BTLFeatureVM
                ' setto feature da ricalcolare
                ResetCalcFeature()
                ' se in View
-               If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(m_BTLPartM)) Then
+               If Map.refMainMenuVM.SelPage = Pages.VIEW Then
                   ' imposto modificato per copie
-                  Dim cc = Map.refMachGroupPanelVM.MachGroupVMList
-                  MyMachGroupPanelM.SetDuploModified(m_BTLPartM.nPartId)
+                  EgtDuploSetModified(m_BTLPartM.nPartId)
                End If
                NotifyPropertyChanged(NameOf(bDO))
                ' aggiorno messaggio su context menu
@@ -187,7 +252,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
 
@@ -210,9 +279,7 @@ Public Class BTLFeatureVM
          m_SelPBTLParam = value
          If Not IsNothing(m_SelPBTLParam) Then
             ' imposto path disegno da mostrare in BottomPanel
-            If Not IsNothing(Map.refBottomPanelVM) Then
-               Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
-            End If
+            Map.refBottomPanelVM.SetCurrDraw(m_SelPBTLParam.sDrawPath)
          End If
          NotifyPropertyChanged(NameOf(SelPBTLParam))
       End Set
@@ -235,7 +302,7 @@ Public Class BTLFeatureVM
       End Get
       Set(value As BTLParamVM)
          m_SelQParam = value
-         If Not IsNothing(m_SelQParam) AndAlso Not IsNothing(Map.refBottomPanelVM) Then
+         If Not IsNothing(m_SelQParam) Then
             ' imposto path disegno da mostrare in BottomPanel
             Map.refBottomPanelVM.SetCurrDraw(m_SelQParam.sDrawPath)
          End If
@@ -330,7 +397,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)
@@ -357,6 +424,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))
@@ -406,28 +499,6 @@ Public Class BTLFeatureVM
       Return Nothing
    End Function
 
-   Public Overrides Sub RefreshFeature()
-      ' leggo gruppo, numero feature, lato e priorità
-      EgtGetInfo(nFeatureId, BTL_FTR_GRP, m_BTLFeatureM.nSelGRP)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRC, m_BTLFeatureM.nPRC)
-      EgtGetInfo(nFeatureId, BTL_FTR_SIDE, m_BTLFeatureM.nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, m_BTLFeatureM.nPriority)
-      Dim nDO As Integer = 1
-      If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
-         m_BTLFeatureM.bDO = (nDO <> 0)
-      Else
-         m_BTLFeatureM.bDO = True
-      End If
-      NotifyPropertyChanged(NameOf(bDO))
-      ' leggo des,prid e frame
-      EgtGetInfo(nFeatureId, BTL_FTR_DES, m_BTLFeatureM.sDES)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRID, m_BTLFeatureM.nPRID)
-      EgtGetInfo(nFeatureId, BTL_FTR_FRAME, m_BTLFeatureM.frFRAME)
-
-      ' aggiorno parametri della feature
-
-   End Sub
-
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -444,7 +515,7 @@ Public Class BTLFeatureVM
    End Property
 
    Public Sub DeleteFeature()
-      If Map.refMainMenuVM.SelPage = Pages.VIEW Then Map.refFeatureListManagerVM.RemoveFeature()
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then Map.refLeftPanelVM.RemoveFeature()
    End Sub
 
 #End Region ' DeleteFeature

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -213,11 +213,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

@@ -5,6 +5,7 @@ Imports EgtBEAMWALL.Core
 Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports System.Windows.Threading
+Imports System.Security.Cryptography
 
 Public Class BTLPartVM
    Inherits VMBase
@@ -19,21 +20,21 @@ Public Class BTLPartVM
    End Property
    Private m_BTLStructureM As BTLStructureM
 
-   'Private m_IsSelected As Boolean
-   'Public Property IsSelected As Boolean
-   '   Get
-   '      Return m_IsSelected
-   '   End Get
-   '   Set(value As Boolean)
-   '      m_IsSelected = value
-   '      Map.refProjectVM.BTLStructureVM.UpdateSelBTLParts()
-   '   End Set
-   'End Property
-   'Friend Sub SetIsSelected(value As Boolean, Optional bByOptim As Boolean = False)
-   '   m_IsSelected = value
-   '   Map.refProjectVM.BTLStructureVM.UpdateSelBTLParts(False, bByOptim)
-   '   NotifyPropertyChanged(NameOf(IsSelected))
-   'End Sub
+   Private m_IsSelected As Boolean
+   Public Property IsSelected As Boolean
+      Get
+         Return m_IsSelected
+      End Get
+      Set(value As Boolean)
+         m_IsSelected = value
+         Map.refProjectVM.BTLStructureVM.UpdateSelBTLParts()
+      End Set
+   End Property
+   Friend Sub SetIsSelected(value As Boolean, Optional bByOptim As Boolean = False)
+      m_IsSelected = value
+      Map.refProjectVM.BTLStructureVM.UpdateSelBTLParts(False, bByOptim)
+      NotifyPropertyChanged(NameOf(IsSelected))
+   End Sub
 
    Public ReadOnly Property nPartId As Integer
       Get
@@ -96,13 +97,8 @@ Public Class BTLPartVM
                      If nMachgroupId = GDB_ID.NULL Then
                         EgtOutLog("Trovato Duplo Ghost")
                      Else
-                        Dim MachGroupModel = Nothing
-                        If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjManagerVM) Then
-                           MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProj.nProdId, nMachgroupId)
-                        ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
-                           MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refOnlyProdManagerVM.CurrProj.nProdId, nMachgroupId)
-                        End If
-                        If Not IsNothing(MachGroupModel) AndAlso MachGroupModel.State > ItemState.ND Then
+                        Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
+                        If MachGroupModel.State > ItemState.ND Then
                            bDuploInProduction = True
                            Exit For
                         End If
@@ -117,7 +113,6 @@ Public Class BTLPartVM
                ' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
                If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
                   MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
-                  If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then DeleteDuplo_OnlyProdPage(DuploList)
                Else
                   ' reimposto vecchio valore
                   Return False
@@ -133,7 +128,7 @@ Public Class BTLPartVM
       If Not EgtBeamSetPartBox(dBtlL, dBtlH, dBtlW, False) Then Return False
 
       ' imposto modificato per copie
-      MyMachGroupPanelM.SetDuploModified(m_BTLPartM.nPartId)
+      EgtDuploSetModified(m_BTLPartM.nPartId)
       ' ricalcolo tutte le feature contenute
       UpdateFeatures()
       ' setto part da ricalcolare
@@ -150,34 +145,6 @@ Public Class BTLPartVM
       Return True
    End Function
 
-   Private Sub DeleteDuplo_OnlyProdPage(DuploList As List(Of Integer))
-      For Each nDuploId In DuploList
-         ' recupero grezzo cui appartiene
-         Dim nRawPartId As Integer = MyMachGroupPanelM.DuploGetRawPart(nDuploId)
-         ' recupero gruppo di lavorazione 
-         Dim nMachGroupId As Integer = EgtGetParent(EgtGetParent(nRawPartId))
-         ' lo setto come corrente
-         EgtSetCurrMachGroup(nMachGroupId)
-         ' elimino pezzo copia
-         EgtRemovePartFromRawPart(nDuploId)
-         EgtErase(nDuploId)
-         '' recupero gruppo di lavorazione e trave dell'interfaccia
-         Dim BeamMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
-         If Not IsNothing(BeamMachGroup) Then
-            Dim Beam As PartVM = BeamMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
-            EgtSetCurrMachGroup(BeamMachGroup.Id)
-            Beam.DeletePart()
-         End If
-         ' reset necessario per poter ottenere nMachGroupId corretto
-         EgtResetCurrMachGroup()
-         ' aggiorno dati utilizzo barra
-         BeamMachGroup.UpdateUsage()
-      Next
-      ' aggiorno quantita' in prod
-      Dim BTLPart As BTLPartVM = CALCPanelVM.GetBTLPartVMFromBTLPartId(m_BTLPartM.nPartId)
-      BTLPart.RefreshPartInProd()
-   End Sub
-
    Private Function GetOrigFrameGroup(nPartId As Integer) As Integer
       Dim nCOP As Integer = GDB_ID.NULL
       Dim nBAS As Integer = GDB_ID.NULL
@@ -1555,15 +1522,13 @@ Public Class BTLPartVM
       End Get
       Set(value As BTLFeatureVM)
          m_SelBTLFeatureVM = value
-         If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART) Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW Then
             If Not IsNothing(m_SelBTLFeatureVM) Then
                DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).SelGeomFeature()
-               If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-                  ' imposto path disegno da mostrare in BottomPanel
-                  Map.refBottomPanelVM.SetCurrDraw(DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).sDrawPath)
-                  ' seleziono pagina BottomPanel
-                  Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.FEATURE)
-               End If
+               ' imposto path disegno da mostrare in BottomPanel
+               Map.refBottomPanelVM.SetCurrDraw(DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).sDrawPath)
+               ' seleziono pagina BottomPanel
+               Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.FEATURE)
                ' deseleziono i parametri
                If Not IsNothing(SelBTLFeatureVM.SelPBTLParam) Then SelBTLFeatureVM.SelPBTLParam = Nothing
                ' rinfresco bottoni freecontour
@@ -1571,18 +1536,30 @@ Public Class BTLPartVM
                ' aggiorno stato abilitazione del bottone modifica free contour
                Map.refFeatureManagerVM.SetEditIsEnabled()
                Map.refFeatureManagerVM.NotifyPropertyChanged(NameOf(Map.refFeatureManagerVM.Priority_Visibility))
-            Else
-               EgtDeselectAll()
+               ' 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()
             End If
-            'Map.refLeftPanelVM.FeatureSelectionChanged()
-            If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
-         End If
-         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-            EgtResetCurrMachGroup()
-            ResetSearchFound()
-         End If
-         EgtDraw()
-         NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+            EgtDraw()
+            NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
       End Set
    End Property
 
@@ -1593,27 +1570,6 @@ Public Class BTLPartVM
       End Get
    End Property
 
-   Private m_bSearchFound As Boolean
-   Public ReadOnly Property bSearchFound As Boolean
-      Get
-         Return m_bSearchFound
-      End Get
-   End Property
-   Friend Sub SetSearchFound()
-      m_bSearchFound = True
-      NotifyPropertyChanged(NameOf(Search_Background))
-   End Sub
-   Friend Sub ResetSearchFound()
-      m_bSearchFound = False
-      NotifyPropertyChanged(NameOf(Search_Background))
-   End Sub
-
-   Public ReadOnly Property Search_Background As SolidColorBrush
-      Get
-         Return If(m_bSearchFound AndAlso Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Brushes.Purple, Brushes.Transparent)
-      End Get
-   End Property
-
    ' Definizione comandi
    Private m_cmdInvert As ICommand
    Private m_cmdBackRotation As ICommand
@@ -1786,8 +1742,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
@@ -1830,11 +1792,7 @@ Public Class BTLPartVM
       Dim nNewPartId As Integer = EgtBeamCreatePart()
       If nNewPartId = GDB_ID.NULL Then Return Nothing
       ' scrivo info proj
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjManagerVM) Then
-         EgtSetInfo(nNewPartId, BTL_PRT_PROJ, ProjectManagerVM.CurrProj.nProjId)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
-         EgtSetInfo(nNewPartId, BTL_PRT_PROJ, Map.refOnlyProdManagerVM.CurrProd.nProdId)
-      End If
+      EgtSetInfo(nNewPartId, BTL_PRT_PROJ, Map.refProjManagerVM.CurrProj.nProjId)
       EgtBeamSetPartProdNbr(m_BTLStructureM.NewPDN())
       EgtBeamSetPartName(m_BTLPartM.sNAM)
       EgtBeamSetPartCount(m_BTLPartM.nCNT)
@@ -2131,7 +2089,7 @@ Public Class BTLPartVM
       ' eseguo rotazione di 90 gradi 
       If EgtRotate(nPartId, b3Solid.Center, vtAxes, 90, GDB_RT.GLOB) Then
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
       ' aggiorno visualizzazione dimensioni
       NotifyPropertyChanged(NameOf(sW))
@@ -2233,7 +2191,7 @@ Public Class BTLPartVM
             CalcGlobalUpdate(True)
             ' imposto path disegno da mostrare in BottomPanel
             Dim SelPBTLParam As BTLParamVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
-            If Not IsNothing(Map.refBottomPanelVM) AndAlso Not IsNothing(SelPBTLParam) Then Map.refBottomPanelVM.SetCurrDraw(SelPBTLParam.sDrawPath)
+            If Not IsNothing(SelPBTLParam) Then Map.refBottomPanelVM.SetCurrDraw(SelPBTLParam.sDrawPath)
          Case NameOf(sender.bDO), NameOf(sender.sPriority)
             NotifyPropertyChanged(NameOf(bDOALL))
             ' setto pezzo da ricalcolare

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -66,44 +66,21 @@ Public Class BTLStructureVM
       End Get
    End Property
    Friend Sub SetSelectionType(value As SelectionTypes)
-      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-         ' resetto gruppo di lavorazione corrente
-         EgtResetCurrMachGroup()
-      End If
-      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ' rimuovo selezione da pezzo in MachGroup
-         If Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup) Then
-            If Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart) Then
-               Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart = Nothing
-            End If
-         End If
-      End If
       m_PrevSelectionType = m_SelectionType
-      If value = m_SelectionType And (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Or Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST) Then Return
+      If value = m_SelectionType Then Return
       m_SelectionType = value
       Select Case m_SelectionType
          Case SelectionTypes.SELECT_
-            ' imposto modalita' proj su vista feature
-            'Map.refProjectVM.SelProdProj = ProdProj.PROJ
-            If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
-            ' rendo enable bottone parameters
-            Map.refLeftPanelVM.SetParametersIsEnabled(True)
             ' verifico reset mark su tutti i pezzi
             For Each BTLPart In m_BTLPartVMList
                EgtResetMark(BTLPart.nPartId)
             Next
             ' mostro barra di gestione pezzo
-            'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
          Case SelectionTypes.HIGHLIGHT
-            ' imposto modalita' nulla su vista feature
-            'Map.refProjectVM.SelProdProj = ProdProj.NULL
-            If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
-            ' rendo disable bottone parameters
-            Map.refLeftPanelVM.SetParametersIsEnabled(False)
             If m_PrevSelectionType = SelectionTypes.SELECT_ Then
-               EgtBeamShowFacesName(False)
-               EgtBeamShowLoadingSide(False, False)
+               EgtBeamShowFacesName( False)
+               EgtBeamShowLoadingSide( False, False)
             End If
             If Not IsNothing(m_SelBTLPart) Then
                m_SelBTLPart = Nothing
@@ -112,21 +89,15 @@ Public Class BTLStructureVM
             ' mostro pezzi selezionati
             Map.refProjectVM.BTLStructureVM.ShowAll(False)
             ' se attivata opzione, li assemblo
-            Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
+            Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
             ' nascondo barra di gestione pezzo
-            'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+            Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
       End Select
       ' aggiornamento grafica
-      'Map.refLeftPanelVM.PartShowAllChanged()
-      Configuration.UpdateGraphics()
-      'If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
-      'If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
-      'Map.refLeftPanelVM.FeatureSelectionChanged()
-      If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
+      Map.refLeftPanelVM.PartShowAllChanged()
+      Map.refLeftPanelVM.FeatureSelectionChanged()
       Map.refCALCPanelVM.SetIsEnabledForSelPart()
-      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
    End Sub
 
    Private m_SelBTLParts As New PartsObservableCollection(Of BTLPartVM)
@@ -142,52 +113,44 @@ Public Class BTLStructureVM
          Return m_SelBTLPartsCnt
       End Get
    End Property
-
-   'Friend Sub UpdateSelBTLParts(Optional bFromSelPart As Boolean = False, Optional bByOptim As Boolean = False)
-   '   Dim nOldSelCount As Integer = m_SelBTLPartsCnt
-   '   Dim nSelCount As Integer = BTLPartVMList.LongCount(Function(x) x.IsSelected)
-   '   m_SelBTLPartsCnt = nSelCount
-   '   If Not bByOptim AndAlso (nOldSelCount <> nSelCount AndAlso (nOldSelCount = 1 OrElse nSelCount = 1)) OrElse bFromSelPart Then
-   '      'Map.refLeftPanelVM.PartShowAllChanged()
-   '      If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
-   '      If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
-   '      Map.refFeatureListManagerVM.FeatureSelectionChanged()
-   '      'Map.refLeftPanelVM.FeatureSelectionChanged()
-   '      Map.refCALCPanelVM.SetIsEnabledForSelPart()
-   '      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-   '   End If
-   '   If nSelCount = 1 Then
-   '      If bByOptim Then
-   '         m_SelBTLPart = BTLPartVMList.FirstOrDefault(Function(x) x.IsSelected)
-   '      Else
-   '         SelBTLPart = BTLPartVMList.FirstOrDefault(Function(x) x.IsSelected)
-   '      End If
-   '   Else
-   '      If bByOptim Then
-   '         m_SelBTLPart = Nothing
-   '      Else
-   '         SelBTLPart = Nothing
-   '         ' mostro in parte bassa dati BTL
-   '         Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STRUCTURE_)
-   '         ' mostro pezzi selezionati
-   '         Map.refProjectVM.BTLStructureVM.ShowAll(False, True)
-   '         Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
-   '         EgtZoom(ZM.ALL)
-   '      End If
-   '      NotifyPropertyChanged(NameOf(SelBTLPart))
-   '   End If
-   'End Sub
+   Friend Sub UpdateSelBTLParts(Optional bFromSelPart As Boolean = False, Optional bByOptim As Boolean = False)
+      Dim nOldSelCount As Integer = m_SelBTLPartsCnt
+      Dim nSelCount As Integer = BTLPartVMList.LongCount(Function(x) x.IsSelected)
+      m_SelBTLPartsCnt = nSelCount
+      If Not bByOptim AndAlso (nOldSelCount <> nSelCount AndAlso (nOldSelCount = 1 OrElse nSelCount = 1)) OrElse bFromSelPart Then
+         Map.refLeftPanelVM.PartShowAllChanged()
+         Map.refLeftPanelVM.FeatureSelectionChanged()
+         Map.refCALCPanelVM.SetIsEnabledForSelPart()
+         Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+      End If
+      If nSelCount = 1 Then
+         If bByOptim Then
+            m_SelBTLPart = BTLPartVMList.FirstOrDefault(Function(x) x.IsSelected)
+         Else
+            SelBTLPart = BTLPartVMList.FirstOrDefault(Function(x) x.IsSelected)
+         End If
+      Else
+         If bByOptim Then
+            m_SelBTLPart = Nothing
+         Else
+            SelBTLPart = Nothing
+            ' mostro in parte bassa dati BTL
+            Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.STRUCTURE_)
+            ' mostro pezzi selezionati
+            Map.refProjectVM.BTLStructureVM.ShowAll(False, True)
+            Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
+            EgtZoom(ZM.ALL)
+         End If
+         NotifyPropertyChanged(NameOf(SelBTLPart))
+      End If
+   End Sub
 
    Private Sub SelBTLParts_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
       If m_bOnlySelectItem Then Return
       Select Case e.Action
          Case NotifyCollectionChangedAction.Add
-            If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-               ' resetto gruppo di lavorazione corrente
-               EgtResetCurrMachGroup()
-            End If
             If e.NewItems.Count > 0 AndAlso Not IsNothing(e.NewItems(0)) Then
-               If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+               If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                   SelectBTLPart(e.NewItems(0))
                Else     ' SelectionTypes.HIGHLIGHT
                   HighlightBTLPart(e.NewItems(0))
@@ -195,14 +158,14 @@ Public Class BTLStructureVM
             End If
          Case NotifyCollectionChangedAction.Remove
             If e.OldItems.Count > 0 AndAlso Not IsNothing(e.OldItems(0)) Then
-               If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+               If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                   DeselectBTLPart(e.OldItems(0))
                Else     ' SelectionTypes.HIGHLIGHT
                   DeHighlightBTLPart(e.OldItems(0))
                End If
             End If
          Case NotifyCollectionChangedAction.Reset
-            If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+            If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                If Not IsNothing(m_SelBTLPart) Then
                   DeselectBTLPart(m_SelBTLPart)
                End If
@@ -215,35 +178,28 @@ Public Class BTLStructureVM
             SelBTLPart = Nothing
       End Select
       ' aggiornamento grafica
-      'Map.refLeftPanelVM.PartShowAllChanged()
-      Configuration.UpdateGraphics()
-      'If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
-      'If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
+      Map.refLeftPanelVM.PartShowAllChanged()
    End Sub
 
    Private Sub SelectBTLPart(BtlPart As BTLPartVM)
+      EgtBeamShowFacesName( False)
+      EgtBeamShowLoadingSide( False, False)
       m_SelBTLPart = BtlPart
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-         Configuration.SelectedPieces(BtlPart.nPartId, Me)
-         'EgtBeamShowFacesName(False)
-         'EgtBeamShowLoadingSide(False, False)
-         'Map.refProjectVM.MacroFeature_IsEnabled = True
-         '' se modalità building, la tolgo
-         'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         '   ShowBuilding(False, False)
-         'End If
-         '' seleziono pezzo nella scena
-         'SceneSelPartSelection()
-         '' seleziono pezzo in Db geometrico
-         'EgtBeamSetPart(BtlPart.nPartId)
-         'EgtBeamShowFacesName(True)
-         'Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
-         'Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
-         'EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
-         ' seleziono pagina BottomPanel
-         If Not IsNothing(Map.refBottomPanelVM) Then
-            Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
+         ' se modalità building, la tolgo
+         If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
+            ShowBuilding(False, False)
          End If
+         ' seleziono pezzo nella scena
+         SceneSelPartSelection()
+         ' seleziono pezzo in Db geometrico
+         EgtBeamSetPart(BtlPart.nPartId)
+         EgtBeamShowFacesName( True)
+         Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
+         Dim bLeftToRight As Boolean = Not ( CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
+         EgtBeamShowLoadingSide( bLoadingSideShow, bLeftToRight)
+         ' seleziono pagina BottomPanel
+         Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
          '' mostro barra di gestione pezzo
          'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
          ' deseleziono le feature
@@ -255,121 +211,48 @@ Public Class BTLStructureVM
       ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
          ' resetto gruppo di lavorazione corrente
          EgtResetCurrMachGroup()
-         EgtBeamShowFacesName(False)
-         EgtBeamShowLoadingSide(False, False)
          ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-         Configuration.SetSearchPiece(BtlPart.nPartId)
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
+         If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+            Dim MachGroupList As New List(Of MyMachGroupVM)
+            For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
+               Dim bFound As Boolean = False
+               For Each Part As PartVM In Machgroup.PartVMList
+                  If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
+                     Part.SetSearchFound()
+                     bFound = True
+                  Else
+                     Part.ResetSearchFound()
+                  End If
+               Next
+               If bFound Then
+                  Machgroup.SetSearchFound()
+               Else
+                  Machgroup.ResetSearchFound()
+               End If
+            Next
+         End If
          ' seleziono pezzo nella scena
          SceneSelPartSelection()
          Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
          EgtZoom(ZM.ALL)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ' deseleziono eventuale MachGroup selezionato
-         If Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
-            Map.refMachGroupPanelVM.SelectedMachGroup = Nothing
-         End If
-         If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-            ' resetto gruppo di lavorazione corrente
-            EgtResetCurrMachGroup()
-         End If
-         Configuration.SelectedPieces(BtlPart.nPartId, Me)
-         'EgtBeamShowFacesName(False)
-         'EgtBeamShowLoadingSide(False, False)
-         'Map.refProjectVM.MacroFeature_IsEnabled = True
-         '' se modalità building, la tolgo
-         'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         '   ShowBuilding(False, False)
-         'End If
-         '' seleziono pezzo nella scena
-         'SceneSelPartSelection()
-         '' seleziono pezzo in Db geometrico
-         'EgtBeamSetPart(BtlPart.nPartId)
-         'EgtBeamShowFacesName(True)
-         'Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
-         'Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
-         'EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
-         ' seleziono la prima feature
-         If Not IsNothing(BtlPart.BTLFeatureVMList) AndAlso BtlPart.BTLFeatureVMList.Count > 0 Then SelBTLPart.SelBTLFeatureVM = BtlPart.BTLFeatureVMList(0)
-         ' aggiorno stato selezionato tutto
-         Map.refShowBeamPanelVM.bShowAll = False
-         '' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
-         Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-         EgtZoom(ZM.ALL)
       End If
       NotifyPropertyChanged(NameOf(SelBTLPart))
    End Sub
    Private Sub DeselectBTLPart(BtlPart As BTLPartVM)
       ' se necessario tolgo solido dal precedentemente selezionato
-      Configuration.DeselectSolid(BtlPart.nPartId, True)
-      'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-      '   ' tolgo eventuale indicazione solido rimasta da pezzo precedente
-      '   Map.refShowBeamPanelVM.SetShowSolid(False)
-      '   Map.refProjectVM.BTLStructureVM.ShowSolid(BtlPart.nPartId, False, False)
-      'End If
+      If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
+         ' tolgo eventuale indicazione solido rimasta da pezzo precedente
+         Map.refShowBeamPanelVM.SetShowSolid(False)
+         Map.refProjectVM.BTLStructureVM.ShowSolid(BtlPart.nPartId, False, False)
+      End If
       If m_SelBTLPart Is BtlPart Then
-         EgtBeamShowFacesName(False)
-         EgtBeamShowLoadingSide(False, False)
+         EgtBeamShowFacesName( False)
+         EgtBeamShowLoadingSide( False, False)
          m_SelBTLPart = Nothing
          NotifyPropertyChanged(NameOf(SelBTLPart))
       End If
       ' disabilito eventuale feature selezionata 
       If Not IsNothing(BtlPart.m_SelBTLFeatureVM) Then BtlPart.SelBTLFeatureVM = Nothing
-      '' deevidenzio MachGroup e Duplo di questo pezzo
-      'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-      '   Dim MachGroupList As New List(Of MyMachGroupVM)
-      '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-      '      Dim bFound As Boolean = False
-      '      For Each Part As PartVM In Machgroup.PartVMList
-      '         Dim i = EgtDuploGetOriginal(Part.nPartId)
-      '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-      '            Part.ResetSearchFound()
-      '            bFound = True
-      '         End If
-      '      Next
-      '      If bFound Then
-      '         Machgroup.ResetSearchFound()
-      '      End If
-      '   Next
-      'End If
-      EgtResetCurrMachGroup()
       EgtDraw()
    End Sub
    Private Sub HighlightBTLPart(BtlPart As BTLPartVM)
@@ -388,38 +271,15 @@ Public Class BTLStructureVM
             nNextPartId = EgtGetNext(nNextPartId)
          End While
       End If
-      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-         Configuration.SetSearchPiece(BtlPart.nPartId)
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
-      End If
       ' seleziono pagina BottomPanel
-      If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
+      Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
       EgtDraw()
    End Sub
    Private Sub DeHighlightBTLPart(BtlPart As BTLPartVM, Optional bDraw As Boolean = True)
       EgtResetMark(BtlPart.nPartId)
       ' se modalità building
       If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         ' deevidenzio anche copie
+         ' evidenzio anche copie
          Dim nNextPartId As Integer = EgtGetNext(BtlPart.nPartId)
          While nNextPartId <> GDB_ID.NULL
             Dim nOrigId As Integer = GDB_ID.NULL
@@ -431,34 +291,16 @@ Public Class BTLStructureVM
             nNextPartId = EgtGetNext(nNextPartId)
          End While
       End If
-      ' deevidenzio MachGroup e Duplo di questo pezzo
-      Configuration.ResetSearchPiece(BtlPart.nPartId)
-      'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-      '   Dim MachGroupList As New List(Of MyMachGroupVM)
-      '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-      '      Dim bFound As Boolean = False
-      '      For Each Part As PartVM In Machgroup.PartVMList
-      '         Dim i = EgtDuploGetOriginal(Part.nPartId)
-      '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-      '            Part.ResetSearchFound()
-      '            bFound = True
-      '         End If
-      '      Next
-      '      If bFound Then
-      '         Machgroup.ResetSearchFound()
-      '      End If
-      '   Next
-      'End If
       ' seleziono pagina BottomPanel
       'Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
       If bDraw Then EgtDraw()
    End Sub
 
-   'Friend ReadOnly Property SelBTLPartList As List(Of BTLPartVM)
-   '   Get
-   '      Return m_BTLPartVMList.Where(Function(x) x.IsSelected).ToList()
-   '   End Get
-   'End Property
+   Friend ReadOnly Property SelBTLPartList As List(Of BTLPartVM)
+      Get
+         Return m_BTLPartVMList.Where(Function(x) x.IsSelected).ToList()
+      End Get
+   End Property
 
    Private m_SelBTLPart As BTLPartVM = Nothing
    Public Property SelBTLPart As BTLPartVM
@@ -466,17 +308,11 @@ Public Class BTLStructureVM
          Return m_SelBTLPart
       End Get
       Set(value As BTLPartVM)
-         If Map.refMainMenuVM.SelPage = Pages.MACHINING Or (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) AndAlso
-            Not IsNothing(value) Then
-            ' resetto gruppo di lavorazione corrente
-            EgtResetCurrMachGroup()
-         End If
          If Not IsNothing(m_SelBTLPart) Then
             ' se necessario tolgo solido dal precedentemente selezionato
-            Configuration.DeselectSolid()
-            'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-            '   Map.refShowBeamPanelVM.SetShowSolid(False)
-            'End If
+            If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
+               Map.refShowBeamPanelVM.SetShowSolid(False)
+            End If
             ' disabilito eventuale feature selezionata 
             If Not IsNothing(m_SelBTLPart.m_SelBTLFeatureVM) Then m_SelBTLPart.SelBTLFeatureVM = Nothing
          End If
@@ -495,8 +331,7 @@ Public Class BTLStructureVM
                ' seleziono pagina BottomPanel
                Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
                ' mostro barra di gestione pezzo
-               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
                ' deseleziono le feature
                If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
                ' aggiorno stato selezionato tutto
@@ -504,70 +339,30 @@ Public Class BTLStructureVM
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
             ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+               ' resetto gruppo di lavorazione corrente
+               EgtResetCurrMachGroup()
                ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-               Configuration.SetSearchPiece(m_SelBTLPart.nPartId)
-               'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               '   Dim MachGroupList As New List(Of MyMachGroupVM)
-               '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-               '      Dim bFound As Boolean = False
-               '      For Each Part As PartVM In Machgroup.PartVMList
-               '         If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
-               '            Part.SetSearchFound()
-               '            bFound = True
-               '         Else
-               '            Part.ResetSearchFound()
-               '         End If
-               '      Next
-               '      If bFound Then
-               '         Machgroup.SetSearchFound()
-               '      Else
-               '         Machgroup.ResetSearchFound()
-               '      End If
-               '   Next
-               'End If
-               ' seleziono pezzo nella scena
-               SceneSelPartSelection()
-               Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-               EgtZoom(ZM.ALL)
-            ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-               ' se modalità building, la tolgo
-               If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-                  ShowBuilding(False, False)
+               If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+                  Dim MachGroupList As New List(Of MyMachGroupVM)
+                  For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
+                     Dim bFound As Boolean = False
+                     For Each Part As PartVM In Machgroup.PartVMList
+                        If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
+                           Part.SetSearchFound()
+                           bFound = True
+                        Else
+                           Part.ResetSearchFound()
+                        End If
+                     Next
+                     If bFound Then
+                        Machgroup.SetSearchFound()
+                     Else
+                        Machgroup.ResetSearchFound()
+                     End If
+                  Next
                End If
                ' seleziono pezzo nella scena
                SceneSelPartSelection()
-               ' seleziono pezzo in Db geometrico
-               EgtBeamSetPart(m_SelBTLPart.nPartId)
-               ' seleziono pagina BottomPanel
-               Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
-               ' mostro barra di gestione pezzo
-               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
-               ' deseleziono le feature
-               If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
-               ' aggiorno stato selezionato tutto
-               Map.refShowBeamPanelVM.bShowAll = False
-               ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-               Configuration.ResetSearchPiece(m_SelBTLPart.nPartId)
-               'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               '   Dim MachGroupList As New List(Of MyMachGroupVM)
-               '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-               '      Dim bFound As Boolean = False
-               '      For Each Part As PartVM In Machgroup.PartVMList
-               '         If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
-               '            Part.SetSearchFound()
-               '            bFound = True
-               '         Else
-               '            Part.ResetSearchFound()
-               '         End If
-               '      Next
-               '      If bFound Then
-               '         Machgroup.SetSearchFound()
-               '      Else
-               '         Machgroup.ResetSearchFound()
-               '      End If
-               '   Next
-               'End If
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
             End If
@@ -823,8 +618,6 @@ Public Class BTLStructureVM
                Return Map.refProjManagerVM.nProjType
             Case Pages.MACHINING
                Return Map.refProdManagerVM.nProdType
-            Case Pages.ONLYPRODPAGE
-               Return Map.refOnlyProdManagerVM.nProdType
             Case Else
                Return BWType.NULL
          End Select
@@ -845,7 +638,7 @@ Public Class BTLStructureVM
       End Get
       Set(value As String)
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_LISTNAME, value) Then
-            DbControllers.m_ProjController.UpdateListName(ProjectManagerVM.CurrProj.nProjId, value)
+            DbControllers.m_ProjController.UpdateListName(Map.refProjManagerVM.CurrProj.nProjId, value)
             m_BTLStructureM.m_sLISTNAME = value
          Else
             NotifyPropertyChanged("sLISTNAME")
@@ -1228,7 +1021,7 @@ Public Class BTLStructureVM
       Next
    End Sub
 
-   Friend Sub SceneSelPartSelection()
+   Private Sub SceneSelPartSelection()
       ' deseleziono tutto
       EgtDeselectAll()
       ' disabilito impostazione modificato
@@ -1251,10 +1044,9 @@ Public Class BTLStructureVM
       Dim DisableMgr As New DisableModifiedMgr
       If Not IsNothing(SelBTLPart) Then
          ' se pezzo solido, lo riporto normale
-         Configuration.DeselectSolid()
-         'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-         '   Map.refShowBeamPanelVM.SetShowSolid(False)
-         'End If
+         If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
+            Map.refShowBeamPanelVM.SetShowSolid(False)
+         End If
          ' tolgo pezzo selezionato
          SelBTLPart.SelBTLFeatureVM = Nothing
       End If
@@ -1267,8 +1059,7 @@ Public Class BTLStructureVM
       Dim nGeomPartId As Integer = EgtGetFirstPart()
       While nGeomPartId <> GDB_ID.NULL
          Dim CurrPart As BTLPartVM = BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nGeomPartId)
-         ' If Not IsNothing(CurrPart) AndAlso (Not bOnlySelected OrElse (bOnlySelected AndAlso CurrPart.IsSelected)) Then
-         If Not IsNothing(CurrPart) AndAlso Not bOnlySelected Then
+         If Not IsNothing(CurrPart) AndAlso (Not bOnlySelected OrElse (bOnlySelected AndAlso CurrPart.IsSelected)) Then
             Dim nMode As Integer
             EgtGetMode(CurrPart.nPartId, nMode)
             If nMode <> GDB_MD.STD Then
@@ -1292,11 +1083,10 @@ Public Class BTLStructureVM
       Dim DisableMgr As New DisableModifiedMgr
       If Not IsNothing(SelBTLPart) Then
          ' se pezzo solido, lo riporto normale
-         Configuration.DeselectSolid(GDB_ID.NULL, True)
-         'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-         '   ShowSolid(GDB_ID.NULL, False, False)
-         '   Map.refShowBeamPanelVM.SetShowSolid(False)
-         'End If
+         If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
+            ShowSolid(GDB_ID.NULL, False, False)
+            Map.refShowBeamPanelVM.SetShowSolid(False)
+         End If
          ' tolgo pezzo selezionato
          SelBTLPart.SelBTLFeatureVM = Nothing
       End If
@@ -1435,7 +1225,7 @@ Public Class BTLStructureVM
          bSearchTextOk = False
       End If
       Dim bResult As Boolean = bSectionOk AndAlso bGroupOk AndAlso bSubGroupOk AndAlso bSearchTextOk
-      '  If Not bResult And CurrBTLPart.IsSelected Then CurrBTLPart.IsSelected = False
+      If Not bResult And CurrBTLPart.IsSelected Then CurrBTLPart.IsSelected = False
       Return bResult
    End Function
 
@@ -1539,7 +1329,7 @@ Public Class BTLStructureVM
    End Property
 
    Public Sub DeletePart()
-      If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refBTLPartManagerVM.RemovePartCmd()
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then Map.refLeftPanelVM.RemovePartCmd()
    End Sub
 
 #End Region ' DeletePart

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -2,6 +2,7 @@
                             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.ViewerOptimizer" 
                             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                             Title="{Binding Title}"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,6 +1,4 @@
-Imports EgtBEAMWALL.Core
-
-Public Class BeamMachiningsWindowV
+Public Class BeamMachiningsWindowV
 
    Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
 

EgtBEAMWALL.ViewerOptimizer/BlockedWnd/BlockedWndVM.vb

@@ -100,7 +100,7 @@ Public Class BlockedWndVM
          NotifyPropertyChanged(NameOf(Buttons_Visibility))
          NotifyPropertyChanged(NameOf(Msg_Text))
          ' mando messaggio di blocco avvenuto
-         DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
+         DbControllers.m_StatusMapController.UpdateAction("", Map.refProdManagerVM.CurrProd.nProdId, Map.refProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
          'ElseIf m_nIndex > 17 Then
          '   'If m_Waiting_Timer.IsEnabled Then m_Waiting_Timer.Stop()
          '   If Not SupervisorCommThread.bViewerOptimizerBlocked Then
@@ -136,7 +136,7 @@ Public Class BlockedWndVM
       ' salvo progetto
       Map.refProdManagerVM.Save()
       ' mando messaggio di blocco avvenuto
-      DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
+      DbControllers.m_StatusMapController.UpdateAction("", Map.refProdManagerVM.CurrProd.nProdId, Map.refProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
 #End Region    ' Save
@@ -160,7 +160,7 @@ Public Class BlockedWndVM
    ''' </summary>
    Public Sub DoNotSave()
       ' mando messaggio di blocco avvenuto
-      DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
+      DbControllers.m_StatusMapController.UpdateAction("", Map.refProdManagerVM.CurrProd.nProdId, Map.refProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
 #End Region    ' DoNotSave

EgtBEAMWALL.ViewerOptimizer/BottomPanel/BottomPanelV.xaml

@@ -33,8 +33,8 @@
                </Grid.RowDefinitions>
                <EgtWPFLib5:EgtScrollViewer Focusable="False">
                   <EgtBEAMWALL:PartParametersV DataContext="{StaticResource PartParametersVM}"
-                                               Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BottomPanelV}}}"
-                                               Margin="5"/>
+                                            Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BottomPanelV}}}"
+                                            Margin="5"/>
                </EgtWPFLib5:EgtScrollViewer>
                <TextBlock Grid.Row="1"
                           Text="{Binding Tag.SelBTLPart.sCALC_MSG, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BottomPanelV}}}"
@@ -99,7 +99,7 @@
                <Image Grid.Column="1"
                       Grid.Row="1"
                       Source="{Binding sCurrDraw}" 
-                      Margin="5"/>
+                               Margin="5"/>
                <!--</TabItem.Content>
                      </TabItem>
                   </TabControl>-->

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -4,7 +4,6 @@ Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
 Imports System.Collections.ObjectModel
 Imports System.Windows.Threading
-Imports System.Data.Entity.Core.Metadata.Edm
 
 Public Class CALCPanelVM
    Inherits VMBase
@@ -46,16 +45,6 @@ Public Class CALCPanelVM
       End Set
    End Property
 
-   Private m_VerifyAll_IsEnabled As Boolean = True
-   Public Property VerifyAll_IsEnabled As Boolean
-      Get
-         Return m_VerifyAll_IsEnabled
-      End Get
-      Set(value As Boolean)
-         m_VerifyAll_IsEnabled = value
-      End Set
-   End Property
-
    Private m_ChooseMachineBtn_Visibility As Boolean = True
    Public Property ChooseMachineBtn_Visibility As Visibility
       Get
@@ -218,25 +207,16 @@ Public Class CALCPanelVM
 
    Friend Sub SetCalcPanelIsEnabled(bIsEnabled As Boolean)
       m_CALCPanel_IsEnabled = bIsEnabled
-      m_VerifyAll_IsEnabled = bIsEnabled
       NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
-      NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
       NotifyPropertyChanged(NameOf(Verify_IsEnabled))
       NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
    Friend Sub SetIsEnabledForSelPart()
       NotifyPropertyChanged(NameOf(Verify_IsEnabled))
-      m_VerifyAll_IsEnabled = False
-      NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
       NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
-   Friend Sub SetVerifyIsEnabled(bIsEnabled As Boolean)
-      m_CALCPanel_IsEnabled = bIsEnabled
-      NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
-      NotifyPropertyChanged(NameOf(Verify_IsEnabled))
-   End Sub
 
    Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
       ProcessResults(e.m_Result)
@@ -269,9 +249,9 @@ Public Class CALCPanelVM
       If m_FromProduce <> ProduceType.NULL Then
          Select Case m_FromProduce
             Case ProduceType.PRODUCE
-               Map.refRawPartManagerVM.ProduceRawPart()
+               Map.refTopPanelVM.ProduceRawPart()
             Case ProduceType.PRODUCEALL
-               Map.refRawPartManagerVM.ProduceAllRawPart()
+               Map.refTopPanelVM.ProduceAllRawPart()
          End Select
          m_FromProduce = ProduceType.NULL
       End If
@@ -286,7 +266,7 @@ Public Class CALCPanelVM
          EgtGetCurrFilePath(sCurrFilePath)
          EgtOpenFile(sCurrFilePath)
          ' imposto duplo modificato
-         MyMachGroupPanelM.SetDuploModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
+         EgtDuploSetModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
          ' riseleziono il pezzo precedentemente selezionato
          Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.SelBTLPart)
          Map.refMyStatusBarVM.SetOutputMessage("Modified file reloaded", 1)
@@ -296,7 +276,7 @@ Public Class CALCPanelVM
    End Sub
 
    Friend Shared Sub ProcessResults(MachGroupId As MyMachGroupVM)
-      ProcessResults(ProjectManagerVM.CurrProd.sProdDirPath & "/" & MachGroupId.nName & ".txt", ProjectType.PROD, MachGroupId.Id)
+      ProcessResults(Map.refProdManagerVM.CurrProd.sProdDirPath & "/" & MachGroupId.nName & ".txt", ProjectType.PROD, MachGroupId.Id)
    End Sub
 
    Private Shared Sub ProcessResults(Bar As Bar)
@@ -375,7 +355,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
@@ -386,7 +366,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
@@ -407,15 +387,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
@@ -442,14 +422,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
@@ -594,15 +574,14 @@ Public Class CALCPanelVM
          Dim sMachineName As String = ""
          If Map.refMainMenuVM.SelPage = Pages.VIEW Then
             nProjType = Map.refProjManagerVM.nProjType
-            sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProj), ProjectManagerVM.CurrProj.sMachine, "")
+            sMachineName = If(Not IsNothing(Map.refProjManagerVM.CurrProj), Map.refProjManagerVM.CurrProj.sMachine, "")
          ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
             nProjType = Map.refProdManagerVM.nProdType
-            sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.CurrProd.sMachine, "")
+            sMachineName = If(Not IsNothing(Map.refProdManagerVM.CurrProd), Map.refProdManagerVM.CurrProd.sMachine, "")
          End If
          If nMachType = nProjType OrElse
-            (nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.VIEW And Not IsNothing(Map.refProjManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProj)) OrElse
-            (nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.MACHINING And Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd)) OrElse
-            (nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.CurrProd)) Then
+            (nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.VIEW And Not IsNothing(Map.refProjManagerVM.CurrProj)) OrElse
+            (nMachType = 3 And Map.refMainMenuVM.SelPage = Pages.MACHINING And Not IsNothing(Map.refProdManagerVM.CurrProd)) Then
             MachineList.Add(Machine)
             ' Se il nome Macchina coincide setto la macchina selezionata con la macchina associata al progetto
             If Machine.Name = sMachineName Then
@@ -666,40 +645,19 @@ Public Class CALCPanelVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Verify()
-      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(Map.refOnlyProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) OrElse
+         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(Map.refProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)))) Then Return
       Dim ProjType As BWType
-      Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-         ProjType = ProjectManagerVM.CurrProj.nType
-         If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
-         ' lancio calcolo
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-         ProjType = ProjectManagerVM.CurrProd.nType
-         If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
-         ' lancio calcolo
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
-         If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
-            If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
-            ' lancio calcolo
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-         ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-            If Not CreateBarToVerify(Pages.MACHINING, ProjType, BarList) Then Return
-            ' lancio calcolo
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refOnlyProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-         End If
+         ProjType = Map.refProjManagerVM.CurrProj.nType
+      Else
+         ProjType = Map.refProdManagerVM.CurrProd.nType
       End If
-   End Sub
-
-   Private Function CreateBarToVerify(SelPage As Pages, ProjType As BWType, ByRef BarList As Bar()) As Boolean
-      If SelPage = Pages.VIEW Then
+      Dim BarList() As EgtBEAMWALL.Core.Bar
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
             Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
-            If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return False
+            If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return
             Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
                                                       .nProgramPage = ProjectType.PROJ,
                                                       .nProjType = ProjType,
@@ -711,7 +669,7 @@ Public Class CALCPanelVM
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
                   If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nFeaturesGlobalState > CalcStates.INFO Then
-                     Dim sBTLPartFilePath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
+                     Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
                      If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
                   End If
                   Bar.nCmdType = CalcIntegration.CmdTypes.CHECKGEN
@@ -719,15 +677,18 @@ Public Class CALCPanelVM
             TempBarList(0) = Bar
             BarList = TempBarList
          Else
-            Return False
+            Return
          End If
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
-      ElseIf SelPage = Pages.MACHINING Then
+         ' lancio calcolo
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProjManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
+
+      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
          If Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
             Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
             ' se barra gia' assegnata a supervisore, esco
-            If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return False
+            If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
             Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
             Dim MachineName As String = ""
             EgtGetMachGroupMachineName(SelMachGroup.Id, MachineName)
@@ -742,7 +703,7 @@ Public Class CALCPanelVM
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
                   If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED OrElse (SelMachGroup.nPartsGlobalState > CalcStates.INFO) Then
-                     Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
+                     Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
                      If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   End If
                   Bar.nCmdType = CalcIntegration.CmdTypes.CHECKGEN
@@ -750,13 +711,14 @@ Public Class CALCPanelVM
             TempBarList(0) = Bar
             BarList = TempBarList
          Else
-            Return False
+            Return
          End If
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
+         ' lancio calcolo
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
       End If
-      Return True
-   End Function
+   End Sub
 
    ' funzione che gestisce risposta da thread di verifica, aggiorna progress e segnala comando di interruzione
    Private Sub ManageCalc(dProgress As Double, sProgress As String, ByRef bCancel As Boolean)
@@ -798,43 +760,21 @@ Public Class CALCPanelVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub VerifyAll()
-      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) OrElse
+         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(Map.refProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)))) Then Return
       ' se modalita' assemblato
-      Configuration.AssembledMode(Map.refShowBeamPanelVM.ShowBuilding_IsChecked)
-      'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
-      '   ' devo smontarlo prima di calcolare le travi, altrimenti non trova i pezzi
-      '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-      'End If
-      Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
+      If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         ' devo smontarlo prima di calcolare le travi, altrimenti non trova i pezzi
+         Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
+      End If
       Dim ProjType As BWType
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-         ProjType = ProjectManagerVM.CurrProj.nType
-         If Not CreateBarListToVerify(Pages.VIEW, ProjType, BarList) Then Return
-         ' lancio calcolo
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-         ProjType = ProjectManagerVM.CurrProd.nType
-         If Not CreateBarListToVerify(Pages.MACHINING, ProjType, BarList) Then Return
-         ' lancio calcolo
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ProjType = ProjectManagerVM.CurrProd.nType
-         If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART OrElse Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST Then
-            If Not CreateBarListToVerify(Pages.VIEW, ProjType, BarList) Then Return
-            ' lancio calcolo
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-         ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-            If Not CreateBarListToVerify(Pages.MACHINING, ProjType, BarList) Then Return
-            ' lancio calcolo
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-         End If
+         ProjType = Map.refProjManagerVM.CurrProj.nType
+      Else
+         ProjType = Map.refProdManagerVM.CurrProd.nType
       End If
-   End Sub
-
-   Private Function CreateBarListToVerify(SelPage As Pages, ProjType As BWType, ByRef BarList As Bar()) As Boolean
-      If SelPage = Pages.VIEW Then
+      Dim BarList() As EgtBEAMWALL.Core.Bar
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          Dim TempBarList As New List(Of EgtBEAMWALL.Core.Bar)
          For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
             Dim CurrPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex)
@@ -850,7 +790,7 @@ Public Class CALCPanelVM
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
                   If CurrPart.nGlobalState = CalcStates.NOTCALCULATED OrElse CurrPart.nFeaturesGlobalState > CalcStates.INFO Then
-                     Dim sBTLPartFilePath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
+                     Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
                      If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
                   End If
                   Bar.nCmdType = CalcIntegration.CmdTypes.CHECKGEN
@@ -860,7 +800,9 @@ Public Class CALCPanelVM
          BarList = TempBarList.ToArray()
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
-      ElseIf SelPage = Pages.MACHINING Then
+         ' lancio calcolo
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProjManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
+      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
          Dim TempBarList As New List(Of EgtBEAMWALL.Core.Bar)
          For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
             Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(PartIndex)
@@ -879,20 +821,21 @@ Public Class CALCPanelVM
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
                   If CurrMachGroup.nGlobalState = CalcStates.NOTCALCULATED OrElse (CurrMachGroup.nPartsGlobalState > CalcStates.INFO) Then
-                     Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe"
+                     Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe"
                      If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   End If
                   Bar.nCmdType = CalcIntegration.CmdTypes.CHECKGEN
             End Select
             TempBarList.Add(Bar)
          Next
-         If TempBarList.Count = 0 Then Return False
+         If TempBarList.Count = 0 Then Return
          BarList = TempBarList.ToArray()
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
+         ' lancio calcolo
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
       End If
-      Return True
-   End Function
+   End Sub
 
 #End Region ' VerifyAll
 
@@ -914,10 +857,9 @@ Public Class CALCPanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub ResetCalc()
-      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
-      If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART OrElse Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST)) Then
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) OrElse
+         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(Map.refProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)))) Then Return
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
             For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
                If Part.nGlobalState <> CalcStates.NOTCALCULATED Then
@@ -926,11 +868,11 @@ Public Class CALCPanelVM
                End If
             Next
          ElseIf Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1 Then
-            'For Each SelPart In Map.refProjectVM.BTLStructureVM.SelBTLPartList
-            '   If Not IsNothing(SelPart) AndAlso SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
-            '      SelPart.ResetCalcTotalPart()
-            '   End If
-            'Next
+            For Each SelPart In Map.refProjectVM.BTLStructureVM.SelBTLPartList
+               If Not IsNothing(SelPart) AndAlso SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
+                  SelPart.ResetCalcTotalPart()
+               End If
+            Next
          Else
             Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
             If IsNothing(SelPart) Then Return
@@ -938,7 +880,7 @@ Public Class CALCPanelVM
                SelPart.ResetCalcTotalPart()
             End If
          End If
-      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) Then
+      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
          If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
             For Each MachGroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
                If MachGroup.nProduction_State >= ItemState.Assigned Then Continue For
@@ -978,37 +920,16 @@ Public Class CALCPanelVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Simulate()
-      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) OrElse
-         (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) OrElse
+         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(Map.refProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)))) Then Return
       Dim ProjType As BWType
-      Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-         ProjType = ProjectManagerVM.CurrProj.nType
-         If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
-         ' lancio simulazione
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-         ProjType = ProjectManagerVM.CurrProd.nType
-         If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
-         ' lancio simulazione
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
-         If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
-            If Not CreateBarToSimulate(Pages.VIEW, ProjType, BarList) Then Return
-            ' lancio simulazione
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
-         ElseIf Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
-            If Not CreateBarToSimulate(Pages.MACHINING, ProjType, BarList) Then Return
-            ' lancio simulazione
-            EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
-         End If
+         ProjType = Map.refProjManagerVM.CurrProj.nType
+      Else
+         ProjType = Map.refProdManagerVM.CurrProd.nType
       End If
-   End Sub
-
-   Private Function CreateBarToSimulate(SelPage As Pages, ProjType As BWType, ByRef BarList As Bar()) As Boolean
-      If SelPage = Pages.VIEW Then
+      Dim BarList() As EgtBEAMWALL.Core.Bar
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
             Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
             Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
@@ -1019,17 +940,19 @@ Public Class CALCPanelVM
                                                      .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
                                                      .nGlobState = Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState}
             If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED Then
-               Dim sBTLPartFilePath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
+               Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
                If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
             End If
             TempBarList(0) = Bar
             BarList = TempBarList
          Else
-            Return False
+            Return
          End If
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
-      ElseIf SelPage = Pages.MACHINING Then
+         ' lancio simulazione
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProjManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
+      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
          If Not IsNothing(Map.refMachGroupPanelVM.SelectedMachGroup) Then
             Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
             Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
@@ -1043,19 +966,20 @@ Public Class CALCPanelVM
                                                      .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
                                                      .nGlobState = SelMachGroup.nGlobalState}
             If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
-               Dim sMachGroupFilePath As String = ProjectManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
+               Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
                If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
             End If
             TempBarList(0) = Bar
             BarList = TempBarList
          Else
-            Return False
+            Return
          End If
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
+         ' lancio simulazione
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProdManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
       End If
-      Return True
-   End Function
+   End Sub
 
 #End Region ' Simulate
 
@@ -1077,12 +1001,12 @@ Public Class CALCPanelVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Edit()
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) Then Return
+      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) Then Return
       Dim ProjType As BWType
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-         ProjType = ProjectManagerVM.CurrProj.nType
+         ProjType = Map.refProjManagerVM.CurrProj.nType
       Else
-         ProjType = ProjectManagerVM.CurrProd.nType
+         ProjType = Map.refProdManagerVM.CurrProd.nType
       End If
       Dim BarList() As EgtBEAMWALL.Core.Bar
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
@@ -1105,7 +1029,7 @@ Public Class CALCPanelVM
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)
          ' lancio edit
-         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
+         EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refProjManagerVM.CurrProj.sProjDirPath, AddressOf ManageCalc)
       End If
    End Sub
 
@@ -1130,7 +1054,7 @@ Public Class CALCPanelVM
    ''' </summary>
    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 Then
+      If Map.refProjManagerVM.CurrProj.nProdId > 0 Then
          MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       Else
          SetChooseMachine_Visibility(True)
@@ -1162,7 +1086,7 @@ Public Class CALCPanelVM
       m_IsMachineApplied = True
       SetChooseMachine_Visibility(False)
       ' resetto i parametri errori integration ciclando su ogni Part e per ogni Part ogni Feature
-      Dim ProjId = ProjectManagerVM.CurrProj.nProjId
+      Dim ProjId = Map.refProjManagerVM.CurrProj.nProjId
       Dim TempList As New List(Of BTLPartM)
       Dim nPartId As Integer = EgtGetFirstPart()
       While nPartId <> GDB_ID.NULL

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CalcPanelV.xaml

@@ -18,7 +18,7 @@
            ToolTip="{Binding VerifyAll_ToolTip}"
            Style="{StaticResource ToolBar_Button}"
            Command="{Binding VerifyAll_Command}"
-           IsEnabled="{Binding VerifyAll_IsEnabled}">
+           IsEnabled="{Binding CALCPanel_IsEnabled}">
       <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ResetCalc_Command}"

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

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,99 +1,294 @@
-<DockPanel x:Class="ConfigurationPageV"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+<DockPanel x:Class="ConfigurationPageV"
+                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                                xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
 
    <Grid>
       <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="10*"/>
+         <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
          <RowDefinition Height="6*"/>
+         <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
       <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
-                  SelectedIndex="{Binding SelConfigSubPage}">
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
+                    SelectedIndex="{Binding SelConfigSubPage}">
+         <TabItem Header="General">
             <TabItem.Content>
-               <EgtBEAMWALLCORE:General_ConfigurationPageV/>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
+                     <GroupBox Header="{Binding CurrentLanguage_Msg}"
+                      Margin="0,0,0,5">
+                        <UniformGrid Rows="2" Margin="3,3,3,3">
+                           <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
+                            DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
+                            Margin="0,0,0,5"/>
+                           <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
+                  TextAlignment="Center"/>
+                        </UniformGrid>
+                     </GroupBox>
+                     <UniformGrid Columns="2"
+                         Margin="0,0,0,5">
+                        <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
+                        <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
+                                 SelectedIndex="{Binding SelMeasureUnit}" Height="25"
+                                 Margin="0,5,0,0"/>
+                     </UniformGrid>
+                     <GroupBox Header="{Binding Nesting_Msg}"
+                      Margin="0,0,0,5">
+                        <StackPanel>
+                           <UniformGrid Columns="2"
+                         Margin="0,0,0,5">
+                              <TextBlock Text="{Binding SectionTime_Msg}"
+                          Grid.Row="0" Grid.Column="0"/>
+                              <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
+                                      Grid.Row="0" Grid.Column="1"/>
+                           </UniformGrid>
+                           <UniformGrid Columns="2"
+                         Margin="0,0,0,5">
+                              <TextBlock Text="{Binding PartTime_Msg}"
+                          Grid.Row="1" Grid.Column="0"/>
+                              <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
+                                      Grid.Row="1" Grid.Column="1"/>
+                           </UniformGrid>
+                        </StackPanel>
+                     </GroupBox>
+                     <UniformGrid Columns="2"
+                         Margin="0,0,0,5">
+                        <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
+                        <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
+                                 Margin="0,5,0,0"/>
+                     </UniformGrid>
+                     <GroupBox Header="Backup And Restore">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                           </Grid.RowDefinitions>
+                           <Grid Grid.Row="0"
+                                 Margin="0,2,0,5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <CheckBox x:Name="ExternalBackup_CheckBox"
+                                        IsChecked="{Binding bExternalBackupActive}"
+                                        VerticalAlignment="Center"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="External file path:"
+                                         VerticalAlignment="Center"/>
+                           </Grid>
+                           <Grid Grid.Row="1"
+                                 Margin="0,2,0,5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBox Text="{Binding ExternalBackupFolderPath}"
+                                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
+                                       Margin="0,0,2.5,0"/>
+                              <Button Grid.Column="1"
+                                      Content="..."
+                                      Width="18"
+                                      Command="{Binding ChooseExternalBackupFolderPath_Command}"
+                                      IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
+                                      Margin="2.5,0,0,0"/>
+                           </Grid>
+                           <Grid Grid.Row="2">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBlock Text="Reminder Frequency"/>
+                              <ComboBox Grid.Column="1"
+                                        ItemsSource="{Binding ReminderList}"
+                                        SelectedItem="{Binding SelReminder}"/>
+                           </Grid>
+                           <StackPanel Grid.Row="3"
+                                       Orientation="Horizontal">
+                              <Button Content="Backup"
+                                      Command="{Binding Backup_Command}"
+                                      Style="{StaticResource ToolBar_TextButton}"/>
+                              <Button Content="Restore"
+                                      Command="{Binding Restore_Command}"
+                                      Style="{StaticResource ToolBar_TextButton}"/>
+                           </StackPanel>
+                        </Grid>
+                     </GroupBox>
+                  </StackPanel>
+               </Grid>
             </TabItem.Content>
          </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding ParameterQ_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding ParameterQ_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
+         <TabItem Header="Parametri Q">
             <TabItem.Content>
-               <EgtBEAMWALLCORE:QParameter_ConfigurationPageV/>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="2*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
+                                           ItemsSource="{Binding QBTLParamVMList}"
+                                           SelectedItem="{Binding SelQParam}"
+                                           Grid.Column="0"
+                                           Margin="5">
+                     <DataGrid.GroupStyle>
+                        <GroupStyle>
+                           <GroupStyle.Panel>
+                              <ItemsPanelTemplate>
+                                 <DataGridRowsPresenter/>
+                              </ItemsPanelTemplate>
+                           </GroupStyle.Panel>
+                           <GroupStyle.HeaderTemplate>
+                              <DataTemplate>
+                                 <StackPanel>
+                                    <TextBlock Text="{Binding Path=Name}"/>
+                                 </StackPanel>
+                              </DataTemplate>
+                           </GroupStyle.HeaderTemplate>
+                           <GroupStyle.ContainerStyle>
+                              <Style TargetType="{x:Type GroupItem}">
+                                 <Setter Property="Template">
+                                    <Setter.Value>
+                                       <ControlTemplate TargetType="{x:Type GroupItem}">
+                                          <Expander IsExpanded="True">
+                                             <Expander.Background>
+                                                <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
+                                             </Expander.Background>
+                                             <Expander.Header>
+                                                <StackPanel Orientation="Horizontal">
+                                                   <TextBlock Text="{Binding Path=Name}" />
+                                                </StackPanel>
+                                             </Expander.Header>
+                                             <ItemsPresenter />
+                                          </Expander>
+                                       </ControlTemplate>
+                                    </Setter.Value>
+                                 </Setter>
+                              </Style>
+                           </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                        <GroupStyle>
+                           <GroupStyle.ContainerStyle>
+                              <Style TargetType="{x:Type GroupItem}">
+                                 <Setter Property="Template">
+                                    <Setter.Value>
+                                       <ControlTemplate TargetType="{x:Type GroupItem}">
+                                          <Expander IsExpanded="True">
+                                             <Expander.Background>
+                                                <SolidColorBrush Color="LightGray"></SolidColorBrush>
+                                             </Expander.Background>
+                                             <Expander.Header>
+                                                <StackPanel Orientation="Horizontal">
+                                                   <TextBlock Text="{Binding Path=Name}" />
+                                                </StackPanel>
+                                             </Expander.Header>
+                                             <ItemsPresenter />
+                                          </Expander>
+                                       </ControlTemplate>
+                                    </Setter.Value>
+                                 </Setter>
+                              </Style>
+                           </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                     </DataGrid.GroupStyle>
+                  </EgtBEAMWALL:QParamListV>
+               </Grid>
             </TabItem.Content>
          </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding Machine_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
+         <TabItem Header="Macchina">
             <TabItem.Content>
-               <EgtBEAMWALLCORE:Machine_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding PDFEditor_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding PDFEditor_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="10*"/>
+                  </Grid.RowDefinitions>
 
-            <TabItem.Content>
-               <EgtBEAMWALL:PDFEditorV/>
+                  <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
+                     <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
+                        <EgtBEAMWALL:MachinePanelV  DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
+                     </GroupBox>
+                  </StackPanel>
+
+                  <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
+                     <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
+                        <ItemsControl.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
+                           </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                           <DataTemplate>
+                              <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
+                                 <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
+                                    <ItemsControl.ItemsPanel>
+                                       <ItemsPanelTemplate>
+                                          <WrapPanel Orientation="Vertical"/>
+                                       </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemTemplate>
+                                       <DataTemplate>
+                                          <Grid Margin="0,0,5,5">
+                                             <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="*" />
+                                             </Grid.ColumnDefinitions>
+                                             <TextBlock Text="{Binding sName}"
+                                                        TextWrapping="WrapWithOverflow"
+                                                        Width="100"
+                                                        Style="{StaticResource MachParamTextBlock}"/>
+                                             <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
+                                                                    Grid.Column="1"
+                                                                    Width="70"/>
+                                             <TextBlock Text="{Binding sDescription}"
+                                                        TextWrapping="WrapWithOverflow"
+                                                        Width="200"
+                                                        Style="{StaticResource MachParamTextBlock}"
+                                                        Grid.Column="2"/>
+                                          </Grid>
+                                       </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                 </ItemsControl>
+                              </GroupBox>
+                           </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                     </ItemsControl>
+                  </StackPanel>
+               </Grid>
             </TabItem.Content>
          </TabItem>
-
       </TabControl>
 
-      <!--<Button Command="{Binding SaveCommand}"
+      <Button Command="{Binding SaveCommand}"
                 ToolTip="{Binding SaveToolTip}"
                 Grid.Row="1" 
                 Grid.Column="1"
                 Style="{StaticResource OptionPanel_Button}">
          <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      </Button>-->
+      </Button>
 
    </Grid>
 </DockPanel>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -3,9 +3,14 @@ Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
-Imports System.Linq.Expressions
 Imports MS.Internal
+Imports Org.BouncyCastle.X509
 Imports Ionic.Zip
+Imports Org.BouncyCastle.Bcpg
+Imports Microsoft.VisualBasic.ApplicationServices
+Imports Renci.SshNet.Security
+Imports Google.Protobuf.WellKnownTypes
+Imports System.Globalization
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -14,7 +19,6 @@ Public Class ConfigurationPageVM
       GENERAL = 0
       QPARAMETERS = 1
       MACHINE = 2
-      PDFEDITOR = 3
    End Enum
 
    Private m_QParametersModified As Boolean = False
@@ -34,37 +38,13 @@ Public Class ConfigurationPageVM
       End Get
       Set(value As Integer)
          m_SelConfigSubPage = value
-         If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
-            m_bGeneral_Visibility = Visibility.Visible
-            m_bParameterQ_Visibility = Visibility.Collapsed
-            m_bMachine_Visibility = Visibility.Collapsed
-            m_bPDFEditor_Visibility = Visibility.Collapsed
-         ElseIf m_SelConfigSubPage = ConfigSubPages.QPARAMETERS Then
-            m_bParameterQ_Visibility = Visibility.Visible
-            m_bGeneral_Visibility = Visibility.Collapsed
-            m_bMachine_Visibility = Visibility.Collapsed
-            m_bPDFEditor_Visibility = Visibility.Collapsed
-         ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
-            m_bMachine_Visibility = Visibility.Visible
-            m_bGeneral_Visibility = Visibility.Collapsed
-            m_bParameterQ_Visibility = Visibility.Collapsed
-            m_bPDFEditor_Visibility = Visibility.Collapsed
-         ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
-            m_bPDFEditor_Visibility = Visibility.Visible
-            m_bMachine_Visibility = Visibility.Collapsed
-            m_bGeneral_Visibility = Visibility.Collapsed
-            m_bParameterQ_Visibility = Visibility.Collapsed
-         End If
-         NotifyPropertyChanged(NameOf(General_Visibility))
-         NotifyPropertyChanged(NameOf(ParameterQ_Visibility))
-         NotifyPropertyChanged(NameOf(Machine_Visibility))
-         NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
       End Set
    End Property
 
    ' flag modifica parametri Macchina
    Friend bModifyMachParam As Boolean
 
+
    Public ReadOnly Property MachinePanelVM As MachinePanelVM
       Get
          Return Map.refMachinePanelVM
@@ -240,50 +220,6 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   Private m_bGeneral_Visibility As Visibility = Visibility.Visible
-   Public Property General_Visibility As Visibility
-      Get
-         Return m_bGeneral_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bGeneral_Visibility = value
-         NotifyPropertyChanged(NameOf(General_Visibility))
-      End Set
-   End Property
-
-   Private m_bParameterQ_Visibility As Visibility = Visibility.Collapsed
-   Public Property ParameterQ_Visibility As Visibility
-      Get
-         Return m_bParameterQ_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bParameterQ_Visibility = value
-         NotifyPropertyChanged(NameOf(ParameterQ_Visibility))
-      End Set
-   End Property
-
-   Private m_bMachine_Visibility As Visibility = Visibility.Collapsed
-   Public Property Machine_Visibility As Visibility
-      Get
-         Return m_bMachine_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bMachine_Visibility = value
-         NotifyPropertyChanged(NameOf(Machine_Visibility))
-      End Set
-   End Property
-
-   Private m_bPDFEditor_Visibility As Visibility = Visibility.Collapsed
-   Public Property PDFEditor_Visibility As Visibility
-      Get
-         Return m_bPDFEditor_Visibility
-      End Get
-      Set(value As Visibility)
-         m_bPDFEditor_Visibility = value
-         NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
-      End Set
-   End Property
-
    ' Definizione comandi
    Private m_cmdSave As ICommand
    Private m_cmdChooseExternalBackupFolderPath As ICommand
@@ -291,6 +227,7 @@ Public Class ConfigurationPageVM
    Private m_cmdRestore As ICommand
 
 #Region "Messages"
+
    Public ReadOnly Property L_Msg As String
       Get
          Return EgtMsg(61803)
@@ -309,12 +246,6 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
-   Public ReadOnly Property PND_Msg As String
-      Get
-         Return EgtMsg(6180)
-      End Get
-   End Property
-
    Public ReadOnly Property Type_Msg As String
       Get
          Return EgtMsg(61850)
@@ -344,43 +275,36 @@ Public Class ConfigurationPageVM
          Return EgtMsg(61616)
       End Get
    End Property
-
    Public ReadOnly Property Max_Msg As String
       Get
          Return EgtMsg(61617)
       End Get
    End Property
-
    Public ReadOnly Property CurrentLanguage_Msg As String
       Get
          Return EgtMsg(6501)
       End Get
    End Property
-
    Public ReadOnly Property LanguageAdvert_Msg As String
       Get
          Return EgtMsg(6502)
       End Get
    End Property
-
    Public ReadOnly Property MMUnits_Msg As String
       Get
          Return EgtMsg(6540)
       End Get
    End Property
-
    Public ReadOnly Property Nesting_Msg As String
       Get
          Return EgtMsg(61829)
       End Get
    End Property
-
    Public ReadOnly Property SectionTime_Msg As String
       Get
          Return EgtMsg(61806)
       End Get
    End Property
-
    Public ReadOnly Property PartTime_Msg As String
       Get
          Return EgtMsg(61807)
@@ -435,30 +359,6 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
-   Public ReadOnly Property General_Msg As String
-      Get
-         Return EgtMsg(62535)
-      End Get
-   End Property
-
-   Public ReadOnly Property ParameterQ_Msg As String
-      Get
-         Return EgtMsg(62536)
-      End Get
-   End Property
-
-   Public ReadOnly Property Machine_Msg As String
-      Get
-         Return EgtMsg(62537)
-      End Get
-   End Property
-
-   Public ReadOnly Property PDFEditor_Msg As String
-      Get
-         Return EgtMsg(62538)
-      End Get
-   End Property
-
 #End Region    ' Messages
 
 #Region "Constructor"
@@ -1062,7 +962,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

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -1,118 +0,0 @@
-<Grid x:Class="General_ConfigurationPageV"
-      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">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"
-                          Grid.Row="0" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="0" Grid.Column="1"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding PartTime_Msg}"
-                          Grid.Row="1" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="1" Grid.Column="1"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Width="18"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"/>
-            </Grid>
-            <Grid Grid.Row="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding ReminderList}"
-                         SelectedItem="{Binding SelReminder}"/>
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/General_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -1,70 +0,0 @@
-<Grid x:Class="Machine_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="10*"/>
-   </Grid.RowDefinitions>
-
-   <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:MachinePanelV  DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Margin="0,0,5,5">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="100"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Grid.Column="1"
-                                                     Width="70"/>
-                              <TextBlock Text="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="200"
-                                         Style="{StaticResource MachParamTextBlock}"
-                                         Grid.Column="2"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/Machine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/QParameter_ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<Grid x:Class="QParameter_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="2*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
-                            ItemsSource="{Binding QBTLParamVMList}"
-                            SelectedItem="{Binding SelQParam}"
-                            Grid.Column="0"
-                            Margin="5">
-      <DataGrid.GroupStyle>
-         <GroupStyle>
-            <GroupStyle.Panel>
-               <ItemsPanelTemplate>
-                  <DataGridRowsPresenter/>
-               </ItemsPanelTemplate>
-            </GroupStyle.Panel>
-            <GroupStyle.HeaderTemplate>
-               <DataTemplate>
-                  <StackPanel>
-                     <TextBlock Text="{Binding Path=Name}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </GroupStyle.HeaderTemplate>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-         <GroupStyle>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-      </DataGrid.GroupStyle>
-   </EgtBEAMWALL:QParamListV>
-
-</Grid>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -1,4 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,31 +16,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 +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.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 +57,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>
@@ -137,6 +69,12 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
@@ -145,7 +83,55 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtWPFLib5.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>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    </Reference>
+    <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.CSharp" />
+    <Reference Include="MigraDoc.DocumentObjectModel-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.DocumentObjectModel-wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="MigraDoc.Rendering-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.Rendering-wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="MigraDoc.RtfRendering-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.RtfRendering-wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="PdfSharp-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp-wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="PdfSharp.Charting-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp.Charting-wpf.dll</HintPath>
+    </Reference>
+    <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="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.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -154,9 +140,24 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
+    <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.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.Security" />
+    <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.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -167,10 +168,16 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsFormsIntegration" />
+    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="Application.xaml">
@@ -180,10 +187,6 @@
     <Compile Include="AboutBoxWindow\AboutBoxV.xaml.vb">
       <DependentUpon>AboutBoxV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BTLPartManager\BTLPartManagerV.xaml.vb">
-      <DependentUpon>BTLPartManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BTLPartManager\BTLPartManagerVM.vb" />
     <Compile Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml.vb">
       <DependentUpon>ChangeMaterialWndV.xaml</DependentUpon>
     </Compile>
@@ -191,40 +194,6 @@
     <Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
     <Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
     <Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
-    <Compile Include="FeatureListManager\FeatureListManagerV.xaml.vb">
-      <DependentUpon>FeatureListManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="FeatureListManager\FeatureListManagerVM.vb" />
-    <Compile Include="MachinePanel\MachinePanelVM.vb" />
-    <Compile Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml.vb">
-      <DependentUpon>PartInRawPartManagerWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PdfViewer\PDFViewerVM.vb" />
-    <Compile Include="RawPartManager\RawPartManagerWndV.xaml.vb">
-      <DependentUpon>RawPartManagerWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="TabWnd\ProdWndV.xaml.vb">
-      <DependentUpon>ProdWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="TabWnd\ProjWndV.xaml.vb">
-      <DependentUpon>ProjWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\OnlyProdFeatureListV.xaml.vb">
-      <DependentUpon>OnlyProdFeatureListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\OnlyProdPParameterListV.xaml.vb">
-      <DependentUpon>OnlyProdPParameterListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\OnlyProdQParameterListV.xaml.vb">
-      <DependentUpon>OnlyProdQParameterListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="LeftPanel\OnlyProdLeftPanelV.xaml.vb">
-      <DependentUpon>OnlyProdLeftPanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OnlyProdManager\OnlyProdManagerV.vb">
-      <DependentUpon>OnlyProdManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OnlyProdManager\OnlyProdManagerVM.vb" />
     <Compile Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml.vb">
       <DependentUpon>MovePartInRawPartWndV.xaml</DependentUpon>
     </Compile>
@@ -242,6 +211,10 @@
       <DependentUpon>AddSectionXMaterialWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="AddSectionXMaterialWnd\AddSectionXMaterialWndVM.vb" />
+    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
+      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
     <Compile Include="BlockedWnd\BlockedWndV.xaml.vb">
       <DependentUpon>BlockedWndV.xaml</DependentUpon>
     </Compile>
@@ -286,37 +259,11 @@
     </Compile>
     <Compile Include="NestingRunningWnd\NestingRunningWndVM.vb" />
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="OnlyProdProject\OnlyProdProjectV.xaml.vb">
-      <DependentUpon>OnlyProdProjectV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OptimizePanel\OnlyProdOptimizePanelV.xaml.vb">
-      <DependentUpon>OnlyProdOptimizePanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PartInRawPartManager\PartInRawPartManagerV.xaml.vb">
-      <DependentUpon>PartInRawPartManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PartInRawPartManager\PartInRawPartManagerVM.vb" />
-    <Compile Include="PartParametersWnd\PartParametersWndV.xaml.vb">
-      <DependentUpon>PartParametersWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PartParametersWnd\PartParametersWndVM.vb" />
-    <Compile Include="ProdProjManager\ProdProjManagerV.xaml.vb">
-      <DependentUpon>ProdProjManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ProdProjManager\ProdProjManagerVM.vb" />
-    <Compile Include="ProjectManager\ProjectManagerVM.vb" />
-    <Compile Include="PdfViewer\PdfViewer.xaml.vb">
-      <DependentUpon>PdfViewer.xaml</DependentUpon>
-    </Compile>
     <Compile Include="ProjectTypeWnd\ProjectTypeWndV.xaml.vb">
       <DependentUpon>ProjectTypeWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectTypeWnd\ProjectTypeWndVM.vb" />
     <Compile Include="ProjectFileVM\ProdFileVM.vb" />
-    <Compile Include="RawPartManager\RawPartManagerV.xaml.vb">
-      <DependentUpon>RawPartManagerV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="RawPartManager\RawPartManagerVM.vb" />
     <Compile Include="SetUp\SetUpSupportClass.vb" />
     <Compile Include="SetUp\SetUpV.xaml.vb">
       <DependentUpon>SetUpV.xaml</DependentUpon>
@@ -330,19 +277,9 @@
       <DependentUpon>StatisticsTimePanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="StatisticsTimePanel\StatisticsTimePanelVM.vb" />
-    <Compile Include="StatisticsWnd\OptimizerStatisticsWndV.xaml.vb">
-      <DependentUpon>OptimizerStatisticsWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="StatisticsWnd\StatisticsWndV.xaml.vb">
-      <DependentUpon>StatisticsWndV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Statistics\OptimizerStatisticsV.xaml.vb">
       <DependentUpon>OptimizerStatisticsV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Statistics\PDFEditorV.xaml.vb">
-      <DependentUpon>PDFEditorV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Statistics\PDFEditorVM.vb" />
     <Compile Include="Statistics\PDFHelper.vb" />
     <Compile Include="Statistics\StatisticsV.xaml.vb">
       <DependentUpon>StatisticsV.xaml</DependentUpon>
@@ -351,7 +288,6 @@
     <Compile Include="Statistics\StatisticsUtility.vb" />
     <Compile Include="SupervisorCommThread\SupervisorComm.vb" />
     <Compile Include="SupervisorCommThread\SupervisorCommThread.vb" />
-    <Compile Include="TabWnd\ProjWndVM.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
     <Compile Include="UpdateBTLWnd\UpdateOrAppendWndVM.vb" />
@@ -362,13 +298,11 @@
     <Compile Include="UpdateBTLWnd\UpdateOrAppendWndV.xaml.vb">
       <DependentUpon>UpdateOrAppendWndV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Utility\Configuration.vb" />
     <Compile Include="Utility\DbControllers.vb" />
     <Compile Include="Utility\DisableModifiedMgr.vb" />
     <Compile Include="Utility\LuaExec.vb" />
     <Compile Include="Utility\PartsObservableCollection.vb" />
     <Compile Include="Utility\SectionXMaterialToBeAdded.vb" />
-    <Compile Include="Utility\Statistic_Messages.vb" />
     <Compile Include="Utility\TextBlockUtils.vb" />
     <Compile Include="Utility\TreeViewItemBase.vb" />
     <Compile Include="WarehouseWnd\WarehouseHelper.vb" />
@@ -409,6 +343,10 @@
       <DependentUpon>ConfigurationPageV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ConfigurationPage\ConfigurationPageVM.vb" />
+    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
+      <DependentUpon>MachinePanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MachinePanel\MachinePanelVM.vb" />
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogVM.vb" />
     <Compile Include="OptimizePanel\OptimizePanelV.xaml.vb">
       <DependentUpon>OptimizePanelV.xaml</DependentUpon>
@@ -465,78 +403,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="BTLPartManager\BTLPartManagerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="FeatureListManager\FeatureListManagerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="OnlyProdProject\OnlyProdProjectV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="OptimizePanel\OnlyProdOptimizePanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="PartInRawPartManager\PartInRawPartManagerV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PartParametersWnd\PartParametersWndV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="PdfViewer\PdfViewer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ProdProjManager\ProdProjManagerV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="RawPartManager\RawPartManagerWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TabWnd\ProdWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TabWnd\ProjWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ItemParamList\OnlyProdFeatureListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ItemParamList\OnlyProdPParameterListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ItemParamList\OnlyProdQParameterListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="LeftPanel\OnlyProdLeftPanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="OnlyProdManager\OnlyProdManagerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -561,6 +431,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="BlockedWnd\BlockedWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -601,38 +475,22 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="RawPartManager\RawPartManagerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SetUp\SetUpV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
     <Page Include="SpecialPanel\SpecialPanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
     <Page Include="StatisticsTimePanel\StatisticsTimePanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="StatisticsWnd\OptimizerStatisticsWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="StatisticsWnd\StatisticsWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Statistics\OptimizerStatisticsV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Statistics\PDFEditorV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Statistics\StatisticsV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -701,6 +559,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="MachinePanel\MachinePanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MacroFeatureWnd\MacroFeatureWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -855,6 +717,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
@@ -1073,56 +936,9 @@
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\AddProj.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\PDFEditor\MoveUp.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\PDFEditor\MoveDown.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\PDFEditor\PrintPDF.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\PDFEditor\Delete.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\OpenProjectFileDialog\Archived.png" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="BouncyCastle">
-      <Version>1.8.5</Version>
-    </PackageReference>
-    <PackageReference Include="DotNetZip">
-      <Version>1.16.0</Version>
-    </PackageReference>
-    <PackageReference Include="EntityFramework">
-      <Version>6.4.4</Version>
-    </PackageReference>
-    <PackageReference Include="Google.Protobuf">
-      <Version>3.21.9</Version>
-    </PackageReference>
-    <PackageReference Include="K4os.Compression.LZ4.Streams">
-      <Version>1.3.5</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.22621.2428</Version>
-    </PackageReference>
-    <PackageReference Include="MySql.Data.EntityFramework">
-      <Version>8.0.21</Version>
-    </PackageReference>
-    <PackageReference Include="NLog">
-      <Version>5.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="PDFsharp-MigraDoc-wpf">
-      <Version>1.50.5147</Version>
-    </PackageReference>
-    <PackageReference Include="Portable.BouncyCastle">
-      <Version>1.9.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.IO.Pipelines">
-      <Version>6.0.0</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
@@ -1130,4 +946,12 @@ IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPa
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR64.exe
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD64.exe</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/FeatureListManagerV.xaml

@@ -1,36 +0,0 @@
-<StackPanel x:Class="FeatureListManagerV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Orientation="Horizontal"
-            HorizontalAlignment="Right"
-            DataContext="{StaticResource FeatureListManagerVM}">
-
-   <Button Command="{Binding CopyFeature_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding CopyFeature_ToolTip}"
-           IsEnabled="{Binding CopyFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/CopyFeature.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding MacroFeature_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding MacroFeature_ToolTip}"
-           IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/MacroFeature.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding AddFeature_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding AddFeature_ToolTip}"
-           IsEnabled="{Binding AddFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/AddFeature.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding RemoveFeature_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
-           ToolTip="{Binding RemoveFeature_ToolTip}"
-           IsEnabled="{Binding RemoveFeature_IsEnabled}"
-           Style="{StaticResource LeftPanel_Button}">
-      <Image Source="/Resources/LeftPanel/RemoveFeature.png" Stretch="Uniform"/>
-   </Button>
-</StackPanel>

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/FeatureListManagerV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/FeatureListManagerVM.vb

@@ -1,316 +0,0 @@
-Imports EgtBEAMWALL.Core
-Imports EgtUILib.EgtInterface
-Imports EgtWPFLib5
-
-Public Class FeatureListManagerVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public ReadOnly Property ViewPage_Visibility As Visibility
-      Get
-         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property PartIsSelected As Boolean
-      Get
-         Return Not IsNothing(Map.refProjectVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart)
-      End Get
-   End Property
-
-   Public ReadOnly Property FeatureIsSelected As Boolean
-      Get
-         Return PartIsSelected AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM)
-      End Get
-   End Property
-
-
-   Public ReadOnly Property CopyFeature_IsEnabled As Boolean
-      Get
-         Return Map.refBTLPartManagerVM.BTLPartManager_IsEnabled AndAlso PartIsSelected AndAlso FeatureIsSelected
-      End Get
-   End Property
-
-   Public ReadOnly Property MacroFeature_IsEnabled As Boolean
-      Get
-         Return Map.refBTLPartManagerVM.BTLPartManager_IsEnabled AndAlso PartIsSelected AndAlso FeatureIsSelected
-      End Get
-   End Property
-
-   Public ReadOnly Property AddFeature_IsEnabled As Boolean
-      Get
-         Return Map.refBTLPartManagerVM.BTLPartManager_IsEnabled AndAlso PartIsSelected AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1
-      End Get
-   End Property
-
-   Public ReadOnly Property RemoveFeature_IsEnabled As Boolean
-      Get
-         Return Map.refBTLPartManagerVM.BTLPartManager_IsEnabled AndAlso PartIsSelected AndAlso FeatureIsSelected
-      End Get
-   End Property
-
-
-   Private m_cmdCopyFeature As ICommand
-   Private m_cmdMacroFeature As ICommand
-   Private m_cmdAddFeature As ICommand
-   Private m_cmdRemoveFeature As ICommand
-
-#End Region    ' Fields & Properties
-
-#Region "Messages"
-
-   Public ReadOnly Property CopyFeature_ToolTip As String
-      Get
-         Return EgtMsg(61908)
-      End Get
-   End Property
-
-   Public ReadOnly Property MacroFeature_ToolTip As String
-      Get
-         Return EgtMsg(61909)
-      End Get
-   End Property
-
-   Public ReadOnly Property AddFeature_ToolTip As String
-      Get
-         Return EgtMsg(61910)
-      End Get
-   End Property
-
-   Public ReadOnly Property RemoveFeature_ToolTip As String
-      Get
-         Return EgtMsg(61911)
-      End Get
-   End Property
-
-
-#End Region    ' Messages
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      Map.SetRefFeatureListManagerVM(Me)
-   End Sub
-
-#End Region    ' Constructor
-
-#Region "METHODS"
-
-   Friend Sub UpdateView()
-      NotifyPropertyChanged(NameOf(ViewPage_Visibility))
-   End Sub
-
-   Friend Sub SetLeftPanelIsEnabled(bIsEnabled As Boolean)
-      NotifyPropertyChanged(NameOf(CopyFeature_IsEnabled))
-      NotifyPropertyChanged(NameOf(AddFeature_IsEnabled))
-      NotifyPropertyChanged(NameOf(RemoveFeature_IsEnabled))
-      NotifyPropertyChanged(NameOf(MacroFeature_IsEnabled))
-   End Sub
-
-   Friend Sub PartShowAllChanged()
-      NotifyPropertyChanged(NameOf(AddFeature_IsEnabled))
-   End Sub
-
-
-   Friend Sub FeatureSelectionChanged()
-      NotifyPropertyChanged(NameOf(CopyFeature_IsEnabled))
-      NotifyPropertyChanged(NameOf(MacroFeature_IsEnabled))
-      NotifyPropertyChanged(NameOf(RemoveFeature_IsEnabled))
-   End Sub
-
-#End Region    ' Methods
-
-#Region "COMMANDS"
-
-#Region "CopyFeature"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property CopyFeature_Command As ICommand
-      Get
-         If m_cmdCopyFeature Is Nothing Then
-            m_cmdCopyFeature = New Command(AddressOf CopyFeature)
-         End If
-         Return m_cmdCopyFeature
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub CopyFeature()
-      If IsNothing(ProjectManagerVM.CurrProj) Then Return
-      Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
-      If IsNothing(SelPart) Then Return
-      Dim SelFeature As BTLFeatureVM = SelPart.SelBTLFeatureVM
-      If IsNothing(SelFeature) Then Return
-      ' creo copia
-      Dim NewFeature = SelFeature.Copy()
-      If Not IsNothing(NewFeature) Then
-         SelPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.FirstOrDefault(Function(x) x.BTLFeatureM Is NewFeature)
-         MyMachGroupPanelM.SetDuploModified(SelPart.nPartId)
-      End If
-      SelPart.ResetCalcPart()
-   End Sub
-
-#End Region    ' CopyFeature
-
-#Region "MacroFeature"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property MacroFeature_Command As ICommand
-      Get
-         If m_cmdMacroFeature Is Nothing Then
-            m_cmdMacroFeature = New Command(AddressOf MacroFeature)
-         End If
-         Return m_cmdMacroFeature
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub MacroFeature()
-      If IsNothing(ProjectManagerVM.CurrProj) Then Return
-      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
-      ' apro finestra di creazione macro
-      Dim MacroFeatureWndVM As New MacroFeatureWndVM()
-      Dim MacroFeatureWnd As New MacroFeatureWndV(Application.Current.MainWindow, MacroFeatureWndVM)
-      If MacroFeatureWnd.ShowDialog() Then
-
-      End If
-   End Sub
-
-#End Region    ' MacroFeature
-
-#Region "AddFeature"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property AddFeature_Command As ICommand
-      Get
-         If m_cmdAddFeature Is Nothing Then
-            m_cmdAddFeature = New Command(AddressOf AddFeature)
-         End If
-         Return m_cmdAddFeature
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub AddFeature(ByVal param As Object)
-      If IsNothing(ProjectManagerVM.CurrProj) Then Return
-      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
-      ' apro finestra di definizione nuova feature
-      Dim AddFeatureWndVM As New AddFeatureWndVM()
-      Dim AddFeatureWnd As New AddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
-      If AddFeatureWnd.ShowDialog() Then
-         Dim NewFeat As BTLFeatureM
-         Dim nNewFeatureId As Integer = 0
-         Dim bMacroFlag As Boolean = False
-         ' verifico se una Macro è selezionata
-         If AddFeatureWndVM.MacroList.Count > 0 AndAlso AddFeatureWndVM.nSelMacro >= 0 Then
-            ' Creo nuova feature sulla base della Macro selezionata
-            ' Creo table e setto variabili
-            EgtLuaCreateGlobTable("MACRO")
-            EgtLuaSetGlobNumVar("MACRO.L", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlL)
-            EgtLuaSetGlobNumVar("MACRO.W", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW)
-            EgtLuaSetGlobNumVar("MACRO.H", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH)
-            EgtLuaSetGlobIntVar("MACRO.PROCID", Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId())
-            Dim bOk = EgtLuaExecFile(AddFeatureWndVM.m_MacroFilePathList(AddFeatureWndVM.nSelMacro))
-            ' Leggo variabili
-            EgtLuaGetGlobIntVar("MACRO.FEATUREID", nNewFeatureId)
-            ' Reset lua
-            EgtLuaResetGlobVar("MACRO")
-            If Not bOk Then
-               MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
-               Return
-            End If
-            bMacroFlag = True
-         Else
-            ' Creo nuova feature (Macro non selezionata)
-            NewFeat = BTLFeatureM.CreateBTLFeature(AddFeatureWndVM.nSelPRC.nPRC, AddFeatureWndVM.nSelPRC.nGRP, AddFeatureWndVM.nSelPRC.nSIDE)
-            NewFeat.SetDefaultValues()
-            Dim vPar() As Double = Nothing
-            Dim sPar As String = String.Empty
-            Dim vParQ() As String = Nothing
-            NewFeat.CalcParamArray(vPar, sPar, vParQ)
-            ' aggiorno la feature con nuovo valore
-            EgtBeamSetPart(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, "",
-                                              Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
-                                              New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
-            bMacroFlag = False
-         End If
-         ' se è stata creata
-         If nNewFeatureId <> GDB_ID.NULL Then
-            MyMachGroupPanelM.SetDuploModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            ' la aggiungo a struttura BTL corrente
-            NewFeat = BTLFeatureM.CreateBTLFeature(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM, nNewFeatureId)
-            If Not bMacroFlag Then NewFeat.SetDefaultValues()
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.AddBTLFeature(NewFeat)
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.FirstOrDefault(Function(x) x.BTLFeatureM Is NewFeat)
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart()
-         End If
-      End If
-   End Sub
-
-#End Region    ' AddFeature
-
-#Region "RemoveFeature"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property RemoveFeature_Command As ICommand
-      Get
-         If m_cmdRemoveFeature Is Nothing Then
-            m_cmdRemoveFeature = New Command(AddressOf RemoveFeature)
-         End If
-         Return m_cmdRemoveFeature
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub RemoveFeature()
-      If IsNothing(ProjectManagerVM.CurrProj) Then Return
-      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
-      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then Return
-      If EgtBeamEraseProcess(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.nFeatureId) Then
-         MyMachGroupPanelM.SetDuploModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-         ' rimuovo dalla lista feature
-         Dim Index As Integer = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.IndexOf(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM)
-         If Index = 0 Then
-            If Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.Count > 0 Then
-               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList(0)
-            Else
-               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Nothing
-            End If
-         ElseIf Index = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.Count - 1 Then
-            If Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.Count > 1 Then
-               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.Count - 2)
-            Else
-               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Nothing
-            End If
-         Else
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList(Index - 1)
-         End If
-         Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.RemoveAt(Index)
-         EgtDraw()
-         Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart()
-      End If
-   End Sub
-
-#End Region    ' RemoveFeature
-
-#End Region    ' Commands
-
-End Class

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
@@ -97,7 +110,6 @@ Public Class FeatureManagerVM
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
 
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -321,8 +321,7 @@ Public Class FreeContourManagerVM
       nSideAngTextLayer = GDB_ID.NULL
       SideAngValues.Clear()
       ' nascondo PartManager
-      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
       ' verifico se solido attivo
       m_bPrevShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
       If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
@@ -428,7 +427,7 @@ 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)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)
@@ -438,11 +437,9 @@ Public Class FreeContourManagerVM
       ' attivo bottoni save e cancel
       SelFeature.RefreshFCMBtnVisibility()
       ' nascondo Part Manager
-      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
       ' attivo pannello
       Map.refProjectVM.SetFreeContourManager_Visibility(True)
-      Map.refProjWndVM.SetFreeContourManager_Visibility(True)
       EgtDraw()
    End Sub
 
@@ -531,7 +528,6 @@ Public Class FreeContourManagerVM
       End If
       ' disattivo pannello
       Map.refProjectVM.SetFreeContourManager_Visibility(False)
-      Map.refProjWndVM.SetFreeContourManager_Visibility(False)
       ' attivo bottone edit
       SelFeature.RefreshFCMBtnVisibility()
       ' resetto tutte le variabili correnti
@@ -541,8 +537,7 @@ Public Class FreeContourManagerVM
       nSelFeatureId = GDB_ID.NULL
       nProcessingLayerId = GDB_ID.NULL
       ' riattivo Part Manager
-      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
       ' disattivo modifiche su scena
       Map.refSceneHostVM.MainScene.SetStatusNull()
       If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
@@ -562,8 +557,7 @@ Public Class FreeContourManagerVM
       Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)
       ' rimetto PartManager
-      'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
+      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
    End Sub
 
    ' funzione lanciata su fine creazione percorso