-aggiunto OnlyProdNewOpenProjectFileDialogV e OnlyProdOpenProjectFileDialogV per nuova interfaccia

-sistemato Notify

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -316,12 +316,13 @@ Public Class BTLFeatureM
    End Function
 
    Public Shared Function CreateBTLFeature(nPRC As Integer, nGRP As Integer, nSIDE As Integer) As BTLFeatureM
-      Dim NewBTLFeature As New BTLFeatureM
-      NewBTLFeature.m_nPRC = nPRC
-      NewBTLFeature.m_nSelGRP = nGRP
-      NewBTLFeature.m_nSelSIDE = nSIDE
-      NewBTLFeature.m_nPriority = 0
-      NewBTLFeature.m_bDO = True
+      Dim NewBTLFeature As New BTLFeatureM With {
+         .m_nPRC = nPRC,
+         .m_nSelGRP = nGRP,
+         .m_nSelSIDE = nSIDE,
+         .m_nPriority = 0,
+         .m_bDO = True
+      }
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature

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/ConstGen.vb

@@ -68,7 +68,9 @@ Public Module ConstGen
    ' Sottodirettorio per Csv automatico
    Public Const PRODS_DIR As String = "Prods"
    ' Sottodirettorio per Macro
-   Public Const MACRO_DIR As String = "Macro"
+   Public Const MACRODEFAULT_DIR As String = "MacroDefault"
+   ' Sottodirettorio per MacroCustom
+   Public Const MACROCUSTOM_DIR As String = "MacroCustom"
    ' Sottodirettorio per Magazzino
    Public Const WAREHOUSE_DIR As String = "Warehouse"
    ' Sottodirettorio per lavorazioni travi

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,6 +144,12 @@
       <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" />
@@ -211,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>
@@ -219,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>
@@ -243,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>
@@ -255,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/MachGroupModel/PartM.vb

@@ -482,8 +482,8 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
       EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
-      EgtGetInfo(nPartId, BTL_PRT_ROT, NewPartM.m_dROT)
-      EgtGetInfo(nPartId, BTL_PRT_FLIP, NewPartM.m_nFLIP)
+      EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
+      EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0
@@ -516,8 +516,6 @@ Public Class PartM
          ' leggo PosX, PosY, Rot e Flip
          EgtGetInfo(nPartId, MGR_PRT_POSX, NewPartM.m_dPOSX)
          EgtGetInfo(nPartId, MGR_PRT_POSY, NewPartM.m_dPOSY)
-         EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
-         EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       End If
       ' leggo volume 
       If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -1,13 +1,13 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
-Imports System.IO
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
-Imports EgtBEAMWALL.Core
 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/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/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.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/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/AddFeatureWnd/AddFeatureWndV.xaml

@@ -27,7 +27,6 @@
                <RowDefinition Height="1*"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-
             <Grid HorizontalAlignment="Center"
                   Grid.Row="0"
                   Margin="0,0,0,5">
@@ -46,13 +45,14 @@
                          Grid.Column="1"
                          DisplayMemberPath="ghDesc"
                          Width="200"
+                         HorizontalAlignment="Left"
                          Style="{StaticResource FeatureComboBox}"/>
                <TextBlock Text="Macro"
                           Grid.Row="1"
                           Margin="0,5,0,0"
                           Style="{StaticResource OptionTextBlock}"/>
-               <ComboBox ItemsSource="{Binding MacroList}"
-                         SelectedIndex="{Binding nSelMacro}"
+               <ComboBox ItemsSource="{Binding MacroCustomList}"
+                         SelectedIndex="{Binding nSelMacroCustom}"
                          Grid.Row="1"
                          Grid.Column="1"
                          DisplayMemberPath="Name"
@@ -66,7 +66,6 @@
                    Height="300"
                    Width="300"
                    Margin="5,0,5,5"/>
-
             <!--<StackPanel Orientation="Horizontal"
                         HorizontalAlignment="Center"
                         Grid.Row="2"
@@ -84,7 +83,6 @@
                <TextBlock Text="{Binding sName}"
                           Style="{StaticResource OptionTextBlock}"/>
             </StackPanel>-->
-
             <Grid Grid.Row="2" Margin="0,0,0,5">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
@@ -94,18 +92,16 @@
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
-                 IsDefault="True"
-                 Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                       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}"/>
+                       IsCancel="True"
+                       Grid.Column="3"
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
             </Grid>
-
          </Grid>
       </Border>
-         
    </StackPanel>
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -11,6 +11,7 @@ Public Class AddFeatureWndVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
    Friend m_MacroFilePathList As List(Of String)
+   Friend m_MacroCustomFilePathList As List(Of String)
 
    Private m_PrevSelPRCIndex_L As Integer = 0
    Private m_PrevSelPRCIndex_T As Integer = 0
@@ -37,8 +38,8 @@ Public Class AddFeatureWndVM
          ElseIf m_SelGRPType = GRPType.T Then
             nSelPRC = PRCList(m_PrevSelPRCIndex_T)
          End If
-         NotifyPropertyChanged("PRCList")
-         NotifyPropertyChanged("nSelPRC")
+         NotifyPropertyChanged(NameOf(PRCList))
+         NotifyPropertyChanged(NameOf(nSelPRC))
       End Set
    End Property
 
@@ -49,6 +50,36 @@ Public Class AddFeatureWndVM
       End Get
    End Property
 
+   Private m_PRCListView As New List(Of PRC)
+   Public ReadOnly Property PRCListView As List(Of PRC)
+      Get
+         Return m_PRCListView
+      End Get
+   End Property
+
+#Region "New Macro OnlyProdPage"
+
+   Private m_MacroDefaultList As New ObservableCollection(Of Object)
+   Public ReadOnly Property MacroDefaultList As ObservableCollection(Of Object)
+      Get
+         Return m_MacroDefaultList
+      End Get
+   End Property
+
+   Private m_nSelMacroDefault As Integer = -1
+   Public Property nSelMacroDefault As Integer
+      Get
+         Return m_nSelMacroDefault
+      End Get
+      Set(value As Integer)
+         If value <> m_nSelMacroDefault Then
+            m_nSelMacroDefault = value
+         End If
+      End Set
+   End Property
+
+#End Region ' New Macro OnlyProdPage
+
    Private m_nSelPRC As PRC = Nothing
    Public Property nSelPRC As PRC
       Get
@@ -64,47 +95,31 @@ Public Class AddFeatureWndVM
                   m_PrevSelPRCIndex_T = PRCList.IndexOf(m_nSelPRC)
                End If
             End If
-            NotifyPropertyChanged("sDrawPath")
+            NotifyPropertyChanged(NameOf(sDrawPath))
             ' carico eventuali file Macro
-            MacroList.Clear()
+            MacroCustomList.Clear()
+            If Core.Configuration.bOnlyProd Then
+               MacroDefaultList.Clear()
+            End If
             m_MacroFilePathList = New List(Of String)
+            m_MacroCustomFilePathList = New List(Of String)
             If Not IsNothing(nSelPRC) Then
                Dim nGRPFromFileName As Integer = 0
                Dim nPRCFromFileName As Integer = 0
                Dim sMacroNameFromFileName As String = String.Empty
                Dim nIdMacroName As Integer = 0
-               ' ricavo lista file Macro
-               Dim AllFilesInDir As IEnumerable(Of String) = IO.Directory.EnumerateFiles(Map.refMainWindowVM.MainWindowM.sMacroDir)
-               For Each File In AllFilesInDir
-                  If Path.GetExtension(File).ToLower() = ".lua" Then
-                     If File.Contains(FILENAMESEPARATOR) Then
-                        Dim FileName As String = Path.GetFileNameWithoutExtension(File)
-                        Dim DataFromFileName As String() = FileName.Split(FILENAMESEPARATOR)
-                        If DataFromFileName.Count = 2 Then
-                           If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
-                              Dim NumbersFromFileName As String() = DataFromFileName(0).Split(".")
-                              Integer.TryParse(NumbersFromFileName(0), nGRPFromFileName)
-                              Integer.TryParse(NumbersFromFileName(1), nPRCFromFileName)
-                           End If
-                           If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
-                              sMacroNameFromFileName = DataFromFileName(1)
-                           End If
-                           If nGRPFromFileName = CalcBeamPrivateProfileGRP(nSelPRC.nGRP) AndAlso nPRCFromFileName = nSelPRC.nPRC Then
-                              MacroList.Add(New IdNameStruct(nIdMacroName, sMacroNameFromFileName))
-                              m_MacroFilePathList.Add(File)
-                              nIdMacroName = nIdMacroName + 1
-                           End If
-                        End If
-                     End If
-                  End If
-               Next
-               If MacroList.Count > 0 Then
+               ' ricavo lista file Macro Default
+               GetMacroListDefault(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
+               ' ricavo lista file Macro Custom
+               If Core.Configuration.bOnlyProd Then GetMacroListCustom(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
+               If MacroCustomList.Count > 0 Then
                   MacroList_IsEnabled = True
                Else
                   MacroList_IsEnabled = False
                End If
             End If
          End If
+         NotifyPropertyChanged(NameOf(nSelPRC))
       End Set
    End Property
 
@@ -116,26 +131,26 @@ Public Class AddFeatureWndVM
       Set(value As Boolean)
          If value <> m_MacroList_IsEnabled Then
             m_MacroList_IsEnabled = value
-            NotifyPropertyChanged("MacroList_IsEnabled")
+            NotifyPropertyChanged(NameOf(MacroList_IsEnabled))
          End If
       End Set
    End Property
 
-   Private m_MacroList As New ObservableCollection(Of Object)
-   Public ReadOnly Property MacroList As ObservableCollection(Of Object)
+   Private m_MacroCustomList As New ObservableCollection(Of Object)
+   Public ReadOnly Property MacroCustomList As ObservableCollection(Of Object)
       Get
-         Return m_MacroList
+         Return m_MacroCustomList
       End Get
    End Property
 
-   Private m_nSelMacro As Integer = -1
-   Public Property nSelMacro As Integer
+   Private m_nSelMacroCustom As Integer = -1
+   Public Property nSelMacroCustom As Integer
       Get
-         Return m_nSelMacro
+         Return m_nSelMacroCustom
       End Get
       Set(value As Integer)
-         If value <> m_nSelMacro Then
-            m_nSelMacro = value
+         If value <> m_nSelMacroCustom Then
+            m_nSelMacroCustom = value
          End If
       End Set
    End Property
@@ -157,17 +172,133 @@ Public Class AddFeatureWndVM
    ' Definizione comandi
    Private m_cmdOk As ICommand
 
+#Region "Messages"
+
+   Public ReadOnly Property Process_Msg As String
+      Get
+         Return EgtMsg(61805).ToUpper()
+      End Get
+   End Property
+
+   Public ReadOnly Property Default_Msg As String
+      Get
+         Return EgtMsg(61899).ToUpper()
+      End Get
+   End Property
+
+   Public ReadOnly Property Custom_Msg As String
+      Get
+         Return EgtMsg(61801).ToUpper()
+      End Get
+   End Property
+
+#End Region
+
 #End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
 
    Sub New()
-      SelGRPType = 0
-      nSelPRC = PRCList(0)
+      If Core.Configuration.bOnlyProd Then
+         ' carico lista process
+         Dim TempPRCList As New ObservableCollection(Of Integer)
+         Dim TempPRCLList As New ObservableCollection(Of Integer)
+         Dim TempPRCLTist As New ObservableCollection(Of Integer)
+         GetBeamPrivateProfileProcessList(0, TempPRCLList)
+         GetBeamPrivateProfileProcessList(1, TempPRCLTist)
+         ' riporto le liste process in un unica lista
+         For Each PRCL In TempPRCLList
+            TempPRCList.Add(PRCL)
+         Next
+         For Each PRCT In TempPRCLTist
+            TempPRCList.Add(PRCT)
+         Next
+         m_PRCList.Clear()
+         ' ciclo sulla lista process eliminado i doppi
+         For Each PRC In TempPRCList.Distinct()
+            ' leggo gruppi 
+            Dim GRPLList As New ObservableCollection(Of Integer)
+            Dim GRPTList As New ObservableCollection(Of Integer)
+            GetBeamPrivateProfileGRPList(0, PRC, GRPLList)
+            GetBeamPrivateProfileGRPList(1, PRC, GRPTList)
+            If GRPLList.Count > 0 Then m_PRCList.Add(New PRC(GRPLList(0), PRC, GetBeamPrivateProfileName(0, PRC)))
+            If GRPTList.Count > 0 Then m_PRCList.Add(New PRC(GRPTList(0), PRC, GetBeamPrivateProfileName(1, PRC)))
+         Next
+         m_PRCListView = m_PRCList.OrderBy(Function(x) x.nPRC).ToList()
+         nSelPRC = m_PRCList(0)
+         NotifyPropertyChanged(NameOf(PRCListView))
+         NotifyPropertyChanged(NameOf(PRCList))
+      Else
+         SelGRPType = 0
+         nSelPRC = PRCList(0)
+      End If
    End Sub
 
 #End Region    ' CONSTRUCTOR
 
+#Region "METHODS"
+
+   Private Sub GetMacroListDefault(ByRef nGRPFromFileName As Integer, ByRef nPRCFromFileName As Integer, ByRef sMacroNameFromFileName As String, ByRef nIdMacroName As Integer)
+      Dim AllFilesInDir As IEnumerable(Of String) = IO.Directory.EnumerateFiles(Map.refMainWindowVM.MainWindowM.sMacroCustomDir)
+      For Each File In AllFilesInDir
+         If Path.GetExtension(File).ToLower() = ".lua" Then
+            If File.Contains(FILENAMESEPARATOR) Then
+               Dim FileName As String = Path.GetFileNameWithoutExtension(File)
+               Dim DataFromFileName As String() = FileName.Split(FILENAMESEPARATOR)
+               If DataFromFileName.Count = 2 Then
+                  If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
+                     Dim NumbersFromFileName As String() = DataFromFileName(0).Split(".")
+                     Integer.TryParse(NumbersFromFileName(0), nGRPFromFileName)
+                     Integer.TryParse(NumbersFromFileName(1), nPRCFromFileName)
+                  End If
+                  If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
+                     sMacroNameFromFileName = DataFromFileName(1)
+                  End If
+                  If nGRPFromFileName = CalcBeamPrivateProfileGRP(nSelPRC.nGRP) AndAlso nPRCFromFileName = nSelPRC.nPRC Then
+                     If Core.Configuration.bOnlyProd Then
+                        MacroCustomList.Add(New NewMacro(nIdMacroName, sMacroNameFromFileName, Map.refMainWindowVM.MainWindowM.sMacroCustomDir & "\Template\" & sMacroNameFromFileName & ".png"))
+                     Else
+                        MacroCustomList.Add(New IdNameStruct(nIdMacroName, sMacroNameFromFileName))
+                     End If
+                     m_MacroFilePathList.Add(File)
+                     nIdMacroName += 1
+                  End If
+               End If
+            End If
+         End If
+      Next
+   End Sub
+
+   Private Sub GetMacroListCustom(ByRef nGRPFromFileName As Integer, ByRef nPRCFromFileName As Integer, ByRef sMacroNameFromFileName As String, ByRef nIdMacroName As Integer)
+      nIdMacroName = 0
+      Dim AllFilesInDirCustom As IEnumerable(Of String) = IO.Directory.EnumerateFiles(Map.refMainWindowVM.MainWindowM.sMacroDefaultDir)
+      For Each File In AllFilesInDirCustom
+         If Path.GetExtension(File).ToLower() = ".lua" Then
+            If File.Contains(FILENAMESEPARATOR) Then
+               Dim FileName As String = Path.GetFileNameWithoutExtension(File)
+               Dim DataFromFileName As String() = FileName.Split(FILENAMESEPARATOR)
+               If DataFromFileName.Count = 2 Then
+                  If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
+                     Dim NumbersFromFileName As String() = DataFromFileName(0).Split(".")
+                     Integer.TryParse(NumbersFromFileName(0), nGRPFromFileName)
+                     Integer.TryParse(NumbersFromFileName(1), nPRCFromFileName)
+                  End If
+                  If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
+                     sMacroNameFromFileName = DataFromFileName(1)
+                  End If
+                  If nGRPFromFileName = CalcBeamPrivateProfileGRP(nSelPRC.nGRP) AndAlso nPRCFromFileName = nSelPRC.nPRC Then
+                     MacroDefaultList.Add(New NewMacro(nIdMacroName, sMacroNameFromFileName))
+                     m_MacroCustomFilePathList.Add(File)
+                     nIdMacroName += 1
+                  End If
+               End If
+            End If
+         End If
+      Next
+   End Sub
+
+#End Region    ' METHODS
+
 #Region "COMMANDS"
 
 #Region "Ok"
@@ -259,4 +390,43 @@ Public Class PRC
       m_QBTLParamVMList = QBTLParamList
    End Sub
 
+End Class
+
+Public Class NewMacro
+
+   ' Indice Macro
+   Private m_nIndexMacro As Integer
+   Public ReadOnly Property nIndexMacro As Integer
+      Get
+         Return m_nIndexMacro
+      End Get
+   End Property
+
+   ' Nome Macro
+   Private m_sMacroName As String
+   Public ReadOnly Property sMacroName As String
+      Get
+         Return m_sMacroName.ToUpper()
+      End Get
+   End Property
+
+   ' Cartella dove sono contenuti i templete delle macro
+   Private m_sMacroDrawPath As String
+   Public ReadOnly Property sMacroDrawPath As String
+      Get
+         Return m_sMacroDrawPath
+      End Get
+   End Property
+
+   Sub New(IndexMacro As Integer, MacroName As String)
+      m_nIndexMacro = IndexMacro
+      m_sMacroName = MacroName
+   End Sub
+
+   Sub New(IndexMacro As Integer, MacroName As String, MacroDrawPath As String)
+      m_nIndexMacro = IndexMacro
+      m_sMacroName = MacroName
+      m_sMacroDrawPath = MacroDrawPath
+   End Sub
+
 End Class

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml

@@ -0,0 +1,159 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="NewAddFeatureWndV"
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="WidthAndHeight"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="AddProcess">
+   <Grid Margin="5">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="Auto"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <TextBlock Text="{Binding Process_Msg}"
+                 Style="{StaticResource ListTextBlock}"/>
+      <ListBox ItemsSource="{Binding PRCListView}"
+               SelectedItem="{Binding nSelPRC}"
+               Grid.Row="1"
+               BorderThickness="0"
+               Height="585"
+               Width="260"
+               HorizontalAlignment="Left"
+               Margin="5">
+         <ListBox.Resources>
+            <Style TargetType="ListBoxItem">
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="ListBoxItem">
+                        <Border Name="Border" Padding="2" SnapsToDevicePixels="True">
+                           <ContentPresenter/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HotTrackBrushKey}}"/>
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Foreground" Value="White"/>
+                              <Setter Property="FontSize" Value="15"/>
+                           </Trigger>
+                        </ControlTemplate.Triggers>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+         </ListBox.Resources>
+         <ListBox.ItemTemplate>
+            <DataTemplate>
+               <TextBlock Text="{Binding ghDesc}"
+                          ToolTip="{Binding ghDesc}"
+                          HorizontalAlignment="Left"
+                          Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
+                          Style="{StaticResource OptionTextBlock}"/>
+            </DataTemplate>
+         </ListBox.ItemTemplate>
+      </ListBox>
+      <TextBlock Text="{Binding Custom_Msg}"
+                 Grid.Column="1"
+                 Style="{StaticResource ListTextBlock}"/>
+      <ListBox ItemsSource="{Binding MacroCustomList}"
+               SelectedIndex="{Binding nSelMacroCustom}"
+               Grid.Row="1"
+               Grid.Column="1"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               BorderThickness="0"
+               Width="980"
+               Height="610"
+               Margin="5">
+         <ListBox.ItemsPanel>
+            <ItemsPanelTemplate>
+               <WrapPanel IsItemsHost="True" Orientation="Horizontal"/>
+            </ItemsPanelTemplate>
+         </ListBox.ItemsPanel>
+         <ListBox.ItemTemplate>
+            <DataTemplate>
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <TextBlock Text="{Binding sMacroName}"
+                             Margin="5"
+                             FontSize="14"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <Image Source="{Binding sMacroDrawPath}"
+                         Grid.Row="1"                               
+                         Width="300"
+                         Margin="5,0,5,5"/>
+               </Grid>
+            </DataTemplate>
+         </ListBox.ItemTemplate>
+      </ListBox>
+      <TextBlock Text="{Binding Default_Msg}"
+                 Grid.Column="2"
+                 Style="{StaticResource ListTextBlock}"/>
+      <ListBox ItemsSource="{Binding MacroDefaultList}"
+               SelectedIndex="{Binding nSelMacroDefault}"
+               Grid.Row="1"
+               Grid.Column="2"
+               BorderThickness="0"
+               Height="585"
+               Width="250"
+               HorizontalAlignment="Left"
+               Margin="5">
+         <ListBox.Resources>
+            <Style TargetType="ListBoxItem">
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="ListBoxItem">
+                        <Border Name="Border" Padding="2" SnapsToDevicePixels="True">
+                           <ContentPresenter/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HotTrackBrushKey}}"/>
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Foreground" Value="White"/>
+                              <Setter Property="FontSize" Value="14"/>
+                              <Setter Property="HorizontalAlignment" Value="Left"/>
+                           </Trigger>
+                        </ControlTemplate.Triggers>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+         </ListBox.Resources>
+         <ListBox.ItemTemplate>
+            <DataTemplate>
+               <TextBlock Text="{Binding sMacroName}"
+                          Margin="2.5"
+                          HorizontalAlignment="Left"
+                          Width="239"
+                          Style="{StaticResource OptionTextBlock}"/>
+            </DataTemplate>
+         </ListBox.ItemTemplate>
+      </ListBox>
+
+      <UniformGrid Columns="2"
+                   Grid.Row="2"
+                   Grid.ColumnSpan="3"
+                   Margin="5">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml.vb

@@ -0,0 +1,17 @@
+Public Class NewAddFeatureWndV
+
+   Private WithEvents m_AddFeatureWndVM As AddFeatureWndVM
+
+   Sub New(Owner As Window, AddFeatureWndVM As AddFeatureWndVM)
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+      Me.DataContext = AddFeatureWndVM
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      m_AddFeatureWndVM = AddFeatureWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_AddFeatureWndVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

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/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
@@ -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
@@ -715,6 +726,7 @@ Public Class BTLPartManagerVM
       Dim dPosX As Double = BeamMachGroup.dStartCut
       Dim nPartIndex As Integer = 0
       Dim nIndex As Integer
+      Dim bDuploInfo As Boolean = False
       ' ciclo sui pezzi
       For nIndex = 0 To BeamMachGroup.PartVMList.Count - 1
          For PartsToAddIndex = nPartIndex To PartsToAdd.Count - 1
@@ -768,34 +780,26 @@ Public Class BTLPartManagerVM
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
       If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
          EgtOutLog("Fallito inserimento grezzo nella barra in AddPartToBeam")
-
          ' elimino duplo 
          For Each nDuploId In nPartDuploIdList
             EgtErase(nDuploId)
-            EgtRemoveRawPart(nDuploId)
          Next
-
-         ' rimuovo info duplo e aggiorno info grezzo
-         nPartIndex = 0
+         ' aggiorno info grezzo
          For nIndex = 0 To BeamMachGroup.PartVMList.Count - 1
-            If nPartIndex < nPartDuploIdList.Count() AndAlso BeamMachGroup.PartVMList(nIndex).dL > PartsToAdd(0).dL Then
-               EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1)
-               nPartIndex += 1
-            ElseIf nPartIndex < nPartDuploIdList.Count() AndAlso BeamMachGroup.PartVMList(nIndex).dL < PartsToAdd(0).dL Then
-               EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1)
-               nPartIndex += 1
-            End If
-            EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + nPartIndex + 1)
             EgtSetInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1, BeamMachGroup.PartVMList(nIndex).nPartId & "," & DoubleToString(BeamMachGroup.PartVMList(nIndex).dPOSX, 3))
          Next
-
+         ' rimuovo info duplo
+         While EgtGetInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1, nPartDuploIdList(0))
+            bDuploInfo = EgtGetInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1, nPartDuploIdList(0))
+            EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1)
+            nIndex += 1
+         End While
          ' elimino vecchio grezzo ed eseguo script creazione nuovo
          nRawId = EgtGetFirstRawPart()
          While nRawId <> GDB_ID.NULL
             EgtRemoveRawPart(nRawId)
             nRawId = EgtGetFirstRawPart()
          End While
-
          If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
             EgtOutLog("Fallita esecuzione ExecBeam. ERRORE")
          End If
@@ -809,8 +813,8 @@ Public Class BTLPartManagerVM
       ' seleziono pezzo aggiunto
       If BeamMachGroup.PartVMList.Count > nInsertIndex Then
          BeamMachGroup.SelPart = BeamMachGroup.PartVMList(nInsertIndex)
-      Else
-         BeamMachGroup.SelPart = BeamMachGroup.PartVMList(nInsertIndex - 1)
+      ElseIf bDuploInfo Then
+         BeamMachGroup.SelPart = BeamMachGroup.PartVMList(BeamMachGroup.PartVMList.Count - 1)
       End If
       Return True
    End Function
@@ -948,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()
@@ -1081,14 +1090,10 @@ Public Class BTLPartManagerVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub Invert()
-      If IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
+      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)
-      'If bShowBuilding AndAlso Map.refShowBeamPanelVM.bShowAll Then
-      '   ' devo smontarlo prima di ruotare le travi
-      '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-      'End If
       ' inverto i pezzi selezionati
       For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
          Part.Invert()
@@ -1123,10 +1128,6 @@ Public Class BTLPartManagerVM
       ' se modalita' assemblato
       Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
       Configuration.AssembledMode(bShowBuilding)
-      'If bShowBuilding AndAlso Map.refShowBeamPanelVM.bShowAll Then
-      '   ' devo smontarlo prima di ruotare le travi
-      '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-      'End If
       ' ruoto i pezzi selezionati
       For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
          Part.BackRotation(False, False)
@@ -1168,10 +1169,6 @@ Public Class BTLPartManagerVM
       ' se modalita' assemblato
       Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
       Configuration.AssembledMode(bShowBuilding)
-      'If bShowBuilding AndAlso Map.refShowBeamPanelVM.bShowAll Then
-      '   ' devo smontarlo prima di ruotare le travi
-      '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-      'End If
       ' ruoto i pezzi selezionati
       For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
          Part.ForwardRotation(False, False)

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
@@ -165,7 +165,7 @@ Public Class BTLFeatureVM
                ' se in View
                If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(m_BTLPartM)) Then
                   ' imposto modificato per copie
-                  Dim cc = Map.refMachGroupPanelVM.MachGroupVMList
+                  'Dim cc = Map.refMachGroupPanelVM.MachGroupVMList
                   MyMachGroupPanelM.SetDuploModified(m_BTLPartM.nPartId)
                End If
                NotifyPropertyChanged(NameOf(bDO))

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -132,9 +132,24 @@ 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
+               Dim ParentPart As BTLPartM = TryCast(m_BTLParamM.ParentFeature.ParentPart, BTLPartM)
+               ' recupero PartId
+               Dim nPartId As Integer = ParentPart.nPartId
+               ' numero di pezzi inseriti nelle barre 
+               Dim INPROD As Integer = 0
+               EgtDuploInRawCount(nPartId, INPROD)
+               ' recupero pezzi lavorati da Db
+               Dim nDoneCnt As Integer = DbControllers.m_ProjController.getCountItemState(ProjectManagerVM.CurrProj.nProjId, nPartId, ItemState.Assigned)
+               ' controllo se i pezzi sono lavorati se si messaggio di warning altrimenti messaggio informativo
+               If nDoneCnt > 0 Then
+                  MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+               ElseIf INPROD > 0 Then
+                  MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
+               End If
                UpdateParamValue(dNewValue, "")
             Case Else
                UpdateParamValue(0, value)

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

@@ -84,10 +84,10 @@ Public Class BTLStructureVM
       Select Case m_SelectionType
          Case SelectionTypes.SELECT_
             ' imposto modalita' proj su vista feature
-            'Map.refProjectVM.SelProdProj = ProdProj.PROJ
             If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.PROJ
             ' rendo enable bottone parameters
             Map.refLeftPanelVM.SetParametersIsEnabled(True)
+            Map.refLeftPanelVM.SetData_IsEnabled(False)
             ' verifico reset mark su tutti i pezzi
             For Each BTLPart In m_BTLPartVMList
                EgtResetMark(BTLPart.nPartId)
@@ -97,10 +97,10 @@ Public Class BTLStructureVM
             Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
          Case SelectionTypes.HIGHLIGHT
             ' imposto modalita' nulla su vista feature
-            'Map.refProjectVM.SelProdProj = ProdProj.NULL
             If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProdProjManagerVM.SelProdProj = ProdProj.NULL
             ' rendo disable bottone parameters
             Map.refLeftPanelVM.SetParametersIsEnabled(False)
+            Map.refLeftPanelVM.SetData_IsEnabled(True)
             If m_PrevSelectionType = SelectionTypes.SELECT_ Then
                EgtBeamShowFacesName(False)
                EgtBeamShowLoadingSide(False, False)
@@ -120,8 +120,6 @@ Public Class BTLStructureVM
       ' aggiornamento grafica
       'Map.refLeftPanelVM.PartShowAllChanged()
       Configuration.UpdateGraphics()
-      'If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
-      'If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
       'Map.refLeftPanelVM.FeatureSelectionChanged()
       If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
       Map.refCALCPanelVM.SetIsEnabledForSelPart()
@@ -215,39 +213,19 @@ Public Class BTLStructureVM
             SelBTLPart = Nothing
       End Select
       ' aggiornamento grafica
-      'Map.refLeftPanelVM.PartShowAllChanged()
       Configuration.UpdateGraphics()
-      'If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.PartShowAllChanged()
-      'If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.PartShowAllChanged()
    End Sub
 
    Private Sub SelectBTLPart(BtlPart As BTLPartVM)
       m_SelBTLPart = BtlPart
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          Configuration.SelectedPieces(BtlPart.nPartId, Me)
-         'EgtBeamShowFacesName(False)
-         'EgtBeamShowLoadingSide(False, False)
-         'Map.refProjectVM.MacroFeature_IsEnabled = True
-         '' se modalità building, la tolgo
-         'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         '   ShowBuilding(False, False)
-         'End If
-         '' seleziono pezzo nella scena
-         'SceneSelPartSelection()
-         '' seleziono pezzo in Db geometrico
-         'EgtBeamSetPart(BtlPart.nPartId)
-         'EgtBeamShowFacesName(True)
-         'Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
-         'Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
-         'EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
          ' seleziono pagina BottomPanel
          If Not IsNothing(Map.refBottomPanelVM) Then
             Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
          End If
-         '' mostro barra di gestione pezzo
-         'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-         ' deseleziono le feature
-         If Not IsNothing(BtlPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
+         ' mostro barra di gestione pezzo
+         If Not IsNothing(BtlPart.BTLFeatureVMList) AndAlso BtlPart.BTLFeatureVMList.Count > 0 Then SelBTLPart.SelBTLFeatureVM = BtlPart.BTLFeatureVMList(0)
          ' aggiorno stato selezionato tutto
          Map.refShowBeamPanelVM.bShowAll = False
          Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
@@ -259,25 +237,6 @@ Public Class BTLStructureVM
          EgtBeamShowLoadingSide(False, False)
          ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
          Configuration.SetSearchPiece(BtlPart.nPartId)
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
          ' seleziono pezzo nella scena
          SceneSelPartSelection()
          Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
@@ -292,45 +251,10 @@ Public Class BTLStructureVM
             EgtResetCurrMachGroup()
          End If
          Configuration.SelectedPieces(BtlPart.nPartId, Me)
-         'EgtBeamShowFacesName(False)
-         'EgtBeamShowLoadingSide(False, False)
-         'Map.refProjectVM.MacroFeature_IsEnabled = True
-         '' se modalità building, la tolgo
-         'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         '   ShowBuilding(False, False)
-         'End If
-         '' seleziono pezzo nella scena
-         'SceneSelPartSelection()
-         '' seleziono pezzo in Db geometrico
-         'EgtBeamSetPart(BtlPart.nPartId)
-         'EgtBeamShowFacesName(True)
-         'Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
-         'Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
-         'EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
          ' seleziono la prima feature
          If Not IsNothing(BtlPart.BTLFeatureVMList) AndAlso BtlPart.BTLFeatureVMList.Count > 0 Then SelBTLPart.SelBTLFeatureVM = BtlPart.BTLFeatureVMList(0)
          ' aggiorno stato selezionato tutto
          Map.refShowBeamPanelVM.bShowAll = False
-         '' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
          Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
          EgtZoom(ZM.ALL)
       End If
@@ -339,11 +263,6 @@ Public Class BTLStructureVM
    Private Sub DeselectBTLPart(BtlPart As BTLPartVM)
       ' se necessario tolgo solido dal precedentemente selezionato
       Configuration.DeselectSolid(BtlPart.nPartId, True)
-      'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-      '   ' tolgo eventuale indicazione solido rimasta da pezzo precedente
-      '   Map.refShowBeamPanelVM.SetShowSolid(False)
-      '   Map.refProjectVM.BTLStructureVM.ShowSolid(BtlPart.nPartId, False, False)
-      'End If
       If m_SelBTLPart Is BtlPart Then
          EgtBeamShowFacesName(False)
          EgtBeamShowLoadingSide(False, False)
@@ -351,25 +270,7 @@ Public Class BTLStructureVM
          NotifyPropertyChanged(NameOf(SelBTLPart))
       End If
       ' disabilito eventuale feature selezionata 
-      If Not IsNothing(BtlPart.m_SelBTLFeatureVM) Then BtlPart.SelBTLFeatureVM = Nothing
-      '' deevidenzio MachGroup e Duplo di questo pezzo
-      'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-      '   Dim MachGroupList As New List(Of MyMachGroupVM)
-      '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-      '      Dim bFound As Boolean = False
-      '      For Each Part As PartVM In Machgroup.PartVMList
-      '         Dim i = EgtDuploGetOriginal(Part.nPartId)
-      '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-      '            Part.ResetSearchFound()
-      '            bFound = True
-      '         End If
-      '      Next
-      '      If bFound Then
-      '         Machgroup.ResetSearchFound()
-      '      End If
-      '   Next
-      'End If
-      EgtResetCurrMachGroup()
+      If Not IsNothing(BtlPart.m_SelBTLFeatureVM) AndAlso (Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING) Then BtlPart.SelBTLFeatureVM = Nothing
       EgtDraw()
    End Sub
    Private Sub HighlightBTLPart(BtlPart As BTLPartVM)
@@ -391,25 +292,6 @@ Public Class BTLStructureVM
       If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
          ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
          Configuration.SetSearchPiece(BtlPart.nPartId)
-         'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-         '   Dim MachGroupList As New List(Of MyMachGroupVM)
-         '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-         '      Dim bFound As Boolean = False
-         '      For Each Part As PartVM In Machgroup.PartVMList
-         '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-         '            Part.SetSearchFound()
-         '            bFound = True
-         '         Else
-         '            Part.ResetSearchFound()
-         '         End If
-         '      Next
-         '      If bFound Then
-         '         Machgroup.SetSearchFound()
-         '      Else
-         '         Machgroup.ResetSearchFound()
-         '      End If
-         '   Next
-         'End If
       End If
       ' seleziono pagina BottomPanel
       If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
@@ -433,22 +315,6 @@ Public Class BTLStructureVM
       End If
       ' deevidenzio MachGroup e Duplo di questo pezzo
       Configuration.ResetSearchPiece(BtlPart.nPartId)
-      'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-      '   Dim MachGroupList As New List(Of MyMachGroupVM)
-      '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-      '      Dim bFound As Boolean = False
-      '      For Each Part As PartVM In Machgroup.PartVMList
-      '         Dim i = EgtDuploGetOriginal(Part.nPartId)
-      '         If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
-      '            Part.ResetSearchFound()
-      '            bFound = True
-      '         End If
-      '      Next
-      '      If bFound Then
-      '         Machgroup.ResetSearchFound()
-      '      End If
-      '   Next
-      'End If
       ' seleziono pagina BottomPanel
       'Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
       If bDraw Then EgtDraw()
@@ -474,16 +340,13 @@ Public Class BTLStructureVM
          If Not IsNothing(m_SelBTLPart) Then
             ' se necessario tolgo solido dal precedentemente selezionato
             Configuration.DeselectSolid()
-            'If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-            '   Map.refShowBeamPanelVM.SetShowSolid(False)
-            'End If
             ' disabilito eventuale feature selezionata 
             If Not IsNothing(m_SelBTLPart.m_SelBTLFeatureVM) Then m_SelBTLPart.SelBTLFeatureVM = Nothing
          End If
          m_SelBTLPart = value
          ' se seleziono un pezzo
          If Not IsNothing(m_SelBTLPart) Then
-            If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+            If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                ' se modalità building, la tolgo
                If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
                   ShowBuilding(False, False)
@@ -495,7 +358,6 @@ Public Class BTLStructureVM
                ' seleziono pagina BottomPanel
                Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
                ' mostro barra di gestione pezzo
-               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
                Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
                ' deseleziono le feature
                If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
@@ -506,70 +368,10 @@ Public Class BTLStructureVM
             ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
                Configuration.SetSearchPiece(m_SelBTLPart.nPartId)
-               'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               '   Dim MachGroupList As New List(Of MyMachGroupVM)
-               '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-               '      Dim bFound As Boolean = False
-               '      For Each Part As PartVM In Machgroup.PartVMList
-               '         If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
-               '            Part.SetSearchFound()
-               '            bFound = True
-               '         Else
-               '            Part.ResetSearchFound()
-               '         End If
-               '      Next
-               '      If bFound Then
-               '         Machgroup.SetSearchFound()
-               '      Else
-               '         Machgroup.ResetSearchFound()
-               '      End If
-               '   Next
-               'End If
                ' seleziono pezzo nella scena
                SceneSelPartSelection()
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
-            ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-               ' se modalità building, la tolgo
-               If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-                  ShowBuilding(False, False)
-               End If
-               ' seleziono pezzo nella scena
-               SceneSelPartSelection()
-               ' seleziono pezzo in Db geometrico
-               EgtBeamSetPart(m_SelBTLPart.nPartId)
-               ' seleziono pagina BottomPanel
-               Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
-               ' mostro barra di gestione pezzo
-               'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
-               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
-               ' deseleziono le feature
-               If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
-               ' aggiorno stato selezionato tutto
-               Map.refShowBeamPanelVM.bShowAll = False
-               ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-               Configuration.ResetSearchPiece(m_SelBTLPart.nPartId)
-               'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               '   Dim MachGroupList As New List(Of MyMachGroupVM)
-               '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-               '      Dim bFound As Boolean = False
-               '      For Each Part As PartVM In Machgroup.PartVMList
-               '         If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
-               '            Part.SetSearchFound()
-               '            bFound = True
-               '         Else
-               '            Part.ResetSearchFound()
-               '         End If
-               '      Next
-               '      If bFound Then
-               '         Machgroup.SetSearchFound()
-               '      Else
-               '         Machgroup.ResetSearchFound()
-               '      End If
-               '   Next
-               'End If
-               Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-               EgtZoom(ZM.ALL)
             End If
          End If
          NotifyPropertyChanged(NameOf(SelBTLPart))
@@ -772,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
@@ -785,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
@@ -798,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
@@ -811,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
@@ -848,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
@@ -861,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
@@ -874,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
@@ -887,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
@@ -900,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
@@ -913,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
@@ -926,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
@@ -939,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
@@ -952,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
@@ -973,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
@@ -994,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
@@ -1007,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
@@ -1020,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
@@ -1033,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
@@ -1046,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
@@ -1067,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
@@ -1080,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
@@ -1293,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
@@ -1567,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)
@@ -1581,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

@@ -2,7 +2,8 @@
            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">
+           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
+           DataContext="{StaticResource ConfigurationPageVM}">
 
    <Grid>
       <Grid.ColumnDefinitions>
@@ -54,12 +55,12 @@
                <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>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -37,27 +37,22 @@ 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_bMachine_Visibility = Visibility.Collapsed
             m_bGeneral_Visibility = Visibility.Collapsed
             m_bParameterQ_Visibility = Visibility.Collapsed
          End If
          NotifyPropertyChanged(NameOf(General_Visibility))
          NotifyPropertyChanged(NameOf(ParameterQ_Visibility))
-         NotifyPropertyChanged(NameOf(Machine_Visibility))
          NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
       End Set
    End Property
@@ -284,6 +279,17 @@ 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
    Private m_cmdChooseExternalBackupFolderPath As ICommand
@@ -518,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
 
@@ -1016,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
@@ -1193,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
@@ -1213,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

@@ -180,14 +180,35 @@
     <Compile Include="AboutBoxWindow\AboutBoxV.xaml.vb">
       <DependentUpon>AboutBoxV.xaml</DependentUpon>
     </Compile>
+    <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" />
@@ -195,14 +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>
@@ -354,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>
@@ -371,6 +467,12 @@
     <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>
@@ -465,18 +567,94 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="AddFeatureWnd\NewAddFeatureWndV.xaml">
+      <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>
@@ -485,14 +663,26 @@
       <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>
+    </Page>
     <Page Include="PartInRawPartManager\PartInRawPartManagerWndV.xaml">
       <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>
@@ -505,10 +695,42 @@
       <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>
@@ -637,6 +859,14 @@
       <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>
@@ -645,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>
@@ -1123,6 +1361,12 @@
       <Version>6.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\InstrumentPanel\Ott.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\InstrumentPanel\Vis.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe

EgtBEAMWALL.ViewerOptimizer/FeatureListManager/FeatureListManagerVM.vb

@@ -112,13 +112,93 @@ Public Class FeatureListManagerVM
       NotifyPropertyChanged(NameOf(AddFeature_IsEnabled))
    End Sub
 
-
    Friend Sub FeatureSelectionChanged()
       NotifyPropertyChanged(NameOf(CopyFeature_IsEnabled))
       NotifyPropertyChanged(NameOf(MacroFeature_IsEnabled))
       NotifyPropertyChanged(NameOf(RemoveFeature_IsEnabled))
    End Sub
 
+   Private Sub CreateNewFeature(MacroListCount As Integer, nSelMacro As Integer, AddFeatureWndVM As AddFeatureWndVM, nNewFeatureId As Integer, bMacroFlag As Boolean, NewFeat As BTLFeatureM)
+      ' verifico se una Macro è selezionata
+      If MacroListCount > 0 AndAlso nSelMacro >= 0 Then
+         ' Creo nuova feature sulla base della Macro selezionata
+         ' Creo table e setto variabili
+         CreateMacroTable()
+         Dim bOk As Boolean
+         If AddFeatureWndVM.nSelMacroDefault >= 0 Then
+            bOk = EgtLuaExecFile(AddFeatureWndVM.m_MacroCustomFilePathList(nSelMacro))
+         Else
+            bOk = EgtLuaExecFile(AddFeatureWndVM.m_MacroFilePathList(nSelMacro))
+         End If
+         ' Leggo variabili
+         EgtLuaGetGlobIntVar("MACRO.FEATUREID", nNewFeatureId)
+         ' Reset lua
+         EgtLuaResetGlobVar("MACRO")
+         If Not bOk Then
+            MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
+            Return
+         End If
+         bMacroFlag = True
+      Else
+         ' Creo nuova feature (Macro non selezionata)
+         NewFeat = BTLFeatureM.CreateBTLFeature(AddFeatureWndVM.nSelPRC.nPRC, AddFeatureWndVM.nSelPRC.nGRP, AddFeatureWndVM.nSelPRC.nSIDE)
+         NewFeat.SetDefaultValues()
+         Dim vPar() As Double = Nothing
+         Dim sPar As String = String.Empty
+         Dim vParQ() As String = Nothing
+         NewFeat.CalcParamArray(vPar, sPar, vParQ)
+         If NewFeat.nPRC = 900 Then NewFeat.sDES = "2"
+         ' aggiorno la feature con nuovo valore
+         EgtBeamSetPart(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
+         nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, NewFeat.sDES,
+                                           Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
+                                           New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
+         bMacroFlag = False
+      End If
+      ' se è stata creata
+      If nNewFeatureId <> GDB_ID.NULL Then
+         MyMachGroupPanelM.SetDuploModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
+         ' la aggiungo a struttura BTL corrente
+         NewFeat = BTLFeatureM.CreateBTLFeature(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM, nNewFeatureId)
+         If Not bMacroFlag Then NewFeat.SetDefaultValues()
+         Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.AddBTLFeature(NewFeat)
+         Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.FirstOrDefault(Function(x) x.BTLFeatureM Is NewFeat)
+         Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart()
+      End If
+   End Sub
+
+   Private Sub CreateMacroTable()
+      Dim nMacroW, nMacroH As Integer
+      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
+         End If
+      End If
+
+      EgtLuaCreateGlobTable("MACRO")
+      EgtLuaSetGlobNumVar("MACRO.L", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlL)
+      EgtLuaSetGlobNumVar("MACRO.W", nMacroW)
+      EgtLuaSetGlobNumVar("MACRO.H", nMacroH)
+      EgtLuaSetGlobIntVar("MACRO.PROCID", Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId())
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
@@ -179,9 +259,14 @@ Public Class FeatureListManagerVM
       If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
       ' apro finestra di creazione macro
       Dim MacroFeatureWndVM As New MacroFeatureWndVM()
-      Dim MacroFeatureWnd As New MacroFeatureWndV(Application.Current.MainWindow, MacroFeatureWndVM)
-      If MacroFeatureWnd.ShowDialog() Then
-
+      If bOnlyProd Then
+         Dim NewMacroFeatureWnd As New NewMacroFeatureWnd(Application.Current.MainWindow, MacroFeatureWndVM)
+         If NewMacroFeatureWnd.ShowDialog() Then
+         End If
+      Else
+         Dim MacroFeatureWnd As New MacroFeatureWndV(Application.Current.MainWindow, MacroFeatureWndVM)
+         If MacroFeatureWnd.ShowDialog() Then
+         End If
       End If
    End Sub
 
@@ -209,54 +294,24 @@ Public Class FeatureListManagerVM
       If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
       ' apro finestra di definizione nuova feature
       Dim AddFeatureWndVM As New AddFeatureWndVM()
-      Dim AddFeatureWnd As New AddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
-      If AddFeatureWnd.ShowDialog() Then
-         Dim NewFeat As BTLFeatureM
-         Dim nNewFeatureId As Integer = 0
-         Dim bMacroFlag As Boolean = False
-         ' verifico se una Macro è selezionata
-         If AddFeatureWndVM.MacroList.Count > 0 AndAlso AddFeatureWndVM.nSelMacro >= 0 Then
-            ' Creo nuova feature sulla base della Macro selezionata
-            ' Creo table e setto variabili
-            EgtLuaCreateGlobTable("MACRO")
-            EgtLuaSetGlobNumVar("MACRO.L", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlL)
-            EgtLuaSetGlobNumVar("MACRO.W", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlW)
-            EgtLuaSetGlobNumVar("MACRO.H", Map.refProjectVM.BTLStructureVM.SelBTLPart.dBtlH)
-            EgtLuaSetGlobIntVar("MACRO.PROCID", Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId())
-            Dim bOk = EgtLuaExecFile(AddFeatureWndVM.m_MacroFilePathList(AddFeatureWndVM.nSelMacro))
-            ' Leggo variabili
-            EgtLuaGetGlobIntVar("MACRO.FEATUREID", nNewFeatureId)
-            ' Reset lua
-            EgtLuaResetGlobVar("MACRO")
-            If Not bOk Then
-               MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
-               Return
+      Dim NewFeat As BTLFeatureM = Nothing
+      Dim nNewFeatureId As Integer = 0
+      Dim bMacroFlag As Boolean = False
+      If bOnlyProd Then
+         Dim AddNewFeatureWnd As New NewAddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
+         If AddNewFeatureWnd.ShowDialog() Then
+            ' verifico se una Macro è selezionata
+            If AddFeatureWndVM.nSelMacroDefault >= 0 Then
+               CreateNewFeature(AddFeatureWndVM.MacroDefaultList.Count, AddFeatureWndVM.nSelMacroDefault, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
+            Else
+               CreateNewFeature(AddFeatureWndVM.MacroCustomList.Count, AddFeatureWndVM.nSelMacroCustom, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
             End If
-            bMacroFlag = True
-         Else
-            ' Creo nuova feature (Macro non selezionata)
-            NewFeat = BTLFeatureM.CreateBTLFeature(AddFeatureWndVM.nSelPRC.nPRC, AddFeatureWndVM.nSelPRC.nGRP, AddFeatureWndVM.nSelPRC.nSIDE)
-            NewFeat.SetDefaultValues()
-            Dim vPar() As Double = Nothing
-            Dim sPar As String = String.Empty
-            Dim vParQ() As String = Nothing
-            NewFeat.CalcParamArray(vPar, sPar, vParQ)
-            ' aggiorno la feature con nuovo valore
-            EgtBeamSetPart(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, "",
-                                              Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
-                                              New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
-            bMacroFlag = False
          End If
-         ' se è stata creata
-         If nNewFeatureId <> GDB_ID.NULL Then
-            MyMachGroupPanelM.SetDuploModified(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            ' la aggiungo a struttura BTL corrente
-            NewFeat = BTLFeatureM.CreateBTLFeature(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM, nNewFeatureId)
-            If Not bMacroFlag Then NewFeat.SetDefaultValues()
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.AddBTLFeature(NewFeat)
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLFeatureVMList.FirstOrDefault(Function(x) x.BTLFeatureM Is NewFeat)
-            Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart()
+      Else
+         Dim AddFeatureWnd As New AddFeatureWndV(Application.Current.MainWindow, AddFeatureWndVM)
+         If AddFeatureWnd.ShowDialog() Then
+            ' verifico se una Macro è selezionata
+            CreateNewFeature(AddFeatureWndVM.MacroCustomList.Count, AddFeatureWndVM.nSelMacroCustom, AddFeatureWndVM, nNewFeatureId, bMacroFlag, NewFeat)
          End If
       End If
    End Sub

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

@@ -15,7 +15,7 @@
          </Style>
       </StackPanel.Style>
       <TextBlock Text="{Binding Message}"
-                    Visibility="{Binding Message_Visibility}"
+                 Visibility="{Binding Message_Visibility}"
                  Style="{StaticResource OptionTextBlock}"/>
       <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
                Width="200"
@@ -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/FreeContourManagerVM.vb

@@ -442,7 +442,6 @@ Public Class FreeContourManagerVM
       Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProdProjManagerVM.PartManager_Visibility))
       ' attivo pannello
       Map.refProjectVM.SetFreeContourManager_Visibility(True)
-      Map.refProjWndVM.SetFreeContourManager_Visibility(True)
       EgtDraw()
    End Sub
 
@@ -531,7 +530,6 @@ Public Class FreeContourManagerVM
       End If
       ' disattivo pannello
       Map.refProjectVM.SetFreeContourManager_Visibility(False)
-      Map.refProjWndVM.SetFreeContourManager_Visibility(False)
       ' attivo bottone edit
       SelFeature.RefreshFCMBtnVisibility()
       ' resetto tutte le variabili correnti

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,18 +45,20 @@
       <Image Source="/Resources/InstrumentPanel/Statistics.png" Stretch="Uniform"/>
    </ToggleButton>
 
-   <Button Content="VIS"
-           Command="{Binding Visualization_Command}"
+   <!--<Button Command="{Binding Visualization_Command}"
            ToolTip="{Binding Statistics_Msg}"
            Style="{StaticResource ToolBar_Button}"
            Visibility="{Binding VisStatistic_Visibility}"
-           IsEnabled="{Binding VisStatistic_IsEnabled}"/>
+           IsEnabled="{Binding VisStatistic_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/Vis.png" Stretch="Uniform"/>
+   </Button>
 
-   <Button Content="OTT"
-           Command="{Binding Optimizer_Command}"
+   <Button Command="{Binding Optimizer_Command}"
            ToolTip="{Binding Statistics_Msg}"
            Style="{StaticResource ToolBar_Button}"
            Visibility="{Binding OtStatistic_Visibility}"
-           IsEnabled="{Binding OtStatistic_IsEnabled}"/>
+           IsEnabled="{Binding OtStatistic_IsEnabled}">
+      <Image Source="/Resources/InstrumentPanel/Ott.png" Stretch="Uniform"/>
+   </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,12 +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}}}"/>
+               <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,16 +19,20 @@
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>
          <!--DO - Abilitazione-->
-         <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.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>
@@ -66,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}}}"/>
@@ -83,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/PParameterListV.xaml

@@ -34,8 +34,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/PartInRawPartListV.xaml

@@ -108,9 +108,11 @@
          </DataGridTextColumn>
          <!--ROT - Rotazione-->
          <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
-            <DataGridTemplateColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
-            </DataGridTemplateColumn.Header>
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <Grid>
@@ -143,9 +145,11 @@
          </DataGridTemplateColumn>
          <!--INV - Inversione-->
          <DataGridTemplateColumn x:Key="colFLIP">
-            <DataGridTemplateColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
-            </DataGridTemplateColumn.Header>
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb

@@ -155,6 +155,11 @@ Public Class PartInRawPartListVM
       m_colPartInRawPart_PosY = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSY)
       ' aggiorno la visibilità delle colonne
       For Each col In PartInRawPartColumns
+         If Not bOnlyProd AndAlso nMachType = MachineType.BEAM AndAlso (col.Name.Equals(COL_ROT) OrElse col.Name.Equals(COL_FLIP) OrElse col.Name.Equals(COL_POSX)) Then
+            col.Visible = False
+         Else
+            col.Visible = True
+         End If
          col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
       Next
    End Sub

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}">
@@ -133,10 +133,12 @@
          </DataGridTextColumn>
          <!--PosZ - Posizione in Z-->
          <DataGridTextColumn x:Key="colPOSZ" Binding="{Binding sPosZ}">
-            <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
-            </DataGridTextColumn.Header>
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
+                                            RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
                   <Setter Property="Foreground" Value="Blue" />

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -43,6 +43,18 @@ Public Class LeftPanelVM
       NotifyPropertyChanged(NameOf(Parameters_IsEnabled))
    End Sub
 
+   Private m_Data_IsEnabled As Boolean = False
+   Public ReadOnly Property Data_IsEnabled As Boolean
+      Get
+         Return m_Data_IsEnabled
+      End Get
+   End Property
+   Friend Sub SetData_IsEnabled(bIsEnabled As Boolean)
+      m_Data_IsEnabled = bIsEnabled
+      NotifyPropertyChanged(NameOf(Data_IsEnabled))
+   End Sub
+
+
    ' Definizione comandi
    Private m_cmdData As ICommand
    Private m_cmdParameter As ICommand

EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml

@@ -83,6 +83,7 @@
                   HorizontalAlignment="Left">
          <Button Command="{Binding Data_Command}"
                  ToolTip="{Binding Data_ToolTip}"
+                 IsEnabled="{Binding Data_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/InstrumentPanel/Analyze.png" Stretch="Uniform"/>
          </Button>
@@ -94,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

@@ -24,39 +24,13 @@ Public Class MyMachGroupPanelVM
                   Dim nSelBTLPartId As Integer = Map.refProjectVM.BTLStructureVM.SelBTLParts(0).nPartId
                   ' deevidenzio MachGroup e Duplo di questo pezzo
                   Configuration.ResetSearchPiece(nSelBTLPartId)
-                  'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-                  '   Dim MachGroupList As New List(Of MyMachGroupVM)
-                  '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-                  '      Dim bFound As Boolean = False
-                  '      For Each Part As PartVM In Machgroup.PartVMList
-                  '         If EgtDuploGetOriginal(Part.nPartId) = nSelBTLPartId Then
-                  '            Part.ResetSearchFound()
-                  '            bFound = True
-                  '         End If
-                  '      Next
-                  '      If bFound Then
-                  '         Machgroup.ResetSearchFound()
-                  '      End If
-                  '   Next
-                  'End If
                End If
             End If
             If Not IsNothing(SelectedMachGroup) AndAlso Not IsNothing(SelectedMachGroup.SelPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
                Configuration.ResetSearch(SelectedMachGroup.SelPart.nPartId)
-               'For BTLPartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
-               '   Dim nDuploOriginalId As Integer = 0
-               '   If EgtGetInfo(SelectedMachGroup.SelPart.nPartId, GDB_SI_DUPSOU, nDuploOriginalId) AndAlso nDuploOriginalId > 0 AndAlso nDuploOriginalId = Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).nPartId Then
-               '      Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).ResetSearchFound()
-               '      Exit For
-               '   End If
-               'Next
             End If
             ' se modalita' assemblato
             Configuration.AssembledMode(Map.refShowBeamPanelVM.ShowBuilding_IsChecked)
-            'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
-            '   ' devo smontarlo prima di calcolare le travi, altrimenti non trova i pezzi
-            '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-            'End If
             ' se precedente pezzo selezionato
             If Not IsNothing(value) AndAlso Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART AndAlso Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
                Dim SelBTLPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLParts(0)
@@ -75,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)
@@ -89,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)
@@ -307,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

@@ -1,6 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Collections.Specialized
-Imports System.ComponentModel
 Imports System.IO
 Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
@@ -30,47 +28,15 @@ Public Class MyMachGroupVM
                Dim nSelBTLPartId As Integer = Map.refProjectVM.BTLStructureVM.SelBTLParts(0).nPartId
                ' deevidenzio MachGroup e Duplo di questo pezzo
                Configuration.ResetSearchPiece(nSelBTLPartId)
-               'If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               '   Dim MachGroupList As New List(Of MyMachGroupVM)
-               '   For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
-               '      Dim bFound As Boolean = False
-               '      For Each Part As PartVM In Machgroup.PartVMList
-               '         If EgtDuploGetOriginal(Part.nPartId) = nSelBTLPartId Then
-               '            Part.ResetSearchFound()
-               '            bFound = True
-               '         End If
-               '      Next
-               '      If bFound Then
-               '         Machgroup.ResetSearchFound()
-               '      End If
-               '   Next
-               'End If
             End If
             If Not IsNothing(m_SelPart) Then
                ' deevidenzio BTLPart di questo pezzo
                If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
                   Configuration.ResetSearch(m_SelPart.nPartId)
-                  'For BTLPartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
-                  '   Dim nDuploOriginalId As Integer = 0
-                  '   If EgtGetInfo(m_SelPart.nPartId, GDB_SI_DUPSOU, nDuploOriginalId) AndAlso nDuploOriginalId > 0 AndAlso nDuploOriginalId = Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).nPartId Then
-                  '      Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).ResetSearchFound()
-                  '      Exit For
-                  '   End If
-                  'Next
                End If
             End If
             ' se modalita' assemblato
             Configuration.AssembledMode(Map.refShowBeamPanelVM.ShowBuilding_IsChecked)
-            'If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
-            '   ' devo smontarlo prima di calcolare le travi, altrimenti non trova i pezzi
-            '   Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-            'End If
-            'If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
-            '   ' deseleziono pezzo in lista BTLPart
-            '   For BTLPartIndex = Map.refProjectVM.BTLStructureVM.SelBTLParts.Count - 1 To 0 Step -1
-            '      Map.refProjectVM.BTLStructureVM.SelBTLParts.Remove(Map.refProjectVM.BTLStructureVM.SelBTLParts(BTLPartIndex))
-            '   Next
-            'End If
          End If
          m_SelPart = value
          ' seleziono pezzo
@@ -78,10 +44,11 @@ Public Class MyMachGroupVM
          If Not IsNothing(value) Then
             If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                ' imposto modalita' prod su vista feature
-               'Map.refProjectVM.SelProdProj = ProdProj.PROD
                Map.refProdProjManagerVM.SelProdProj = ProdProj.PROD
-               '' deseleziono pezzo in lista BTLPart
-               'Map.refProjectVM.BTLStructureVM.SelBTLParts.Clear()
+               ' deseleziono pezzo in lista BTLPart
+               For BTLPartIndex = Map.refProjectVM.BTLStructureVM.SelBTLParts.Count - 1 To 0 Step -1
+                  Map.refProjectVM.BTLStructureVM.SelBTLParts.RemoveFromList(Map.refProjectVM.BTLStructureVM.SelBTLParts(BTLPartIndex))
+               Next
             End If
             EgtSelectObj(SelPart.nPartId)
             If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
@@ -89,15 +56,7 @@ Public Class MyMachGroupVM
             End If
             ' trovo ed evidenzio BTLPart di questo pezzo
             If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-               'Dim MachGroupList As New List(Of MyMachGroupVM)
                Configuration.SetSearch(m_SelPart.nPartId)
-               'For BTLPartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
-               '   Dim nDuploOriginalId As Integer = 0
-               '   If EgtGetInfo(m_SelPart.nPartId, GDB_SI_DUPSOU, nDuploOriginalId) AndAlso nDuploOriginalId > 0 AndAlso nDuploOriginalId = Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).nPartId Then
-               '      Map.refProjectVM.BTLStructureVM.BTLPartVMList(BTLPartIndex).SetSearchFound()
-               '      Exit For
-               '   End If
-               'Next
             End If
 
          End If
@@ -150,14 +109,6 @@ Public Class MyMachGroupVM
                         ' verifico se la dimensione e' maggiore del box minimo dei pezzi
                         Dim b3Parts As New BBox3d
                         Configuration.VerifyMaxDimension(m_PartVMList, b3Parts)
-                        'Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(m_PartVMList(0).nPartId, "Box")
-                        'EgtGetBBoxGlob(nBoxLayerId, GDB_BB.EXACT, b3Parts)
-                        'For PartIndex = 1 To m_PartVMList.Count - 1
-                        '   Dim b3Part As New BBox3d
-                        '   nBoxLayerId = EgtGetFirstNameInGroup(m_PartVMList(PartIndex).nPartId, "Box")
-                        '   EgtGetBBoxGlob(nBoxLayerId, GDB_BB.EXACT, b3Part)
-                        '   b3Parts.Add(b3Part)
-                        'Next
                         Dim b3RawPart As New BBox3d
                         EgtGetRawPartBBox(nRawPartId, b3RawPart)
                         Dim dMinValue As Double = 0
@@ -175,19 +126,6 @@ Public Class MyMachGroupVM
                         ' riporto il grezzo nell'angolo tavola di origine
                         Dim b3Tab As New BBox3d
                         Configuration.SelectCorner(b3Tab, nRawPartId)
-                        'EgtGetTableArea(1, b3Tab)
-                        'Dim p3OrigOnTab As Point3d
-                        'Select Case CurrentMachine.OrigCorner
-                        '   Case MCH_CR.BL
-                        '      p3OrigOnTab = New Point3d(CurrentMachine.OrigOffsX, CurrentMachine.OrigOffsY, 0)
-                        '   Case MCH_CR.BR
-                        '      p3OrigOnTab = New Point3d(b3Tab.DimX() - CurrentMachine.OrigOffsX, CurrentMachine.OrigOffsY, 0)
-                        '   Case MCH_CR.TL
-                        '      p3OrigOnTab = New Point3d(CurrentMachine.OrigOffsX, b3Tab.DimY() - CurrentMachine.OrigOffsY, 0)
-                        '   Case MCH_CR.TR
-                        '      p3OrigOnTab = New Point3d(b3Tab.DimX() - CurrentMachine.OrigOffsX, b3Tab.DimY() - CurrentMachine.OrigOffsY, 0)
-                        'End Select
-                        'EgtMoveToCornerRawPart(nRawPartId, p3OrigOnTab, CurrentMachine.OrigCorner)
                         ' sposto tutti i pezzi di quanto si e' accorciato il grezzo
                         If CurrentMachine.NestingCorner = MCH_CR.TR OrElse CurrentMachine.NestingCorner = MCH_CR.BR Then
                            For Each Part In m_PartVMList
@@ -223,14 +161,6 @@ Public Class MyMachGroupVM
                      ' verifico se la dimensione e' maggiore del box minimo dei pezzi
                      Dim b3Parts As New BBox3d
                      Configuration.VerifyMaxDimension(m_PartVMList, b3Parts)
-                     'Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(m_PartVMList(0).nPartId, "Box")
-                     'EgtGetBBoxGlob(nBoxLayerId, GDB_BB.EXACT, b3Parts)
-                     'For PartIndex = 1 To m_PartVMList.Count - 1
-                     '   Dim b3Part As New BBox3d
-                     '   nBoxLayerId = EgtGetFirstNameInGroup(m_PartVMList(PartIndex).nPartId, "Box")
-                     '   EgtGetBBoxGlob(nBoxLayerId, GDB_BB.EXACT, b3Part)
-                     '   b3Parts.Add(b3Part)
-                     'Next
                      Dim b3RawPart As New BBox3d
                      EgtGetRawPartBBox(nRawPartId, b3RawPart)
                      Dim dMinValue As Double = 0
@@ -248,19 +178,6 @@ Public Class MyMachGroupVM
                      ' riporto il grezzo nell'angolo tavola di origine
                      Dim b3Tab As New BBox3d
                      Configuration.SelectCorner(b3Tab, nRawPartId)
-                     'EgtGetTableArea(1, b3Tab)
-                     'Dim p3OrigOnTab As Point3d
-                     'Select Case CurrentMachine.OrigCorner
-                     '   Case MCH_CR.BL
-                     '      p3OrigOnTab = New Point3d(CurrentMachine.OrigOffsX, CurrentMachine.OrigOffsY, 0)
-                     '   Case MCH_CR.BR
-                     '      p3OrigOnTab = New Point3d(b3Tab.DimX() - CurrentMachine.OrigOffsX, CurrentMachine.OrigOffsY, 0)
-                     '   Case MCH_CR.TL
-                     '      p3OrigOnTab = New Point3d(CurrentMachine.OrigOffsX, b3Tab.DimY() - CurrentMachine.OrigOffsY, 0)
-                     '   Case MCH_CR.TR
-                     '      p3OrigOnTab = New Point3d(b3Tab.DimX() - CurrentMachine.OrigOffsX, b3Tab.DimY() - CurrentMachine.OrigOffsY, 0)
-                     'End Select
-                     'EgtMoveToCornerRawPart(nRawPartId, p3OrigOnTab, CurrentMachine.OrigCorner)
                      ' sposto tutti i pezzi di quanto si e' accorciato il grezzo
                      If CurrentMachine.NestingCorner = MCH_CR.TR OrElse CurrentMachine.NestingCorner = MCH_CR.TL Then
                         For Each Part In m_PartVMList
@@ -448,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

@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
-Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
 Imports EgtUILib
@@ -223,7 +222,7 @@ Public Class PartVM
                Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
                ' reinserisco il pezzo nel grezzo
                EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
-            ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+            ElseIf bOnlyProd AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
                ' elimino vecchio grezzo ed eseguo script creazione nuovo
                DeleteOldRaw()
                Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
@@ -253,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
@@ -267,6 +295,7 @@ Public Class PartVM
       CalcGlobalUpdate()
       ' aggiorno stato di produzione
       ReadProductionData()
+      NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -309,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)
@@ -321,7 +350,7 @@ Public Class PartVM
    End Sub
 
    Private Sub Rotate(IsPositive As Boolean)
-      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+      If bOnlyProd AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
          ' elimino vecchio grezzo ed eseguo script creazione nuovo
          DeleteOldRaw()
          ' recupero layer del box
@@ -360,39 +389,21 @@ Public Class PartVM
             ' annullo Flip
             If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
             ' ripristino rotazione
-            Dim dRotation As Integer = 0
-            If dW <> dH Then
-               dRotation = m_PartM.dROT + dRot
-               m_PartM.dROT = dRotation
-               If dRotation >= 360 Then
-                  dRotation = dRot
-                  m_PartM.dROT = 0
-               End If
-            ElseIf dW = dH Then
-               dRotation = m_PartM.dROT - dRot
-               If dRotation = 0 Then
-                  dRotation = 3 * dRot
-                  m_PartM.dROT = 0
-               ElseIf dRotation = 90 Then
-                  dRotation += 2 * dRot
-                  m_PartM.dROT = 90
-               ElseIf dRotation = 180 Then
-                  dRotation += dRot
-                  m_PartM.dROT = 180
-               ElseIf dRotation < 0 Then
-                  dRotation += 4 * dRot
-                  m_PartM.dROT = 270
-               End If
+            Dim TempRot = m_PartM.dROT
+            TempRot -= dRot
+            If TempRot >= 360 Then
+               TempRot -= 360
+            ElseIf TempRot < 0 Then
+               TempRot += 360
             End If
-            EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, dRotation, GDB_RT.GLOB)
-            ' salvo informazione
+            m_PartM.dROT = TempRot
             EgtSetInfo(nPartId, MGR_PRT_ROT, m_PartM.dROT)
-            ' annullo Flip
+            EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, -dRot, GDB_RT.GLOB)
             If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
             If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
                EgtOutLog("Fallita esecuzione ExecBeam. ERRORE")
             End If
-            NotifyPropertyChanged(NameOf(m_PartM.dROT))
+            NotifyPropertyChanged(NameOf(sROT))
          End If
       ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
          ' salvo posizione 
@@ -469,7 +480,6 @@ Public Class PartVM
          nRawId = EgtGetFirstRawPart()
       End While
    End Sub
-
    Friend Sub SelectBTLPart()
       ' eseguo la selezione nella lista pezzi
       Dim nBTLPartId As Integer = MyMachGroupPanelM.DuploGetOriginal(nPartId)
@@ -773,6 +783,7 @@ Public Class PartVM
          Case NameOf(sender.bDO)
             ' setto pezzo da ricalcolare
             ResetCalcTotalPart()
+            NotifyPropertyChanged(NameOf(bDOALL))
       End Select
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb

@@ -21,7 +21,7 @@ Public Class MachinePanelVM
       Set(value As Machine)
          If value IsNot m_SelectedMachine Then
             ' imposto macchina in DbGeometrico
-            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) Then
+            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
                m_SelectedMachine = value
             End If
             ' Salvo impostazione macchina corrente
@@ -68,7 +68,7 @@ Public Class MachinePanelVM
       End Get
       Set(value As Boolean)
          m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged("MachPanel_IsEnabled")
+         NotifyPropertyChanged(NameOf(MachPanel_IsEnabled))
       End Set
    End Property
 
@@ -92,7 +92,6 @@ Public Class MachinePanelVM
       End Get
    End Property
 
-
 #Region "Messages"
 
    Public ReadOnly Property ToolDBMsg As String
@@ -110,6 +109,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
 
@@ -136,6 +140,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
 
@@ -352,6 +357,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.ViewerOptimizer/MacroFeatureWnd/MacroFeatureWndV.xaml

@@ -71,14 +71,14 @@
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
-                 IsDefault="True"
-                 Grid.Column="1"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+                       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}"/>
+                       IsCancel="True"
+                       Grid.Column="3"
+                       Style="{StaticResource EgtWPFLib5_InputButton}"/>
             </Grid>
 
          </Grid>