-aggiunto OnlyProdNewOpenProjectFileDialogV e OnlyProdOpenProjectFileDialogV per nuova interfaccia

-sistemato Notify

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -7,8 +7,6 @@
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -21,7 +19,7 @@
       </GroupBox>
    </StackPanel>
 
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
+   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
       <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
@@ -46,15 +44,17 @@
                                  <ColumnDefinition Width="*" />
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding sName}"
+                                         ToolTip="{Binding sName}"
                                          TextWrapping="WrapWithOverflow"
-                                         Width="100"
+                                         Width="190"
                                          Style="{StaticResource MachParamTextBlock}"/>
                               <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
                                                      Grid.Column="1"
-                                                     Width="70"/>
+                                                     Width="60"/>
                               <TextBlock Text="{Binding sDescription}"
+                                         ToolTip="{Binding sDescription}"
                                          TextWrapping="WrapWithOverflow"
-                                         Width="200"
+                                         Width="185"
                                          Style="{StaticResource MachParamTextBlock}"
                                          Grid.Column="2"/>
                            </Grid>
@@ -67,4 +67,13 @@
       </ItemsControl>
    </StackPanel>
 
+   <Button Command="{Binding SaveCommand}"
+           Grid.Column="0"
+           Grid.Row="1"
+           ToolTip="{Binding SaveToolTip}"
+           Visibility="{Binding Machine_Visibility}"
+           Style="{StaticResource MachinePanel_Button}">
+      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+   </Button>
+
 </Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml

@@ -0,0 +1,118 @@
+<Grid x:Class="OnlyProdGeneral_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/OnlyProdGeneral_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml

@@ -0,0 +1,79 @@
+<Grid x:Class="OnlyProdMachine_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*"/>
+   </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" Visibility="{Binding MachineParameter_Visibility}">
+      <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}"
+                                         ToolTip="{Binding sName}"
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="190"
+                                         Style="{StaticResource MachParamTextBlock}"/>
+                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
+                                                     Grid.Column="1"
+                                                     Width="60"/>
+                              <TextBlock Text="{Binding sDescription}"
+                                         ToolTip="{Binding sDescription}"
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="185"
+                                         Style="{StaticResource MachParamTextBlock}"
+                                         Grid.Column="2"/>
+                           </Grid>
+                        </DataTemplate>
+                     </ItemsControl.ItemTemplate>
+                  </ItemsControl>
+               </GroupBox>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+      </ItemsControl>
+   </StackPanel>
+
+   <Button Command="{Binding SaveCommand}"
+           Grid.Column="0"
+           Grid.Row="1"
+           ToolTip="{Binding SaveToolTip}"
+           Visibility="{Binding Machine_Visibility}"
+           Style="{StaticResource MachinePanel_Button}">
+      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+   </Button>
+
+</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml

@@ -0,0 +1,80 @@
+<Grid x:Class="OnlyProdQParameter_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/OnlyProdQParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -144,6 +144,8 @@
    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"

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -1,11 +1,27 @@
 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"
@@ -15,13 +31,10 @@
    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_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_QTY As String = "colQTY"
    Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -19,6 +19,7 @@
    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/ConstIni.vb

@@ -97,6 +97,7 @@ 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 S_MACH As String = "Mach"
@@ -163,6 +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"

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -83,12 +83,21 @@
     <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
+    <Compile Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml.vb">
+      <DependentUpon>OnlyProdMachine_ConfigurationPageV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ConfigurationPage\OnlyProdGeneral_ConfigurationPageV.xaml.vb">
+      <DependentUpon>OnlyProdGeneral_ConfigurationPageV.xaml</DependentUpon>
+    </Compile>
     <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\OnlyProdQParameter_ConfigurationPageV.xaml.vb">
+      <DependentUpon>OnlyProdQParameter_ConfigurationPageV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
       <DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
     </Compile>
@@ -135,7 +144,14 @@
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
+    <Compile Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OnlyProdNewOpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OnlyProdOpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
     <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" />
@@ -210,6 +226,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ConfigurationPage\OnlyProdGeneral_ConfigurationPageV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ConfigurationPage\General_ConfigurationPageV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -218,6 +242,10 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
+    <Page Include="ConfigurationPage\OnlyProdQParameter_ConfigurationPageV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
@@ -242,6 +270,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -254,7 +290,9 @@
   <ItemGroup>
     <Content Include="Resources\ProjectManager\Save.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{94E38DFF-614B-4CBD-B67C-F211BB35CE8B}" />
+  </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,9 +4,6 @@ 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
 
@@ -370,9 +367,23 @@ 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
@@ -574,6 +585,7 @@ 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/MachGroupPanel/PartVM.vb

@@ -6,6 +6,8 @@ Imports System.Windows.Input
 Imports System.Windows.Media
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgtBEAMWALL.Core
+Imports System.Windows.Threading
 
 Public MustInherit Class PartVM
    Inherits VMBase

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -40,6 +40,10 @@
               Visibility="{Binding WallTable_Visibility}">
          <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
       </Button>
+      <Button Content="{Binding ParameterMachineMsg}"
+              ToolTip="{Binding ParameterMachineMsg}"
+              Command="{Binding ParameterMachine_Command}"
+              Style="{StaticResource ToolBar_ParameterMachineButton}"/>
    </StackPanel>
 
 </Grid>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -779,94 +779,3 @@ 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/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml

@@ -0,0 +1,249 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdNewOpenProjectFileDialogV"
+                            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" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsClosable="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="{Binding Filters_Msg}"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+               <CheckBox Grid.Column="2"
+                         IsChecked="{Binding bViewArchived}"
+                         Content="{Binding ViewArchived_Msg}"
+                         VerticalAlignment="Center"/>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="{Binding Rows_Msg}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
+
+      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+                               Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               RowDetailsVisibilityMode="Visible"
+                               CellEditEnding="MainDataGrid_CellEditEnding"
+                               BindingColumns="{Binding ProdColumns}">
+         <DataGrid.Resources>
+            <!-- ProdId -->
+            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!--Name-->
+            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+               <DataGridTextColumn.Header>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                     <ToggleButton Grid.Column="1"
+                                   Margin="5,0,0,0"
+                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                   Style="{StaticResource ToolBar_SmallToggleButton}">
+                        <Image Source="\Resources\CalcPanel\Edit.png"
+                               Style="{StaticResource LockImage}"/>
+                     </ToggleButton>
+                  </Grid>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Creation date -->
+            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Machine -->
+            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Archived -->
+            <DataGridTemplateColumn x:Key="colARCHIVED">
+               <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate>
+                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
+                            Visibility="{Binding Archived_Visibility}"
+                            Height="15"
+                            Width="15"
+                            Stretch="UniformToFill"/>
+                  </DataTemplate>
+               </DataGridTemplateColumn.CellTemplate>
+               <DataGridTemplateColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTemplateColumn.Header>
+            </DataGridTemplateColumn>
+         </DataGrid.Resources>
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="FontWeight" Value="DemiBold"/>
+               <Setter Property="VerticalContentAlignment" Value="Center"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+         <DataGrid.RowDetailsTemplate>
+            <DataTemplate>
+               <ItemsControl ItemsSource="{Binding ProjFileList}"
+                             BorderThickness="0"
+                             Margin="0,-1,0,0"
+                             Padding="0">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid TextBlock.FontSize="12"
+                              TextBlock.FontWeight="Normal">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="1"/>
+                              <RowDefinition Height="1*"/>
+                           </Grid.RowDefinitions>
+                           <Grid Grid.Row="0"
+                                 Grid.ColumnSpan="2"
+                                 Background="Gray"
+                                 Margin="40,0,40,0"/>
+                           <Grid Grid.Column="1"
+                                 Grid.Row="1"
+                                 Margin="2">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="1*"/>
+                                 <RowDefinition Height="1*"/>
+                              </Grid.RowDefinitions>
+                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="{Binding sBTLFileName}"/>
+                              <TextBlock Grid.Row="1"
+                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Grid.Row="1"
+                                         Text="{Binding sListName}"/>
+                              <TextBlock Grid.Column="2"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="3"
+                                         Text="{Binding dtExportDate}"/>
+                           </Grid>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </DataTemplate>
+         </DataGrid.RowDetailsTemplate>
+      </EgtBEAMWALL:EgtDataGrid>
+
+      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Archive_Msg}"
+                 Command="{Binding Archive_Command}"
+                 IsEnabled="{Binding bArchived_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Delete_Msg}"
+                 Command="{Binding Delete_Command}"
+                 IsEnabled="{Binding bDelete_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Command="{Binding Cancel_Command}"
+                 Content="{Binding Cancel_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb

@@ -0,0 +1,80 @@
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Input
+Imports EgtWPFLib5
+
+Public Class OnlyProdNewOpenProjectFileDialogV
+
+   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
+      ' Funzione che interpreta l'xaml
+      InitializeComponent()
+      Me.Owner = Owner
+      Me.DataContext = OpenProjFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
+      m_OpenProjFileDialogVM.ProjDoubleClick()
+   End Sub
+
+#End Region    ' EVENTS
+
+   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
+      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
+      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
+   End Sub
+
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml

@@ -0,0 +1,189 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdOpenProjectFileDialogV"
+                            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" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Filters"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="Rows"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
+
+      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               BindingColumns="{Binding ProjectColumns}">
+         <DataGrid.Resources>
+            <!-- ProjId -->
+            <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- ProdId -->
+            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Project Name -->
+            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- BTL FileName -->
+            <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- ListName -->
+            <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Exported date -->
+            <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Creation date -->
+            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Machine -->
+            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Name (per Prod) -->
+            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+         </DataGrid.Resources>
+
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+      </EgtBEAMWALL:EgtDataGrid>
+
+      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Delete_Msg}"
+                 Command="{Binding Delete_Command}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button IsCancel="True"
+                 Content="{Binding Cancel_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb

@@ -0,0 +1,75 @@
+Imports System.Windows
+Imports System.Windows.Input
+Imports EgtWPFLib5
+
+Public Class OnlyProdOpenProjectFileDialogV
+
+   Private WithEvents m_OpenProjFileDialogVM As OpenProjectFileDialogVM
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, OpenProjFileDialogVM As OpenProjectFileDialogVM)
+      ' Funzione che interpreta l'xaml
+      InitializeComponent()
+      Me.Owner = Owner
+      Me.DataContext = OpenProjFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
+      m_OpenProjFileDialogVM.ProjDoubleClick()
+   End Sub
+
+#End Region    ' EVENTS
+
+   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
+      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -121,17 +121,17 @@
       </StackPanel>-->
 
       <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-               ItemsSource="{Binding ProjectList}" 
-               SelectedItem="{Binding SelProject}"
-               CanUserAddRows="False"
-               AutoGenerateColumns="False"
-               CanUserResizeRows="False"
-               SelectionMode="Single"
-               ScrollViewer.CanContentScroll="True" 
-               ScrollViewer.VerticalScrollBarVisibility="Auto"
-               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-               Margin="5"
-               BindingColumns="{Binding ProjectColumns}">
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>
             <!-- ProjId -->
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -42,6 +42,8 @@ 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
@@ -438,7 +440,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(Optional GoToProd As Boolean = False)
+   Public Overridable Sub RefreshProjectList()
    End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -14,6 +14,13 @@ 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
@@ -60,6 +67,24 @@ 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

@@ -0,0 +1,119 @@
+
+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/ProjectFileVM/ProjFileM.vb

@@ -19,28 +19,28 @@ Public Class ProjFileM
    End Property
 
    Protected m_sBTLFileName As String = String.Empty
-    Public Property sBTLFileName As String
-        Get
-            Return m_sBTLFileName
-        End Get
-        Set(value As String)
-            m_sBTLFileName = value
-        End Set
-    End Property
+   Public Property sBTLFileName As String
+      Get
+         Return m_sBTLFileName
+      End Get
+      Set(value As String)
+         m_sBTLFileName = value
+      End Set
+   End Property
 
-    Protected m_sDescription As String = String.Empty
-    Public Property sDescription As String
-        Get
-            Return m_sDescription
-        End Get
-        Set(value As String)
-            m_sDescription = value
-        End Set
-    End Property
+   Protected m_sDescription As String = String.Empty
+   Public Property sDescription As String
+      Get
+         Return m_sDescription
+      End Get
+      Set(value As String)
+         m_sDescription = value
+      End Set
+   End Property
 
 #Region "CONSTRUCTORS"
 
-    Protected Sub New()
+   Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -2,6 +2,7 @@
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using static EgtBEAMWALL.Core.ConstBeam;
 
@@ -208,11 +209,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);
@@ -220,9 +221,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
@@ -235,7 +236,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(numRecord)
+                    .Take(NumRecord)
                     .ToList();
             }
 
@@ -247,13 +248,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);
@@ -261,14 +262,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,
@@ -276,7 +277,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(numRecord)
+                    .Take(NumRecord)
                     .ToList();
             }
 
@@ -285,6 +286,183 @@ 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>
@@ -910,6 +1088,29 @@ 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,6 +33,8 @@ 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...
@@ -581,7 +583,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Update record su DB x elenco BTLParts
         /// </summary>
         /// <param name="ProjId"></param>
-        /// <param name="newBTLFileName"></param>
+        /// <param name="BtlPartList"></param>
         /// <returns></returns>
         public ProjModel UpdateBtlParts(int ProjId, List<Core.BTLPartM> BtlPartList)
         {

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -19,6 +19,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
+        public ProdModel()
+        {
+            ProjListNav = new HashSet<ProjModel>();
+        }
+
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -98,6 +103,11 @@ 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.Supervisor/ConfigurationPage/ConfigurationPageVM.vb

@@ -21,13 +21,10 @@ Public Class ConfigurationPageVM
          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
 
@@ -187,6 +184,16 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Private m_MachineParameter_Visibility As Visibility = Visibility.Collapsed
+   Public Property MachineParameter_Visibility As Visibility
+      Get
+         Return m_MachineParameter_Visibility
+      End Get
+      Set(value As Visibility)
+         m_MachineParameter_Visibility = value
+         NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
+      End Set
+   End Property
 
    ' Definizione comandi
    Private m_cmdSave As ICommand
@@ -394,6 +401,11 @@ Public Class ConfigurationPageVM
       ConfigMachTableList = CurrentMachine.MachTableList
       Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1)
       SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
+      ' rendo invisibile la sezione Offset presente nel tab Macchine
+      m_MachineParameter_Visibility = Visibility.Collapsed
+      m_bMachine_Visibility = Visibility.Collapsed
+      NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
+      NotifyPropertyChanged(NameOf(Machine_Visibility))
    End Sub
 
 #End Region ' Constructor
@@ -651,7 +663,7 @@ Public Class MachParam
       End Get
       Set(value As Double)
          m_dValue = value
-         NotifyPropertyChanged("sValue")
+         NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property
 

EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb

@@ -93,6 +93,11 @@ Public Class MachinePanelVM
          Return EgtMsg(MSG_ALARMSPAGEUC + 33)
       End Get
    End Property
+   Public ReadOnly Property ParameterMachineMsg As String
+      Get
+         Return EgtMsg(61778)
+      End Get
+   End Property
 
 #End Region    ' Messages
 
@@ -119,6 +124,7 @@ Public Class MachinePanelVM
    ' Definizione comandi
    Private m_cmdBeamTable As ICommand
    Private m_cmdWallTable As ICommand
+   Private m_cmdParameterMachine As ICommand
 
 #End Region    'FIELDS & PROPERTIES
 
@@ -340,6 +346,27 @@ Public Class MachinePanelVM
 
 #End Region    ' WallTable
 
+#Region "ParameterMachine"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property ParameterMachine_Command As ICommand
+      Get
+         If m_cmdParameterMachine Is Nothing Then
+            m_cmdParameterMachine = New Command(AddressOf ParameterMachineVisibility)
+         End If
+         Return m_cmdParameterMachine
+      End Get
+   End Property
+
+   Public Sub ParameterMachineVisibility()
+      Map.refConfigurationPageVM.MachineParameter_Visibility = Visibility.Visible
+      Map.refConfigurationPageVM.Machine_Visibility = Visibility.Visible
+   End Sub
+
+#End Region    ' ParameterMachine
+
 #End Region    ' COMMANDS
 
 End Class

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -11,13 +11,14 @@ 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(GoToProd)
+         RefreshProjectList()
       Else
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
          NotifyPropertyChanged(NameOf(ProjectList))
@@ -26,7 +27,7 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
-   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+   Public Overrides Sub RefreshProjectList()
       m_ProjectList.Clear()
       ' calcolo periodo e righe
       Dim dtStart As DateTime

EgtBEAMWALL.Supervisor/Project/ProjectVM.vb

@@ -174,14 +174,14 @@ Public Class ProjectVM
    End Sub
 
    Friend Sub NotifyAllPanelVisibility()
-      NotifyPropertyChanged("LeftPanel_Visibility")
-      NotifyPropertyChanged("TopPanel_Visibility")
-      NotifyPropertyChanged("BottomPanel_Visibility")
-      NotifyPropertyChanged("PartManager_Visibility")
-      NotifyPropertyChanged("FeatureManager_Visibility")
-      NotifyPropertyChanged("ShowBeamPanel_Visibility")
-      NotifyPropertyChanged("ProjManager_Visibility")
-      NotifyPropertyChanged("ProdManager_Visibility")
+      NotifyPropertyChanged(NameOf(LeftPanel_Visibility))
+      NotifyPropertyChanged(NameOf(TopPanel_Visibility))
+      NotifyPropertyChanged(NameOf(BottomPanel_Visibility))
+      NotifyPropertyChanged(NameOf(PartManager_Visibility))
+      NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
+      NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
+      NotifyPropertyChanged(NameOf(ProjManager_Visibility))
+      NotifyPropertyChanged(NameOf(ProdManager_Visibility))
    End Sub
 
 #End Region    ' FIELDS & PROPERTIES

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -165,6 +165,13 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
+   <Style x:Key="MachinePanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="50"/>
+      <Setter Property="Width" Value="50"/>
+      <Setter Property="Margin" Value="50"/>
+      <Setter Property="VerticalAlignment" Value="Bottom"/>
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+   </Style>
    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
    </Style>
@@ -790,5 +797,9 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <Style x:Key="ToolBar_ParameterMachineButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="120"/>
+   </Style>
 
 </ResourceDictionary>

EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml

@@ -1,8 +1,8 @@
 <Window x:Class="AboutBoxV"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
+        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -35,15 +35,15 @@
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18" />
+                    VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="12" />
+                    VerticalAlignment="Center" FontSize="12" />
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-               Margin="100,0"/>
+                 Margin="100,0"/>
 
       </Grid>
 

EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb

@@ -43,7 +43,7 @@ Public Class AddPartWndVM
          If StringToLenAdv(value, dTempL, True) AndAlso dTempL > 0 Then
             m_dL = dTempL
          Else
-            NotifyPropertyChanged("sL")
+            NotifyPropertyChanged(NameOf(sL))
          End If
       End Set
    End Property
@@ -64,7 +64,7 @@ Public Class AddPartWndVM
             EgtDraw()
             m_dW = dTempW
          Else
-            NotifyPropertyChanged("sW")
+            NotifyPropertyChanged(NameOf(sW))
          End If
       End Set
    End Property
@@ -85,7 +85,7 @@ Public Class AddPartWndVM
             EgtDraw()
             m_dH = dTempH
          Else
-            NotifyPropertyChanged("sH")
+            NotifyPropertyChanged(NameOf(sH))
          End If
       End Set
    End Property
@@ -115,7 +115,7 @@ Public Class AddPartWndVM
          If Integer.TryParse(value, nTempCNT) AndAlso nTempCNT > 0 Then
             m_nCNT = nTempCNT
          Else
-            NotifyPropertyChanged("sCNT")
+            NotifyPropertyChanged(NameOf(sCNT))
          End If
       End Set
    End Property

EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml

@@ -0,0 +1,104 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdAddPartWndV"
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddPartWndV">
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <!--<RowDefinition Height="Auto"/>-->
+      </Grid.RowDefinitions>
+
+      <Grid HorizontalAlignment="Center"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="Name"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding sNAM}"
+                                Grid.Column="1"
+                                Width="200"/>
+      </Grid>
+      <Grid Grid.Row="1"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="Prod Number"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding nPDN}"
+                                Grid.Column="1"
+                                Width="45"/>
+         <TextBlock Text="Count"
+                    Grid.Column="2"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding sCNT}"
+                                Grid.Column="3"
+                                Width="45"/>
+      </Grid>
+      <Grid Grid.Row="2"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="W"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding sW}"
+                                Grid.Column="1"
+                                Width="45"/>
+         <TextBlock Text="H"
+                    Grid.Column="2"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding sH}"
+                                Grid.Column="3"
+                                Width="45"/>
+         <TextBlock Text="L"
+                    Grid.Column="4"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding sL}"
+                                Grid.Column="5"
+                                Width="45"/>
+      </Grid>
+
+      <Grid Grid.Row="3"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/AddPartWnd/OnlyProdAddPartWndV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -235,14 +235,14 @@ Public Class Variable
                If StringToLenAdv(value, dTempValue, True) Then
                   m_dValue = dTempValue
                Else
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                End If
             Case Else         ' VariableType.DOUBLE_
                Dim dTempValue As Double
                If StringToDoubleAdv(value, dTempValue, True) Then
                   m_dValue = dTempValue
                Else
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                End If
          End Select
       End Set

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml

@@ -0,0 +1,65 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdAddRawPartWndV"
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddRawPartWnd">
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <ComboBox ItemsSource="{Binding DimensionsList}"
+                SelectedItem="{Binding SelDimension}"
+                DisplayMemberPath="sDimension"
+                Visibility="{Binding DimensionsList_Visibility}"
+                Margin="0,0,0,5"/>
+      <ItemsControl ItemsSource="{Binding VariableList}"
+                    Grid.Row="1">
+         <ItemsControl.ItemTemplate>
+            <DataTemplate>
+               <Grid Margin="0,0,0,5">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+
+                  <TextBlock Text="{Binding sMsg}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding sValue}"
+                                         Grid.Column="1"
+                                         Width="65"/>
+               </Grid>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+      </ItemsControl>
+      <Grid Grid.Row="2"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml

@@ -13,94 +13,94 @@
                             IsResizable="False"
                             Title="AddSectionXMaterial">
    <StackPanel Margin="5,5,5,0">
-       
+
       <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="0" Width="500" MaxHeight="600"
-                               ItemsSource="{Binding NewSectionXMaterialList}" 
-                               SelectedItem="{Binding SelNewSectionXMaterial}"
-                               CanUserAddRows="False"
-                               AutoGenerateColumns="False"
-                               CanUserResizeRows="False"
-                               SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="False" 
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                               Margin="5"
-                               BindingColumns="{Binding SectXMatColumns}">
-          <DataGrid.Resources>
-              <!-- SectionXMaterial -->
-              <DataGridTextColumn x:Key="colSECTXMAT" Binding="{Binding sSectionXMaterial}">
-                  <DataGridTextColumn.HeaderTemplate>
-                      <DataTemplate>
-                          <TextBlock Text="{Binding Path=DataContext.SectionXMaterial_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                      </DataTemplate>
-                  </DataGridTextColumn.HeaderTemplate>
-              </DataGridTextColumn>
-              <!-- Alias -->
-              <DataGridTemplateColumn x:Key="colALIAS">
-                  <DataGridTemplateColumn.Header>
-                      <TextBlock Text="{Binding Path=DataContext.Alias_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                  </DataGridTemplateColumn.Header>
-                  <DataGridTemplateColumn.CellTemplate>
+                                   ItemsSource="{Binding NewSectionXMaterialList}" 
+                                   SelectedItem="{Binding SelNewSectionXMaterial}"
+                                   CanUserAddRows="False"
+                                   AutoGenerateColumns="False"
+                                   CanUserResizeRows="False"
+                                   SelectionMode="Single"
+                                   ScrollViewer.CanContentScroll="False" 
+                                   ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                   Margin="5"
+                                   BindingColumns="{Binding SectXMatColumns}">
+         <DataGrid.Resources>
+            <!-- SectionXMaterial -->
+            <DataGridTextColumn x:Key="colSECTXMAT" Binding="{Binding sSectionXMaterial}">
+               <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                      <CheckBox IsChecked="{Binding Path=Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}" 
-                                IsEnabled="{Binding Alias_IsEnabled}"
-                                HorizontalAlignment="Center"/>
+                     <TextBlock Text="{Binding Path=DataContext.SectionXMaterial_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
                   </DataTemplate>
-              </DataGridTemplateColumn.CellTemplate>
-              </DataGridTemplateColumn>
-              <!-- W -->
-              <DataGridTextColumn x:Key="colW" Binding="{Binding sNewW}">
-                  <DataGridTextColumn.HeaderTemplate>
-                      <DataTemplate>
-                          <TextBlock Text="{Binding Path=DataContext.W_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                      </DataTemplate>
-                  </DataGridTextColumn.HeaderTemplate>
-                  <DataGridTextColumn.CellStyle>
-                      <Style TargetType="DataGridCell">
-                          <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
-                      </Style>
-                  </DataGridTextColumn.CellStyle>
-              </DataGridTextColumn>
-              <!-- L -->
-              <DataGridTextColumn x:Key="colL" Binding="{Binding sNewL}">
-                  <DataGridTextColumn.HeaderTemplate>
-                      <DataTemplate>
-                          <TextBlock Text="{Binding Path=DataContext.L_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                      </DataTemplate>
-                  </DataGridTextColumn.HeaderTemplate>
-                  <DataGridTextColumn.CellStyle>
-                      <Style TargetType="DataGridCell">
-                          <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
-                      </Style>
-                  </DataGridTextColumn.CellStyle>
-              </DataGridTextColumn>
-              <!-- Material -->
-              <DataGridTemplateColumn x:Key="colMATERIAL">
-                  <DataGridTemplateColumn.Header>
-                      <TextBlock Text="{Binding Path=DataContext.Material_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                  </DataGridTemplateColumn.Header>
-                  <DataGridTemplateColumn.CellTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Alias -->
+            <DataGridTemplateColumn x:Key="colALIAS">
+               <DataGridTemplateColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Alias_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
+               </DataGridTemplateColumn.Header>
+               <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
-                      <ComboBox ItemsSource="{Binding MaterialForSameSection_List}" 
-                                SelectedItem="{Binding SelMaterialForSameSection, UpdateSourceTrigger=PropertyChanged}"
-                                IsEnabled="{Binding Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}"/>
+                     <CheckBox IsChecked="{Binding Path=Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}" 
+                               IsEnabled="{Binding Alias_IsEnabled}"
+                               HorizontalAlignment="Center"/>
                   </DataTemplate>
-              </DataGridTemplateColumn.CellTemplate>
-              </DataGridTemplateColumn>
-              <!-- Quantity -->
-              <DataGridTextColumn x:Key="colQTY" Binding="{Binding sQuantity}">
-                  <DataGridTextColumn.HeaderTemplate>
-                      <DataTemplate>
-                          <TextBlock Text="{Binding Path=DataContext.Quantity_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
-                      </DataTemplate>
-                  </DataGridTextColumn.HeaderTemplate>
-                  <DataGridTextColumn.CellStyle>
-                      <Style TargetType="DataGridCell">
-                          <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
-                      </Style>
-                  </DataGridTextColumn.CellStyle>
-              </DataGridTextColumn>
-          </DataGrid.Resources>
+               </DataGridTemplateColumn.CellTemplate>
+            </DataGridTemplateColumn>
+            <!-- W -->
+            <DataGridTextColumn x:Key="colW" Binding="{Binding sNewW}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.W_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+               <DataGridTextColumn.CellStyle>
+                  <Style TargetType="DataGridCell">
+                     <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
+                  </Style>
+               </DataGridTextColumn.CellStyle>
+            </DataGridTextColumn>
+            <!-- L -->
+            <DataGridTextColumn x:Key="colL" Binding="{Binding sNewL}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.L_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+               <DataGridTextColumn.CellStyle>
+                  <Style TargetType="DataGridCell">
+                     <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
+                  </Style>
+               </DataGridTextColumn.CellStyle>
+            </DataGridTextColumn>
+            <!-- Material -->
+            <DataGridTemplateColumn x:Key="colMATERIAL">
+               <DataGridTemplateColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Material_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
+               </DataGridTemplateColumn.Header>
+               <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate>
+                     <ComboBox ItemsSource="{Binding MaterialForSameSection_List}" 
+                               SelectedItem="{Binding SelMaterialForSameSection, UpdateSourceTrigger=PropertyChanged}"
+                               IsEnabled="{Binding Alias_IsChecked, UpdateSourceTrigger=PropertyChanged}"/>
+                  </DataTemplate>
+               </DataGridTemplateColumn.CellTemplate>
+            </DataGridTemplateColumn>
+            <!-- Quantity -->
+            <DataGridTextColumn x:Key="colQTY" Binding="{Binding sQuantity}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Quantity_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:AddSectionXMaterialWndV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+               <DataGridTextColumn.CellStyle>
+                  <Style TargetType="DataGridCell">
+                     <Setter Property="IsEnabled" Value="{Binding Alias_IsNotChecked}" />
+                  </Style>
+               </DataGridTextColumn.CellStyle>
+            </DataGridTextColumn>
+         </DataGrid.Resources>
       </EgtBEAMWALLCORE:EgtDataGrid>
 
       <Grid Grid.Row="2" Margin="0,0,0,5">

EgtBEAMWALL.ViewerOptimizer/App.config

@@ -1,16 +1,13 @@
 <?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" />
@@ -49,6 +46,10 @@
             <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

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

EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml

@@ -0,0 +1,236 @@
+<UserControl x:Class="OnlyProdBTLPartListV"
+             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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
+   <UserControl.Resources>
+      <EgtBEAMWALL:DataGridCellBorderThicknessConverter x:Key="DataGridCellBorderThicknessConverter"/>
+   </UserControl.Resources>
+   <EgtBEAMWALLCORE:EgtDataGrid x:Name="BTLPart_DataGrid"
+                                ItemsSource="{Binding Tag.BTLPartVMList,
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                                CanUserAddRows="False"
+                                AutoGenerateColumns="False"
+                                CanUserResizeRows="False"
+                                SelectionMode="Extended"
+                                ScrollViewer.CanContentScroll="True" 
+                                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                PreviewMouseDown="DataGrid_PreviewMouseDown"
+                                PreviewMouseUp="DataGrid_PreviewMouseUp"
+                                PreviewMouseMove="DataGrid_PreviewMouseMove"
+                                Margin="0,0,0,5"
+                                EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
+                                                                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                                BindingColumns="{Binding PartColumns}"
+                                IsEnabled="{Binding PartList_IsEnabled}"
+                                Style="{StaticResource DataGrid_CustomHighLight}">
+
+      <DataGrid.InputBindings>
+         <KeyBinding Key="Delete" Command="{Binding Tag.DeletePart_Command,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}" />
+      </DataGrid.InputBindings>
+      <DataGrid.CellStyle>
+         <Style TargetType="{x:Type DataGridCell}">
+            <Style.Resources>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
+               <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
+               <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
+            </Style.Resources>
+            <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
+            <Setter Property="BorderThickness">
+               <Setter.Value>
+                  <MultiBinding Converter="{StaticResource DataGridCellBorderThicknessConverter}"
+                                ConverterParameter="3">
+                     <Binding Path="Column.DisplayIndex" RelativeSource="{RelativeSource Self}"/>
+                  </MultiBinding>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="BorderBrush" Value="Cyan" />
+                  <Setter Property="FontWeight" Value="Bold" />
+                  <Setter Property="Foreground" Value="Blue" />
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </DataGrid.CellStyle>
+      <DataGrid.Resources>
+         <!--PDN - Nome-->
+         <DataGridTextColumn x:Key="colPDN"
+                             Binding="{Binding nPDN}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.PDN_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn x:Key="colCALC" CanUserResize="False"
+                                 SortMemberPath="nGlobalState">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Grid Margin="2,0,0,0">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="25"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="↓"
+                                Foreground="Blue"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="18"
+                                Margin="-1,-6,1,-3"
+                                Visibility="{Binding CALC_FALL_Visibility}"/>
+                     <Border Grid.Column="1"
+                             BorderBrush="{Binding Calc_BorderBrush}"
+                             BorderThickness="2"
+                             Padding="1">
+                        <ItemsControl ItemsSource="{Binding BTLFeatureVMList_View}"
+                                      Margin="0"
+                                      Padding="0">
+                           <ItemsControl.ItemsPanel>
+                              <ItemsPanelTemplate>
+                                 <UniformGrid Columns="6" Rows="5"
+                                              Margin="0"/>
+                              </ItemsPanelTemplate>
+                           </ItemsControl.ItemsPanel>
+                           <ItemsControl.ItemTemplate>
+                              <DataTemplate>
+                                 <Border Background="{Binding Calc_Background}"/>
+                              </DataTemplate>
+                           </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                     </Border>
+                     <Grid Grid.Column="2"
+                           HorizontalAlignment="Center">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Ellipse Width="5"
+                                 Height="5"
+                                 Fill="Red"
+                                 Visibility="{Binding CALC_ROT_Visibility}"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Top"
+                                 Margin="2,1,-2,0"/>
+                        <TextBlock Grid.Row="1"
+                                   Text="{Binding CALC_ERR_Letter}"
+                                   Foreground="{Binding CALC_ERR_Foreground}"
+                                   TextAlignment="Center"
+                                   FontWeight="Bold"
+                                   FontSize="12"
+                                   Margin="2,-6,-2,-3"/>
+                     </Grid>
+                  </Grid>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--DO - Abilitazione-->
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.W_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn x:Key="colH" Binding="{Binding sH}" SortMemberPath="dH">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.H_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn x:Key="colL" Binding="{Binding sL}" SortMemberPath="dL">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.L_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--NAM - Descrizione-->
+         <DataGridTextColumn x:Key="colNAM" Binding="{Binding sNAM}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.MAT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--CNT - Richiesti da BTL-->
+         <DataGridTextColumn x:Key="colCNT" Binding="{Binding sCNT}" SortMemberPath="nCNT">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.ShortCNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--ADDED - Aggiunti-->
+         <DataGridTextColumn x:Key="colADDED" Binding="{Binding sADDED}" SortMemberPath="nADDED">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.ShortADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--INPROD - IN OTTIMIZZAZIONE-->
+         <DataGridTextColumn x:Key="colINPROD" Binding="{Binding nINPROD}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.ShortINPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--DONE - PRODOTTI-->
+         <DataGridTextColumn x:Key="colDONE" Binding="{Binding nDONE}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.ShortDONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+      </DataGrid.Resources>
+      <DataGrid.RowStyle>
+         <Style TargetType="DataGridRow">
+            <Setter Property="Background" Value="{Binding Background}"/>
+            <Setter Property="Foreground" Value="{Binding Foreground}"/>
+            <Setter Property="FontWeight" Value="{Binding FontWeight}"/>
+            <EventSetter Event="PreviewMouseDown" Handler="PartList_PreviewMouseDown"/>
+            <EventSetter Event="PreviewMouseUp" Handler="PartList_PreviewMouseUp"/>
+         </Style>
+      </DataGrid.RowStyle>
+
+   </EgtBEAMWALLCORE:EgtDataGrid>
+
+</UserControl>

EgtBEAMWALL.ViewerOptimizer/BTLPartList/OnlyProdBTLPartListV.xaml.vb

@@ -0,0 +1,137 @@
+Imports System.Reflection
+Imports EgtBEAMWALL.Core.ConstGen
+
+Public Class OnlyProdBTLPartListV
+
+   Private m_BTLPartListVM As BTLPartListVM
+
+   Private m_SelectBtn As MouseButton = MouseButton.Left
+   Private m_HighlightBtn As MouseButton = MouseButton.Right
+
+   Private m_NameDataGridType As Type
+   Private s_isDraggingSelectionField As FieldInfo
+   Private s_endDraggingMethod As MethodInfo
+
+   Sub New()
+      ' This call is required by the designer.
+      InitializeComponent()
+      ' Add any initialization after the InitializeComponent() call.
+      m_BTLPartListVM = DataContext
+      m_NameDataGridType = BTLPart_DataGrid.GetType()
+      s_isDraggingSelectionField = m_NameDataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
+      s_endDraggingMethod = m_NameDataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
+      SetSelButton(MouseButton.Right)
+   End Sub
+
+   Public Sub SetSelButton(SelButton As MouseButton)
+      Select Case SelButton
+         Case MouseButton.Right
+            m_SelectBtn = MouseButton.Right
+            m_HighlightBtn = MouseButton.Left
+         Case Else      ' MouseButton.Left
+            m_SelectBtn = MouseButton.Left
+            m_HighlightBtn = MouseButton.Right
+      End Select
+   End Sub
+
+   Public Sub DataGrid_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If e.ChangedButton = MouseButton.Left Then
+         If e.ChangedButton = m_SelectBtn Then
+            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+               e.Handled = True
+            Else
+               Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.SELECT_)
+            End If
+         ElseIf e.ChangedButton = m_HighlightBtn AndAlso (Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso
+                ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control)) Then
+            e.Handled = True
+         ElseIf e.ChangedButton = m_HighlightBtn Then
+            Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
+         End If
+         ' imposto tipo di grid selezionata
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PARTLIST)
+      End If
+   End Sub
+
+   Public Sub DataGrid_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs)
+      If e.ChangedButton = MouseButton.Right Then
+         If e.ChangedButton = m_SelectBtn Then
+            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+               e.Handled = True
+            Else
+               Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.SELECT_)
+            End If
+         ElseIf e.ChangedButton = m_HighlightBtn Then
+            Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
+         End If
+         ' imposto tipo di grid selezionata
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PART)
+      End If
+   End Sub
+
+   Public Shared Function FindVisualParent(Of T As DependencyObject)(ByVal child As DependencyObject) As T
+      Dim parentObject As DependencyObject = VisualTreeHelper.GetParent(child)
+      If parentObject Is Nothing Then Return Nothing
+      Dim parent As T = TryCast(parentObject, T)
+
+      If parent IsNot Nothing Then
+         Return parent
+      Else
+         Return FindVisualParent(Of T)(parentObject)
+      End If
+   End Function
+
+   Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
+      If m_SelectBtn = MouseButton.Left AndAlso e.LeftButton = MouseButtonState.Pressed Then
+         If CBool(If(s_isDraggingSelectionField?.GetValue(BTLPart_DataGrid), False)) Then s_endDraggingMethod.Invoke(BTLPart_DataGrid, New Object(-1) {})
+      End If
+   End Sub
+
+   Private Sub PartList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is DataGridRow Then
+         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+         If Not Row.IsSelected Then Return
+         Select Case e.ChangedButton
+            Case MouseButton.Left
+               If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+                  Return
+               Else
+                  BTLPart_DataGrid.SelectedItem = Nothing
+                  BTLPart_DataGrid.SelectedItem = Row.DataContext
+               End If
+
+            Case MouseButton.Right
+
+
+         End Select
+      End If
+   End Sub
+
+   Private Sub PartList_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is DataGridRow Then
+         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+         If Not Row.IsSelected Then Return
+         Select Case e.ChangedButton
+            Case MouseButton.Right
+               If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+                  Row.IsSelected = Not Row.IsSelected
+               Else
+                  BTLPart_DataGrid.SelectedItem = Nothing
+                  BTLPart_DataGrid.SelectedItem = Row.DataContext
+                  ' metto focus su cella selezionata per evitare errori di focus del sistema normale
+                  Dim dep As DependencyObject = CType(e.OriginalSource, DependencyObject)
+                  While (dep IsNot Nothing) AndAlso Not (TypeOf dep Is DataGridCell)
+                     dep = VisualTreeHelper.GetParent(dep)
+                  End While
+                  If dep Is Nothing Then Return
+                  If TypeOf dep Is DataGridCell Then
+                     Dim cell As DataGridCell = TryCast(dep, DataGridCell)
+                     cell.Focus()
+                  End If
+               End If
+         End Select
+      End If
+
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -243,7 +243,12 @@ Public Class BTLPartManagerVM
             dRawW += 2 * dKerf
          End If
          Dim AddRawPartWndVM As New AddRawPartWndVM(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dRawL, dRawW, dStartOffset)
-         Dim AddRawPartWnd As New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+         Dim AddRawPartWnd As Object = Nothing
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+            AddRawPartWnd = New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+         Else
+            AddRawPartWnd = New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+         End If
          If Not AddRawPartWnd.ShowDialog() Then Return
          dRawL = AddRawPartWndVM.VariableList(0).dValue
          dRawW = AddRawPartWndVM.VariableList(1).dValue
@@ -329,11 +334,7 @@ Public Class BTLPartManagerVM
       EgtGetMachGroupName(nCurrMachGroup, sCurrMachGroupName)
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
       ' scrivo dati per variabili P di comunicazione con la macchina in gruppo di lavorazione
-      If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-         EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, Map.refOnlyProdManagerVM.CurrProd.nProdId)
-      End If
+      EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
       EgtSetInfo(nCurrMachGroup, MGR_RPT_PATTID, nCurrMachGroup)
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
          ' ordino i pezzi per lunghezza
@@ -452,7 +453,12 @@ Public Class BTLPartManagerVM
                                   ByRef dStartOffset As Double, ByRef dOffset As Double, ByRef dKerf As Double) As Boolean
       ' apro finestra con solo edit
       Dim AddRawPartWndVM As New AddRawPartWndVM(EditType, Map.refProjectVM.BTLStructureVM.nPROJTYPE, SParamlist, dRawL, dRawW, dStartOffset, dOffset, dKerf)
-      Dim AddRawPartWndV As New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+      Dim AddRawPartWndV As Object = Nothing
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         AddRawPartWndV = New OnlyProdAddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+      Else
+         AddRawPartWndV = New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+      End If
       If Not AddRawPartWndV.ShowDialog() Then Return False
       Select Case Map.refProjectVM.BTLStructureVM.nPROJTYPE
          Case BWType.BEAM
@@ -518,7 +524,7 @@ Public Class BTLPartManagerVM
          Return CurrSParam
       ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
          ' creo sParam
-         If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then CurrSParam = New SParam(Map.refProjectVM.BTLStructureVM.SelBTLPart.Section, dRawW, dRawL, nQuantity, False)
+         If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLParts(0)) Then CurrSParam = New SParam(Map.refProjectVM.BTLStructureVM.SelBTLParts(0).Section, dRawW, dRawL, nQuantity, False)
          Dim sW As String = String.Empty
          Dim sL As String = String.Empty
          sW = LenToString(CurrSParam.dW, 3)
@@ -612,7 +618,12 @@ Public Class BTLPartManagerVM
    ''' </summary>
    Public Sub AddToRawPart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
-      Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLParts(0)
+      Dim SelPart As BTLPartVM
+      If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count <= 0 Then
+         Return
+      Else
+         SelPart = Map.refProjectVM.BTLStructureVM.SelBTLParts(0)
+      End If
       Dim SelParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
       For Index = 0 To SelParts.Count() - 1
          If IsNothing(SelParts(Index)) Then
@@ -941,7 +952,12 @@ Public Class BTLPartManagerVM
       If IsNothing(ProjectManagerVM.CurrProj) Then Return
       ' apro finestra di definizione nuovo part
       Dim AddPartWndVM As New AddPartWndVM()
-      Dim AddPartWnd As New AddPartWndV(Application.Current.MainWindow, AddPartWndVM)
+      Dim AddPartWnd As Object = Nothing
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         AddPartWnd = New OnlyProdAddPartWndV(Application.Current.MainWindow, AddPartWndVM)
+      Else
+         AddPartWnd = New AddPartWndV(Application.Current.MainWindow, AddPartWndVM)
+      End If
       If AddPartWnd.ShowDialog() Then
          ' creo nuovo part
          Dim nNewPartId As Integer = EgtBeamCreatePart()
@@ -1001,12 +1017,7 @@ Public Class BTLPartManagerVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub RemovePartCmd()
-      'If IsNothing(ProjectManagerVM.CurrProj) Then Return
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso IsNothing(Map.refProjManagerVM) Then
-         Return
-      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso IsNothing(Map.refOnlyProdManagerVM) Then
-         Return
-      End If
+      If IsNothing(ProjectManagerVM.CurrProj) Then Return
       If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
          Dim CurrSelBTLParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
          For RemoveIndex = CurrSelBTLParts.Count - 1 To 0 Step -1
@@ -1079,11 +1090,7 @@ Public Class BTLPartManagerVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub Invert()
-      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso IsNothing(ProjectManagerVM.CurrProj)) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then
-         Return
-      ElseIf (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso IsNothing(ProjectManagerVM.CurrProj)) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then
-         Return
-      End If
+      If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProj)) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
       ' se modalita' assemblato
       Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
       Configuration.AssembledMode(bShowBuilding)

EgtBEAMWALL.ViewerOptimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml

@@ -0,0 +1,79 @@
+<StackPanel x:Class="OnlyProdBTLPartManagerV"
+            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/OnlyProdBTLPartManagerV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -107,7 +107,7 @@ Public Class BTLFeatureVM
                ' rendo non calcolata questa feature
                ResetCalcFeature()
             End If
-            NotifyPropertyChanged("nSelSIDE")
+            NotifyPropertyChanged(NameOf(nSelSIDE))
             If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
             EgtDraw()
          End If

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -132,7 +132,7 @@ Public Class BTLParamVM
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
                   MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                   Return
                End If
                ' recupero ParentPart

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -100,7 +100,7 @@ Public Class BTLPartVM
                         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)
+                           MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProj.nProdId, nMachgroupId)
                         End If
                         If Not IsNothing(MachGroupModel) AndAlso MachGroupModel.State > ItemState.ND Then
                            bDuploInProduction = True
@@ -375,7 +375,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_SINGLEMEMBERNUM, value) Then
             m_BTLPartM.nSINGLEMEMBERNUM = value
          Else
-            NotifyPropertyChanged("nSINGLEMEMBERNUM")
+            NotifyPropertyChanged(NameOf(nSINGLEMEMBERNUM))
          End If
       End Set
    End Property
@@ -388,7 +388,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ASSEMBLYNUM, value) Then
             m_BTLPartM.sASSEMBLYNUM = value
          Else
-            NotifyPropertyChanged("sASSEMBLYNUM")
+            NotifyPropertyChanged(NameOf(sASSEMBLYNUM))
          End If
       End Set
    End Property
@@ -401,7 +401,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ORDERNUM, value) Then
             m_BTLPartM.nORDERNUM = value
          Else
-            NotifyPropertyChanged("nORDERNUM")
+            NotifyPropertyChanged(NameOf(nORDERNUM))
          End If
       End Set
    End Property
@@ -414,7 +414,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_DESIGNATION, value) Then
             m_BTLPartM.sDESIGN = value
          Else
-            NotifyPropertyChanged("sDESIGN")
+            NotifyPropertyChanged(NameOf(sDESIGN))
          End If
       End Set
    End Property
@@ -427,7 +427,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ANNOTATION, value) Then
             m_BTLPartM.sANNOT = value
          Else
-            NotifyPropertyChanged("sANNOT")
+            NotifyPropertyChanged(NameOf(sANNOT))
          End If
       End Set
    End Property
@@ -440,7 +440,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STOREY, value) Then
             m_BTLPartM.sSTOREY = value
          Else
-            NotifyPropertyChanged("sSTOREY")
+            NotifyPropertyChanged(NameOf(sSTOREY))
          End If
       End Set
    End Property
@@ -453,7 +453,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_GROUP, value) Then
             m_BTLPartM.sGROUP = value
          Else
-            NotifyPropertyChanged("sGROUP")
+            NotifyPropertyChanged(NameOf(sGROUP))
          End If
       End Set
    End Property
@@ -466,7 +466,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PACKAGE, value) Then
             m_BTLPartM.sPACKAGE = value
          Else
-            NotifyPropertyChanged("sPACKAGE")
+            NotifyPropertyChanged(NameOf(sPACKAGE))
          End If
       End Set
    End Property
@@ -520,7 +520,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_TIMBERGRADE, value) Then
             m_BTLPartM.sTIMBERGRADE = value
          Else
-            NotifyPropertyChanged("sTIMBERGRADE")
+            NotifyPropertyChanged(NameOf(sTIMBERGRADE))
          End If
       End Set
    End Property
@@ -533,7 +533,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_QUALITYGRADE, value) Then
             m_BTLPartM.sQUALITYGRADE = value
          Else
-            NotifyPropertyChanged("sQUALITYGRADE")
+            NotifyPropertyChanged(NameOf(sQUALITYGRADE))
          End If
       End Set
    End Property
@@ -563,7 +563,7 @@ Public Class BTLPartVM
             m_BTLPartM.m_colCOLOR.A = Color3d.Clamp(nCOLA, 0, 100)
             EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COLOUR, m_BTLPartM.colCOLOR.ToString())
          Else
-            NotifyPropertyChanged("sCOLRGB")
+            NotifyPropertyChanged(NameOf(sCOLRGB))
          End If
       End Set
    End Property
@@ -576,8 +576,8 @@ Public Class BTLPartVM
          If m_BTLPartM.colCOLOR.A <> value Then
             m_BTLPartM.m_colCOLOR.A = Color3d.Clamp(value, 0, 100)
             EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COLOUR, m_BTLPartM.colCOLOR.ToString())
-            NotifyPropertyChanged("nCOLA")
-            NotifyPropertyChanged("PartColour")
+            NotifyPropertyChanged(NameOf(nCOLA))
+            NotifyPropertyChanged(NameOf(PartColour))
          End If
       End Set
    End Property
@@ -591,7 +591,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempPlaningLen, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PLANINGLENGTH, dTempPlaningLen) Then
             m_BTLPartM.dPLANINGLEN = dTempPlaningLen
          Else
-            NotifyPropertyChanged("dPLANINGLEN")
+            NotifyPropertyChanged(NameOf(dPLANINGLEN))
          End If
       End Set
    End Property
@@ -605,7 +605,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempStartOffset, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STARTOFFSET, dTempStartOffset) Then
             m_BTLPartM.dSTARTOFFSET = dTempStartOffset
          Else
-            NotifyPropertyChanged("dSTARTOFFSET")
+            NotifyPropertyChanged(NameOf(dSTARTOFFSET))
          End If
       End Set
    End Property
@@ -619,7 +619,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempEndOffset, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ENDOFFSET, dTempEndOffset) Then
             m_BTLPartM.dENDOFFSET = dTempEndOffset
          Else
-            NotifyPropertyChanged("dENDOFFSET")
+            NotifyPropertyChanged(NameOf(dENDOFFSET))
          End If
       End Set
    End Property
@@ -638,11 +638,11 @@ Public Class BTLPartVM
          If m_BTLPartM.SelUID <> value Then
             m_BTLPartM.m_refTransf = m_BTLPartM.refTransfList(value)
             m_BTLPartM.SelUID = value
-            NotifyPropertyChanged("TransfOrig")
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfOrig))
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("SelUID")
+            NotifyPropertyChanged(NameOf(SelUID))
          End If
       End Set
    End Property
@@ -677,7 +677,7 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
          Else
-            NotifyPropertyChanged("TransfOrig")
+            NotifyPropertyChanged(NameOf(TransfOrig))
          End If
       End Set
    End Property
@@ -712,10 +712,10 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.x, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("TransfVersX")
+            NotifyPropertyChanged(NameOf(TransfVersX))
          End If
       End Set
    End Property
@@ -750,10 +750,10 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.x, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersY))
          End If
       End Set
    End Property
@@ -782,7 +782,7 @@ Public Class BTLPartVM
                                                   " P04: " & sValArray(3)) Then
             m_BTLPartM.SelCAMBERSIDE = value
          Else
-            NotifyPropertyChanged("SelCAMBERSIDE")
+            NotifyPropertyChanged(NameOf(SelCAMBERSIDE))
          End If
       End Set
    End Property
@@ -807,7 +807,7 @@ Public Class BTLPartVM
                                                   " P03: " & sValArray(2) &
                                                   " P04: " & sValArray(3))
          Else
-            NotifyPropertyChanged("CamberParams")
+            NotifyPropertyChanged(NameOf(CamberParams))
          End If
       End Set
    End Property
@@ -839,7 +839,7 @@ Public Class BTLPartVM
                                                       " P14: " & sValArray(3)) Then
             m_BTLPartM.SelREFSIDEFIXCLAMP = value
          Else
-            NotifyPropertyChanged("SelREFSIDEFIXCLAMP")
+            NotifyPropertyChanged(NameOf(SelREFSIDEFIXCLAMP))
          End If
       End Set
    End Property
@@ -867,7 +867,7 @@ Public Class BTLPartVM
                                                       " P13: " & sValArray(2) &
                                                       " P14: " & sValArray(3))
          Else
-            NotifyPropertyChanged("PartOffsetParams")
+            NotifyPropertyChanged(NameOf(PartOffsetParams))
          End If
       End Set
    End Property
@@ -888,7 +888,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PROCESSINGQUALITY, sValue) Then
             m_BTLPartM.SelPROCESSINGQUALITY = value
          Else
-            NotifyPropertyChanged("SelPROCESSINGQUALITY")
+            NotifyPropertyChanged(NameOf(SelPROCESSINGQUALITY))
          End If
       End Set
    End Property
@@ -909,7 +909,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_RECESS, sValue) Then
             m_BTLPartM.SelRECESS = value
          Else
-            NotifyPropertyChanged("SelRECESS")
+            NotifyPropertyChanged(NameOf(SelRECESS))
          End If
       End Set
    End Property
@@ -930,7 +930,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STOREYTYPE, sValue) Then
             m_BTLPartM.SelSTOREYTYPE = value
          Else
-            NotifyPropertyChanged("SelSTOREYTYPE")
+            NotifyPropertyChanged(NameOf(SelSTOREYTYPE))
          End If
       End Set
    End Property
@@ -943,7 +943,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ELEMENTNUM, value) Then
             m_BTLPartM.sELEMENTNUM = value
          Else
-            NotifyPropertyChanged("sELEMENTNUM")
+            NotifyPropertyChanged(NameOf(sELEMENTNUM))
          End If
       End Set
    End Property
@@ -956,7 +956,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_LAYER, value) Then
             m_BTLPartM.nLAYER = value
          Else
-            NotifyPropertyChanged("nLAYER")
+            NotifyPropertyChanged(NameOf(nLAYER))
          End If
       End Set
    End Property
@@ -969,7 +969,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MODULENUM, value) Then
             m_BTLPartM.sMODULENUM = value
          Else
-            NotifyPropertyChanged("sMODULENUM")
+            NotifyPropertyChanged(NameOf(sMODULENUM))
          End If
       End Set
    End Property
@@ -996,7 +996,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COMMENT, value) Then
             m_BTLPartM.sCOMMENT = value
          Else
-            NotifyPropertyChanged("sCOMMENT")
+            NotifyPropertyChanged(NameOf(sCOMMENT))
          End If
       End Set
    End Property
@@ -1020,7 +1020,7 @@ Public Class BTLPartVM
                                                     sValArray(2) & ";" &
                                                     If(bGRAINDIRALIGN, 1, 0))
          Else
-            NotifyPropertyChanged("GrainDirection")
+            NotifyPropertyChanged(NameOf(GrainDirection))
          End If
       End Set
    End Property
@@ -1040,7 +1040,7 @@ Public Class BTLPartVM
                                                     sValArray(2) & ";" &
                                                     If(value, 1, 0)) Then
             m_BTLPartM.bGRAINDIRALIGN = value
-            NotifyPropertyChanged("bGRAINDIRALIGN")
+            NotifyPropertyChanged(NameOf(bGRAINDIRALIGN))
          End If
       End Set
    End Property
@@ -1059,7 +1059,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_REFSIDE, (value + 1) & ";" & If(bREFSIDEALIGN, 1, 0)) Then
             m_BTLPartM.SelREFSIDE = value
          Else
-            NotifyPropertyChanged("SelREFSIDE")
+            NotifyPropertyChanged(NameOf(SelREFSIDE))
          End If
       End Set
    End Property
@@ -1071,7 +1071,7 @@ Public Class BTLPartVM
       Set(value As Boolean)
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_REFSIDE, (SelREFSIDE + 1) & ";" & If(value, 1, 0)) Then
             m_BTLPartM.bREFSIDEALIGN = value
-            NotifyPropertyChanged("bREFSIDEALIGN")
+            NotifyPropertyChanged(NameOf(bREFSIDEALIGN))
          End If
       End Set
    End Property
@@ -1094,7 +1094,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ALIGNMENT, sValueLoc & ": " & sValueEnd) Then
             m_BTLPartM.SelALIGNLOCATION = value
          Else
-            NotifyPropertyChanged("SelALIGNLOCATION")
+            NotifyPropertyChanged(NameOf(SelALIGNLOCATION))
          End If
       End Set
    End Property
@@ -1117,7 +1117,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ALIGNMENT, sValueLoc & ": " & sValueEnd) Then
             m_BTLPartM.SelALIGNENDTYPE = value
          Else
-            NotifyPropertyChanged("SelALIGNENDTYPE")
+            NotifyPropertyChanged(NameOf(SelALIGNENDTYPE))
          End If
       End Set
    End Property
@@ -1138,7 +1138,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & sMATERIALTYPESPEC) Then
             m_BTLPartM.SelMATERIALTYPEGRP = value
          Else
-            NotifyPropertyChanged("SelMATERIALTYPEGRP")
+            NotifyPropertyChanged(NameOf(SelMATERIALTYPEGRP))
          End If
       End Set
    End Property
@@ -1153,7 +1153,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & value) Then
             m_BTLPartM.sMATERIALTYPESPEC = value
          Else
-            NotifyPropertyChanged("sMATERIALTYPESPEC")
+            NotifyPropertyChanged(NameOf(sMATERIALTYPESPEC))
          End If
       End Set
    End Property
@@ -1580,6 +1580,8 @@ Public Class BTLPartVM
          If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
             EgtResetCurrMachGroup()
             ResetSearchFound()
+            Map.refStatisticsTimePanelVM.ViewPage_Visibility = Visibility.Visible
+            Map.refStatisticsTimePanelVM.MachiningPage_Visibility = Visibility.Collapsed
          End If
          EgtDraw()
          NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
@@ -1833,7 +1835,7 @@ Public Class BTLPartVM
       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)
+         EgtSetInfo(nNewPartId, BTL_PRT_PROJ, ProjectManagerVM.CurrProd.nProjIdList(0))
       End If
       EgtBeamSetPartProdNbr(m_BTLStructureM.NewPDN())
       EgtBeamSetPartName(m_BTLPartM.sNAM)

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -574,7 +574,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJNUM, value) Then
             m_BTLStructureM.m_sPROJNUM = value
          Else
-            NotifyPropertyChanged("sPROJNUM")
+            NotifyPropertyChanged(NameOf(sPROJNUM))
          End If
       End Set
    End Property
@@ -587,7 +587,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJNAME, value) Then
             m_BTLStructureM.m_sPROJNAME = value
          Else
-            NotifyPropertyChanged("sPROJNAME")
+            NotifyPropertyChanged(NameOf(sPROJNAME))
          End If
       End Set
    End Property
@@ -600,7 +600,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJPART, value) Then
             m_BTLStructureM.m_sPROJPART = value
          Else
-            NotifyPropertyChanged("sPROJPART")
+            NotifyPropertyChanged(NameOf(sPROJPART))
          End If
       End Set
    End Property
@@ -613,7 +613,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJGUID, value) Then
             m_BTLStructureM.m_sPROJGUID = value
          Else
-            NotifyPropertyChanged("sPROJGUID")
+            NotifyPropertyChanged(NameOf(sPROJGUID))
          End If
       End Set
    End Property
@@ -650,7 +650,7 @@ Public Class BTLStructureVM
             DbControllers.m_ProjController.UpdateListName(ProjectManagerVM.CurrProj.nProjId, value)
             m_BTLStructureM.m_sLISTNAME = value
          Else
-            NotifyPropertyChanged("sLISTNAME")
+            NotifyPropertyChanged(NameOf(sLISTNAME))
          End If
       End Set
    End Property
@@ -663,7 +663,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_CUSTOMER, value) Then
             m_BTLStructureM.m_sCUSTOMER = value
          Else
-            NotifyPropertyChanged("sCUSTOMER")
+            NotifyPropertyChanged(NameOf(sCUSTOMER))
          End If
       End Set
    End Property
@@ -676,7 +676,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_ARCHITECT, value) Then
             m_BTLStructureM.m_sARCHITECT = value
          Else
-            NotifyPropertyChanged("sARCHITECT")
+            NotifyPropertyChanged(NameOf(sARCHITECT))
          End If
       End Set
    End Property
@@ -689,7 +689,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EDITOR, value) Then
             m_BTLStructureM.m_sEDITOR = value
          Else
-            NotifyPropertyChanged("sEDITOR")
+            NotifyPropertyChanged(NameOf(sEDITOR))
          End If
       End Set
    End Property
@@ -702,7 +702,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_DELIVDATE, value) Then
             m_BTLStructureM.m_sDELIVDATE = value
          Else
-            NotifyPropertyChanged("sDELIVDATE")
+            NotifyPropertyChanged(NameOf(sDELIVDATE))
          End If
       End Set
    End Property
@@ -715,7 +715,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPDATE, value) Then
             m_BTLStructureM.m_sEXPDATE = value
          Else
-            NotifyPropertyChanged("sEXPDATE")
+            NotifyPropertyChanged(NameOf(sEXPDATE))
          End If
       End Set
    End Property
@@ -728,7 +728,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPTIME, value) Then
             m_BTLStructureM.m_sEXPTIME = value
          Else
-            NotifyPropertyChanged("sEXPTIME")
+            NotifyPropertyChanged(NameOf(sEXPTIME))
          End If
       End Set
    End Property
@@ -741,7 +741,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPRELEASE, value) Then
             m_BTLStructureM.m_sEXPRELEASE = value
          Else
-            NotifyPropertyChanged("sEXPRELEASE")
+            NotifyPropertyChanged(NameOf(sEXPRELEASE))
          End If
       End Set
    End Property
@@ -754,7 +754,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_LANGUAGE, value) Then
             m_BTLStructureM.m_sLANGUAGE = value
          Else
-            NotifyPropertyChanged("sLANGUAGE")
+            NotifyPropertyChanged(NameOf(sLANGUAGE))
          End If
       End Set
    End Property
@@ -775,7 +775,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_RANGE, sValue) Then
             m_BTLStructureM.m_SelRANGE = value
          Else
-            NotifyPropertyChanged("SelRANGE")
+            NotifyPropertyChanged(NameOf(SelRANGE))
          End If
       End Set
    End Property
@@ -796,7 +796,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_PRT_PROCESSINGQUALITY, sValue) Then
             m_BTLStructureM.m_SelPROCESSINGQUALITY = value
          Else
-            NotifyPropertyChanged("SelPROCESSINGQUALITY")
+            NotifyPropertyChanged(NameOf(SelPROCESSINGQUALITY))
          End If
       End Set
    End Property
@@ -809,7 +809,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_COMPUTERNAME, value) Then
             m_BTLStructureM.m_sCOMPUTERNAME = value
          Else
-            NotifyPropertyChanged("sCOMPUTERNAME")
+            NotifyPropertyChanged(NameOf(sCOMPUTERNAME))
          End If
       End Set
    End Property
@@ -822,7 +822,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_USER, value) Then
             m_BTLStructureM.m_sUSER = value
          Else
-            NotifyPropertyChanged("sUSER")
+            NotifyPropertyChanged(NameOf(sUSER))
          End If
       End Set
    End Property
@@ -835,7 +835,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_SRCFILE, value) Then
             m_BTLStructureM.m_sSRCFILE = value
          Else
-            NotifyPropertyChanged("sSRCFILE")
+            NotifyPropertyChanged(NameOf(sSRCFILE))
          End If
       End Set
    End Property
@@ -848,7 +848,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPFILE, value) Then
             m_BTLStructureM.m_sEXPFILE = value
          Else
-            NotifyPropertyChanged("sEXPFILE")
+            NotifyPropertyChanged(NameOf(sEXPFILE))
          End If
       End Set
    End Property
@@ -869,7 +869,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_PRT_RECESS, sValue) Then
             m_BTLStructureM.m_SelRECESS = value
          Else
-            NotifyPropertyChanged("SelRECESS")
+            NotifyPropertyChanged(NameOf(SelRECESS))
          End If
       End Set
    End Property
@@ -882,7 +882,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_USERATTRIBUTE, value) Then
             m_BTLStructureM.m_sUSERATTRIBUTE = value
          Else
-            NotifyPropertyChanged("sUSERATTRIBUTE")
+            NotifyPropertyChanged(NameOf(sUSERATTRIBUTE))
          End If
       End Set
    End Property
@@ -1095,10 +1095,6 @@ Public Class BTLStructureVM
       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
          ' tolgo pezzo selezionato
          SelBTLPart.SelBTLFeatureVM = Nothing
       End If
@@ -1369,7 +1365,7 @@ Public Class BTLStructureVM
    End Sub
 
    Private Sub OnBTLPartVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      Select Case e.PropertyName
+      Select Case "bDO"
          Case NameOf(sender.sMATERIAL)
             If Not GroupList.Contains(sender.sMATERIAL) Then
                GroupList.Add(sender.sMATERIAL)
@@ -1383,7 +1379,7 @@ Public Class BTLStructureVM
          Case NameOf(sender.nDONE)
             NotifyPropertyChanged(NameOf(sBTLDoneTime))
             NotifyPropertyChanged(NameOf(sBTLRemainingTime))
-         Case NameOf(sender.bDOALL)
+         Case NameOf(sender.bDO), NameOf(sender.sPriority)
             NotifyPropertyChanged(NameOf(bDOALL))
       End Select
    End Sub

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -598,11 +598,14 @@ Public Class CALCPanelVM
          ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
             nProjType = Map.refProdManagerVM.nProdType
             sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.CurrProd.sMachine, "")
+         ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+            nProjType = Map.refOnlyProdManagerVM.nProdType
+            sMachineName = If(Not IsNothing(ProjectManagerVM.CurrProd), ProjectManagerVM.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.ONLYPRODPAGE And Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.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
@@ -611,7 +614,7 @@ Public Class CALCPanelVM
             End If
          End If
       Next
-      Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1)
+      Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1)
    End Sub
 
    Friend Function IsMachineModified() As Boolean
@@ -668,7 +671,7 @@ Public Class CALCPanelVM
    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
+         (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) 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
@@ -682,7 +685,7 @@ Public Class CALCPanelVM
          ' lancio calcolo
          EgtBEAMWALL.Core.CalcIntegration.Run(BarList, ProjectManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
       ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         ProjType = Map.refOnlyProdManagerVM.CurrProd.nType
+         ProjType = ProjectManagerVM.CurrProd.nType
          If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
             If Not CreateBarToVerify(Pages.VIEW, ProjType, BarList) Then Return
             ' lancio calcolo
@@ -1130,7 +1133,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 ProjectManagerVM.CurrProj.nProdId > 0 AndAlso Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE Then
          MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       Else
          SetChooseMachine_Visibility(True)
@@ -1162,16 +1165,21 @@ 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 TempList As New List(Of BTLPartM)
+      Dim ProjId As Integer
+      Dim nPartProjId As Integer
+      'Dim TempList As New List(Of BTLPartM)
       Dim nPartId As Integer = EgtGetFirstPart()
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         ProjId = ProjectManagerVM.CurrProd.nProjIdList(0)
+      Else
+         ProjId = ProjectManagerVM.CurrProj.nProjId
+      End If
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, nPartProjId)
       While nPartId <> GDB_ID.NULL
          ' se devo filtrare un progetto
-         If ProjId > 0 Then
+         If ProjId > 0 OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
             ' verifico se il pezzo appartiene al ProjId
-            Dim nPartProjId As Integer
-            EgtGetInfo(nPartId, BTL_PRT_PROJ, nPartProjId)
-            If nPartProjId = ProjId Then
+            If nPartProjId = ProjId OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                EgtRemoveInfo(nPartId, ITG_PROJ_ERR)
                EgtRemoveInfo(nPartId, ITG_PROJ_MSG)
                EgtRemoveInfo(nPartId, ITG_PROJ_ROT)
@@ -1198,9 +1206,9 @@ Public Class CALCPanelVM
                   ' verifico che sia una feature
                   Dim nGRP As Integer
                   If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
-                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR))
-                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG))
-                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ROT, ITG_PROD_ROT))
+                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_ERR, ITG_PROD_ERR))
+                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_MSG, ITG_PROD_MSG))
+                     EgtRemoveInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, ITG_PROJ_ROT, ITG_PROD_ROT))
                   End If
                   nFeatureId = EgtGetNext(nFeatureId)
                End While
@@ -1208,6 +1216,15 @@ Public Class CALCPanelVM
          End If
          nPartId = EgtGetNextPart(nPartId)
       End While
+      ' Se OnlyProdPage rimuovo MachGroup
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
+         If MessageBox.Show(EgtMsg(61779), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+            For Index As Integer = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 To 0 Step -1
+               Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Index)
+               CurrMachGroup.DeleteMachGroup()
+            Next
+         End If
+      End If
       ' rigenero struttura BTL
       Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId))
    End Sub

EgtBEAMWALL.ViewerOptimizer/CALCPanel/OnlyProdCalcPanelV.xaml

@@ -0,0 +1,69 @@
+<EgtFloating:EgtFloatingPanel x:Class="OnlyProdCalcPanelV"
+                              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"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+   
+   <Button FontSize="20"
+           FontWeight="Light"
+           ToolTip="{Binding Verify_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding Verify_Command}"
+           IsEnabled="{Binding Verify_IsEnabled}">
+      <Image Source="/Resources/CALCPanel/Verify.png" Stretch="Uniform"/>
+   </Button>
+   <Button FontSize="20"
+           FontWeight="Light"
+           ToolTip="{Binding VerifyAll_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding VerifyAll_Command}"
+           IsEnabled="{Binding VerifyAll_IsEnabled}">
+      <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding ResetCalc_Command}"
+           ToolTip="{Binding ResetCalc_ToolTip}"
+           IsEnabled="{Binding CALCPanel_IsEnabled}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>
+   </Button>
+   <Button ToolTip="{Binding Simulate_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding Simulate_Command}"
+           IsEnabled="{Binding Simulate_IsEnabled}">
+      <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
+   </Button>
+   <Button ToolTip="{Binding Edit_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding Edit_Command}"
+           IsEnabled="{Binding Edit_IsEnabled}"
+           Visibility="{Binding Edit_Visibility}">
+      <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
+   </Button>
+   <Button ToolTip="{Binding ChooseMachine_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding ChooseMachine_Command}"
+           IsEnabled="{Binding CALCPanel_IsEnabled}"
+           Visibility="{Binding ChooseMachineBtn_Visibility}">
+      <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
+   </Button>
+
+   <Grid Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="Auto"/>
+      </Grid.ColumnDefinitions>
+      <!--Combobox per selezionare la macchina corrente-->
+      <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
+                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+                Height="22" Width="150"
+                Grid.Column="0"/>
+      <Button Content="OK"
+                FontSize="10"
+                FontWeight="Light"
+                Style="{StaticResource ToolBar_Button}"
+                Command="{Binding Ok_Command}"
+                Grid.Column="1"/>
+   </Grid>
+
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/CALCPanel/OnlyProdCalcPanelV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml

@@ -1,17 +1,17 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="ChangeMaterialWndV"
-             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"
-             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-             WindowStyle="None" ResizeMode="NoResize"
-             SizeToContent="WidthAndHeight"
-             WindowStartupLocation="CenterOwner"
-             IsClosable="False"
-             IsMinimizable="False"
-             IsResizable="False"
-             Title="ChangeMaterialWnd">
-   
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="ChangeMaterialWnd">
+
    <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -59,7 +59,7 @@ Public Class ChangeParameterWndVM
       End Get
       Set(value As Parameters)
          m_SelParam = value
-         NotifyPropertyChanged("SelParam")
+         NotifyPropertyChanged(NameOf(SelParam))
       End Set
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,7 +1,9 @@
-<DockPanel x:Class="ConfigurationPageV"
+<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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+           DataContext="{StaticResource ConfigurationPageVM}">
 
    <Grid>
       <Grid.ColumnDefinitions>
@@ -48,23 +50,42 @@
                <EgtBEAMWALLCORE:QParameter_ConfigurationPageV/>
             </TabItem.Content>
          </TabItem>
-         <TabItem >
+         <TabItem>
             <TabItem.Header>
                <StackPanel Orientation="Horizontal">
                   <TextBlock Text="{Binding Machine_Msg}"
                              Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
+                  <!--<Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding Machine_Visibility}"
                           Style="{StaticResource OptionPanel_Button}">
                      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
+                  </Button>-->
                </StackPanel>
             </TabItem.Header>
             <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>
+
+            <TabItem.Content>
+               <EgtBEAMWALL:PDFEditorV/>
+            </TabItem.Content>
+         </TabItem>
+
       </TabControl>
 
       <!--<Button Command="{Binding SaveCommand}"

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -3,6 +3,7 @@ Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
+Imports System.Linq.Expressions
 Imports MS.Internal
 Imports Ionic.Zip
 
@@ -13,6 +14,7 @@ Public Class ConfigurationPageVM
       GENERAL = 0
       QPARAMETERS = 1
       MACHINE = 2
+      PDFEDITOR = 3
    End Enum
 
    Private m_QParametersModified As Boolean = False
@@ -35,19 +37,23 @@ Public Class ConfigurationPageVM
          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_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
 
@@ -262,6 +268,28 @@ Public Class ConfigurationPageVM
       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
+
+   Private m_MachineParameter_Visibility As Visibility = Visibility.Collapsed
+   Public Property MachineParameter_Visibility As Visibility
+      Get
+         Return m_MachineParameter_Visibility
+      End Get
+      Set(value As Visibility)
+         m_MachineParameter_Visibility = value
+         NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
+      End Set
+   End Property
+
    ' Definizione comandi
    Private m_cmdSave As ICommand
    Private m_cmdChooseExternalBackupFolderPath As ICommand
@@ -269,7 +297,6 @@ Public Class ConfigurationPageVM
    Private m_cmdRestore As ICommand
 
 #Region "Messages"
-
    Public ReadOnly Property L_Msg As String
       Get
          Return EgtMsg(61803)
@@ -288,6 +315,12 @@ 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)
@@ -317,36 +350,43 @@ 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)
@@ -419,6 +459,12 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public ReadOnly Property PDFEditor_Msg As String
+      Get
+         Return EgtMsg(62538)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "Constructor"
@@ -478,6 +524,10 @@ Public Class ConfigurationPageVM
       SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
       Dim nExternalBackupActive As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, 0)
       m_bExternalBackupActive = nExternalBackupActive > 0
+      m_MachineParameter_Visibility = Visibility.Collapsed
+      m_bMachine_Visibility = Visibility.Collapsed
+      NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
+      NotifyPropertyChanged(NameOf(Machine_Visibility))
       NotifyPropertyChanged(NameOf(bExternalBackupActive))
    End Sub
 
@@ -976,9 +1026,14 @@ Public Class ConfigurationPageVM
 
    ' funzione che verifica l'inserimento della password quando si edita un parametro Macchina
    Friend Function VerifyConfigPagePassword() As Boolean
+      Dim InputPwdWnd As Object = Nothing
       ' Display message, title, and default value.
       Dim InputPwdWndVM As New InputPwdWndVM()
-      Dim InputPwdWnd As New InputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         InputPwdWnd = New OnlyProdInputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
+      Else
+         InputPwdWnd = New InputPwdWndV(Application.Current.MainWindow, InputPwdWndVM)
+      End If
       If InputPwdWnd.ShowDialog() Then
          ' Lettura PWD dall'INI e confronto
          Dim sPwdIni As String = String.Empty
@@ -1153,7 +1208,7 @@ Public Class MachParam
          If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then
             Map.refConfigurationPageVM.bModifyMachParam = Map.refConfigurationPageVM.VerifyConfigPagePassword()
             If Not Map.refConfigurationPageVM.bModifyMachParam Then
-               NotifyPropertyChanged("sValue")
+               NotifyPropertyChanged(NameOf(sValue))
                m_IsModifiedValue = False
                Return
             End If
@@ -1173,7 +1228,7 @@ Public Class MachParam
       End Get
       Set(value As Double)
          m_dValue = value
-         NotifyPropertyChanged("sValue")
+         NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml

@@ -0,0 +1,83 @@
+<DockPanel x:Class="OnlyProdConfigurationPageV"
+           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"
+           DataContext="{StaticResource ConfigurationPageVM}">
+   <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>
+               <EgtBEAMWALLCORE: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>
+               <EgtBEAMWALLCORE:QParameter_ConfigurationPageV/>
+            </TabItem.Content>
+         </TabItem>
+         <TabItem>
+            <TabItem.Header>
+               <StackPanel Orientation="Horizontal">
+                  <TextBlock Text="{Binding Machine_Msg}"
+                             Style="{StaticResource OptionTextBlock}"/>
+               </StackPanel>
+            </TabItem.Header>
+            <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>
+
+            <TabItem.Content>
+               <EgtBEAMWALL:PDFEditorV/>
+            </TabItem.Content>
+         </TabItem>
+      </TabControl>
+   </Grid>
+</DockPanel>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/OnlyProdConfigurationPageV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -1,5 +1,4 @@
 <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>
@@ -138,12 +137,6 @@
     <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>
@@ -152,55 +145,7 @@
       <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" />
@@ -209,24 +154,9 @@
     <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" />
@@ -237,16 +167,10 @@
     <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">
@@ -259,14 +183,32 @@
     <Compile Include="AddFeatureWnd\NewAddFeatureWndV.xaml.vb">
       <DependentUpon>NewAddFeatureWndV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AddPartWnd\OnlyProdAddPartWndV.xaml.vb">
+      <DependentUpon>OnlyProdAddPartWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml.vb">
+      <DependentUpon>OnlyProdAddRawPartWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="BTLPartList\OnlyProdBTLPartListV.xaml.vb">
+      <DependentUpon>OnlyProdBTLPartListV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="BTLPartManager\BTLPartManagerV.xaml.vb">
       <DependentUpon>BTLPartManagerV.xaml</DependentUpon>
     </Compile>
     <Compile Include="BTLPartManager\BTLPartManagerVM.vb" />
+    <Compile Include="BTLPartManager\OnlyProdBTLPartManagerV.xaml.vb">
+      <DependentUpon>OnlyProdBTLPartManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CALCPanel\OnlyProdCalcPanelV.xaml.vb">
+      <DependentUpon>OnlyProdCalcPanelV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml.vb">
       <DependentUpon>ChangeMaterialWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ChangeMaterialWnd\ChangeMaterialWndVM.vb" />
+    <Compile Include="ConfigurationPage\OnlyProdConfigurationPageV.xaml.vb">
+      <DependentUpon>OnlyProdConfigurationPageV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
     <Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
     <Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
@@ -274,16 +216,83 @@
       <DependentUpon>FeatureListManagerV.xaml</DependentUpon>
     </Compile>
     <Compile Include="FeatureListManager\FeatureListManagerVM.vb" />
+    <Compile Include="FeatureListManager\OnlyProdFeatureListManagerV.xaml.vb">
+      <DependentUpon>OnlyProdFeatureListManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FeatureManager\OnlyProdFeatureManagerV.xaml.vb">
+      <DependentUpon>OnlyProdFeatureManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FreeContourInput\OnlyProdFreeContourInputV.xaml.vb">
+      <DependentUpon>OnlyProdFreeContourInputV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FreeContourManager\OnlyProdFreeContourManagerV.xaml.vb">
+      <DependentUpon>OnlyProdFreeContourManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="InputPwdWnd\OnlyProdInputPwdWndV.xaml.vb">
+      <DependentUpon>OnlyProdInputPwdWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml.vb">
+      <DependentUpon>OnlyProdInstrumentPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml.vb">
+      <DependentUpon>OnlyProdFeatureInPartInRawPartListV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ItemParamList\OnlyProdPartInRawPartListV.xaml.vb">
+      <DependentUpon>OnlyProdPartInRawPartListV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ItemParamList\OnlyProdRawPartListV.xaml.vb">
+      <DependentUpon>OnlyProdRawPartListV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MachinePanel\MachinePanelVM.vb" />
     <Compile Include="MacroFeatureWnd\NewMacroFeatureWnd.xaml.vb">
       <DependentUpon>NewMacroFeatureWnd.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MainMenu\OnlyProdMainMenuV.xaml.vb">
+      <DependentUpon>OnlyProdMainMenuV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml.vb">
+      <DependentUpon>OnlyProdMovePartInRawPartWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NestingRunningWnd\OnlyProdNestingRunningWndV.xaml.vb">
+      <DependentUpon>OnlyProdNestingRunningWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PartInRawPartManager\OnlyProdPartInRawPartManagerV.xaml.vb">
+      <DependentUpon>OnlyProdPartInRawPartManagerV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml.vb">
       <DependentUpon>PartInRawPartManagerWndV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PartManager\OnlyProdPartManagerV.xaml.vb">
+      <DependentUpon>OnlyProdPartManagerV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PdfViewer\PDFViewerVM.vb" />
+    <Compile Include="ProjectTypeWnd\OnlyProdProjectTypeWndV.xaml.vb">
+      <DependentUpon>OnlyProdProjectTypeWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RawPartManager\OnlyProdRawPartManagerV.xaml.vb">
+      <DependentUpon>OnlyProdRawPartManagerV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="RawPartManager\RawPartManagerWndV.xaml.vb">
       <DependentUpon>RawPartManagerWndV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ShowBeamPanel\OnlyProdShowBeamPanelV.xaml.vb">
+      <DependentUpon>OnlyProdShowBeamPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ShowPanel\OnlyProdShowPanelV.xaml.vb">
+      <DependentUpon>OnlyProdShowPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SpecialPanel\OnlyProdSpecialPanelV.xaml.vb">
+      <DependentUpon>OnlyProdSpecialPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="StatisticsTimePanel\OnlyProdStatisticsTimePanelV.xaml.vb">
+      <DependentUpon>OnlyProdStatisticsTimePanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Statistics\OnlyProdOptimizerStatisticsV.xaml.vb">
+      <DependentUpon>OnlyProdOptimizerStatisticsV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Statistics\OnlyProdStatisticsV.xaml.vb">
+      <DependentUpon>OnlyProdStatisticsV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TabWnd\ProdWndV.xaml.vb">
       <DependentUpon>ProdWndV.xaml</DependentUpon>
     </Compile>
@@ -386,6 +395,9 @@
     </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>
@@ -417,6 +429,10 @@
     <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>
@@ -428,6 +444,12 @@
     <Compile Include="TabWnd\ProjWndVM.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
+    <Compile Include="UpdateBTLWnd\OnlyProdUpdateBTLWndV.xaml.vb">
+      <DependentUpon>OnlyProdUpdateBTLWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UpdateBTLWnd\OnlyProdUpdateOrAppendWndV.xaml.vb">
+      <DependentUpon>OnlyProdUpdateOrAppendWndV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UpdateBTLWnd\UpdateOrAppendWndVM.vb" />
     <Compile Include="UpdateBTLWnd\UpdateBTLWndV.xaml.vb">
       <DependentUpon>UpdateBTLWndV.xaml</DependentUpon>
@@ -442,8 +464,15 @@
     <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="ViewPanel\OnlyProdViewPanelV.xaml.vb">
+      <DependentUpon>OnlyProdViewPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WarehouseWnd\OnlyProdWarehouseWndV.xaml.vb">
+      <DependentUpon>OnlyProdWarehouseWndV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WarehouseWnd\WarehouseHelper.vb" />
     <Compile Include="WarehouseWnd\WarehouseWndV.xaml.vb">
       <DependentUpon>WarehouseWndV.xaml</DependentUpon>
@@ -542,18 +571,106 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="AddPartWnd\OnlyProdAddPartWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="AddRawPartWnd\OnlyProdAddRawPartWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="BTLPartList\OnlyProdBTLPartListV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="BTLPartManager\BTLPartManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="BTLPartManager\OnlyProdBTLPartManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CALCPanel\OnlyProdCalcPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ConfigurationPage\OnlyProdConfigurationPageV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FeatureListManager\FeatureListManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="FeatureListManager\OnlyProdFeatureListManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="FeatureManager\OnlyProdFeatureManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="FreeContourInput\OnlyProdFreeContourInputV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="FreeContourManager\OnlyProdFreeContourManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="InputPwdWnd\OnlyProdInputPwdWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="InstrumentPanel\OnlyProdInstrumentPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ItemParamList\OnlyProdFeatureInPartInRawPartListV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ItemParamList\OnlyProdPartInRawPartListV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ItemParamList\OnlyProdRawPartListV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainMenu\OnlyProdMainMenuV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MovePartInRawPartWnd\OnlyProdMovePartInRawPartWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NestingRunningWnd\OnlyProdNestingRunningWndV.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\OnlyProdPartInRawPartManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PartInRawPartManager\PartInRawPartManagerV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MacroFeatureWnd\NewMacroFeatureWnd.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -562,10 +679,58 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PartManager\OnlyProdPartManagerV.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="ProjectTypeWnd\OnlyProdProjectTypeWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RawPartManager\OnlyProdRawPartManagerV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RawPartManager\RawPartManagerWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ShowBeamPanel\OnlyProdShowBeamPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ShowPanel\OnlyProdShowPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SpecialPanel\OnlyProdSpecialPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="StatisticsTimePanel\OnlyProdStatisticsTimePanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Statistics\OnlyProdOptimizerStatisticsV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Statistics\OnlyProdStatisticsV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TabWnd\ProdWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -654,26 +819,6 @@
       <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">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PartParametersWnd\PartParametersWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ProdProjManager\ProdProjManagerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ProjectTypeWnd\ProjectTypeWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -706,10 +851,22 @@
       <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>
     </Page>
+    <Page Include="UpdateBTLWnd\OnlyProdUpdateBTLWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UpdateBTLWnd\OnlyProdUpdateOrAppendWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UpdateBTLWnd\UpdateBTLWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -718,6 +875,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ViewPanel\OnlyProdViewPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WarehouseWnd\OnlyProdWarehouseWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="WarehouseWnd\WarehouseWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -928,7 +1093,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
@@ -1147,9 +1311,56 @@
   <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>
   <ItemGroup>
     <Resource Include="Resources\InstrumentPanel\Ott.png" />
   </ItemGroup>
@@ -1163,12 +1374,4 @@ 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/FeatureListManagerVM.vb

@@ -169,18 +169,23 @@ Public Class FeatureListManagerVM
 
    Private Sub CreateMacroTable()
       Dim nMacroW, nMacroH As Integer
-      If Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 0 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 180 Then
-         If Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 1 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 3 Then
-            nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
-            nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
-         Else
-            nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
-            nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
-         End If
-      ElseIf Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 90 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 270 Then
-         If Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 1 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 3 Then
-            nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
-            nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
+      If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM) Then
+         If Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 0 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 180 Then
+            If Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 1 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 3 Then
+               nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
+               nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
+            Else
+               nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
+               nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
+            End If
+         ElseIf Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 90 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nROTATED = 270 Then
+            If Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 1 OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.m_SelBTLFeatureVM.nSelSIDE = 3 Then
+               nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
+               nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
+            Else
+               nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
+               nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH
+            End If
          Else
             nMacroW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW
             nMacroH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/OnlyProdFeatureListManagerV.xaml

@@ -0,0 +1,37 @@
+<StackPanel x:Class="OnlyProdFeatureListManagerV"
+            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/OnlyProdFeatureListManagerV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerV.xaml

@@ -25,8 +25,8 @@
               Visibility="{Binding Priority_Visibility}"
               Style="{StaticResource OptionTextBlock}"/>
    <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPriority, 
-                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}},
-                                 UpdateSourceTrigger=Explicit}"
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}},
+                                         UpdateSourceTrigger=Explicit}"
                           IsEnabled="{Binding FeatureManager_IsEnabled}"
                           Visibility="{Binding Priority_Visibility}"
                           Width="45"/>

EgtBEAMWALL.ViewerOptimizer/FeatureManager/OnlyProdFeatureManagerV.xaml

@@ -0,0 +1,49 @@
+<StackPanel x:Class="OnlyProdFeatureManagerV"
+            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"
+            Orientation="Horizontal"
+            Height="32">
+
+   <TextBlock Text="{Binding Face_Msg}"
+              IsEnabled="{Binding FeatureManager_IsEnabled}"
+              Style="{StaticResource OptionTextBlock}"/>
+   <ComboBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+             SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+             IsEnabled="{Binding FeatureManager_IsEnabled}"
+             Style="{StaticResource FeatureComboBox}"/>
+   <TextBlock Text="{Binding Group_Msg}"
+              IsEnabled="{Binding FeatureManager_IsEnabled}"
+              Style="{StaticResource OptionTextBlock}"/>
+   <ComboBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+             SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+             IsEnabled="{Binding FeatureManager_IsEnabled}"
+             Style="{StaticResource FeatureComboBox}"/>
+   <TextBlock Text="{Binding Priority_Msg}"
+              IsEnabled="{Binding FeatureManager_IsEnabled}"
+              Visibility="{Binding Priority_Visibility}"
+              Style="{StaticResource OptionTextBlock}"/>
+   <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPriority, 
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}},
+                                         UpdateSourceTrigger=Explicit}"
+                          IsEnabled="{Binding FeatureManager_IsEnabled}"
+                          Visibility="{Binding Priority_Visibility}"
+                          Width="45"/>
+   <TextBlock Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+              Style="{StaticResource OptionTextBlock}"/>
+   <Button Content="{Binding Edit_Msg}"
+           Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           IsEnabled="{Binding Edit_IsEnabled}"
+           Style="{StaticResource EgtWPFLib5_InputButton}"/>
+   <Button Content="{Binding Save_Msg}"
+           Command="{Binding Tag.Save_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           Style="{StaticResource EgtWPFLib5_InputButton}"/>
+   <Button Content="{Binding Cancel_Msg}"
+           Command="{Binding Tag.Cancel_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureManagerV}}}"
+           Style="{StaticResource EgtWPFLib5_InputButton}"/>
+
+</StackPanel>

EgtBEAMWALL.ViewerOptimizer/FeatureManager/OnlyProdFeatureManagerV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/FreeContourInput/FreeContourInputV.xaml

@@ -27,7 +27,7 @@
          </TextBox.InputBindings>
       </TextBox>
       <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
-                   Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
+                Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
                 VerticalAlignment="Center"/>
       <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
                    Visibility="{Binding Combo_Visibility}" Margin="5,0,5,0"/>
@@ -37,10 +37,10 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding Show_Command}" Visibility="{Binding ShowBtn_Visibility}"
-               Content="{Binding ShowMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Content="{Binding ShowMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
          <Button Command="{Binding Done_Command}" Visibility="{Binding DoneBtn_Visibility}"
                  Grid.Column="1"
-               Content="{Binding OkMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                 Content="{Binding OkMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
       </Grid>
    </StackPanel>
 </UserControl>

EgtBEAMWALL.ViewerOptimizer/FreeContourInput/OnlyProdFreeContourInputV.xaml

@@ -0,0 +1,45 @@
+<UserControl x:Class="OnlyProdFreeContourInputV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Height="32">
+   
+   <StackPanel Orientation="Horizontal">
+      <StackPanel.Style>
+         <Style TargetType="{x:Type StackPanel}">
+            <Style.Triggers>
+               <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
+                  <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
+               </DataTrigger>
+            </Style.Triggers>
+         </Style>
+      </StackPanel.Style>
+      <TextBlock Text="{Binding Message}"
+                 Visibility="{Binding Message_Visibility}"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
+               Width="200"
+               Visibility="{Binding Text_Visibility}" Margin="5,0,5,0"
+               Style="{StaticResource FreeContour_TextBox}">
+         <TextBox.InputBindings>
+            <KeyBinding Key="Enter" Command="{Binding Done_Command, UpdateSourceTrigger=PropertyChanged}"/>
+            <KeyBinding Key="S" Modifiers="Control" Command="{Binding Show_Command}"/>
+         </TextBox.InputBindings>
+      </TextBox>
+      <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
+                Visibility="{Binding Check_Visibility}" Margin="5,0,5,0"
+                VerticalAlignment="Center"/>
+      <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
+                   Visibility="{Binding Combo_Visibility}" Margin="5,0,5,0"/>
+      <Grid Margin="5,0,5,0">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Command="{Binding Show_Command}" Visibility="{Binding ShowBtn_Visibility}"
+                 Content="{Binding ShowMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Command="{Binding Done_Command}" Visibility="{Binding DoneBtn_Visibility}"
+                 Grid.Column="1"
+                 Content="{Binding OkMsg}" Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+   </StackPanel>
+</UserControl>

EgtBEAMWALL.ViewerOptimizer/FreeContourInput/OnlyProdFreeContourInputV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/OnlyProdFreeContourManagerV.xaml

@@ -0,0 +1,70 @@
+<EgtFloating:EgtFloatingPanel x:Class="OnlyProdFreeContourManagerV"
+                              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"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+
+   <ComboBox ItemsSource="{Binding TypeList}"
+             SelectedIndex="{Binding SelType, Delay=1}"
+             Height="22" Width="160"
+             Margin="0,0,5,0"/>
+   <ComboBox ItemsSource="{Binding PathList}"
+             SelectedIndex="{Binding SelPath}"
+             Height="22" Width="100"
+             Margin="0,0,5,0"
+             Visibility="{Binding PathList_Visibility}"/>
+   <Button Command="{Binding Line2P_Command}"
+           ToolTip="{Binding Line2P_ToolTip}"
+           IsEnabled="{Binding Line2P_IsEnabled}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding Delete_Command}"
+           ToolTip="{Binding Delete_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding ModifyCurve_Command}"
+           ToolTip="{Binding ModifyCurve_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding AddPointCurve_Command}"
+           ToolTip="{Binding AddPointCurve_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding RemovePointCurve_Command}"
+           ToolTip="{Binding RemovePointCurve_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding ChangeStart_Command}"
+           ToolTip="{Binding ChangeStart_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding InvertCurve_Command}"
+           ToolTip="{Binding InvertCurve_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding Move_Command}"
+           ToolTip="{Binding Move_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding Rotate_Command}"
+           ToolTip="{Binding Rotate_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding TextAngle_Command}"
+           ToolTip="{Binding TextAngle_ToolTip}" 
+           Style="{StaticResource ToolBar_Button}"
+           Visibility="{Binding TextAngle_Visibility}">
+      <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
+   </Button>
+
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/OnlyProdFreeContourManagerV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml

@@ -0,0 +1,50 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdInputPwdWndV"
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="InputPwdWndV">
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="{Binding PasswordMsg}"
+                 Style="{StaticResource OptionTextBlock}"
+                 Grid.Row="0"
+                 Margin="0,0,0,5"/>
+      <PasswordBox PasswordChanged="PasswordBox_PasswordChanged"
+                   HorizontalContentAlignment="Right"
+                   Grid.Row="1"
+                   Margin="0,0,0,5"/>
+
+      <Grid Grid.Row="2"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/InputPwdWnd/OnlyProdInputPwdWndV.xaml.vb

@@ -0,0 +1,25 @@
+Public Class OnlyProdInputPwdWndV
+
+   Private WithEvents m_InputPwdWndVM As InputPwdWndVM
+
+   Sub New(Owner As Window, InputPwdWndVM As InputPwdWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = InputPwdWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_InputPwdWndVM = InputPwdWndVM
+   End Sub
+
+   ' Sub necessaria per ottenere la stringa immessa nella PasswordBox
+   Private Sub PasswordBox_PasswordChanged(sender As Object, e As RoutedEventArgs)
+      If Not IsNothing(Me.DataContext) Then
+         Me.DataContext.sPassword = DirectCast(sender, PasswordBox).Password
+      End If
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_InputPwdWndVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml

@@ -1,9 +1,9 @@
 <EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
-   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"
-   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-   IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+                              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"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <ToggleButton ToolTip="{Binding GetDistToolTip}"
                  Style="{StaticResource ToolBar_ToggleButton}"
@@ -45,7 +45,7 @@
       <Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
    </ToggleButton>
 
-   <Button Command="{Binding Visualization_Command}"
+   <!--<Button Command="{Binding Visualization_Command}"
            ToolTip="{Binding Statistics_Msg}"
            Style="{StaticResource ToolBar_Button}"
            Visibility="{Binding VisStatistic_Visibility}"
@@ -59,6 +59,6 @@
            Visibility="{Binding OtStatistic_Visibility}"
            IsEnabled="{Binding OtStatistic_IsEnabled}">
       <Image Source="/Resources/InstrumentPanel/Ott.png" Stretch="Uniform"/>
-   </Button>
+   </Button>-->
 
 </EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/OnlyProdInstrumentPanelV.xaml

@@ -0,0 +1,54 @@
+<EgtFloating:EgtFloatingPanel x:Class="OnlyProdInstrumentPanelV"
+                              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"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+
+   <ToggleButton ToolTip="{Binding GetDistToolTip}"
+                 Style="{StaticResource ToolBar_ToggleButton}"
+                 IsChecked="{Binding GetDistIsChecked}">
+      <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
+   </ToggleButton>
+
+   <Button ToolTip="{Binding ChangeParam_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding ChangeParameter_Command}"
+           Visibility="{Binding ChangeParam_Visibility}"
+           IsEnabled="{Binding InstrumentPanel_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/ChangeParam.png" Stretch="Uniform"/>
+   </Button>
+
+   <Button ToolTip="{Binding ChangeMaterial_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding ChangeMaterial_Command}"
+           Visibility="{Binding ChangeMaterial_Visibility}"
+           IsEnabled="{Binding InstrumentPanel_IsEnabled}"
+           Content="MAT">
+   </Button>
+
+   <ToggleButton ToolTip="{Binding Statistics_Msg}"
+                 Style="{StaticResource ToolBar_ToggleButton}"
+                 Visibility="{Binding Statistic_Visibility}"
+                 IsChecked="{Binding Statistics_IsChecked}"
+                 IsEnabled="{Binding Statistics_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
+   </ToggleButton>
+
+   <Button Command="{Binding Visualization_Command}"
+           ToolTip="{Binding Statistics_Msg}"
+           Style="{StaticResource ToolBar_Button}"
+           Visibility="{Binding VisStatistic_Visibility}"
+           IsEnabled="{Binding VisStatistic_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/Vis.png" Stretch="Uniform"/>
+   </Button>
+
+   <Button Command="{Binding Optimizer_Command}"
+           ToolTip="{Binding Statistics_Msg}"
+           Style="{StaticResource ToolBar_Button}"
+           Visibility="{Binding OtStatistic_Visibility}"
+           IsEnabled="{Binding OtStatistic_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/Ott.png" Stretch="Uniform"/>
+   </Button>
+
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/OnlyProdInstrumentPanelV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLDataV.xaml

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

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml

@@ -143,13 +143,27 @@
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+         <!--<DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
                                  MinWidth="28">
             <DataGridCheckBoxColumn.Header>
                <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
                          HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
-         </DataGridCheckBoxColumn>
+         </DataGridCheckBoxColumn>-->
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
          <!--W - Larghezza-->
          <DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
             <DataGridTextColumn.Header>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -10,7 +10,7 @@
          <RowDefinition Height="30"/>
       </Grid.RowDefinitions>-->
    <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.FeatureVMList,
-                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
                                  SelectedItem="{Binding Tag.SelFeatureVM,
                                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
                                  CanUserAddRows="False"
@@ -26,20 +26,34 @@
                                  Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
-                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
       </DataGrid.InputBindings>
       <DataGrid.Resources>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO,UpdateSourceTrigger=PropertyChanged}">
-            <!--<DataGridCheckBoxColumn.Header>
+         <!--<DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO,UpdateSourceTrigger=PropertyChanged}">
+            --><!--<DataGridCheckBoxColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
-               </DataGridCheckBoxColumn.Header>-->
+               </DataGridCheckBoxColumn.Header>--><!--
             <DataGridCheckBoxColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
                </DataTemplate>
             </DataGridCheckBoxColumn.HeaderTemplate>
-         </DataGridCheckBoxColumn>
+         </DataGridCheckBoxColumn>-->
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
          <!--Validità feature-->
          <DataGridTemplateColumn x:Key="colCALC">
             <DataGridTemplateColumn.CellTemplate>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListVM.vb

@@ -1,8 +1,10 @@
 Imports System.Collections.ObjectModel
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class FeatureInPartInRawPartListVM
+   Inherits VMBase
 
    Private m_colFeatureInPartInRawPart_Do As EgtDataGridColumn
    Public ReadOnly Property colFeatureInPartInRawPart_Do As EgtDataGridColumn

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml

@@ -21,13 +21,28 @@
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+         <!--<DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
                                  MinWidth="28">
             <DataGridCheckBoxColumn.Header>
                <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}"
                          HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
-         </DataGridCheckBoxColumn>
+         </DataGridCheckBoxColumn>-->
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+
          <!--Validità feature-->
          <DataGridTemplateColumn x:Key="colCALC">
             <DataGridTemplateColumn.CellTemplate>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml

@@ -0,0 +1,95 @@
+<UserControl x:Class="OnlyProdFeatureInPartInRawPartListV"
+             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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
+   
+   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.FeatureVMList,
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
+                                 SelectedItem="{Binding Tag.SelFeatureVM,
+                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
+                                 CanUserAddRows="False"
+                                 AutoGenerateColumns="False"
+                                 CanUserResizeRows="False"
+                                 SelectionMode="Single"
+                                 ScrollViewer.CanContentScroll="True" 
+                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                 Margin="0,0,0,5"
+                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
+                                 BeginningEdit="FeatureInPartInRawPartList_BeginningEdit"
+                                 Style="{StaticResource DataGrid_CustomHighLight}">
+      <DataGrid.InputBindings>
+         <KeyBinding Key="Delete" Command="{Binding Tag.SelFeatureVM.DeleteFeature_Command,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"/>
+      </DataGrid.InputBindings>
+      <DataGrid.Resources>
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureInPartInRawPartListV}}}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--Validità feature-->
+         <DataGridTemplateColumn x:Key="colCALC">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="10"/>
+                     </Grid.ColumnDefinitions>
+                     <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                             Background="{Binding Calc_Background}"/>
+                     <Grid Grid.Column="1"
+                           HorizontalAlignment="Center">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Ellipse Width="5"
+                                 Height="5"
+                                 Fill="Red"
+                                 Visibility="{Binding CALC_ROT_Visibility}"
+                                 HorizontalAlignment="Center"/>
+                        <TextBlock Grid.Row="1"
+                                   Text="{Binding CALC_ERR_Letter}"
+                                   Foreground="{Binding CALC_ERR_Foreground}"
+                                   TextAlignment="Center"
+                                   FontWeight="Bold"
+                                   FontSize="12"
+                                   Margin="0,-6,0,-2"/>
+                     </Grid>
+                  </Grid>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--Descrizione-->
+         <DataGridTextColumn x:Key="colDESC" Binding="{Binding sDesc}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+         <!--Descrizione-->
+         <DataGridTextColumn x:Key="colPRIORITY" Binding="{Binding sPriority}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding DataContext.Priority_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+         </DataGridTextColumn>
+      </DataGrid.Resources>
+
+   </EgtBEAMWALLCORE:EgtDataGrid>
+
+</UserControl>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureInPartInRawPartListV.xaml.vb

@@ -0,0 +1,25 @@
+Imports EgtBEAMWALL.Core
+
+Public Class OnlyProdFeatureInPartInRawPartListV
+
+   ' funzione che impedisce di editare le righe che sono gia' in produzione
+   Private Sub FeatureInPartInRawPartList_BeginningEdit(sender As Object, e As DataGridBeginningEditEventArgs)
+      If IsNothing(e.Row) Then Return
+      Dim RowVM As BTLFeatureVM = DirectCast(e.Row.DataContext, BTLFeatureVM)
+      ' se in produzione impedisco modifica dei parametri
+      If DirectCast(RowVM.BTLFeatureM.ParentPart, PartM).nProductionState > ItemState.ND Then
+         'For Each cell In Row.Item
+         e.Cancel = True
+      End If
+   End Sub
+
+   Private Sub FeatureList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is DataGridRow Then
+         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+         If Not IsNothing(Row) AndAlso Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart) Then
+            Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM
+         End If
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdFeatureListV.xaml

@@ -19,19 +19,20 @@
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                                 MinWidth="28">
-            <!--<DataGridCheckBoxColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureInPartInRawPartListV}}}"/>
-               </DataGridCheckBoxColumn.Header>-->
-            <DataGridCheckBoxColumn.HeaderTemplate>
+         <DataGridTemplateColumn x:Key="colDO">
+            <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <!--<TextBlock Text="{Binding DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>-->
                   <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"
                             HorizontalAlignment="Center"/>
                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-         </DataGridCheckBoxColumn>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
          <!--Validità feature-->
          <DataGridTemplateColumn x:Key="colCALC">
             <DataGridTemplateColumn.CellTemplate>
@@ -69,9 +70,6 @@
          </DataGridTemplateColumn>
          <!--Descrizione-->
          <DataGridTextColumn x:Key="colDESC" Binding="{Binding sDesc}">
-            <!--<DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.Description_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdFeatureListV}}}"/>
-            </DataGridTextColumn.Header>-->
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -86,7 +84,6 @@
                                       TextTrimming="CharacterEllipsis"
                                       Margin="4,0,0,0">
                               <TextBlock.ToolTip>
-                                 <!--<ToolTip Visibility="{Binding RelativeSource={RelativeSource Self}, Path=PlacementTarget, Converter={StaticResource TrimToVisConverter}}">-->
                                  <ToolTip>
                                     <ToolTip.Content>
                                        <StackPanel Orientation="Vertical">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml

@@ -0,0 +1,232 @@
+<UserControl x:Class="OnlyProdPartInRawPartListV"
+             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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
+   
+   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.PartVMList,
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
+                                SelectedItem="{Binding Tag.SelPart,
+                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"
+                                AutoGenerateColumns="False"
+                                CanUserAddRows="False"
+                                CanUserDeleteRows="False"
+                                CanUserResizeRows="False"
+                                CanUserSortColumns="False"
+                                SelectionMode="Single"
+                                ScrollViewer.CanContentScroll="True" 
+                                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                Margin="0,0,0,5"
+                                BindingColumns="{Binding PartInRawPartColumns}"
+                                BeginningEdit="PartInRawPartList_BeginningEdit"
+                                Style="{StaticResource DataGrid_CustomHighLight}">
+      <DataGrid.Resources>
+         <!--PDN - Nome-->
+         <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.PDN_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.CellStyle>
+               <Style TargetType="{x:Type DataGridCell}">
+                  <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
+                  <Setter Property="BorderThickness" Value="2"/>
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Foreground" Value="Blue" />
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </DataGridTextColumn.CellStyle>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn x:Key="colCALC">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="10"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="↓"
+                                Foreground="Aqua"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="12"
+                                Margin="0,-6,0,-2"
+                                Visibility="{Binding CALC_FALL_Visibility}"/>
+                     <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                             Grid.Column="1"                          
+                             Background="{Binding Calc_Background}"/>
+                     <Grid Grid.Column="2"
+                           HorizontalAlignment="Center">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Ellipse Width="5"
+                                 Height="5"
+                                 Fill="Red"
+                                 Visibility="{Binding CALC_ROT_Visibility}"
+                                 HorizontalAlignment="Center"/>
+                        <TextBlock Grid.Row="1"
+                                   Text="{Binding CALC_ERR_Letter}"
+                                   Foreground="{Binding CALC_ERR_Foreground}"
+                                   TextAlignment="Center"
+                                   FontWeight="Bold"
+                                   FontSize="12"
+                                   Margin="0,-6,0,-2"/>
+                     </Grid>
+                  </Grid>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--NAM - Descrizione-->
+         <DataGridTextColumn x:Key="colNAM" Binding="{Binding sNAM}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn x:Key="colW" Binding="{Binding sW}" SortMemberPath="dW">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.W_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn x:Key="colH" Binding="{Binding sH}" SortMemberPath="dH">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.H_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn x:Key="colL" Binding="{Binding sL}" SortMemberPath="dL">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.L_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--ROT - Rotazione-->
+         <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <Button Command="{Binding BackRotation_Command}"
+                             Height="15"
+                             Width="15"
+                             VerticalAlignment="Center">
+                        <TextBlock Text="&lt;"
+                                   Margin="-5"/>
+                     </Button>
+                     <TextBlock Text="{Binding sROT}" 
+                                Grid.Column="1"
+                                TextAlignment="Center"/>
+                     <Button Command="{Binding ForwardRotation_Command}"
+                             Grid.Column="2"
+                             Height="15"
+                             Width="15"
+                             VerticalAlignment="Center">
+                        <TextBlock Text=">"
+                                   Margin="-5"/>
+                     </Button>
+                  </Grid>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--INV - Inversione-->
+         <DataGridTemplateColumn x:Key="colFLIP">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--PosX - Posizione-->
+         <DataGridTextColumn x:Key="colPOSX" Binding="{Binding sPOSX}" SortMemberPath="dPOSX">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.PosX_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--PosY - Posizione-->
+         <DataGridTextColumn x:Key="colPOSY" Binding="{Binding sPOSY}" SortMemberPath="dPOSY">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.PosY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--Off - Offset-->
+         <DataGridTextColumn x:Key="colOFFSET" Binding="{Binding sOffset}" SortMemberPath="dOffset">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.Offset_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.MAT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+
+      </DataGrid.Resources>
+      <DataGrid.InputBindings>
+         <KeyBinding Key="Delete" Command="{Binding Tag.SelPart.DeletePart_Command,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPartInRawPartListV}}}" />
+      </DataGrid.InputBindings>
+      <DataGrid.RowStyle>
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+            <Setter Property="Background" Value="{Binding Background}"/>
+            <EventSetter Event="PreviewMouseDown" Handler="PartInRawPartRow_PreviewMouseDown"/>
+         </Style>
+      </DataGrid.RowStyle>
+
+   </EgtBEAMWALLCORE:EgtDataGrid>
+</UserControl>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdPartInRawPartListV.xaml.vb

@@ -0,0 +1,29 @@
+Imports EgtBEAMWALL.Core
+Imports EgtUILib.EgtInterface
+
+Public Class OnlyProdPartInRawPartListV
+
+   ' funzione che permette di selezionare un pezzo anche quando gia' selezionato
+   Private Sub PartInRawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is DataGridRow Then
+         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+         If Not IsNothing(Row) Then
+            Dim MyMachGroup As Core.MyMachGroupVM = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup
+            If EgtGetCurrMachGroup() = GDB_ID.NULL Then Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup = MyMachGroup
+            MyMachGroup.SelPart = MyMachGroup.SelPart
+         End If
+      End If
+   End Sub
+
+   ' funzione che impedisce di editare le righe che sono gia' in produzione
+   Private Sub PartInRawPartList_BeginningEdit(sender As Object, e As DataGridBeginningEditEventArgs)
+      If IsNothing(e.Row) Then Return
+      Dim RowVM As PartVM = DirectCast(e.Row.DataContext, PartVM)
+      ' se in produzione impedisco modifica dei parametri
+      If RowVM.nProduction_State > ItemState.ND Then
+         'For Each cell In Row.Item
+         e.Cancel = True
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml

@@ -36,8 +36,8 @@
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
-                         Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                         HorizontalAlignment="Center"/>
+                            Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                            HorizontalAlignment="Center"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml.vb

@@ -1,5 +1,4 @@
 Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.Core.ConstGen
 
 Public Class OnlyProdQParameterListV
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml

@@ -0,0 +1,183 @@
+<UserControl x:Class="OnlyProdRawPartListV"
+             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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
+
+   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
+                                SelectedItem="{Binding Tag.SelectedMachGroup,
+                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
+                                AutoGenerateColumns="False"
+                                CanUserDeleteRows="False"
+                                CanUserResizeRows="False"
+                                SelectionMode="Single"
+                                ScrollViewer.CanContentScroll="True" 
+                                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                Margin="0,0,0,5"
+                                BindingColumns="{Binding RawPartColumns}"
+                                BeginningEdit="RawPartList_BeginningEdit"
+                                Style="{StaticResource DataGrid_CustomHighLight}">
+      <DataGrid.Resources>
+         <!--ID - Id gruppo-->
+         <DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}"
+                             SortMemberPath="nName">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.ID_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.CellStyle>
+               <Style TargetType="{x:Type DataGridCell}">
+                  <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
+                  <Setter Property="BorderThickness" Value="2,2,0,2"/>
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Foreground" Value="Blue" />
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </DataGridTextColumn.CellStyle>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn x:Key="colCALC">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="10"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="↓"
+                                Foreground="Aqua"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="12"
+                                Margin="0,-6,0,-2"
+                                Visibility="{Binding CALC_FALL_Visibility}"/>
+                     <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                             Grid.Column="1"
+                             Background="{Binding Calc_Background}"/>
+                     <Grid Grid.Column="2"
+                           HorizontalAlignment="Center">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="1*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <Ellipse Width="5"
+                                 Height="5"
+                                 Fill="Red"
+                                 Visibility="{Binding CALC_ROT_Visibility}"
+                                 HorizontalAlignment="Center"/>
+                        <TextBlock Grid.Row="1"
+                                   Text="{Binding CALC_ERR_Letter}"
+                                   Foreground="{Binding CALC_ERR_Foreground}"
+                                   TextAlignment="Center"
+                                   FontWeight="Bold"
+                                   FontSize="12"
+                                   Margin="0,-6,0,-2"/>
+                     </Grid>
+                  </Grid>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--STARTCUT - Ritaglio iniziale-->
+         <DataGridTextColumn x:Key="colSTARTCUT" Binding="{Binding sStartCut}" SortMemberPath="dStartCut">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.StartOffset_Msg,
+                                            RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn x:Key="colW" Binding="{Binding sW}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.W_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn x:Key="colH" Binding="{Binding sH}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.H_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn x:Key="colL" Binding="{Binding sL}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.L_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--PosZ - Posizione in Z-->
+         <DataGridTextColumn x:Key="colPOSZ" Binding="{Binding sPosZ}">
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
+                                            RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
+            <DataGridTextColumn.EditingElementStyle>
+               <Style TargetType="{x:Type TextBox}">
+                  <Setter Property="Foreground" Value="Blue" />
+               </Style>
+            </DataGridTextColumn.EditingElementStyle>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.Material_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--% - % utilizzo-->
+         <DataGridTextColumn x:Key="colUSAGE" Binding="{Binding sUsage}" SortMemberPath="dUsage">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.Used_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--S - Scarti-->
+         <DataGridTextColumn x:Key="colWASTE" Binding="{Binding sWaste}" SortMemberPath="dWaste">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.Waste_Msg,
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+      </DataGrid.Resources>
+      <DataGrid.InputBindings>
+         <KeyBinding Key="Delete" Command="{Binding Tag.SelectedMachGroup.DeleteMachGroup_Command,
+                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
+      </DataGrid.InputBindings>
+      <DataGrid.RowStyle>
+         <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+            <Setter Property="Background" Value="{Binding Background}"/>
+            <EventSetter Event="PreviewMouseDown" Handler="RawPartRow_PreviewMouseDown"/>
+         </Style>
+      </DataGrid.RowStyle>
+
+   </EgtBEAMWALLCORE:EgtDataGrid>
+
+</UserControl>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdRawPartListV.xaml.vb

@@ -0,0 +1,28 @@
+Imports EgtBEAMWALL.Core
+
+Public Class OnlyProdRawPartListV
+
+   ' funzione che permette di selezionare un RawPart anche quando gia' selezionato
+   Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is DataGridRow Then
+         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+         Dim RowVM As MyMachGroupVM = DirectCast(Row.DataContext, MyMachGroupVM)
+         ' se gia' selezionato rifaccio selezione perche' potrbbe essere selezionato un BTLPart
+         If Not IsNothing(Row) AndAlso Row.IsSelected Then
+            Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup
+         End If
+      End If
+   End Sub
+
+   ' funzione che impedisce di editare le righe che sono gia' in produzione
+   Private Sub RawPartList_BeginningEdit(sender As Object, e As DataGridBeginningEditEventArgs)
+      If IsNothing(e.Row) Then Return
+      Dim RowVM As MyMachGroupVM = DirectCast(e.Row.DataContext, MyMachGroupVM)
+      ' se in produzione impedisco modifica dei parametri
+      If RowVM.nProduction_State > ItemState.ND Then
+         'For Each cell In Row.Item
+         e.Cancel = True
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartParametersV.xaml

@@ -21,67 +21,67 @@
          <TextBlock Text="{Binding NAM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sNAM, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COUNT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCNT, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ORDERNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nORDERNUM, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PLANINGLEN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dPLANINGLEN, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STARTOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dSTARTOFFSET, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ENDOFFSET_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.dENDOFFSET, UpdateSourceTrigger=Explicit,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding DESIGN_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sDESIGN, UpdateSourceTrigger=Explicit,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding GROUP_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sGROUP, UpdateSourceTrigger=Explicit,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding STOREY_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sSTOREY, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ANNOT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sANNOT, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MATERIAL_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIAL, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <!--<TextBlock Text="{Binding USERATTRIBUTE_MSG}"
@@ -106,9 +106,9 @@
                        Grid.Row="0"
               Style="{StaticResource PartParam_TextBlock}"/>
             <Button Background="{Binding Tag.PartColour, UpdateSourceTrigger=PropertyChanged,
-                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                     Command="{Binding Tag.PartColour_Command, UpdateSourceTrigger=PropertyChanged,
-                              RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="100"
@@ -117,7 +117,7 @@
                        Grid.Row="1"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nCOLA, UpdateSourceTrigger=Explicit,
-                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                  RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                    Grid.Row="1"
                                    Grid.Column="1"
                                    Style="{StaticResource PartParam_TextBox}"/>
@@ -128,37 +128,37 @@
          <TextBlock Text="{Binding TIMBERGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sTIMBERGRADE, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding QUALITYGRADE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sQUALITYGRADE, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PACKAGE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sPACKAGE, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ASSEMBLYNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sASSEMBLYNUM, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding ELEMENTNUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sELEMENTNUM, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding MODULENUM_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMODULENUM, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
@@ -167,40 +167,40 @@
                                  Path=Tag.ocPROCESSINGQUALITY,
                                  Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                   Path=Tag.SelPROCESSINGQUALITY,
-                                   Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                   Grid.Column="1"
-                                   Style="{StaticResource PartParam_ComboBox}"/>
+                                           Path=Tag.SelPROCESSINGQUALITY,
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                   Grid.Column="1"
+                   Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding RECESS_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                 Path=Tag.ocRECESS,
-                                 Mode=OneWay}"
+                                         Path=Tag.ocRECESS,
+                                         Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                   Path=Tag.SelRECESS,
-                                   Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                           Path=Tag.SelRECESS,
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    Grid.Column="1"
                    Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding STOREYTYPE_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                 Path=Tag.ocSTOREYTYPE,
-                                 Mode=OneWay}"
+                                         Path=Tag.ocSTOREYTYPE,
+                                         Mode=OneWay}"
                    SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                   Path=Tag.SelSTOREYTYPE,
-                                   Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                           Path=Tag.SelSTOREYTYPE,
+                                           Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                    Grid.Column="1"
                    Style="{StaticResource PartParam_ComboBox}"/>
          <TextBlock Text="{Binding LAYER_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.nLAYER, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
          <TextBlock Text="{Binding COMMENT_MSG}"
                     Style="{StaticResource PartParam_TextBlock}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sCOMMENT, UpdateSourceTrigger=Explicit,
-                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                               RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                 Grid.Column="1"
                                 Style="{StaticResource PartParam_TextBox}"/>
       </UniformGrid>
@@ -218,19 +218,19 @@
             <TextBlock Text="{Binding REFSIDE_MSG}"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                    Path=Tag.ocREFSIDE,
-                                    Mode=OneWay}"
+                                            Path=Tag.ocREFSIDE,
+                                            Mode=OneWay}"
                       SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                      Path=Tag.SelREFSIDE,
-                                      Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                              Path=Tag.SelREFSIDE,
+                                              Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       Grid.Column="1"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <TextBlock Text="{Binding REFSIDEALIGN_MSG}"
                        Grid.Row="1"
                        Style="{StaticResource PartParam_TextBlock}"/>
             <CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                  Path=Tag.bREFSIDEALIGN,
-                                  Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                          Path=Tag.bREFSIDEALIGN,
+                                          Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Grid.Row="1"
@@ -273,15 +273,15 @@
                <TextBlock Text="{Binding GRAINDIRECTION_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.GrainDirection, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
                <TextBlock Text="{Binding GRAINDIRALIGN_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <CheckBox IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                         Path=Tag.bGRAINDIRALIGN,
-                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                             Path=Tag.bGRAINDIRALIGN,
+                                             Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          HorizontalAlignment="Center"
                          VerticalAlignment="Center"
                          Grid.Row="1"
@@ -302,18 +302,18 @@
                <TextBlock Text="{Binding CAMBERSIDE_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocCAMBERSIDE,
-                                       Mode=OneWay}"
+                                               Path=Tag.ocCAMBERSIDE,
+                                               Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelCAMBERSIDE,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelCAMBERSIDE,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
                <TextBlock Text="{Binding CAMBERPARAMS_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.CamberParams, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="1"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
@@ -332,18 +332,18 @@
                <TextBlock Text="{Binding REFSIDEFIXCLAMP_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocREFSIDEFIXCLAMP,
-                                       Mode=OneWay}"
+                                               Path=Tag.ocREFSIDEFIXCLAMP,
+                                               Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelREFSIDEFIXCLAMP,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelREFSIDEFIXCLAMP,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
                <TextBlock Text="{Binding PARTOFFSETPARAMS_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.PartOffsetParams, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="1"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
@@ -362,18 +362,18 @@
                <TextBlock Text="{Binding MATERIALTYPEGRP_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocMATERIALTYPEGRP,
-                                       Mode=OneWay}"
+                                               Path=Tag.ocMATERIALTYPEGRP,
+                                               Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelMATERIALTYPEGRP,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelMATERIALTYPEGRP,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
                <TextBlock Text="{Binding MATERIALTYPESPEC_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.sMATERIALTYPESPEC, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="1"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
@@ -392,22 +392,22 @@
                <TextBlock Text="{Binding ALIGNLOCATION_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocALIGNLOCATION,
-                                       Mode=OneWay}"
+                                               Path=Tag.ocALIGNLOCATION,
+                                               Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelALIGNLOCATION,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelALIGNLOCATION,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
                <TextBlock Text="{Binding ALIGNENDTYPE_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocALIGNENDTYPE,
-                                       Mode=OneWay}"
+                                               Path=Tag.ocALIGNENDTYPE,
+                                               Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelALIGNENDTYPE,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelALIGNENDTYPE,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Row="1"
                          Grid.Column="1"
                          Margin="0,5"
@@ -429,18 +429,18 @@
                <TextBlock Text="{Binding UID_MSG}"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                       Path=Tag.ocUID,
-                                       Mode=OneWay}"
+                                                Path=Tag.ocUID,
+                                                Mode=OneWay}"
                          SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}},
-                                         Path=Tag.SelUID,
-                                         Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 Path=Tag.SelUID,
+                                                 Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          Grid.Column="1"
                          Style="{StaticResource PartParam_ComboBox}"/>
                <TextBlock Text="{Binding TRANSFORIG_MSG}"
                           Grid.Row="1"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfOrig, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="1"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
@@ -448,7 +448,7 @@
                           Grid.Row="2"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersX, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="2"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>
@@ -456,7 +456,7 @@
                           Grid.Row="3"
                           Style="{StaticResource PartParam_TextBlock}"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding Tag.TransfVersY, UpdateSourceTrigger=Explicit,
-                                             RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
+                                                     RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartParametersV}}}"
                                       Grid.Row="3"
                                       Grid.Column="1"
                                       Style="{StaticResource PartParam_TextBox}"/>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParamListV.xaml

@@ -17,8 +17,8 @@
 
       <!--BWType-->
       <DataGridTextColumn Binding="{Binding sBWType}"
-                           Width="40"
-                           IsReadOnly="True">
+                          Width="40"
+                          IsReadOnly="True">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
                <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -27,8 +27,8 @@
       </DataGridTextColumn>
       <!--Nome-->
       <DataGridTextColumn Binding="{Binding sName}"
-                           Width="50"
-                           IsReadOnly="True">
+                          Width="50"
+                          IsReadOnly="True">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
                <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
@@ -37,40 +37,40 @@
       </DataGridTextColumn>
       <!--Descrizione-->
       <DataGridTextColumn Binding="{Binding sDescription}"
-                           Width="1*"
-                           IsReadOnly="True">
+                          Width="1*"
+                          IsReadOnly="True">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
-            <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
             </DataTemplate>
          </DataGridTextColumn.HeaderTemplate>
       </DataGridTextColumn>
       <!--Default-->
       <DataGridTextColumn Binding="{Binding sDefault}"
-                           Width="65">
+                          Width="65">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
-            <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               <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">
+                          Width="65"
+                          IsReadOnly="True">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
-            <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               <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">
+                          Width="65"
+                          IsReadOnly="True">
          <DataGridTextColumn.HeaderTemplate>
             <DataTemplate>
-            <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
             </DataTemplate>
          </DataGridTextColumn.HeaderTemplate>
       </DataGridTextColumn>
@@ -100,7 +100,9 @@
           Margin="0,0,0,5">
 
     <DataGrid.Resources>
-        --><!--Nome--><!--
+        -->
+<!--Nome-->
+<!--
         <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
             <DataGridTextColumn.HeaderTemplate>
                 <DataTemplate>
@@ -108,7 +110,9 @@
                 </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
         </DataGridTextColumn>
-        --><!--Descrizione--><!--
+        -->
+<!--Descrizione-->
+<!--
         <DataGridTextColumn x:Key="colDESC" Binding="{Binding sDescription}">
             <DataGridTextColumn.HeaderTemplate>
                 <DataTemplate>
@@ -116,7 +120,9 @@
                 </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
         </DataGridTextColumn>
-        --><!--Default--><!--
+        -->
+<!--Default-->
+<!--
         <DataGridTextColumn x:Key="colDEFAULT" Binding="{Binding sDefault}">
             <DataGridTextColumn.HeaderTemplate>
                 <DataTemplate>
@@ -124,7 +130,9 @@
                 </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
         </DataGridTextColumn>
-        --><!--Minimo--><!--
+        -->
+<!--Minimo-->
+<!--
         <DataGridTextColumn x:Key="colMIN" Binding="{Binding sMin}">
             <DataGridTextColumn.HeaderTemplate>
                 <DataTemplate>
@@ -132,7 +140,9 @@
                 </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
         </DataGridTextColumn>
-        --><!--Massimo--><!--
+        -->
+<!--Massimo-->
+<!--
         <DataGridTextColumn x:Key="colMAX" Binding="{Binding sMax}">
             <DataGridTextColumn.HeaderTemplate>
                 <DataTemplate>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/QParameterListV.xaml

@@ -36,8 +36,8 @@
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
-                         Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                         HorizontalAlignment="Center"/>
+                            Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                            HorizontalAlignment="Center"/>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml

@@ -5,7 +5,7 @@
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
    <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
-                                   RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"
+                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"
                                 SelectedItem="{Binding Tag.SelectedMachGroup,
                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"
                                 AutoGenerateColumns="False"
@@ -86,7 +86,7 @@
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Path=DataContext.StartOffset_Msg,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
+                                            RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
                </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
@@ -99,7 +99,7 @@
          <DataGridTextColumn x:Key="colW" Binding="{Binding sW}">
             <DataGridTextColumn.Header>
                <TextBlock Text="{Binding Path=DataContext.W_Msg,
-                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
             </DataGridTextColumn.Header>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
@@ -136,7 +136,7 @@
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
+                                            RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
                </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>

EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml

@@ -95,10 +95,10 @@
          </Button>
       </StackPanel>
       
-      <EgtBEAMWALL:BTLPartManagerV/>
+      <EgtBEAMWALL:OnlyProdBTLPartManagerV/>
 
-      <EgtBEAMWALL:BTLPartListV DataContext="{StaticResource PartListVM}"
-                                Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
-                                Grid.Row="1"/>
+      <EgtBEAMWALL:OnlyProdBTLPartListV DataContext="{StaticResource PartListVM}"
+                                        Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
+                                        Grid.Row="1"/>
    </Grid>
 </Grid>

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -49,7 +49,7 @@ Public Class MyMachGroupPanelVM
             End If
          End If
 
-         Map.refShowBeamPanelVM.bShowAll = False
+         If Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE Then Map.refShowBeamPanelVM.bShowAll = False
 
          'If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then
          '   EgtBeamShowFacesName(False)
@@ -63,7 +63,11 @@ Public Class MyMachGroupPanelVM
          End If
          NotifyPropertyChanged(NameOf(SelectedMachGroup))
          ' imposto tipo di grid selezionata
-         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(value) Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(value) Then
+            Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
+            Map.refStatisticsTimePanelVM.MachiningPage_Visibility = Visibility.Visible
+            Map.refStatisticsTimePanelVM.ViewPage_Visibility = Visibility.Collapsed
+         End If
          ' se MachGroup gia' mandato in produzione,disabilito pulsanti verify e reset
          If Not IsNothing(SelectedMachGroup) AndAlso SelectedMachGroup.nProduction_State >= ItemState.Assigned Then
             Map.refCALCPanelVM.SetVerifyIsEnabled(False)
@@ -281,6 +285,8 @@ Public Class MyMachGroupPanelVM
          EgtResetCurrMachGroup()
          ' nascondo tutti i pezzi
          Map.refProjectVM.BTLStructureVM.HideAll()
+         ' mostro tutti i pezzi
+         Map.refShowBeamPanelVM.ShowAll(True)
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -365,7 +365,7 @@ Public Class MyMachGroupVM
             If Not IsNothing(Map.refProdManagerVM) Then
                EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
             ElseIf Not IsNothing(Map.refOnlyProdManagerVM) Then
-               EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, Map.refOnlyProdManagerVM.CurrProd.nProdId)
+               EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, ProjectManagerVM.CurrProd.nProdId)
             End If
             EgtSetInfo(nCurrMachGroup, MGR_RPT_MATERIAL, sMATERIAL)
             EgtSetInfo(nCurrMachGroup, MGR_RPT_PATTID, nCurrMachGroup)

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb

@@ -252,6 +252,35 @@ Public Class PartVM
 
 #End Region    ' Wall
 
+   Public Property bDOALL As Boolean?
+      Get
+         If Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList.Count = 0 Then Return False
+         Dim bTemp As Boolean = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList(0).bDO
+         For FeatureIndex = 1 To Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList.Count - 1
+            If Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList(FeatureIndex).bDO <> bTemp Then Return Nothing
+         Next
+         Return bTemp
+      End Get
+      Set(value As Boolean?)
+         If Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList.Count = 0 Then
+            NotifyPropertyChanged(NameOf(bDOALL))
+            Return
+         End If
+         ' imposto modalita' update multiplo
+         BTLFeatureVM.bDO_MultipleUpdate = True
+         For FeatureIndex = 0 To Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList.Count - 1
+            If FeatureIndex = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList.Count - 1 Then
+               ' reset modalita' update multiplo
+               BTLFeatureVM.bDO_MultipleUpdate = False
+            End If
+            Dim Feature As BTLFeatureVM = Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.FeatureVMList(FeatureIndex)
+            Feature.bDO = value
+            Feature.NotifyPropertyChanged(NameOf(Feature.bDO))
+         Next
+      End Set
+   End Property
+
+
    ' Definizione comandi
    Private m_cmdBackRotation As ICommand
    Private m_cmdForwardRotation As ICommand
@@ -266,6 +295,7 @@ Public Class PartVM
       CalcGlobalUpdate()
       ' aggiorno stato di produzione
       ReadProductionData()
+      NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -308,7 +338,7 @@ Public Class PartVM
       If Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso Not IsNothing(Map.refProdManagerVM) Then
          DbControllers.m_PartController.Delete(ProjectManagerVM.CurrProd.nProdId, ParentMachGroupVM.Id, nPartId)
       ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(Map.refOnlyProdManagerVM) Then
-         DbControllers.m_PartController.Delete(Map.refOnlyProdManagerVM.CurrProd.nProdId, ParentMachGroupVM.Id, nPartId)
+         DbControllers.m_PartController.Delete(ProjectManagerVM.CurrProd.nProdId, ParentMachGroupVM.Id, nPartId)
       End If
       If nType = MachineType.BEAM Then
          Dim BeamParentMachGroup As MyMachGroupVM = DirectCast(ParentMachGroupVM, MyMachGroupVM)
@@ -753,6 +783,7 @@ Public Class PartVM
          Case NameOf(sender.bDO)
             ' setto pezzo da ricalcolare
             ResetCalcTotalPart()
+            NotifyPropertyChanged(NameOf(bDOALL))
       End Select
    End Sub