Optimizer 2.7.11.14

-suddiviso project in pannelli

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Globalization
 Imports System.Windows
 Imports EgtUILib
 Imports EgtWPFLib5

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -18,6 +18,17 @@ Public Class BTLPartM
    End Property
 
    ' Info del pezzo
+
+   Public m_nPROJ As Integer
+   Public Property nPROJ As Integer
+      Get
+         Return m_nPROJ
+      End Get
+      Set(value As Integer)
+         m_nPROJ = value
+      End Set
+   End Property
+
    Public m_nPDN As Integer
    Public Property nPDN As Integer
       Get
@@ -752,6 +763,7 @@ Public Class BTLPartM
       Dim sValArray() As String
       Dim sValue As String = String.Empty
       Dim nValue As Integer = 0
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBTLPart.m_nPROJ)
       EgtGetInfo(nPartId, BTL_PRT_PDN, NewBTLPart.m_nPDN)
       Dim nDO As Integer = 1
       If EgtGetInfo(nPartId, BTL_PRT_DO, nDO) Then

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -229,7 +229,6 @@ Public Class BTLFeatureVM
 
    ' funzione che seleziona la feature nella geometria
    Public Sub SelGeomFeature()
-      EgtDeselectAll()
       SelGeomFeature(nFeatureId)
    End Sub
 
@@ -256,6 +255,34 @@ Public Class BTLFeatureVM
       End If
    End Sub
 
+   ' funzione che seleziona la feature nella geometria
+   Public Sub DeselGeomFeature()
+      DeselGeomFeature(nFeatureId)
+   End Sub
+
+   Private Sub DeselGeomFeature(nMyFeatureId As Integer)
+      EgtDeselectObj(nMyFeatureId)
+      Dim sVal As String = ""
+      If EgtGetInfo(nMyFeatureId, BTL_FTR_ADJID, sVal) Then
+         Dim vAdjId() As String = sVal.Split(","c)
+         For Each sAdjId In vAdjId
+            Dim nAdjId As Integer
+            If Integer.TryParse(sAdjId, nAdjId) Then
+               DeselGeomFeature(nMyFeatureId + nAdjId)
+            End If
+         Next
+      End If
+      If EgtGetInfo(nMyFeatureId, BTL_FTR_AUXID, sVal) Then
+         Dim vAuxId() As String = sVal.Split(","c)
+         For Each sAuxId In vAuxId
+            Dim nAuxId As Integer
+            If Integer.TryParse(sAuxId, nAuxId) Then
+               EgtDeselectObj(nMyFeatureId + nAuxId)
+            End If
+         Next
+      End If
+   End Sub
+
    Public Overridable Sub RefreshFeature()
    End Sub
 

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

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

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,11 +1,8 @@
-Imports System.Windows
+Public Class BeamMachiningsWindowV
-
-Public Class BeamMachiningsWindowV
 
    Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
 
-   Sub New(Owner As Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
+   Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BeamMachiningsWindowVM

EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml

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

EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml.vb

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

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -23,6 +23,10 @@ Public Module CalcIntegration
       POINT_CLOUD = 5
       RAWPART = 6
       EDIT = 7
+      CHECKNOSIM = 8
+      TOPOLOGY = 9
+      OPENTOOLDB = 11 ' Non utilizzato
+      OPENMACHINIGDB = 12 ' Non utilizzato
    End Enum
 
    Private Structure MyProc
@@ -160,7 +164,7 @@ Public Module CalcIntegration
                         nActProc += 1
                      End If
                   Else
-                     If vBar(nCurrBar).nCmdType = CmdTypes.CHECK OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKGEN Then
+                     If vBar(nCurrBar).nCmdType = CmdTypes.CHECK OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKNOSIM Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
                      ElseIf vBar(nCurrBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
@@ -175,7 +179,7 @@ Public Module CalcIntegration
                   ' se terminato con successo
                   If vProc(j).Proc.ExitCode = 0 Then
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
@@ -197,7 +201,7 @@ Public Module CalcIntegration
                      ' altrimenti (errore generico di esecuzione)
                   Else
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
@@ -321,8 +325,7 @@ Public Module CalcIntegration
       RaiseEvent Calc_Ended(Nothing, New CalcEndEventArgs(If(bIsSimulation And Not bIsSimulationVerifyed, CmdTypes.SIMULATE, CmdTypes.CHECKGEN), If(bAllKO, CalcEndEventArgs.Results.ERROR_, CalcEndEventArgs.Results.OK)))
    End Sub
 
-   Private Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String
+   Public Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String
-
       ' Aggiorno identificativi per segnalazione errori
       UpdateCutIdAndTaskId(nPartId)
 
@@ -339,7 +342,7 @@ Public Module CalcIntegration
       Dim nPDN As Integer = 0
       EgtGetInfo(nPartId, BTL_PRT_PDN, nPDN)
       Dim sPartFilePath As String = sProjDirPath & "\" & nPDN.ToString() & ".bwe"
-      bOk = EgtSaveObjToFile(nPartId, sPartFilePath, NGE.CMPTEXT)
+      bOk = EgtSaveObjToFile({nPartId, EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO), EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)}, sPartFilePath, NGE.CMPTEXT)
 
       ' Ripristino visibilita' pezzo
       EgtSetMode(nPartId, nOldPartMode)
@@ -350,7 +353,7 @@ Public Module CalcIntegration
       Return If(bOk, sPartFilePath, String.Empty)
    End Function
 
-   Private Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String, nGlobState As Integer) As String
+   Public Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String, nGlobState As Integer) As String
       ' aggiorno cutid e taskid solo fuori dal supervisore o se pezzo ricalcolato
       If Not m_bIsSupervisor OrElse nGlobState = CalcStates.NOTCALCULATED Then
          Dim DisableMgr As DisableModifiedMgr = Nothing
@@ -389,9 +392,12 @@ Public Module CalcIntegration
       Dim sMachGroupName As String = ""
       EgtGetMachGroupName(nMachGroupId, sMachGroupName)
       Dim sMachGroupFilePath As String = sProjDirPath & "\" & sMachGroupName & ".bwe"
-      If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
+      If EgtSaveMachGroupToFile(nMachGroupId, {EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO), EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)}, sMachGroupFilePath, NGE.CMPTEXT) Then
          Return sMachGroupFilePath
       End If
+      'If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
+      '   Return sMachGroupFilePath
+      'End If
       Return String.Empty
    End Function
 

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml

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

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -12,52 +12,54 @@
       <RowDefinition Height="1*"/>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
-   <StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
+   <StackPanel Style="{StaticResource List_StackPanel}">
       <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5">
+                Style="{StaticResource Warehouse_GroupBox}">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
+         <UniformGrid Rows="2"
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
+                      Style="{StaticResource General_UniformGrid}">
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
+            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
-                      Margin="0,0,0,5"
+                      SelectedItem="{Binding SelectedLanguage}"
-                      Style="{x:Null}"/>
+                      DisplayMemberPath="Name" 
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
+                      Style="{StaticResource General_ComboBox}"/>
-                       TextAlignment="Center"/>
+            <TextBlock Text="{Binding LanguageAdvert_Msg}" 
+                       Style="{StaticResource General_TextBlock}"/>
          </UniformGrid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
+         <TextBlock Text="{Binding MMUnits_Msg}" 
+                    Style="{StaticResource MMUnits_TextBlock}"/>
          <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
+                   SelectedIndex="{Binding SelMeasureUnit}" 
-                   Margin="0,5,0,0"
+                   Style="{StaticResource UnitMeasureList_ComboBox}"/>
-                   Style="{x:Null}"/>
       </UniformGrid>
       <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5">
+                Style="{StaticResource Warehouse_GroupBox}">
          <StackPanel>
             <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
+                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
-               <TextBlock Text="{Binding SectionTime_Msg}"
+               <TextBlock Text="{Binding SectionTime_Msg}"/>
-                          Grid.Row="0" Grid.Column="0"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-               <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
+                                      Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
-                                      Grid.Row="0" Grid.Column="1"/>
             </UniformGrid>
             <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
+                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
-               <TextBlock Text="{Binding PartTime_Msg}"
+               <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
-                          Grid.Row="1" Grid.Column="0"/>
+               <EgtWPFLib5:EgtTextBox Grid.Row="1" 
-               <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
+                                      Grid.Column="1"
-                                      Grid.Row="1" Grid.Column="1"/>
+                                      Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"/>
             </UniformGrid>
          </StackPanel>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
+         <TextBlock Text="{Binding PrintLabel_Msg}"
+                    Style="{StaticResource MMUnits_TextBlock}"/>
          <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
+                   Style="{StaticResource General_CheckBox}"/>
       </UniformGrid>
-      <GroupBox Header="Backup And Restore">
+      <GroupBox Header="Backup And Restore"
+                Style="{StaticResource Optimizer_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -65,34 +67,33 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0"
+            <Grid Style="{StaticResource General_Grid}">
-                  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"/>
+                         Style="{StaticResource PParameters_CheckBox}"/>
                <TextBlock Grid.Column="1"
                           Text="External file path:"
-                          VerticalAlignment="Center"/>
+                          Style="{StaticResource Ext_TextBlock}"/>
             </Grid>
             <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
+                  Style="{StaticResource General_Grid}">
                <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"/>
+                        Style="{StaticResource General_TextBox}"/>
                <Button Grid.Column="1"
                        Content="..."
-                       Width="18"
+                       Foreground="{StaticResource BeamWall_White}"
                        Command="{Binding ChooseExternalBackupFolderPath_Command}"
                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"/>
+                       Style="{StaticResource General_Button}"/>
             </Grid>
             <Grid Grid.Row="2">
                <Grid.ColumnDefinitions>
@@ -103,19 +104,26 @@
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
                          SelectedItem="{Binding SelReminder}"
-                         Style="{x:Null}"/>
+                         Style="{StaticResource GeneralConfiguration_ComboBox}" />
             </Grid>
             <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
+                        Style="{StaticResource PartManager_StackPanel}">
                <Button Content="Backup"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
+                       Style="{StaticResource MovePartInRawPartWnd_Button}"/>
                <Button Content="Restore"
                        Command="{Binding Restore_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
+                       Style="{StaticResource EgtWPFLib5_Button}"/>
             </StackPanel>
          </Grid>
       </GroupBox>
+      <UniformGrid Columns="2"
+                   Style="{StaticResource GeneralConfiguration_UniformGrid}">
+         <TextBlock Text="Importa BTL con verifica" 
+                    Style="{StaticResource MMUnits_TextBlock}"/>
+         <CheckBox IsChecked="{Binding bVerifyImportBTL_IsChecked}"
+                   Style="{StaticResource General_CheckBox}"/>
+      </UniformGrid>
    </StackPanel>
 
 </Grid>

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -1,7 +1,7 @@
 <Grid x:Class="Machine_ConfigurationPageV"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+      xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <Grid.ColumnDefinitions>
@@ -13,31 +13,37 @@
       <RowDefinition Height="10*"/>
    </Grid.RowDefinitions>
 
-   <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
+   <StackPanel Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
+      <GroupBox Style="{StaticResource MachineConfiguration_GroupBox}">
-         <EgtBEAMWALL:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
+         <EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
       </GroupBox>
    </StackPanel>
 
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
+   <StackPanel Grid.Row="1"
+               Visibility="{Binding MachineParameter_Visibility}"
+               Style="{StaticResource PartManager_StackPanel}">
       <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
+               <StackPanel x:Name="GroupStackPanel"
+                           Style="{StaticResource PartManager_StackPanel}"/>
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
+               <GroupBox Header="{Binding sName}" 
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
+                         Style="{StaticResource MachineParam_GroupBox}">
+                  <ItemsControl Name="MachParamsItemsControl" 
+                                ItemsSource="{Binding MachParamList}" 
+                                Style="{StaticResource MachinePanel_ItemsControl}">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
+                           <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
                         </ItemsPanelTemplate>
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Margin="0,0,5,5">
+                           <Grid Style="{StaticResource MachParam_Grid}">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="*" />
                                  <ColumnDefinition Width="*" />
@@ -45,18 +51,14 @@
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding sName}"
                                          ToolTip="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
+                                         Style="{StaticResource MachinePanel_TextBlock}"/>
-                                         Width="190"
+                              <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                         Style="{StaticResource MachParamTextBlock}"/>
+                                                     Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
+                                                     Style="{StaticResource MachineConfiguration_TextBox}"/>
-                                                     Grid.Column="1"
+                              <TextBlock Grid.Column="2"
-                                                     Width="60"/>
+                                         Text="{Binding sDescription}"
-                              <TextBlock Text="{Binding sDescription}"
                                          ToolTip="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
+                                         Style="{StaticResource Description_TextBlock}"/>
-                                         Width="185"
-                                         Style="{StaticResource MachParamTextBlock}"
-                                         Grid.Column="2"/>
                            </Grid>
                         </DataTemplate>
                      </ItemsControl.ItemTemplate>
@@ -67,13 +69,13 @@
       </ItemsControl>
    </StackPanel>
 
-   <Button Command="{Binding SaveCommand}"
+   <Button Grid.Row="1"
-           Grid.Column="0"
+           Command="{Binding SaveCommand}"
-           Grid.Row="1"
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource MachinePanel_Button}">
+           Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/Save.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
 </Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml

@@ -1,124 +0,0 @@
-<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 Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <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" Style="{StaticResource OnlyProd_ComboBox}" />
-            <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" Foreground="{StaticResource BeamWall_Corduroy}"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" />
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1" 
-                                      Grid.Column="1"
-                                      Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid 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="..."
-                       Foreground="{StaticResource BeamWall_White}"
-                       Width="20"
-                       Height="20"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-            </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}"
-                         Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
-                       Margin="0,0,5,0"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml

@@ -1,78 +0,0 @@
-<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 Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:OnlyProdMachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" 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" Foreground="{StaticResource BeamWall_Corduroy}">
-                  <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="150"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                                     Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Width="60"/>
-                              <TextBlock Grid.Column="2"
-                                         Text="{Binding sDescription}"
-                                         ToolTip="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="148"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-   <Button Grid.Row="1"
-           Command="{Binding SaveCommand}"
-           ToolTip="{Binding SaveToolTip}"
-           Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-   </Button>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml

@@ -1,82 +0,0 @@
-<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>
-
-   <Border Style="{StaticResource OnlyProdPage_Border}"/>
-
-   <EgtBEAMWALL:OnlyProd_QParamListV DataContext="{Binding}" 
-                                     ItemsSource="{Binding QBTLParamVMList}"
-                                     SelectedItem="{Binding SelQParam}"
-                                     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"/>
-                              </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"/>
-                              </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:OnlyProd_QParamListV>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml

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

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -120,6 +120,7 @@
    Public Const PROJ As String = "PROJ"
    Public Const FILENAMESEPARATOR As Char = "^"c
    Public Const BTLINFO As String = "BtlInfo"
+   Public Const PROJECTINFO As String = "ProjectInfo"
 
    ' layer per assemblato
    Public Const ASSEBASE As String = "AsseBase"

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -1,6 +1,7 @@
 Public Module ConstDataGridColumnsIni
 
    Public Const DATAGRIDCOLUMNS_FILE_NAME As String = "DataGridColumns.ini"
+   Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.ini"
 
    Public Const S_FEATURELIST As String = "DG_FeatureList"
    Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -28,13 +28,15 @@ Public Module ConstGen
 
    ' Pagine del programma
    Public Enum Pages As Integer
+      EMPTY = -1
       VIEW = 0
       MACHINING = 1
       SUPERVISOR = 2
       CONFIG = 3
       INPUTS = 4
       OUTPUTS = 5
-      ONLYPRODPAGE = 6
+      OPTIMIZERPAGE = 6
+      CONFIGPROGRAM = 7
    End Enum
 
    ' Abilitazioni licenza
@@ -55,7 +57,7 @@ Public Module ConstGen
    End Enum
 
    ' File di log generale
-   Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.ViewerOptimizerLog#.txt"
+   Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.OptimizerLog#.txt"
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
@@ -76,19 +78,36 @@ Public Module ConstGen
    Public Const WAREHOUSE_DIR As String = "Warehouse"
    ' Sottodirettorio per lavorazioni travi
    Public Const BEAM_DIR As String = "Beam"
+   ' Sottodirettorio per lavorazioni travi nuovo
+   Public Const BEAMNEW_DIR As String = "BeamNew"
    ' Sottodirettorio per lavorazioni pareti
    Public Const WALL_DIR As String = "Wall"
+   ' Sottodirettorio per lavorazioni pareti nuovo
+   Public Const WALLNEW_DIR As String = "WallNew"
    ' Sottodirettorio di default per il salvataggio con nome
    Public Const SAVE_DFL_NAMEDIR As String = "MyProjects"
    ' Sottodirettorio di default per le macchine
    Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
+   ' Sottodirettorio di immagini
+   Public Const IMAGE_DIR As String = "Image"
    ' Nome file Lua con le funzioni di attrezzaggio
    Public Const SETUP_LUA As String = "SetUp.lua"
    ' Nome eseguibile per stampa
    Public Const ZEBRAPRINTER_EXE As String = "ZebraPrinterUtilitiesD32.exe"
    ' Sottodirettorio di default per macro
    Public Const MACRO_DFL_DIR As String = "Macro"
-
+   ' Sottodirettorio per setup strategie
+   Public Const AISETUP_DIR As String = "AISetup"
+   ' Sottodirettorio per automatismo strategie
+   Public Const STRATEGIES_DIR As String = "Strategies"
+   ' Sottodirettorio per automatismo strategie standard
+   Public Const STANDARD_DIR As String = "Standard"
+   ' File contenente lista strategie per feature/topologia
+   Public Const AVAILABLESTRATEGYLIST_FILE As String = "AvailableStrategyList"
+   ' File contente tutte le feature 
+   Public Const CUSTOMERCONFIG_FILE As String = "CustomerConfig"
+   ' File contenente i parametri generali
+   Public Const GENERALPARAMETERS_FILE As String = "GeneralParameters"
 End Module

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -35,6 +35,8 @@ Public Module ConstIni
    Public Const K_FASTPRODUCE As String = "FastProduce"
    Public Const K_ADDPROJ As String = "AddProj"
    Public Const K_PROJECTMODE As String = "ProjectMode"
+   Public Const K_CAMEXEPATH As String = "CAMExePath"
+   Public Const K_PIPELUADIR As String = "PipeLuaDir"
 
    Public Const K_SHOWBUILDING As String = "ShowBuilding"
 
@@ -50,14 +52,21 @@ Public Module ConstIni
    Public Const K_EXPORTBWE As String = "ExpBwe"
 
    Public Const S_BEAM As String = "Beam"
+   Public Const S_BEAMNEW As String = "BeamNew"
    Public Const K_CALCPATH As String = "CalcPath"
    Public Const K_BEAMBASEDIR As String = "BaseDir"
    Public Const K_BEAMBWEEXEC As String = "BweExec"
 
    Public Const S_WALL As String = "Wall"
+   Public Const S_WALLNEW As String = "WallNew"
    Public Const K_WALLBASEDIR As String = "BaseDir"
    Public Const K_WALLBWEEXEC As String = "BweExec"
 
+   Public Const S_EXECGROUP As String = "ExecGroup"
+   Public Const K_ENVIRONMENT As String = "Environment"
+   Public Const K_PIPELUAFILE As String = "PipeLuaFile"
+   Public Const K_MAXCAMINSTANCES As String = "MaxCAMInstances"
+
    Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
    Public Const K_PARTEVENTTYPE As String = "PartEventType"
    Public Const K_ENTITYTYPE As String = "EntityType"
@@ -119,4 +128,10 @@ Public Module ConstIni
    ' Server Address
    Public Const K_SERVERADDRESS As String = "ServerAddressRelease"
    Public Const K_BEAMWALL As String = "EgtBeamWall"
+
+   Public Const S_STRATEGY As String = "Strategy"
+   Public Const K_PARAMPASSWORD As String = "ParamPassword"
+   Public Const K_DEFAULTCONFIG As String = "DefaultConfiguration"
+
+   Public Const K_VERIFYIMPORTBTL As String = "VerifyImportBTL"
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -56,11 +56,14 @@
     <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
     </Reference>
+    <Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -116,32 +119,13 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
-    <Compile Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>OnlyProdBeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
-    <Compile Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml.vb">
-      <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">
+    <Compile Include="ConfigurationPage\General_ConfigurationPageV.xaml.vb">
-      <DependentUpon>OnlyProdQParameter_ConfigurationPageV.xaml</DependentUpon>
+      <DependentUpon>General_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
-      <DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
     </Compile>
     <Compile Include="Constants\ConstColumns.vb" />
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
@@ -154,9 +138,6 @@
     <Compile Include="EgtColorPicker\EgtColorPickerV.xaml.vb">
       <DependentUpon>EgtColorPickerV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EgtColorPicker\OnlyProdEgtColorPickerV.xaml.vb">
-      <DependentUpon>OnlyProdEgtColorPickerV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="EgtDataGrid\EgtDataGrid.xaml.vb">
       <DependentUpon>EgtDataGrid.xaml</DependentUpon>
     </Compile>
@@ -170,21 +151,9 @@
     <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
       <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EgtManageFileDialog\OnlyProdEgtManageFileDialogV.xaml.vb">
-      <DependentUpon>OnlyProdEgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
       <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="EgtMessageBox\OnlyProdEgtMessageBoxV.xaml.vb">
-      <DependentUpon>OnlyProdEgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\OnlyProd_QParamListV.xaml.vb">
-      <DependentUpon>OnlyProd_QParamListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\QParamListV.xaml.vb">
-      <DependentUpon>QParamListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Lib\MachGroupAddedEventArgs.vb" />
     <Compile Include="Lib\MachGroupVM.vb" />
     <Compile Include="Lib\NewMachGroupPanelVM.vb" />
@@ -196,37 +165,26 @@
     <Compile Include="BTLModel\BTLStructureM.vb" />
     <Compile Include="Constants\ConstBeam.vb" />
     <Compile Include="LoadingWnd\LoadingWndHelper.vb" />
+    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
     <Compile Include="LoadingWnd\LoadingWndV.xaml.vb">
       <DependentUpon>LoadingWndV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
-    <Compile Include="LoadingWnd\OnlyProdLoadingWndV.xaml.vb">
-      <DependentUpon>OnlyProdLoadingWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachinePanel\OnlyProdMachinePanelV.xaml.vb">
-      <DependentUpon>OnlyProdMachinePanelV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
       <DependentUpon>MachinePanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml.vb">
+    <Compile Include="MachiningDbWindow\MachiningDbWindowV.xaml.vb">
-      <DependentUpon>OnlyProdMachiningDbWindowV.xaml</DependentUpon>
+      <DependentUpon>MachiningDbWindowV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
+    <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
-    <Compile Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
-      <DependentUpon>OnlyProdNewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml.vb">
+    <Compile Include="OptmizerWindow\OptimizerWindow.vb" />
-      <DependentUpon>OnlyProdOpenProjectFileDialogV.xaml</DependentUpon>
+    <Compile Include="TitleBar\TitleBarV.xaml.vb">
-    </Compile>
+      <DependentUpon>TitleBarV.xaml</DependentUpon>
-    <Compile Include="SetUpWindow\OnlyProdSetUpWindowV.xaml.vb">
-      <DependentUpon>OnlyProdSetUpWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml.vb">
-      <DependentUpon>OnlyProdToolDbWindowV.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utility\Configuration.vb" />
     <Compile Include="ProjectFileVM\ProdItem.vb" />
@@ -260,9 +218,6 @@
     <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
     <Compile Include="Utility\ManageWindow.vb" />
     <Compile Include="Utility\MyMachine.vb" />
-    <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogVM.vb" />
     <Compile Include="MachGroupModel\PartM.vb" />
     <Compile Include="ProjectFileVM\ProdFileM.vb" />
@@ -302,46 +257,18 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
+    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </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>
-    </Page>
-    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <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>
-    </Page>
     <Page Include="EgtColorPicker\EgtColorPickerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EgtColorPicker\OnlyProdEgtColorPickerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EgtDataGrid\EgtDataGrid.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -350,67 +277,35 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EgtManageFileDialog\OnlyProdEgtManageFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="EgtMessageBox\OnlyProdEgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ItemParamList\OnlyProd_QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ItemParamList\QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="LoadingWnd\LoadingWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="LoadingWnd\OnlyProdLoadingWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MachinePanel\OnlyProdMachinePanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="MachinePanel\MachinePanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml">
+    <Page Include="MachiningDbWindow\MachiningDbWindowV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
-      <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>
-    </Page>
-    <Page Include="SetUpWindow\OnlyProdSetUpWindowV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml">
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="TitleBar\TitleBarV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -420,6 +315,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\EgalwareLogo.ico" />
+    <Content Include="Resources\PartManager\Locked.old.png" />
+    <Content Include="Resources\PartManager\Unlocked.old.png" />
     <Content Include="Resources\ProjectManager\Save.png" />
   </ItemGroup>
   <ItemGroup>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml

@@ -1,41 +1,39 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtColorPickerV"
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtColorPickerV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            WindowStartupLocation="CenterOwner"
+                                 Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
+                                 WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize"
+                                 SizeToContent="WidthAndHeight"
-                            IsMinimizable="False" ShowInTaskbar="False"
+                                 ShowInTaskbar="False"
-                            Width="750" Height="450"
+                                 Width="750" Height="450"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <Grid Margin="5,5,5,0">
+   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
+      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Grid Margin="5,5,5,0">
+         <Grid Style="{StaticResource AddRawPartWnd_Grid}">
             <Grid.RowDefinitions>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TabControl>
                <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid HorizontalAlignment="Center"
+                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                        VerticalAlignment="Center">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <ListBox ItemsSource="{Binding BasicColors}"
                               SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
+                              Style="{StaticResource EgtColorPicker_ListBox}">
-                              BorderThickness="0">
                         <ListBox.ItemsPanel>
                            <ItemsPanelTemplate>
                               <UniformGrid Columns="13"/>
@@ -43,12 +41,8 @@
                         </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                            <DataTemplate>
-                              <Rectangle Width="20"
+                              <Rectangle Fill="{Binding Fill}"
-                                      Height="20"
+                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
                            </DataTemplate>
                         </ListBox.ItemTemplate>
                         <ListBox.ItemContainerStyle>
@@ -64,23 +58,17 @@
                   <TabItem.Resources>
                      <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
                         <Setter Property="BorderThickness" Value="1.5"/>
-                        <Setter Property="BorderBrush" Value="White"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
                      </Style>
                   </TabItem.Resources>
                   <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
                                          SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
                                          Style="{StaticResource EgtHexList}">
                      <EgtWPFLib5:EgtHexList.ItemTemplate>
                         <DataTemplate/>
                      </EgtWPFLib5:EgtHexList.ItemTemplate>
                      <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                        <Style TargetType="EgtWPFLib5:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
+                        <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
                            <Setter Property="Grid.Row" Value="{Binding nRow}"/>
                            <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
                            <Setter Property="Background" Value="{Binding Background}"/>
@@ -89,15 +77,14 @@
                   </EgtWPFLib5:EgtHexList>
                </TabItem>
                <TabItem Header="{Binding ColorPickerTheme_Msg}">
-                  <Grid HorizontalAlignment="Center"
+                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                        VerticalAlignment="Center">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <ListBox ItemsSource="{Binding BasicColorsTheme}"
                               SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
+                              Style="{StaticResource BasicColor_ListBox}">
                         <ListBox.ItemsPanel>
                            <ItemsPanelTemplate>
                               <UniformGrid Columns="13"/>
@@ -105,12 +92,8 @@
                         </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                            <DataTemplate>
-                              <Rectangle Width="20"
+                              <Rectangle Fill="{Binding Fill}"
-                                         Height="20"
+                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
                            </DataTemplate>
                         </ListBox.ItemTemplate>
                         <ListBox.ItemContainerStyle>
@@ -125,15 +108,14 @@
             </TabControl>
          </Grid>
          <Grid Grid.Column="1"
-               Margin="5,0,0,0">
+               Style="{StaticResource CustomerColor_Grid}">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
+                       Style="{StaticResource EgtColorPicker_TextBlock}"/>
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
             <Grid Grid.Row="1">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
@@ -141,9 +123,7 @@
                </Grid.RowDefinitions>
                <ListBox ItemsSource="{Binding CustomColors}"
                         SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
+                        Style="{StaticResource CustomerColor_ListBox}">
-                        Background="Transparent"
-                        BorderThickness="0">
                   <ListBox.ItemsPanel>
                      <ItemsPanelTemplate>
                         <UniformGrid Columns="13"/>
@@ -151,12 +131,8 @@
                   </ListBox.ItemsPanel>
                   <ListBox.ItemTemplate>
                      <DataTemplate>
-                        <Rectangle Width="20"
+                        <Rectangle Fill="{Binding Fill}"
-                                   Height="20"
+                                   Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
                      </DataTemplate>
                   </ListBox.ItemTemplate>
                   <ListBox.ItemContainerStyle>
@@ -168,28 +144,23 @@
                </ListBox>
             </Grid>
             <Grid Grid.Row="2"
-                  Margin="0,20,0,0">
+                  Style="{StaticResource CurrColor_Grid}">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Grid Margin="0,10,5,0"
+               <Grid Style="{StaticResource AddColor_Grid}">
-                     HorizontalAlignment="Left">
                   <Grid.RowDefinitions>
-                     <RowDefinition Height="1*" />
+                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="Auto"/>
                   </Grid.RowDefinitions>
-                  <Rectangle Width="100" 
+                  <Rectangle Fill="{Binding CurrColor}"
-                             Height="70" 
+                             Style="{StaticResource CurrColor_Rectangle}"/>
-                             Stroke="Black" 
+                  <Button Grid.Row="1"
-                             StrokeThickness="0.5"
+                          x:Name="SaveColor"                          
-                             Fill="{Binding CurrColor}"/>
-                  <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
                           Content="{Binding AddCColor_Msg}"
                           Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_TextButton}"/>
+                          Style="{StaticResource EgtColorPicker_TextButton}"/>
                </Grid>
                <Grid Grid.Column="1">
                   <Grid.ColumnDefinitions>
@@ -203,66 +174,45 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
                   <TextBlock Text="{Binding Red_Msg}"
-                             Margin="0,10,5,0"
+                             Style="{StaticResource RedColor_TextBlock}"/>
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,5,5,0"
-                           IsReadOnly="False"
                            Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
+                           Style="{StaticResource RedColor_TextBox}"/>
                   <TextBlock Grid.Row="1"
                              Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Column="1"
                            Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
                            Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
+                           Style="{StaticResource GreenColor_TextBox}"/>
                   <TextBlock Grid.Row="2"
                              Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
-                             HorizontalAlignment="Right"
+                  <TextBox Grid.Row="2"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                           Grid.Column="1"
-                  <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
                            Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
+                           Style="{StaticResource GreenColor_TextBox}"/>
                   <TextBlock Grid.Row="3"
                              Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
+                             Style="{StaticResource GreenColor_TextBlock}"/>
-                             HorizontalAlignment="Right"
+                  <TextBox Grid.Row="3"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                           Grid.Column="1"                           
-                  <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
                            Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
+                           Style="{StaticResource GreenColor_TextBox}"/>
                </Grid>
             </Grid>
          </Grid>
       </Grid>
       <UniformGrid Grid.Row="2"  
                    Rows="1"
-                   Margin="10,10,10,0">
+                   Style="{StaticResource EgtColorPicker_UniformGrid}">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
       </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -1,6 +1,6 @@
-Imports System.Windows
+Imports EgtWPFLib5
+Imports System.Windows
 Imports System.Windows.Forms
-Imports EgtWPFLib5
 
 Public Class EgtColorPickerV
 
@@ -35,7 +35,6 @@ Public Class EgtColorPickerV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
-      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EtgColorPickerVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
@@ -66,4 +65,4 @@ Public Class EgtColorPickerV
 
 #End Region    ' Methods
 
-End Class
+End Class

EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml

@@ -1,268 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtColorPickerV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Width="750" Height="450"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="Auto"/>
-   </Grid.RowDefinitions>
-   <Grid Margin="5,5,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <TabControl>
-            <TabItem Header="{Binding BasicColor_Msg}">
-               <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                      Height="20"
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
-                        </DataTemplate>
-                     </ListBox.ItemTemplate>
-                     <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                           <Setter Property="Margin" Value="0"/>
-                           <Setter Property="Padding" Value="0"/>
-                        </Style>
-                     </ListBox.ItemContainerStyle>
-                  </ListBox>
-               </Grid>
-            </TabItem>
-            <TabItem Header="{Binding ColorPicker_Msg}">
-               <TabItem.Resources>
-                  <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                     <Setter Property="BorderThickness" Value="1.5"/>
-                     <Setter Property="BorderBrush" Value="White"/>
-                  </Style>
-               </TabItem.Resources>
-               <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
-                                         Style="{StaticResource EgtHexList}">
-                  <EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <DataTemplate/>
-                  </EgtWPFLib5:EgtHexList.ItemTemplate>
-                  <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                     <Style TargetType="EgtWPFLib5:EgtHexItem" BasedOn="{StaticResource EgtHexItem}">
-                        <Setter Property="Grid.Row" Value="{Binding nRow}"/>
-                        <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
-                        <Setter Property="Background" Value="{Binding Background}"/>
-                     </Style>
-                  </EgtWPFLib5:EgtHexList.ItemContainerStyle>
-               </EgtWPFLib5:EgtHexList>
-            </TabItem>
-            <TabItem Header="{Binding ColorPickerTheme_Msg}">
-               <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                         Height="20"
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
-                        </DataTemplate>
-                     </ListBox.ItemTemplate>
-                     <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                           <Setter Property="Margin" Value="0"/>
-                           <Setter Property="Padding" Value="0"/>
-                        </Style>
-                     </ListBox.ItemContainerStyle>
-                  </ListBox>
-               </Grid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Column="1"
-               Margin="5,0,0,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
-         <Grid Grid.Row="1">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0">
-               <ListBox.ItemsPanel>
-                  <ItemsPanelTemplate>
-                     <UniformGrid Columns="13"/>
-                  </ItemsPanelTemplate>
-               </ListBox.ItemsPanel>
-               <ListBox.ItemTemplate>
-                  <DataTemplate>
-                     <Rectangle Width="20"
-                                   Height="20"
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
-                  </DataTemplate>
-               </ListBox.ItemTemplate>
-               <ListBox.ItemContainerStyle>
-                  <Style TargetType="ListBoxItem">
-                     <Setter Property="Margin" Value="0"/>
-                     <Setter Property="Padding" Value="0"/>
-                  </Style>
-               </ListBox.ItemContainerStyle>
-            </ListBox>
-         </Grid>
-         <Grid Grid.Row="2"
-                  Margin="0,20,0,0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid Margin="0,10,5,0"
-                     HorizontalAlignment="Left">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Rectangle Width="100" 
-                             Height="70" 
-                             Stroke="Black" 
-                             StrokeThickness="0.5"
-                             Fill="{Binding CurrColor}"/>
-               <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-            <Grid Grid.Column="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <TextBlock Text="{Binding Red_Msg}"
-                             Margin="0,10,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="1"
-                             Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="2"
-                             Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="3"
-                             Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-            </Grid>
-         </Grid>
-      </Grid>
-   </Grid>
-   <UniformGrid Grid.Row="2"  
-                   Rows="1"
-                   Margin="10,10,10,0">
-      <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-      <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-   </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml.vb

@@ -1,69 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-Imports System.Windows.Forms
-
-Public Class OnlyProdEgtColorPickerV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
-
-   Private Shadows DialogResult As DialogResult
-
-   Public Property CustomColors As Integer()
-      Get
-         Return m_EgtColorPickerVM.GetCustomColors()
-      End Get
-      Set(value As Integer())
-         m_EgtColorPickerVM.SetCustomColors(value)
-      End Set
-   End Property
-
-   Public Property Color As System.Drawing.Color
-      Get
-         Return System.Drawing.Color.FromArgb(255, m_EgtColorPickerVM.Red, m_EgtColorPickerVM.Green, m_EgtColorPickerVM.Blue)
-      End Get
-      Set(value As System.Drawing.Color)
-         m_EgtColorPickerVM.Red = value.R
-         m_EgtColorPickerVM.Green = value.G
-         m_EgtColorPickerVM.Blue = value.B
-      End Set
-   End Property
-
-#End Region    ' Fields & Properties
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
-      MyBase.New(Owner)
-      InitializeComponent()
-      Me.DataContext = EtgColorPickerVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtColorPickerVM = EtgColorPickerVM
-   End Sub
-
-#End Region    ' Constructors
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region     ' Events
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una finestra EgtColorPicker
-   ''' </summary>
-   ''' <returns></returns>
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-#End Region    ' Methods
-
-End Class

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -1,20 +1,6 @@
 <DataGrid x:Class="EgtDataGrid"
-          x:Name="CurrDataGrid"
           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <DataGrid.ColumnHeaderStyle>
-      <Style TargetType="{x:Type DataGridColumnHeader}">
-         <EventSetter Event="SizeChanged" Handler="Cell_SizedChanged" />
-         <EventSetter Event="MouseRightButtonDown" Handler="Cell_MouseRightButtonDown" />
-         <!-- Propieta' Header DataGrid -->
-         <Setter Property="Background" Value="{Binding ColumnHeaderBackground, ElementName=CurrDataGrid}" />
-         <Setter Property="Foreground" Value="{Binding ColumnHeaderForeground, ElementName=CurrDataGrid}" />
-         <Setter Property="FontWeight" Value="{Binding ColumnHeaderFontWeight, ElementName=CurrDataGrid}" />
-         <Setter Property="FontSize" Value="{Binding ColumnHeaderFontSize, ElementName=CurrDataGrid}" />
-         <Setter Property="HorizontalContentAlignment" Value="{Binding ColumnHeaderHorizontalContentAlignment, ElementName=CurrDataGrid}" />
-         <Setter Property="Padding" Value="{Binding ColumnHeaderPadding, ElementName=CurrDataGrid}" />
-      </Style>
-   </DataGrid.ColumnHeaderStyle>
 </DataGrid>
 
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -6,6 +6,7 @@ Imports System.Windows.Controls
 Imports System.Windows.Controls.Primitives
 Imports System.Windows.Data
 Imports System.Windows.Media
+Imports System.Windows.Threading
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -25,6 +26,7 @@ Public Class EgtDataGrid
 
    Sub New()
       InitializeComponent()
+      AddHandler Columns.CollectionChanged, AddressOf Columns_CollectionChanged
    End Sub
 
    Public Shadows Property BindingColumns As ObservableCollection(Of EgtDataGridColumn)
@@ -70,6 +72,78 @@ Public Class EgtDataGrid
       End If
    End Sub
 
+   Private Sub Columns_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
+      If e.Action = NotifyCollectionChangedAction.Add Then
+         For Each newColumn As DataGridColumn In e.NewItems
+            Dispatcher.BeginInvoke(New Action(Sub()
+                                                 HookHeaderForColumn(newColumn)
+                                              End Sub), DispatcherPriority.Loaded)
+         Next
+      ElseIf e.Action = NotifyCollectionChangedAction.Remove Then
+         For Each removedColumn As DataGridColumn In e.OldItems
+            Dispatcher.BeginInvoke(New Action(Sub()
+                                                 UnhookHeaderForColumn(removedColumn)
+                                              End Sub), DispatcherPriority.Loaded)
+         Next
+      End If
+   End Sub
+
+   Private Sub HookHeaderForColumn(ByVal column As DataGridColumn)
+      Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me)
+      If headersPresenter Is Nothing Then Return
+
+      For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter)
+
+         If header.Column Is column Then
+            AddHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged
+            AddHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown
+            Exit For
+         End If
+      Next
+   End Sub
+
+   Private Sub UnhookHeaderForColumn(ByVal column As DataGridColumn)
+      Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me)
+      If headersPresenter Is Nothing Then Return
+
+      For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter)
+
+         If header.Column Is column Then
+            RemoveHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged
+            RemoveHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown
+            Exit For
+         End If
+      Next
+   End Sub
+
+   Private Function FindVisualChild(Of T As DependencyObject)(ByVal parent As DependencyObject) As T
+      Dim tChild As T = Nothing
+
+      For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1
+         Dim child = VisualTreeHelper.GetChild(parent, i)
+         tChild = TryCast(child, T)
+         If tChild IsNot Nothing Then Return tChild
+         Dim result = FindVisualChild(Of T)(child)
+         If result IsNot Nothing Then Return result
+      Next
+
+      Return Nothing
+   End Function
+
+   Private Iterator Function FindVisualChildren(Of T As DependencyObject)(ByVal parent As DependencyObject) As IEnumerable(Of T)
+      Dim tChild As T = Nothing
+
+      For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1
+         Dim child = VisualTreeHelper.GetChild(parent, i)
+         tChild = TryCast(child, T)
+         If tChild IsNot Nothing Then Yield tChild
+
+         For Each descendant In FindVisualChildren(Of T)(child)
+            Yield descendant
+         Next
+      Next
+   End Function
+
    Private Sub collectionChanged(ByVal sender As Object, ByVal e As NotifyCollectionChangedEventArgs)
       Select Case e.Action
          Case NotifyCollectionChangedAction.Add
@@ -78,11 +152,11 @@ Public Class EgtDataGrid
 
                For Each one As EgtDataGridColumn In e.NewItems
                   Try
-                     Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
+                     Dim col As DataGridColumn = Me.FindResource(one.Name)
                      one.InitColumn(col)
-                     CurrDataGrid.Columns.Insert(e.NewStartingIndex, col)
+                     Me.Columns.Insert(e.NewStartingIndex, col)
                      If col.DisplayIndex <> e.NewStartingIndex Then
-                        CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
+                        Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
                      End If
                   Catch ex As Exception
                      MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
@@ -95,34 +169,34 @@ Public Class EgtDataGrid
             If e.OldItems IsNot Nothing Then
 
                For Each one As EgtDataGridColumn In e.OldItems
-                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
+                  Dim col As DataGridColumn = Me.FindResource(one.Name)
-                  CurrDataGrid.Columns.Remove(col)
+                  Me.Columns.Remove(col)
                Next
             End If
 
          Case NotifyCollectionChangedAction.Move
-            'Dim col As DataGridColumn = CurrDataGrid.FindResource(BindingColumns(e.OldStartingIndex))
+            'Dim col As DataGridColumn = Me.FindResource(BindingColumns(e.OldStartingIndex))
             'col.DisplayIndex = e.NewStartingIndex
-            CurrDataGrid.Columns.Move(e.OldStartingIndex, e.NewStartingIndex)
+            Me.Columns.Move(e.OldStartingIndex, e.NewStartingIndex)
-            CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
+            Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
-            'Dim x = CurrDataGrid.Columns(e.OldStartingIndex).DisplayIndex
+            'Dim x = Me.Columns(e.OldStartingIndex).DisplayIndex
          Case NotifyCollectionChangedAction.Reset
-            CurrDataGrid.Columns.Clear()
+            Me.Columns.Clear()
 
             If e.NewItems IsNot Nothing Then
 
                For Each one As DataGridColumn In e.NewItems
-                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one)
+                  Dim col As DataGridColumn = Me.FindResource(one)
-                  CurrDataGrid.Columns.Add(col)
+                  Me.Columns.Add(col)
                Next
             End If
          Case NotifyCollectionChangedAction.Replace
-            Dim col As DataGridColumn = CurrDataGrid.FindResource(e.NewItems(0))
+            Dim col As DataGridColumn = Me.FindResource(e.NewItems(0))
-            CurrDataGrid.Columns(e.NewStartingIndex) = col
+            Me.Columns(e.NewStartingIndex) = col
       End Select
    End Sub
 
-   Private Sub Cell_SizedChanged(sender As Object, e As SizeChangedEventArgs)
+   Private Sub ColumnHeader_SizeChanged(sender As Object, e As SizeChangedEventArgs)
       ' ad ogni ridimensionamento della cella del ColumnHeader salvo le nuove dimensioni nell'ini
       If Not IsNothing(e.OriginalSource.Column) AndAlso Not IsNothing(BindingColumns(e.OriginalSource.Column.DisplayIndex)) Then
          ' se la colonna corrente è Star ed è preceduta da una colonna Pixel non scrivo le modifiche
@@ -132,17 +206,17 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Private Sub DataGrid_SizedChanged(sender As Object, e As SizeChangedEventArgs) Handles CurrDataGrid.SizeChanged
+   Private Sub DataGrid_SizedChanged(sender As Object, e As SizeChangedEventArgs) Handles Me.SizeChanged
       ' confronto la larghezza effettiva della EgtDataGrid con la somma delle larghezze delle colonne
       UpdateColumnsWidth()
       If BindingColumns.Count > 0 Then
-         If CurrDataGrid.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
+         If Me.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
             ' nascondo la ScrollBar orizzontale e setto lo UnitType dell'ultima colonna visibile a Star
-            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Hidden)
+            ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Hidden)
             BindingColumns.Last(Function(x) x.Visible = True).Width = New DataGridLength(1, DataGridLengthUnitType.Star)
          Else
             ' mostro la ScrollBar orizzontale e se UnitType delle colonne è Star lo setto a Pixel
-            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Visible)
+            ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Visible)
             For Each bc In BindingColumns
                If bc.Width.IsStar Then
                   bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
@@ -170,7 +244,7 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Private Sub Cell_MouseRightButtonDown(sender As Object, e As RoutedEventArgs)
+   Private Sub ColumnHeader_MouseRightButtonDown(sender As Object, e As RoutedEventArgs)
       Dim nDispIndex As Integer = sender.DisplayIndex
       ' creo il ContextMenu con gli item checkabili
       Dim cm As ContextMenu = New ContextMenu()
@@ -254,12 +328,12 @@ Public Class EgtDataGrid
       cm.IsOpen = True
    End Sub
 
-   Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordering
+   Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles Me.ColumnReordering
       ' conservo il vecchio indice in modo da effettuare lo scambio in BindingColumns una volta riordinate graficamente
       OldIndex = e.Column.DisplayIndex
    End Sub
 
-   Private Sub CurrDataGrid_ColumnReordered(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordered
+   Private Sub CurrDataGrid_ColumnReordered(sender As Object, e As DataGridColumnEventArgs) Handles Me.ColumnReordered
       ' scambio le colonne in BindingColumns
       BindingColumns.Move(OldIndex, e.Column.DisplayIndex)
       ' scrivo tutte le colonne interessate dallo spostamento
@@ -315,12 +389,12 @@ Public Class EgtDataGrid
       ResetSortDirections()
    End Sub
 
-   Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles CurrDataGrid.Loaded
+   Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' setto la SortDirection, se attiva, sulla colonna su cui è attiva
       Dim colIndex As Integer = 0
       For Each col In BindingColumns
          If col.SortDirection > 0 Then
-            CurrDataGrid.Items.SortDescriptions.Add(New SortDescription(CurrDataGrid.Columns(colIndex).SortMemberPath, col.SortDirection - 1))
+            Me.Items.SortDescriptions.Add(New SortDescription(Me.Columns(colIndex).SortMemberPath, col.SortDirection - 1))
             Exit For
          End If
          colIndex += 1
@@ -333,7 +407,7 @@ Public Class EgtDataGrid
       Next
    End Sub
 
-   Private Sub CurrDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs) Handles CurrDataGrid.Sorting
+   Private Sub CurrDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs) Handles Me.Sorting
       ' salvo la SortDirection corrente della colonna prima di resettarla per tutte le colonne
       Dim CurrSortDirection As ListSortDirection? = e.Column.SortDirection
       ResetSortDirections(True)
@@ -356,129 +430,16 @@ Public Class EgtDataGrid
          Next
       Else
          ' altrimenti (caso ResetSort da ContextMenu) è necessatio un Clear più ampio e anche grafico
-         CurrDataGrid.Items.SortDescriptions.Clear()
+         Me.Items.SortDescriptions.Clear()
          For Each column In BindingColumns
             column.SortDirection = 0
             ' resetto graficamente anche l'header della colonna
-            CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
+            Me.Columns(column.DisplayIndex).SortDirection = Nothing
          Next
          RaiseEvent ResetSort()
       End If
    End Sub
 
-#Region "COLUMN HEADER PROPERTY DATAGRID"
-
-#Region "BACKGROUND HEADER"
-
-   Public Shared ReadOnly ColumnHeaderBackgroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderBackground",
-                                                                                                              GetType(Brush),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(SystemColors.ControlBrush))
-
-   Public Property ColumnHeaderBackground As Brush
-      Get
-         Return DirectCast(GetValue(ColumnHeaderBackgroundProperty), Brush)
-      End Get
-      Set(value As Brush)
-         SetValue(ColumnHeaderBackgroundProperty, value)
-      End Set
-   End Property
-
-#End Region    ' BackGround Heder
-
-#Region "FOREGROUND HEADER"
-
-   Public Shared ReadOnly ColumnHeaderForegroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderForeground",
-                                                                                                              GetType(Brush),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(SystemColors.ControlTextBrush))
-
-   Public Property ColumnHeaderForeground As Brush
-      Get
-         Return DirectCast(GetValue(ColumnHeaderForegroundProperty), Brush)
-      End Get
-      Set(value As Brush)
-         SetValue(ColumnHeaderForegroundProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Foreground Header
-
-#Region "FONTWEIGHT HEADER"
-
-   Public Shared ReadOnly ColumnHeaderFontWeightProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontWeight",
-                                                                                                              GetType(FontWeight),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(FontWeights.Normal))
-
-   Public Property ColumnHeaderFontWeight As FontWeight
-      Get
-         Return DirectCast(GetValue(ColumnHeaderFontWeightProperty), FontWeight)
-      End Get
-      Set(value As FontWeight)
-         SetValue(ColumnHeaderFontWeightProperty, value)
-      End Set
-   End Property
-
-#End Region    ' FontWeight Header
-
-#Region "FONTSIZE HEADER"
-
-   Public Shared ReadOnly ColumnHeaderFontSizeProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontSize",
-                                                                                                            GetType(Double),
-                                                                                                            GetType(EgtDataGrid),
-                                                                                                            New FrameworkPropertyMetadata(Convert.ToDouble(12)))
-
-   Public Property ColumnHeaderFontSize As Double
-      Get
-         Return DirectCast(GetValue(ColumnHeaderFontSizeProperty), Double)
-      End Get
-      Set(value As Double)
-         SetValue(ColumnHeaderFontSizeProperty, value)
-      End Set
-   End Property
-
-#End Region    ' FontSize Header
-
-#Region "HORIZONTAKCONTENTALIGNMENT HEADER"
-
-   Public Shared ReadOnly ColumnHeaderHorizontalContentAlignmentProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderHorizontalContentAlignment",
-                                                                                                                              GetType(HorizontalAlignment),
-                                                                                                                              GetType(EgtDataGrid),
-                                                                                                                              New FrameworkPropertyMetadata(HorizontalAlignment.Stretch))
-
-   Public Property ColumnHeaderHorizontalContentAlignment As HorizontalAlignment
-      Get
-         Return DirectCast(GetValue(ColumnHeaderHorizontalContentAlignmentProperty), HorizontalAlignment)
-      End Get
-      Set(value As HorizontalAlignment)
-         SetValue(ColumnHeaderHorizontalContentAlignmentProperty, value)
-      End Set
-   End Property
-
-#End Region    ' HorizontalContentAlignment Header
-
-#Region "PADDING HEADER"
-
-   Public Shared ReadOnly ColumnHeaderPaddingProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderPadding",
-                                                                                                           GetType(Thickness),
-                                                                                                           GetType(EgtDataGrid),
-                                                                                                           New FrameworkPropertyMetadata(New Thickness(0)))
-
-   Public Property ColumnHeaderPadding As Thickness
-      Get
-         Return DirectCast(GetValue(ColumnHeaderPaddingProperty), Thickness)
-      End Get
-      Set(value As Thickness)
-         SetValue(ColumnHeaderPaddingProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Padding Header
-
-
-#End Region    ' Column Header Property DataGrid
-
 End Class
 
 Public Class EgtDataGridColumn
@@ -522,7 +483,11 @@ Public Class EgtDataGridColumn
    Private Property m_Width As DataGridLength
    Public Property Width As DataGridLength
       Get
-         Return m_dgColumn.Width
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.Width
+         Else
+            Return m_Width
+         End If
       End Get
       Set(value As DataGridLength)
          If Not IsNothing(m_dgColumn) Then
@@ -539,10 +504,14 @@ Public Class EgtDataGridColumn
       End Get
    End Property
 
-   Private Property m_DisplayIndex As Integer
+   Private Property m_DisplayIndex As Integer = -1
    Public Property DisplayIndex As Integer
       Get
-         Return m_dgColumn.DisplayIndex
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.DisplayIndex
+         Else
+            Return m_DisplayIndex
+         End If
       End Get
       Set(value As Integer)
          If Not IsNothing(m_dgColumn) Then
@@ -557,7 +526,11 @@ Public Class EgtDataGridColumn
    Private Property m_IsReadOnly As Boolean = True
    Public Property IsReadOnly As Boolean
       Get
-         Return m_dgColumn.IsReadOnly
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.IsReadOnly
+         Else
+            Return m_IsReadOnly
+         End If
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -575,7 +548,11 @@ Public Class EgtDataGridColumn
    Private m_CanUserReorder As Boolean
    Public Property CanUserReorder As Boolean
       Get
-         Return m_dgColumn.CanUserReorder
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.CanUserReorder
+         Else
+            Return m_CanUserReorder
+         End If
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -591,7 +568,11 @@ Public Class EgtDataGridColumn
    Private m_CanUserResize As Boolean
    Public Property CanUserResize As Boolean
       Get
-         Return m_dgColumn.CanUserResize
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.CanUserResize
+         Else
+            Return m_CanUserResize
+         End If
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -606,7 +587,11 @@ Public Class EgtDataGridColumn
    Private m_CanUserSort As Boolean
    Public Property CanUserSort As Boolean
       Get
-         Return m_dgColumn.CanUserSort
+         If Not IsNothing(m_dgColumn) Then
+            Return m_dgColumn.CanUserSort
+         Else
+            Return m_CanUserSort
+         End If
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -721,6 +706,7 @@ Public Class EgtDataGridColumn
 
    ' funzione per calcolare e scrivere la stringa dei parametri della colonna nell'INI
    Public Function SaveDataGridColumn() As Boolean
+      If DisplayIndex = -1 Then Return False
       Dim bOk As Boolean
       Dim sColumnParams = String.Empty
       sColumnParams = Name & "," & If(CanUserReorder, 1, 0) & "," & If(CanUserResize, 1, 0) & "," & If(CanUserSort, 1, 0) & "," & If(m_OrigIsReadOnly, 1, 0) & "," & DoubleToString(Width.Value, 6) & "," & Width.UnitType & "," & If(Visible, 1, 0) & "," & If(CanUserEditVisible, 1, 0) & "," & CInt(SortDirection)

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -1,22 +1,22 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtManageFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            WindowStartupLocation="CenterOwner"
+                                 Title="{Binding sTitle}"
-                            WindowStyle="None" ResizeMode="NoResize" 
+                                 WindowStartupLocation="CenterOwner"
-                            IsMinimizable="False" ShowInTaskbar="False"
+                                 ShowInTaskbar="False"
-                            Height="500" Width="800"
+                                 Height="500" Width="800"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
 
-   <Grid Margin="5,5,5,0">
+   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
+      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
@@ -28,44 +28,35 @@
                    Style="{StaticResource Button_Image}"/>
          </Button>
          <TextBlock Grid.Column="1"
-                    Margin="5"
                     Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
+                    Style="{StaticResource EgtManageDialog_TextBlock}"/>
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding ViewModeList}"
                    SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
+                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
-                   Style="{StaticResource RightPanel_ComboBox}"/>
       </Grid>
       <Grid Grid.Row="1"
-            Margin="5,5,5,0">
+            Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="4*"/>
          </Grid.ColumnDefinitions>
          <TreeView x:Name="FileTree" 
                    ItemsSource="{Binding RootList}"                   
-                   Margin="10"
+                   Style="{StaticResource EgtManageDialog_TreeView}">
-                   FontSize="15"
-                   BorderBrush="White">
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
                                          ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
                      <Image Source="{Binding sIconSource}"
-                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
+                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
                      <Image Source="{Binding sIconSource}"
-                            Height="15"
                             Style="{StaticResource Button_Image}"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
@@ -80,34 +71,27 @@
             </TreeView.ItemContainerStyle>
          </TreeView>
          <TabControl Grid.Column="1"
-                     Background="Transparent"
+                     SelectedIndex="{Binding nSelTab}"
-                     BorderBrush="White"
+                     Style="{StaticResource EgtManageDialog_TabControl}">
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
             <TabControl.ItemContainerStyle>
                <Style TargetType="{x:Type TabItem}">
                   <Setter Property="Visibility" Value="Collapsed"/>
                </Style>
             </TabControl.ItemContainerStyle>
             <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
+               <ListBox Grid.Row="1"
-                        Grid.Row="1"
+                        x:Name="FileList"                         
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
                         SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
                   <ListBox.Resources>
                      <DataTemplate x:Key="ListTemplateView" 
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
+                        <Grid Style="{StaticResource EgtManageDialog_Grid}">
-                              Height="20">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>
                            <Image Source="{Binding sIconSource}"
-                                  Height="15"
                                   Style="{StaticResource Button_Image}"/>
                            <TextBlock Grid.Column="1"
                                       Text="{Binding sName}"
@@ -116,9 +100,7 @@
                      </DataTemplate>
                      <DataTemplate x:Key="TilesTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
+                        <Grid Style="{StaticResource EgtDirectory_Grid}">
-                              Height="50"
-                              Width="250">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="1*"/>
@@ -127,26 +109,19 @@
                                   Style="{StaticResource Button_Image}"/>
                            <UniformGrid Grid.Column="1"
                                         Rows="3"
-                                        Margin="2.5,0,2.5,5">
+                                        Style="{StaticResource EgtManageDialog_UniformGrid}">
-                              <TextBlock TextAlignment="Left"
+                              <TextBlock Text="{Binding sName}"
-                                         Text="{Binding sName}"
+                                         Style="{StaticResource Info_TextBlock}"/>
-                                         HorizontalAlignment="Left"
+                              <TextBlock Text="{Binding ghTypeItem}"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
+                                         Style="{StaticResource Info_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
+                              <TextBlock Text="{Binding sDimension}"
-                                         Text="{Binding ghTypeItem}"
+                                         Style="{StaticResource Info_TextBlock}"/>
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
                            </UniformGrid>
                         </Grid>
                      </DataTemplate>
                      <DataTemplate x:Key="ContentTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
+                        <Grid Style="{StaticResource ContentTemplate_Grid}">
-                              Height="50">
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1*"/>
                               <RowDefinition Height="Auto"/>
@@ -161,32 +136,23 @@
                                      Style="{StaticResource Button_Image}"/>
                               <UniformGrid Grid.Column="1"
                                            Rows="2"
-                                           Margin="2.5,0,2.5,5">
+                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock TextAlignment="Left"
+                                 <TextBlock Text="{Binding sName}"
-                                            HorizontalAlignment="Left"
+                                            Style="{StaticResource Info_TextBlock}"/>
-                                            Text="{Binding sName}"
+                                 <TextBlock Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                               <UniformGrid Grid.Column="2"
                                            Rows="2"
-                                           Margin="2.5,0,2.5,5">
+                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock TextAlignment="Left"
+                                 <TextBlock Text="{Binding sLastModifyDate}"
-                                            HorizontalAlignment="Left"
+                                            Style="{StaticResource Info_TextBlock}"/>
-                                            Text="{Binding sLastModifyDate}"
+                                 <TextBlock Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
+                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                            </Grid>
                            <Border Grid.Row="1"
-                                   BorderThickness="1"
+                                   Style="{StaticResource EgtManageDialog_Border}"/>
-                                   BorderBrush="LightGray"/>
                         </Grid>
                      </DataTemplate>
                   </ListBox.Resources>
@@ -196,13 +162,13 @@
                            <ContentControl.Style>
                               <Style TargetType="{x:Type ContentControl}">
                                  <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="0">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="1">
                                        <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
                                     </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
+                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="2">
                                        <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
                                     </DataTrigger>
                                  </Style.Triggers>
@@ -219,40 +185,42 @@
                   </ListBox.ItemContainerStyle>
                   <ListBox.Style>
                      <Style TargetType="{x:Type ListBox}">
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
+                        <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+                        <Setter Property="Margin" Value="5"/>
                         <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="0">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
+                                       <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="1">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
+                                       <WrapPanel Style="{StaticResource ProjectH_WrapPanel}"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
                            </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
+                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
                                         Value="2">
                               <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
                               <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
+                                       <StackPanel Style="{StaticResource EgtManageDialog_StackPanel}"/>
-                                                   HorizontalAlignment="Stretch"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -266,16 +234,32 @@
                <DataGrid AutoGenerateColumns="False"
                          IsReadOnly="True"
                          HeadersVisibility="Column"
+                         AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                         AlternationCount="2"
+                         SelectionMode="Single"
                          ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}">
+                         SelectedItem="{Binding ItemSelected}"
-                  <!--   ColumnHeaderStyle="{StaticResource DataGridColumnHeader}"
+                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"-->
+                         CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                         Style="{StaticResource Optimizer_DataGrid}">
+                  <DataGrid.ColumnHeaderStyle>
+                     <Style TargetType="{x:Type DataGridColumnHeader}">
+                        <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
+                        <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                        <Setter Property="FontWeight" Value="Bold"/>
+                        <Setter Property="FontSize" Value="15"/>
+                        <Setter Property="Padding" Value="1"/>
+                        <Setter Property="BorderThickness" Value="0,0,1,1"/>
+                     </Style>
+                  </DataGrid.ColumnHeaderStyle>
                   <DataGrid.Columns>
                      <DataGridTemplateColumn Width="5*">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -286,115 +270,80 @@
                                     <ColumnDefinition Width="1*"/>
                                  </Grid.ColumnDefinitions>
                                  <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
+                                        Style="{StaticResource Source_Image}"/>
-                                        Style="{StaticResource Button_Image}"/>
                                  <TextBlock Grid.Column="1"
                                             Text="{Binding sName}"
-                                            VerticalAlignment="Center"
+                                            Style="{StaticResource NameImage_TextBlock}"/>
-                                            Margin="2.5,0,0,0"/>
                               </Grid>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                      </DataGridTemplateColumn>
                      <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
+                                         Width="2*"
+                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
+                                         Width="1*"
+                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                      <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
+                                         Width="1*"
+                                         ElementStyle="{StaticResource DataGridR_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
                               <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
+                                         Style="{StaticResource Name_TextBlock}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
                      </DataGridTextColumn>
                   </DataGrid.Columns>
                   <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
+                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
                   </DataGrid.InputBindings>
                </DataGrid>
             </TabItem>
          </TabControl>
       </Grid>
       <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
+            Style="{StaticResource AddRawPartWnd_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
+         <TextBlock Text="{Binding FileName_Msg}"
-                    Text="{Binding FileName_Msg}"
+                    Style="{StaticResource FileName_TextBlock}"/>
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
                   Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
+                  Style="{StaticResource SaveFileName_TextBox}"/>
          <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
                    ItemsSource="{Binding FilterList}"
                    SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
                    DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
+                   Style="{StaticResource FilterList_ComboBox}"/>
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
       </Grid>
       <UniformGrid Grid.Row="3"  
                    Rows="1"
-                   Margin="2.5,0,2.5,0">
+                   Style="{StaticResource Command_UniformGrid}">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
+                 Style="{StaticResource EgtManageDialogOK_HalfRound_Button}"/>
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
+                 Style="{StaticResource EgtManageDialogCancel_HalfRound_Button}"/>
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
       </UniformGrid>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -1,6 +1,6 @@
-Imports System.Windows.Forms
+Imports EgtWPFLib5
+Imports System.Windows.Forms
 Imports System.Windows.Input
-Imports EgtWPFLib5
 
 Public Class EgtManageFileDialogV
 
@@ -108,7 +108,6 @@ Public Class EgtManageFileDialogV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      MyBase.New(Owner)
       InitializeComponent()
       Me.DataContext = EgtManageFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
@@ -139,4 +138,4 @@ Public Class EgtManageFileDialogV
 
 #End Region    '  METHODS
 
-End Class
+End Class

EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml

@@ -1,416 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtManageFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Command="{Binding GoBack_Command}"
-                 Style="{StaticResource RightPanel_Button}">
-            <Image Source="\Resources\EgtDialog\Restore.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <TextBlock Grid.Column="1"
-                    Margin="5"
-                    Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </TreeView.Resources>
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-               </Style>
-            </TreeView.ItemContainerStyle>
-         </TreeView>
-         <TabControl Grid.Column="1"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Height="15"
-                                  Style="{StaticResource Button_Image}"/>
-                           <TextBlock Grid.Column="1"
-                                      Text="{Binding sName}"
-                                      Style="{StaticResource DialogWindow_TextBlock}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="TilesTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1*"/>
-                              <RowDefinition Height="Auto"/>
-                           </Grid.RowDefinitions>
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Image Source="{Binding sIconSource}"
-                                     Style="{StaticResource Button_Image}"/>
-                              <UniformGrid Grid.Column="1"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ListBox.Resources>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <ContentControl Content="{Binding}">
-                           <ContentControl.Style>
-                              <Style TargetType="{x:Type ContentControl}">
-                                 <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
-                                    </DataTrigger>
-                                 </Style.Triggers>
-                              </Style>
-                           </ContentControl.Style>
-                        </ContentControl>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                        <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-                  <ListBox.Style>
-                     <Style TargetType="{x:Type ListBox}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ListBox.Style>
-               </ListBox>
-            </TabItem>
-            <TabItem Header="DATAGRID">
-               <DataGrid AutoGenerateColumns="False"
-                         IsReadOnly="True"
-                         HeadersVisibility="Column"
-                         AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                         AlternationCount="2"
-                         SelectionMode="Single"
-                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}"
-                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                         CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                         Style="{StaticResource DataGrid_OnlyProd}">
-                  <DataGrid.ColumnHeaderStyle>
-                     <Style TargetType="{x:Type DataGridColumnHeader}">
-                        <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
-                        <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="FontSize" Value="15"/>
-                        <Setter Property="Padding" Value="1"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
-                        <Setter Property="BorderThickness" Value="0,0,1,1"/>
-                     </Style>
-                  </DataGrid.ColumnHeaderStyle>
-                  <DataGrid.Columns>
-                     <DataGridTemplateColumn Width="5*">
-                        <DataGridTemplateColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Style="{StaticResource Button_Image}"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
-         <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Margin="2.5,0,2.5,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml.vb

@@ -1,142 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows.Forms
-Imports System.Windows.Input
-
-Public Class OnlyProdEgtManageFileDialogV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
-
-   Private Shadows DialogResult As DialogResult
-
-   ''' <summary>
-   ''' Stringa che specifica il titolo da mostrare
-   ''' </summary>
-   Public Overloads Property Title As String
-      Get
-         Return m_EgtManageFileDialogVM.sTitle
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sTitle = value
-      End Set
-   End Property
-
-   Public Property Filter As String
-      Get
-         Return m_EgtManageFileDialogVM.sFilter
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFilter = value
-      End Set
-   End Property
-
-   Public Property InitialDirectory As String
-      Get
-         Return m_EgtManageFileDialogVM.sInitialDirectory
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sInitialDirectory = value
-      End Set
-   End Property
-
-   Public Property SafeFileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sSaveFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sSaveFileName = value
-      End Set
-   End Property
-
-   Public Property FileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFileName = value
-      End Set
-   End Property
-
-   Public Property FilterIndex As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nFilterIndex
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nFilterIndex = value
-      End Set
-   End Property
-
-   Public Property Mode As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nMode
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nMode = value
-      End Set
-   End Property
-
-   Public Property CheckFileExists As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bCheckFileExists
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bCheckFileExists = value
-      End Set
-   End Property
-
-   Public Property ValidateNames As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bValidateNames
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bValidateNames = value
-      End Set
-   End Property
-
-   Public Property OverwritePrompt As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bOverwritePrompt
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bOverwritePrompt = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      MyBase.New(Owner)
-      InitializeComponent()
-      Me.DataContext = EgtManageFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtManageFileDialogVM = EgtManageFileDialogVM
-   End Sub
-
-#End Region
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-   Private Sub ListBoxItem_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_EgtManageFileDialogVM.MouseDoubleClick()
-   End Sub
-
-#End Region    '  METHODS
-
-End Class

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml

@@ -1,34 +1,32 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtMessageBoxV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            WindowStartupLocation="CenterOwner"
+                                 Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
+                                 SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize" 
+                                 WindowStartupLocation="CenterOwner"
-                            IsMinimizable="False" ShowInTaskbar="False"
+                                 ShowInTaskbar="False"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
-   
+
-   <Grid Margin="2.5,2.5,2.5,0">
+   <Grid Style="{StaticResource EgtMessageBox_Grid}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
+      <Grid Style="{StaticResource MessageBox_Grid}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
+         <Image Source="{Binding sIconSource}"/>
-                Margin="0,0,0,0"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
+                    Style="{StaticResource EgtMessageBox_TextBlock}"/>
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
       </Grid>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
+                    Style="{StaticResource EgtMessageBox_ItemsControl}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <UniformGrid Rows="1"/>
@@ -39,11 +37,9 @@
                <Button IsDefault="{Binding bIsDefault}"
                        Content="{Binding sMessage}"
                        Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
+                       Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-                       Style="{StaticResource RightPanel_HalfRound_Button}"/>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
-
       </ItemsControl>
    </Grid>
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -14,7 +14,6 @@ Public Class EgtMessageBoxV
 #Region "CONTRUCTORS"
 
    Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = EgtMessageBoxVM

EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml

@@ -1,49 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtMessageBoxV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="2.5,2.5,2.5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-
-      </ItemsControl>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml.vb

@@ -1,110 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class OnlyProdEgtMessageBoxV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
-
-   Private Shadows DialogResult As MessageBoxResult
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = EgtMessageBoxVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtMessageBoxVM = EgtMessageBoxVM
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
-      Dim NewMessagebox As New OnlyProdEgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
-      Dim NewMessagebox As New OnlyProdEgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
-      Dim NewMessagebox As New OnlyProdEgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
-      Dim NewMessagebox As New OnlyProdEgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
-      Dim NewMessagebox As New OnlyProdEgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-End Class

EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml

@@ -1,91 +0,0 @@
-<DataGrid x:Class="OnlyProd_QParamListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="True" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5"
-          AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-          AlternationCount="2"
-          Style="{StaticResource DataGrid_OnlyProd}"
-          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-          CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-   <DataGrid.ColumnHeaderStyle>
-      <Style TargetType="{x:Type DataGridColumnHeader}">
-         <Setter Property="Background" Value="{StaticResource BeamWall_Downy}"/>
-         <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-         <Setter Property="HorizontalContentAlignment" Value="Center"/>
-         <Setter Property="FontWeight" Value="Bold"/>
-         <Setter Property="FontSize" Value="15"/>
-      </Style>
-   </DataGrid.ColumnHeaderStyle>
-
-   <DataGrid.Columns>
-      <!--BWType-->
-      <DataGridTextColumn Binding="{Binding sBWType}"
-                          Width="40"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Nome-->
-      <DataGridTextColumn Binding="{Binding sName}"
-                          Width="65"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Descrizione-->
-      <DataGridTextColumn Binding="{Binding sDescription}"
-                          Width="1*"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Default-->
-      <DataGridTextColumn Binding="{Binding sDefault}"
-                          Width="65">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Minimo-->
-      <DataGridTextColumn Binding="{Binding sMin}"
-                          Width="70"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Massimo-->
-      <DataGridTextColumn Binding="{Binding sMax}"
-                          Width="70"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-   </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml.vb

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

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml

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

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml.vb

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

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -1,4 +1,5 @@
 Imports System.Threading
+Imports System.Threading.Tasks
 Imports System.Windows.Threading
 
 Public Module LoadingWndHelper
@@ -59,12 +60,7 @@ Public Module LoadingWndHelper
       m_thread = New Thread(Sub()
                                m_LoadingWndVM = New Core.LoadingWndVM(nSteps, TotText, AddressOf LoadingCallback)
                                m_LoadingWndVM.UpdateProgress(m_CurrStep, m_StepText, m_nProgress, m_nNextProgress)
-                               Dim LoadingWnd As Object
+                               Dim LoadingWnd As New LoadingWndV(Nothing, m_LoadingWndVM)
-                               If bOnlyProd Then
-                                  LoadingWnd = New OnlyProdLoadingWndV(Nothing, m_LoadingWndVM)
-                               Else
-                                  LoadingWnd = New LoadingWndV(Nothing, m_LoadingWndVM)
-                               End If
                                ' posiziono la finestra
                                If WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen Then
                                   LoadingWnd.WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             Height="200" Width="300" 
                             TitleBarHeight="0"
                             ResizeMode="NoResize" WindowStyle="None"
@@ -23,34 +23,27 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding TotText_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource MessageBox_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding StepText_Msg}"
-                 TextAlignment="Center"
+                 Visibility="{Binding StepText_Visibility}"
-                 Visibility="{Binding StepText_Visibility}"/>
+                 Style="{StaticResource MessageBox_TextBlock}"/>
       <Grid Grid.Row="3"
             Visibility="{Binding StepProgress_Visibility}">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Grid Height="20"/>
+         <Grid Style="{StaticResource EgtManageDialog_Grid}"/>
          <ProgressBar Grid.Row="1"
-                   Minimum="0"
+                      Value="{Binding StepProgress_Value}"
-                   Maximum="100"
+                      Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
-                   Value="{Binding StepProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
       </Grid>
       <ProgressBar Grid.Row="5"
-                   Minimum="0"
-                   Maximum="100"
                    Value="{Binding TotProgress_Value}"
-                   Height="20"
+                   Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
-                   Margin="40,0,40,0"/>
       <TextBlock Grid.Row="7"
                  Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
+                 Style="{StaticResource MessageBox_TextBlock}"/>
    </Grid>
-
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml.vb

@@ -1,5 +1,5 @@
-Imports System.Windows
+Imports System.Windows.Input
-Imports System.Windows.Input
+Imports System.Windows
 
 Public Class LoadingWndV
 

EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml

@@ -1,55 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdLoadingWndV"
-                            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="{StaticResource OnlyProd_EgtCustomWindow}"
-                            Height="200" Width="300" 
-                            TitleBarHeight="0"
-                            ResizeMode="NoResize" WindowStyle="None"
-                            IsClosable="False" IsMinimizable="False"
-                            WindowStartupLocation="Manual" ShowInTaskbar="False">
-   
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <TextBlock Grid.Row="1"
-                 Text="{Binding TotText_Msg}"
-                 TextAlignment="Center"/>
-      <TextBlock Grid.Row="2"
-                 Text="{Binding StepText_Msg}"
-                 TextAlignment="Center"
-                 Visibility="{Binding StepText_Visibility}"/>
-      <Grid Grid.Row="3"
-            Visibility="{Binding StepProgress_Visibility}">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <Grid Height="20"/>
-         <ProgressBar Grid.Row="1"
-                   Minimum="0"
-                   Maximum="100"
-                   Value="{Binding StepProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
-      </Grid>
-      <ProgressBar Grid.Row="5"
-                   Minimum="0"
-                   Maximum="100"
-                   Value="{Binding TotProgress_Value}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
-      <TextBlock Grid.Row="7"
-                 Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb

@@ -1,36 +0,0 @@
-Imports System.Windows.Input
-Imports System.Windows
-
-Public Class OnlyProdLoadingWndV
-
-   Private WithEvents m_LoadingWndVM As LoadingWndVM
-
-   Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = LoadingWndVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_LoadingWndVM = LoadingWndVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
-      Me.Close()
-   End Sub
-
-   Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
-      Me.Activate()
-   End Sub
-
-   Private Sub Me_ContentRendered() Handles Me.ContentRendered
-      m_LoadingWndVM.StartFunction()
-   End Sub
-
-   Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-   End Sub
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/BeamM.vb

@@ -1,205 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class BeamM
-   Inherits PartM
-
-   Protected m_dOffset As Double
-   Public Property dOffset As Double
-      Get
-         Return m_dOffset
-      End Get
-      Set(value As Double)
-         m_dOffset = value
-      End Set
-   End Property
-
-   ' Id del grezzo
-   Protected m_nRawPartId As Integer = GDB_ID.NULL
-
-   '#Region "CONSTRUCTOR"
-
-   '   Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer)
-   '      MyBase.New(nParentMachGroup, nPartId)
-   '      m_nRawPartId = nRawPartId
-   '   End Sub
-
-   '#End Region    ' CONSTRUCTOR
-
-#Region "CONSTRUCTORS"
-
-   Protected Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer)
-      MyBase.New(nParentMachGroup, nPartId)
-   End Sub
-
-   'Public Shared Function CreateNewBeam() As BeamM
-   '   Return New BeamM
-   'End Function
-
-   Public Shared Function CreateBeam(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As BeamM
-      Dim NewBeamM As New BeamM(nParentMachGroup, nPartId)
-      NewBeamM.m_nRawPartId = nRawPartId
-      ' leggo info pezzo
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBeamM.m_nProjId)
-      EgtGetInfo(nPartId, BTL_PRT_PDN, NewBeamM.m_nPDN)
-      EgtGetInfo(nPartId, BTL_PRT_NAM, NewBeamM.m_sNAM)
-      EgtGetInfo(nPartId, BTL_PRT_L, NewBeamM.m_dBtlL)
-      EgtGetInfo(nPartId, BTL_PRT_W, NewBeamM.m_dBtlW)
-      EgtGetInfo(nPartId, BTL_PRT_H, NewBeamM.m_dBtlH)
-      EgtGetInfo(nPartId, BTL_PRT_CNT, NewBeamM.m_nCNT)
-      EgtGetInfo(nPartId, BTL_PRT_GROUP, NewBeamM.m_sGROUP)
-      EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewBeamM.m_sMATERIAL)
-      Dim nTemp As Integer = 0
-      If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
-         nTemp = 0
-      End If
-      NewBeamM.SetRotated(nTemp)
-      If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
-         nTemp = 0
-      End If
-      NewBeamM.SetInverted(nTemp)
-      ' leggo PosX
-      Dim sInfo As String = ""
-      Dim Index = 1
-      Dim sSplitInfo() As String = Nothing
-      Dim bFound As Boolean = False
-      While EgtGetInfo(NewBeamM.m_ParentMachGroup.Id, MGR_RPT_PART & Index, sInfo)
-         If Not String.IsNullOrWhiteSpace(sInfo) Then
-            sSplitInfo = sInfo.Split(","c)
-            If sSplitInfo(0) = nPartId Then
-               bFound = True
-               Exit While
-            End If
-         End If
-         Index += 1
-      End While
-      If bFound Then
-         StringToDouble(sSplitInfo(1), NewBeamM.m_dPOSX)
-      End If
-      ' leggo feature
-      NewBeamM.m_FeatureMList = LoadBTLFeatures(nPartId)
-      ' leggo calc error
-      Dim nErr As Integer = 0
-      Dim nRot As Integer = 0
-      Dim nFall As Integer = 0
-      Dim sMsg As String = ""
-      Dim bCalc As Boolean = False
-      bCalc = EgtGetInfo(nPartId, ITG_PROD_ERR, nErr)
-      EgtGetInfo(nPartId, ITG_PROD_ROT, nRot)
-      EgtGetInfo(nPartId, ITG_PROD_FALL, nFall)
-      EgtGetInfo(nPartId, ITG_PROD_MSG, sMsg)
-      If Not bCalc Then
-         NewBeamM.m_nCALC_State = CalcStates.NOTCALCULATED
-         NewBeamM.m_nCALC_ERR = -1
-         NewBeamM.m_nCALC_ROT = 0
-         NewBeamM.m_nCALC_FALL = 0
-         NewBeamM.m_sCALC_MSG = ""
-      Else
-         NewBeamM.m_nCALC_ERR = nErr
-         NewBeamM.m_nCALC_ROT = nRot
-         NewBeamM.m_nCALC_FALL = nFall
-         NewBeamM.m_sCALC_MSG = sMsg
-         If nErr = 0 Then
-            NewBeamM.m_nCALC_State = CalcStates.OK
-         ElseIf nErr > 1 Then
-            NewBeamM.m_nCALC_State = CalcStates.ERROR_
-         ElseIf nErr < 1 Then
-            NewBeamM.m_nCALC_State = CalcStates.NOTCALCULATED
-         End If
-      End If
-      EgtGetInfo(nPartId, ITG_PROD_TIME, NewBeamM.m_nCALC_TIME)
-      ReadMachGroupData(NewBeamM)
-      Return NewBeamM
-   End Function
-
-#End Region    ' CONSTRUCTORS
-
-#Region "X DataLayer"
-
-   Public Shared Function CreateBeamDL(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As BeamM
-      Dim NewBeamM As New BeamM(nParentMachGroup, nPartId)
-      NewBeamM.m_nRawPartId = nRawPartId
-      '' leggo info pezzo
-      'EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBeamM.nProjId)
-      'EgtGetInfo(nPartId, BTL_PRT_PDN, NewBeamM.nPDN)
-      'EgtGetInfo(nPartId, BTL_PRT_NAM, NewBeamM.sNAM)
-      'EgtGetInfo(nPartId, BTL_PRT_L, NewBeamM.dL)
-      'EgtGetInfo(nPartId, BTL_PRT_W, NewBeamM.dW)
-      'EgtGetInfo(nPartId, BTL_PRT_H, NewBeamM.dH)
-      'EgtGetInfo(nPartId, BTL_PRT_CNT, NewBeamM.nCNT)
-      'Dim nTemp As Integer = 0
-      'If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
-      '   nTemp = 0
-      'End If
-      'NewBeamM.SetRotated(nTemp)
-      'If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
-      '   nTemp = 0
-      'End If
-      'NewBeamM.SetInverted(nTemp)
-      '' leggo PosX
-      'Dim sInfo As String = ""
-      'Dim Index = 1
-      'Dim sSplitInfo() As String
-      'Dim bFound As Boolean = False
-      'While EgtGetInfo(NewBeamM.m_ParentMachGroup.Id, MGR_RPT_PART & Index, sInfo)
-      '   If Not String.IsNullOrWhiteSpace(sInfo) Then
-      '      sSplitInfo = sInfo.Split(","c)
-      '      If sSplitInfo(0) = nPartId Then
-      '         bFound = True
-      '         Exit While
-      '      End If
-      '   End If
-      '   Index += 1
-      'End While
-      'If bFound Then
-      '   StringToDouble(sSplitInfo(1), NewBeamM.dPOSX)
-      'End If
-      '' leggo feature
-      'NewBeamM.m_FeatureMList = LoadBTLFeatures(nPartId)
-      Return NewBeamM
-   End Function
-
-#End Region
-
-   Private Shared Function LoadBTLFeatures(nPartId As Integer) As List(Of BTLFeatureM)
-      Dim TempList As New List(Of BTLFeatureM)
-      ' Aggiungo outline
-      Dim nOutLayerId As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
-      Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutLayerId)
-      While nOutlineId <> GDB_ID.NULL
-         ' verifico che sia una feature
-         Dim nGRP As Integer
-         If EgtGetInfo(nOutlineId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nOutlineId, BTL_FTR_MAINID) Then
-            ' creo la feature
-            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nOutlineId))
-         End If
-         nOutlineId = EgtGetNext(nOutlineId)
-      End While
-      ' Aggiungo feature
-      Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
-      Dim nFeatureId As Integer = EgtGetFirstInGroup(nProcessingId)
-      While nFeatureId <> GDB_ID.NULL
-         ' verifico che sia una feature
-         Dim nGRP As Integer
-         If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
-            ' creo la feature
-            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nFeatureId))
-         End If
-         nFeatureId = EgtGetNext(nFeatureId)
-      End While
-      Return TempList
-   End Function
-
-   Public Sub UpdateOffset()
-      ' calcolo offset
-      Dim nBeamIndex As Integer = ParentMachGroup.PartMList.IndexOf(Me)
-      If nBeamIndex > 0 Then
-         m_dOffset = dPOSX - (ParentMachGroup.PartMList(nBeamIndex - 1).dPOSX + ParentMachGroup.PartMList(nBeamIndex - 1).dL)
-      Else
-         m_dOffset = dPOSX
-      End If
-   End Sub
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/BeamMachGroupM.vb

@@ -1,133 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class BeamMachGroupM
-   Inherits MyMachGroupM
-
-   Protected m_dStartCut As Double
-   Public Property dStartCut As Double
-      Get
-         Return m_dStartCut
-      End Get
-      Set(value As Double)
-         m_dStartCut = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Protected Sub New()
-   End Sub
-
-   Public Shared Function CreateNewBeamMachGroup() As MachGroupM
-      Return New MachGroupM
-   End Function
-
-   Public Shared Function CreateBeamMachGroup(nId As Integer, sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New BeamMachGroupM
-      NewMachGroupM.m_Id = nId
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      ' NewMachGroupM.SetMachineType(MachineType.BEAM)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
-      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
-      NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
-      For Each Part As BeamM In NewMachGroupM.m_PartMList
-         Part.UpdateOffset()
-         NewMachGroupM.m_dMatForPart += Part.dL
-      Next
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   End Function
-
-   Public Shared Function CreateBeamMachGroup(sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New BeamMachGroupM
-      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
-      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
-      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      'NewMachGroupM.SetMachineType(MachineType.BEAM)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
-      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
-      For Each Part In NewMachGroupM.m_PartMList
-         NewMachGroupM.m_dMatForPart += Part.dL
-      Next
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   End Function
-
-#End Region    ' CONSTRUCTORS
-
-#Region "X DataLayer"
-
-   Public Shared Function CreateBeamMachGroupDL(nId As Integer, sName As String, sMachine As String, PartMList As List(Of PartM)) As MachGroupM
-      Dim NewMachGroupM As New BeamMachGroupM
-      NewMachGroupM.m_Id = nId
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      'NewMachGroupM.SetMachineType(MachineType.BEAM)
-      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
-      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
-      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
-      'NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
-      NewMachGroupM.m_PartMList = PartMList
-      Return NewMachGroupM
-   End Function
-
-#End Region
-
-   Private Shared Function LoadParts(NewBeamMachGroupM As BeamMachGroupM) As List(Of PartM)
-      Dim TempList As New List(Of PartM)
-      Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      While nRawPartId <> GDB_ID.NULL
-         Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-         If nPartId <> GDB_ID.NULL Then
-            Dim NewBeam As BeamM = BeamM.CreateBeam(NewBeamMachGroupM, nPartId, nRawPartId)
-            TempList.Add(NewBeam)
-         End If
-         nRawPartId = EgtGetNextRawPart(nRawPartId)
-      End While
-      Return TempList
-   End Function
-
-   Public Overrides Sub RefreshPartList()
-      ' leggo StartCut da posizione primo pezzo
-      Dim sInfo As String = ""
-      Dim sSplitInfo() As String
-      Dim bFound As Boolean = False
-      EgtGetInfo(Id, MGR_RPT_PART & 1, sInfo)
-      If Not String.IsNullOrWhiteSpace(sInfo) Then
-         sSplitInfo = sInfo.Split(","c)
-         StringToDouble(sSplitInfo(1), m_dStartCut)
-      Else
-         m_dStartCut = 0
-      End If
-      ' aggiorno lista pezzi
-      RemoveAllParts()
-      Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      While nRawPartId <> GDB_ID.NULL
-         Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-         If nPartId <> GDB_ID.NULL Then
-            Dim NewBeam As BeamM = BeamM.CreateBeam(Me, nPartId, nRawPartId)
-            AddPart(NewBeam)
-            NewBeam.UpdateOffset()
-         End If
-         nRawPartId = EgtGetNextRawPart(nRawPartId)
-      End While
-   End Sub
-
-   Public Overrides Sub RefreshGroupData()
-      EgtGetInfo(Id, MGR_RPT_BARLEN, dL)
-      EgtGetInfo(Id, MGR_RPT_BARHEIGHT, dH)
-      EgtGetInfo(Id, MGR_RPT_BARWIDTH, dW)
-      EgtGetInfo(Id, MGR_RPT_MATERIAL, sMATERIAL)
-   End Sub
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -88,7 +88,6 @@ Public Class MyMachGroupPanelM
       Return Nothing
    End Function
 
-
    ' funzione che restituisce solo i gruppi di lavorazione creati nel nesting 
    Public Shared Function UpdateFromNestingMyMachGroups(MachineList As List(Of Machine)) As List(Of MachGroupM)
       Dim TempList As New List(Of MachGroupM)
@@ -192,7 +191,13 @@ Public Class MyMachGroupPanelM
          While nOutlineId <> GDB_ID.NULL
             ' verifico che sia feature
             If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-               If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
+               Dim nCurrPrId As Integer = GDB_ID.NULL
+               If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
+                  If nCurrPrId < nPRId Then
+                     EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                     nPRId += 1
+                  End If
+                  nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
                   nOutlineId = EgtGetNext(nOutlineId)
                   Continue While
                Else
@@ -231,7 +236,14 @@ Public Class MyMachGroupPanelM
                   Dim nPRC As Integer
                   If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
                      nPRId = 0
-                     If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                        If nPRId < nGlobPRId Then
+                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                           nPRId = nGlobPRId
+                           nGlobPRId += 1
+                        End If
+                        nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
+                     Else
                         EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
                         nPRId = nGlobPRId
                         nGlobPRId += 1
@@ -329,7 +341,9 @@ Public Class MyMachGroupPanelM
    End Sub
 
    Public Shared Sub SetDuploModified(nPartId As Integer)
-      If Configuration.bOnlyProd Then
+      Dim nDuploCount As Integer = 0
+      EgtDuploCount(nPartId, nDuploCount)
+      If nDuploCount > 0 Then
          ' segno modificato e aggiorno duplo
          EgtDuploSetModified(nPartId)
          UpdateDuplo(nPartId)
@@ -340,8 +354,6 @@ Public Class MyMachGroupPanelM
          For Each CurrMachGroup As MyMachGroupVM In DuploList
             CurrMachGroup.RefreshMachGroup()
          Next
-      Else
-         EgtDuploSetModified(nPartId)
       End If
    End Sub
 

EgtBEAMWALL.Core/MachGroupModel/WallM.vb

@@ -1,110 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class WallM
-   Inherits PartM
-
-   Protected m_dPOSY As Double
-   Public Property dPOSY As Double
-      Get
-         Return m_dPOSY
-      End Get
-      Set(value As Double)
-         m_dPOSY = value
-      End Set
-   End Property
-
-   Protected m_dROT As Double
-   Public Property dROT As Double
-      Get
-         Return m_dROT
-      End Get
-      Set(value As Double)
-         m_dROT = value
-      End Set
-   End Property
-
-   Protected m_bFLIP As Boolean
-   Public Property bFLIP As Boolean
-      Get
-         Return m_bFLIP
-      End Get
-      Set(value As Boolean)
-         m_bFLIP = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTOR"
-
-   Protected Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer)
-      MyBase.New(nParentMachGroup, nPartId)
-   End Sub
-
-   Public Shared Function CreateWall(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As WallM
-      Dim NewWallM As New WallM(nParentMachGroup, nPartId)
-      ' leggo info pezzo
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewWallM.m_nProjId)
-      EgtGetInfo(nPartId, BTL_PRT_PDN, NewWallM.m_nPDN)
-      EgtGetInfo(nPartId, BTL_PRT_NAM, NewWallM.m_sNAM)
-      EgtGetInfo(nPartId, BTL_PRT_L, NewWallM.m_dBtlL)
-      EgtGetInfo(nPartId, BTL_PRT_W, NewWallM.m_dBtlW)
-      EgtGetInfo(nPartId, BTL_PRT_H, NewWallM.m_dBtlH)
-      EgtGetInfo(nPartId, BTL_PRT_CNT, NewWallM.m_nCNT)
-      Dim nTemp As Integer = 0
-      If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
-         nTemp = 0
-      End If
-      NewWallM.SetRotated(nTemp)
-      If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
-         nTemp = 0
-      End If
-      NewWallM.SetInverted(nTemp)
-      ' leggo PosX, PosY, Rot e Flip
-      EgtGetInfo(nPartId, MGR_PRT_POSX, NewWallM.m_dPOSX)
-      EgtGetInfo(nPartId, MGR_PRT_POSY, NewWallM.m_dPOSY)
-      EgtGetInfo(nPartId, MGR_PRT_ROT, NewWallM.m_dROT)
-      EgtGetInfo(nPartId, MGR_PRT_FLIP, NewWallM.m_bFLIP)
-      ' leggo feature
-      NewWallM.m_FeatureMList = LoadBTLFeatures(nPartId)
-      ReadMachGroupData(NewWallM)
-      Return NewWallM
-   End Function
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Private Shared Function LoadBTLFeatures(nPartId As Integer) As List(Of BTLFeatureM)
-      Dim TempList As New List(Of BTLFeatureM)
-      ' Aggiungo outline
-      Dim nOutLayerId As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
-      Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutLayerId)
-      While nOutlineId <> GDB_ID.NULL
-         ' verifico che sia una feature
-         Dim nGRP As Integer
-         If EgtGetInfo(nOutlineId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nOutlineId, BTL_FTR_MAINID) Then
-            ' creo la feature
-            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nOutlineId))
-         End If
-         nOutlineId = EgtGetNext(nOutlineId)
-      End While
-      ' Aggiungo feature
-      Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
-      Dim nFeatureId As Integer = EgtGetFirstInGroup(nProcessingId)
-      While nFeatureId <> GDB_ID.NULL
-         ' verifico che sia una feature
-         Dim nGRP As Integer
-         If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
-            ' creo la feature
-            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nFeatureId))
-         End If
-         nFeatureId = EgtGetNext(nFeatureId)
-      End While
-      Return TempList
-   End Function
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/WallMachGroupM.vb

@@ -1,103 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class WallMachGroupM
-   Inherits MyMachGroupM
-
-   Protected m_nRawPartId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nRawPartId As Integer
-      Get
-         Return m_nRawPartId
-      End Get
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Protected Sub New()
-   End Sub
-
-   Public Shared Function CreateNewWallMachGroup() As MachGroupM
-      Return New MachGroupM
-   End Function
-
-   Public Shared Function CreateWallMachGroup(nId As Integer, sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New WallMachGroupM
-      NewMachGroupM.m_Id = nId
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = MachineType.WALL
-      NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
-      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW
-      NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
-      For Each Part In NewMachGroupM.m_PartMList
-         NewMachGroupM.m_dMatForPart += (Part.dL * Part.dW)
-      Next
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   End Function
-
-   Public Shared Function CreateWallMachGroup(sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New WallMachGroupM
-      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
-      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
-      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = MachineType.WALL
-      NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
-      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
-      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW
-      For Each Part In NewMachGroupM.m_PartMList
-         NewMachGroupM.m_dMatForPart += (Part.dL * Part.dW)
-      Next
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   End Function
-
-#End Region    ' CONSTRUCTORS
-
-   Private Shared Function LoadParts(NewWallMachGroupM As WallMachGroupM) As List(Of PartM)
-      Dim TempList As New List(Of PartM)
-      Dim nWallId As Integer = EgtGetFirstPartInRawPart(NewWallMachGroupM.m_nRawPartId)
-      While nWallId <> GDB_ID.NULL
-         If nWallId <> GDB_ID.NULL Then
-            Dim NewWall As WallM = WallM.CreateWall(NewWallMachGroupM, nWallId, NewWallMachGroupM.m_nRawPartId)
-            TempList.Add(NewWall)
-         End If
-         nWallId = EgtGetNextPartInRawPart(nWallId)
-      End While
-      Return TempList
-   End Function
-
-   Public Overrides Sub RefreshPartList()
-      ' aggiorno lista pezzi
-      RemoveAllParts()
-      Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      If nRawPartId <> GDB_ID.NULL Then
-         Me.m_nRawPartId = nRawPartId
-      End If
-      Dim nWallId As Integer = EgtGetFirstPartInRawPart(m_nRawPartId)
-      While nWallId <> GDB_ID.NULL
-         If nWallId <> GDB_ID.NULL Then
-            Dim NewWall As WallM = WallM.CreateWall(Me, nWallId, m_nRawPartId)
-            AddPart(NewWall)
-         End If
-         nWallId = EgtGetNextPartInRawPart(nWallId)
-      End While
-   End Sub
-
-   Public Overrides Sub RefreshGroupData()
-      EgtGetInfo(Id, MGR_RPT_PANELLEN, dL)
-      EgtGetInfo(Id, MGR_RPT_PANELWIDTH, dW)
-      EgtGetInfo(Id, MGR_RPT_PANELHEIGHT, dH)
-      EgtGetInfo(Id, MGR_RPT_MATERIAL, sMATERIAL)
-   End Sub
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamMachGroupVM.vb

@@ -1,113 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Collections.Specialized
-Imports System.ComponentModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class BeamMachGroupVM
-   Inherits MyMachGroupVM
-
-   Public ReadOnly Property m_BeamMachGroupM As BeamMachGroupM
-      Get
-         Return m_MachGroupM
-      End Get
-   End Property
-
-   Public Overridable Property sStartCut As String
-      Get
-         Return LenToString(m_BeamMachGroupM.dStartCut, 3)
-      End Get
-      Set(value As String)
-         StringToLen(value, m_BeamMachGroupM.dStartCut)
-      End Set
-   End Property
-   Public Property dStartCut As Double
-      Get
-         Return m_BeamMachGroupM.dStartCut
-      End Get
-      Set(value As Double)
-         m_BeamMachGroupM.dStartCut = value
-         NotifyPropertyChanged(NameOf(sStartCut))
-      End Set
-   End Property
-
-   Public Property SelBeam As BeamVM
-      Get
-         Return m_SelPart
-      End Get
-      Set(value As BeamVM)
-         m_SelPart = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Sub New(BeamMachGroupM As BeamMachGroupM)
-      MyBase.New(BeamMachGroupM)
-      AddHandler m_BeamMachGroupM.PartAdded, AddressOf OnBeamAdded
-      AddHandler m_BeamMachGroupM.PartRemoved, AddressOf OnBeamRemoved
-      CreateBeamVMList()
-      ' Aggiorno stato da stati feature
-      CalcGlobalUpdate()
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-#Region "METHODS"
-
-   Protected MustOverride Sub CreateBeamVMList()
-
-   Public Overrides Sub RefreshPartList()
-   End Sub
-
-   Public Overrides Sub RefreshGroupData()
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#End Region    ' COMMANDS
-
-#Region "EVENTS"
-
-   Protected MustOverride Sub OnBeamAdded(sender As Object, e As PartAddedEventArgs)
-   Private Sub OnBeamRemoved(sender As Object, e As PartAddedEventArgs)
-      Dim BeamVM As BeamVM = PartVMList.FirstOrDefault(Function(x) x.PartM Is e.m_NewPart)
-      If Not IsNothing(BeamVM) Then PartVMList.Remove(BeamVM)
-   End Sub
-
-   Protected Sub OnBeamVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
-      If e.Action = NotifyCollectionChangedAction.Add Then
-         If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
-            For Each BeamVM As BeamVM In e.NewItems
-               AddHandler BeamVM.PropertyChanged, AddressOf OnBeamVMPropertyChanged
-            Next
-         End If
-      End If
-      If e.Action = NotifyCollectionChangedAction.Remove Then
-         If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
-            For Each BeamVM As BeamVM In e.OldItems
-               RemoveHandler BeamVM.PropertyChanged, AddressOf OnBeamVMPropertyChanged
-            Next
-         End If
-      End If
-      If e.Action = NotifyCollectionChangedAction.Move Then
-         Dim ItemVM As PartVM = e.OldItems(0)
-         m_BeamMachGroupM.PartMList.RemoveAt(e.OldStartingIndex)
-         m_BeamMachGroupM.PartMList.Insert(e.NewStartingIndex, ItemVM.PartM)
-      End If
-   End Sub
-
-   Protected Overridable Sub OnBeamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      'Select Case e.PropertyName
-      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
-      'End Select
-   End Sub
-
-#End Region
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb

@@ -1,43 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class BeamVM
-   Inherits PartVM
-
-   Public ReadOnly Property m_BeamM As BeamM
-      Get
-         Return m_PartM
-      End Get
-   End Property
-
-   Public Overridable Property sOffset As String
-      Get
-         Return LenToString(m_BeamM.dOffset, 3)
-      End Get
-      Set(value As String)
-         StringToLen(value, m_BeamM.dOffset)
-      End Set
-   End Property
-   Public ReadOnly Property dOffset As Double
-      Get
-         Return m_BeamM.dOffset
-      End Get
-   End Property
-
-
-#Region "CONSTRUCTOR"
-
-   Sub New(BeamM As BeamM, ParentMachGroupVM As BeamMachGroupVM)
-      MyBase.New(BeamM, ParentMachGroupVM)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/WallMachGroupVM.vb

@@ -1,78 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Collections.Specialized
-Imports System.ComponentModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class WallMachGroupVM
-   Inherits MyMachGroupVM
-
-   Public ReadOnly Property m_WallMachGroupM As WallMachGroupM
-      Get
-         Return m_MachGroupM
-      End Get
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Sub New(WallMachGroupM As WallMachGroupM)
-      MyBase.New(WallMachGroupM)
-      AddHandler m_WallMachGroupM.PartAdded, AddressOf OnWallAdded
-      AddHandler m_WallMachGroupM.PartRemoved, AddressOf OnWallRemoved
-      CreateWallVMList()
-      ' Aggiorno stato da stati feature
-      CalcGlobalUpdate()
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-#Region "METHODS"
-
-   Protected MustOverride Sub CreateWallVMList()
-
-#End Region    ' METHODS
-
-   Public Overrides Sub RefreshPartList()
-   End Sub
-
-   Public Overrides Sub RefreshGroupData()
-   End Sub
-
-#Region "COMMANDS"
-
-#End Region    ' COMMANDS
-
-#Region "EVENTS"
-
-   Protected MustOverride Sub OnWallAdded(sender As Object, e As PartAddedEventArgs)
-
-   Private Sub OnWallRemoved(sender As Object, e As PartAddedEventArgs)
-      Dim WallVM As WallVM = PartVMList.FirstOrDefault(Function(x) x.PartM Is e.m_NewPart)
-      If Not IsNothing(WallVM) Then PartVMList.Remove(WallVM)
-   End Sub
-
-   Protected Sub OnWallVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
-      If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
-         For Each WallVM As WallVM In e.NewItems
-            AddHandler WallVM.PropertyChanged, AddressOf OnWallVMPropertyChanged
-         Next
-      End If
-      If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
-         For Each WallVM As WallVM In e.OldItems
-            RemoveHandler WallVM.PropertyChanged, AddressOf OnWallVMPropertyChanged
-         Next
-      End If
-   End Sub
-
-   Protected Sub OnWallVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      'Select Case e.PropertyName
-      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
-      'End Select
-   End Sub
-
-#End Region
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb

@@ -1,81 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows.Input
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class WallVM
-   Inherits PartVM
-
-   Public ReadOnly Property m_WallM As WallM
-      Get
-         Return m_PartM
-      End Get
-   End Property
-
-   Public Overrides Property sPOSX As String
-      Get
-         Return LenToString(m_WallM.dPOSX, 3)
-      End Get
-      Set(value As String)
-         StringToLen(value, m_WallM.dPOSX)
-      End Set
-   End Property
-
-   Public Overridable Property sPOSY As String
-      Get
-         Return LenToString(m_WallM.dPOSY, 3)
-      End Get
-      Set(value As String)
-         StringToLen(value, m_WallM.dPOSY)
-      End Set
-   End Property
-
-   Public ReadOnly Property dPOSY As Double
-      Get
-         Return m_WallM.dPOSY
-      End Get
-   End Property
-
-   Public Property sROT As String
-      Get
-         Return LenToString(m_WallM.dROT, 3) & "°"
-      End Get
-      Set(value As String)
-         StringToLen(value, m_WallM.dROT)
-      End Set
-   End Property
-
-   Public ReadOnly Property dROT As Double
-      Get
-         Return m_WallM.dROT
-      End Get
-   End Property
-
-   Public Overridable Property bFLIP As Boolean
-      Get
-         Return m_WallM.bFLIP
-      End Get
-      Set(value As Boolean)
-         m_WallM.bFLIP = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTOR"
-
-   Sub New(WallM As WallM, ParentMachGroupVM As WallMachGroupVM)
-      MyBase.New(WallM, ParentMachGroupVM)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#End Region    ' COMMANDS
-
-End Class

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -8,42 +8,34 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Grid Margin="0,0,5,0">
+   <Grid Style="{StaticResource CalcPanel_Grid}">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
-      <TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center"  Margin="0,0,5,0"/>
+      <TextBlock Text="Macchina corrente" 
+                 Style="{StaticResource CurrMach_TextBlock}"/>
       <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
+      <ComboBox Grid.Column="1"
+                ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="150"
+                Style="{StaticResource CalcPanel_ComboBox}"/>
-                Grid.Row="0" Grid.Column="1"/>
    </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
+   <StackPanel Grid.Column="1" 
-      <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
+               Style="{StaticResource MachinePanel_StackPanel}">
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
+      <Button Content="{Binding ToolDBMsg}"
-      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
+              ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Margin="5,0,0,0" Content="{Binding MachiningDbMsg}"/>
+              Command="{Binding ToolDbCommand}"
-      <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
+              Style="{StaticResource GeneralConfiguration_Button}"/>
-              Style="{StaticResource ToolBar_TextButton}" Margin="5,0,0,0" Content="{Binding SetUpMsg}"
+      <Button Content="{Binding SetUpMsg}"
+              Command="{Binding SetUpCommand}" 
+              ToolTip="{Binding SetUpToolTip}"
+              Style="{StaticResource GeneralConfiguration_Button}"
               Visibility="{Binding SetUp_Visibility}"/>
-      <Button ToolTip="{Binding BeamTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}" Margin="5,0,0,0"
-              Command="{Binding BeamTable_Command}"
-              Visibility="{Binding BeamTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button ToolTip="{Binding WallTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}" Margin="5,0,0,0"
-              Command="{Binding WallTable_Command}"
-              Visibility="{Binding WallTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
       <Button Content="{Binding ParameterMachineMsg}"
               ToolTip="{Binding ParameterMachineMsg}"
               Command="{Binding ParameterMachine_Command}"
-              Height="30" Width="120" Margin="5,0,0,0" />
+              Style="{StaticResource ParameterMachine_Button}"/>
    </StackPanel>
 
 </Grid>

EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml

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

EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml.vb

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

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml

@@ -0,0 +1,124 @@
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="MachiningDbWindowV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 Title="{Binding Title}"
+                                 TitleBarHeight="30"
+                                 WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+
+   <EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
+                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
+   </EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
+
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+
+   <Grid>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.75*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+
+         <UniformGrid Columns="3">
+            <Button Content="{Binding NewMsg}"
+                    Command="{Binding NewCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding SaveMsg}" 
+                    Command="{Binding SaveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding RemoveMsg}" 
+                    Command="{Binding RemoveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+         </UniformGrid>
+
+         <TreeView Grid.Row="1"
+                   Name="MachiningsTreeView"
+                   ItemsSource="{Binding Path=MachiningsList}"
+                   Style="{StaticResource MachiningDB_TreeView}">
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" 
+                                         ItemsSource="{Binding Items}">
+                  <Grid Style="{StaticResource MachiningDB_Grid}">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <Image Source="{Binding PictureString}" 
+                            Style="{StaticResource MachiningDB_Image}"/>
+                     <TextBlock Grid.Column="1" 
+                                Text="{Binding Name}" 
+                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                     <Ellipse Grid.Column="2" 
+                              Fill="{Binding FamilyColor}"
+                              Style="{StaticResource SetUp_Ellipse}"/>
+                  </Grid>
+               </HierarchicalDataTemplate>
+               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                  <Grid Style="{StaticResource MachiningDB_Grid}">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Grid.Column="1" 
+                                Text="{Binding NamePar}" 
+                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                     <Ellipse Grid.Column="2" 
+                              Fill="{Binding ToolColor}"
+                              Style="{StaticResource SetUp_Ellipse}"/>
+                  </Grid>
+               </DataTemplate>
+            </TreeView.Resources>
+         </TreeView>
+
+         <UniformGrid Grid.Row="2" 
+                      Columns="3">
+            <Button Content="{Binding ImportMsg}" 
+                    Command="{Binding ImportCommand}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding ExportMsg}" 
+                    Command="{Binding ExportCommand}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+            <Button Content="{Binding ResetMsg}" 
+                    Command="{Binding ReloadMachiningCommand}" 
+                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"
+                    Style="{StaticResource MachiningDB_Button}"/>
+         </UniformGrid>
+
+      </Grid>
+
+      <ContentControl Grid.Column="1" 
+                      Grid.ColumnSpan="2"
+                      Content="{Binding Path=ParamPageV}"/>
+
+   </Grid>
+
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb

@@ -1,12 +1,11 @@
 Imports EgtWPFLib5
 Imports System.Windows.Input
 
-Public Class OnlyProdMachiningDbWindowV
+Public Class MachiningDbWindowV
 
    Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
 
    Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
-      MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = MachiningDbWindowVM

EgtBEAMWALL.Core/MachiningDbWindow/OnlyProdMachiningDbWindowV.xaml

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

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -1,6 +1,7 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+Imports System.Windows
 
 ' General Information about an assembly is controlled through the following
 ' set of attributes. Change these attribute values to modify the information
@@ -24,6 +25,8 @@ Imports System.Runtime.InteropServices
 'The following GUID is for the ID of the typelib if this project is exposed to COM
 <Assembly: Guid("632ea0b1-10e2-4f07-8b1b-d9371ef8392e")>
 
+<Assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)>
+
 ' Version information for an assembly consists of the following four values:
 '
 '      Major Version
@@ -35,5 +38,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.1.1")>
+<Assembly: AssemblyVersion("2.7.11.10")>
-<Assembly: AssemblyFileVersion("2.7.1.1")>
+<Assembly: AssemblyFileVersion("2.7.11.10")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -1,19 +1,18 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="NewOpenProjectFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
+                                 Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                                 ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                                 MinHeight="500" MinWidth="500"
-                            IsClosable="False"
+                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                            MinHeight="500" MinWidth="500"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -23,8 +22,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="{Binding Filters_Msg}"
-                Margin="5"
+                Visibility="{Binding Filters_Visibility}"
-                Visibility="{Binding Filters_Visibility}">
+                Style="{StaticResource NewOpenProjectFile_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -38,30 +37,30 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
+                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
-                         Margin="5"
+               <StackPanel Grid.Column="1" 
-                         Style="{StaticResource FeatureComboBox}"/>
+                           Style="{StaticResource PartManager_StackPanel}">
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Width="105"
+                            Style="{StaticResource DayTypeList_ComboBox}"/>
-                            Margin="0,0,2.5,0"
+                  <StackPanel Visibility="{Binding Date_Visibility}"
-                            Style="{StaticResource PartParam_ComboBox}"/>
+                              Style="{StaticResource PartManager_StackPanel}">
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
+                         Style="{StaticResource PParameters_CheckBox}"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -71,47 +70,46 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Width="105"
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"
-                                      Visibility="{Binding SearchText_Visibility}"/>
+                                      Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource PartManager_StackPanel}">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
+                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+      <Border Grid.Row="1" 
-                               Grid.Row="1"
+              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
-                               ItemsSource="{Binding ProjectList}" 
+
-                               SelectedItem="{Binding SelProject}"
+      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                               CanUserAddRows="False"
+                                   x:Name="MainDataGrid"
-                               AutoGenerateColumns="False"
+                                   ItemsSource="{Binding ProjectList}" 
-                               CanUserResizeRows="False"
+                                   SelectedItem="{Binding SelProject}"
-                               SelectionMode="Single"
+                                   SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
+                                   Margin="5"
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                   BindingColumns="{Binding ProdColumns}"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                   RowDetailsVisibilityMode="Visible"
-                               Margin="5"
+                                   CellEditEnding="MainDataGrid_CellEditEnding"
-                               RowDetailsVisibilityMode="Visible"
+                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                               CellEditEnding="MainDataGrid_CellEditEnding"
+                                   AlternationCount="2"
-                               ColumnHeaderBackground="{x:Null}"
+                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                               BindingColumns="{Binding ProdColumns}">
+                                   Style="{StaticResource Optimizer_DataGrid}"
+                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
          <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:NewOpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -123,13 +121,12 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
-                                   Margin="5,0,0,0"
+                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                   Style="{StaticResource Small_ToggleButton}">
-                                   Style="{StaticResource OldToolBar_SmallToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource LockImage}"/>
+                               Style="{StaticResource Lock_Image}"/>
                      </ToggleButton>
                   </Grid>
                </DataGridTextColumn.Header>
@@ -137,13 +134,13 @@
             <!-- Creation date -->
             <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                </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:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Archived -->
@@ -152,18 +149,16 @@
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
                             Visibility="{Binding Archived_Visibility}"
-                            Height="15"
+                            Style="{StaticResource Archived_Image}"/>
-                            Width="15"
-                            Stretch="UniformToFill"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
                <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                </DataGridTemplateColumn.Header>
             </DataGridTemplateColumn>
          </DataGrid.Resources>
          <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
+            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                <Setter Property="FontWeight" Value="DemiBold"/>
                <Setter Property="VerticalContentAlignment" Value="Center"/>
                <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
@@ -172,28 +167,23 @@
          <DataGrid.RowDetailsTemplate>
             <DataTemplate>
                <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             BorderThickness="0"
+                             Style="{StaticResource ProjFileList_ItemsControl}">
-                             Margin="0,-1,0,0"
-                             Padding="0">
                   <ItemsControl.ItemTemplate>
                      <DataTemplate>
-                        <Grid TextBlock.FontSize="12"
+                        <Grid Style="{StaticResource ProjFileList_Grid}">
-                              TextBlock.FontWeight="Normal">
                            <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                               <ColumnDefinition Width="1*"/>
                            </Grid.ColumnDefinitions>
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1"/>
                               <RowDefinition Height="1*"/>
                            </Grid.RowDefinitions>
-                           <Grid Grid.Row="0"
+                           <Grid Grid.ColumnSpan="2"
-                                 Grid.ColumnSpan="2"
+                                 Style="{StaticResource Gray_Grid}"/>
-                                 Background="Gray"
-                                 Margin="40,0,40,0"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Margin="2">
+                                 Style="{StaticResource NewOpenProjectFile_Grid}">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -204,18 +194,18 @@
                                  <RowDefinition Height="1*"/>
                                  <RowDefinition Height="1*"/>
                               </Grid.RowDefinitions>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                          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:NewOpenProjectFileDialogV}}}"
+                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="1"
+                              <TextBlock Grid.Row="1"
-                                         Grid.Row="1"
+                                         Grid.Column="1"                                         
                                          Text="{Binding sListName}"/>
                               <TextBlock Grid.Column="2"
-                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
                               <TextBlock Grid.Column="3"
                                          Text="{Binding dtExportDate}"/>
@@ -226,25 +216,28 @@
                </ItemsControl>
             </DataTemplate>
          </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALL:EgtDataGrid>
+      </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+      <UniformGrid Grid.Row="2"
-         <Button IsDefault="True" Name="OpenBtn"
+                   Columns="4" 
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <Button Name="OpenBtn"
+                 IsDefault="True"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -1,13 +1,7 @@
-Imports System.ComponentModel
+Imports System.Windows
-Imports System.IO
-Imports System.Windows
 Imports System.Windows.Controls
 Imports System.Windows.Input
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
 Imports EgtWPFLib5
-Imports EgtBEAMWALL
-Imports System.Windows.Media
 
 Public Class NewOpenProjectFileDialogV
 
@@ -83,4 +77,17 @@ Public Class NewOpenProjectFileDialogV
       'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
-End Class
+   Public Shared ReadOnly IsSelectedProperty As DependencyProperty = DependencyProperty.Register("IsSelected",
+                                                                                                  GetType(Boolean),
+                                                                                                  GetType(ItemsControl))
+
+   Public Property IsSelected As Boolean
+      Get
+         Return DirectCast(GetValue(IsSelectedProperty), Boolean)
+      End Get
+      Set(value As Boolean)
+         SetValue(IsSelectedProperty, value)
+      End Set
+   End Property
+
+End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml

@@ -1,252 +0,0 @@
-<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="{StaticResource OnlyProd_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}"
-                Visibility="{Binding Filters_Visibility}"
-                Margin="5">
-         <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}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
-               <StackPanel Grid.Column="1" 
-                           Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource DayTypeList_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" 
-                              Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                  </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 OnlyProdCalcPanel_ComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OnyProd_FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
-
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                               x:Name="MainDataGrid"
-                               ItemsSource="{Binding ProjectList}" 
-                               SelectedItem="{Binding SelProject}"
-                               SelectionMode="Single"
-                               Margin="5"
-                               BindingColumns="{Binding ProdColumns}"
-                               RowDetailsVisibilityMode="Visible"
-                               CellEditEnding="MainDataGrid_CellEditEnding"
-                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                               AlternationCount="2"
-                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
-                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
-                               ColumnHeaderHorizontalContentAlignment="Center"
-                               ColumnHeaderFontWeight="Bold"
-                               ColumnHeaderFontSize="15"
-                               ColumnHeaderPadding="0,2,0,2"
-                               Style="{StaticResource DataGrid_OnlyProd}"
-                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-         <DataGrid.Resources>
-            <!-- ProdId -->
-            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
-               <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"
-                                   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}"
-                            Style="{StaticResource Archived_Image}"/>
-                  </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="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-               <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}"
-                             Style="{StaticResource ProjFileList_ItemsControl}">
-                  <ItemsControl.ItemTemplate>
-                     <DataTemplate>
-                        <Grid Style="{StaticResource ProjFileList_Grid}">
-                           <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"
-                                 Style="{StaticResource Gray_Grid}"/>
-                           <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 OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Archive_Msg}"
-                 Command="{Binding Archive_Command}"
-                 IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Command="{Binding Cancel_Command}"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb

@@ -1,93 +0,0 @@
-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
-
-   Public Shared ReadOnly IsSelectedProperty As DependencyProperty = DependencyProperty.Register("IsSelected",
-                                                                                                  GetType(Boolean),
-                                                                                                  GetType(ItemsControl))
-
-   Public Property IsSelected As Boolean
-      Get
-         Return DirectCast(GetValue(IsSelectedProperty), Boolean)
-      End Get
-      Set(value As Boolean)
-         SetValue(IsSelectedProperty, value)
-      End Set
-   End Property
-
-End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml

@@ -1,203 +0,0 @@
-<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="{StaticResource OnlyProd_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}"
-                BorderBrush="{StaticResource BeamWall_RegentStBlue}">
-         <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 OnlyProdCalcPanel_ComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                  </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 OnlyProdCalcPanel_ComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Width="55"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
-      
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                               ItemsSource="{Binding ProjectList}" 
-                               SelectedItem="{Binding SelProject}"
-                               SelectionMode="Single"
-                               Margin="5"
-                               BindingColumns="{Binding ProjectColumns}"
-                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                               AlternationCount="2"
-                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
-                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
-                               ColumnHeaderHorizontalContentAlignment="Center"
-                               ColumnHeaderFontWeight="Bold"
-                               ColumnHeaderFontSize="15"
-                               ColumnHeaderPadding="0,2,0,2"
-                               Style="{StaticResource DataGrid_OnlyProd}"
-                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-         <DataGrid.RowStyle>
-            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
-         <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>
-      </EgtBEAMWALL:EgtDataGrid>
-
-      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button IsCancel="True"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb

@@ -1,75 +0,0 @@
-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

@@ -1,18 +1,18 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OpenProjectFileDialogV"
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="OpenProjectFileDialogV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
+                                 Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                                 ResizeMode="NoResize" TitleBarHeight="30"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                                 WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                                 MinHeight="500" MinWidth="500"
-                            MinHeight="500" MinWidth="500"
+                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+                                 Style="{StaticResource OptimizerWindow.Dialog}">
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -22,8 +22,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="Filters"
-                Margin="5"
+                Visibility="{Binding Filters_Visibility}"
-                Visibility="{Binding Filters_Visibility}">
+                Style="{StaticResource OpenProjectFile_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -36,23 +36,23 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
-                         Margin="5"
+               <StackPanel Grid.Column="1" 
-                         Style="{StaticResource FeatureComboBox}"/>
+                           Style="{StaticResource PartManager_StackPanel}">
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Width="105"
+                            Style="{StaticResource OpenProjectFile_ComboBox}"/>
-                            Margin="0,0,2.5,0"
+                  <StackPanel Visibility="{Binding Date_Visibility}"
-                            Style="{StaticResource PartParam_ComboBox}"/>
+                              Style="{StaticResource PartManager_StackPanel}">
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
+                                 CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
@@ -65,44 +65,49 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Width="105"
+                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"
-                                      Visibility="{Binding SearchText_Visibility}"/>
+                                      Style="{StaticResource NewSearchText_TextBox}"/>
                <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
+                           Style="{StaticResource PartManager_StackPanel}">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"/>
+                             Style="{StaticResource Option_TextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
+                            Style="{StaticResource RowQTY_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+      <Border Grid.Row="1" 
-                               ItemsSource="{Binding ProjectList}" 
+              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
-                               SelectedItem="{Binding SelProject}"
+
-                               CanUserAddRows="False"
+      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                               AutoGenerateColumns="False"
+                                   ItemsSource="{Binding ProjectList}" 
-                               CanUserResizeRows="False"
+                                   SelectedItem="{Binding SelProject}"
-                               SelectionMode="Single"
+                                   SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
+                                   Margin="5"
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                   BindingColumns="{Binding ProjectColumns}"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                               ColumnHeaderBackground="{x:Null}"
+                                   AlternationCount="2"
-                               Margin="5"
+                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                               BindingColumns="{Binding ProjectColumns}">
+                                   Style="{StaticResource Optimizer_DataGrid}"
+                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+         <DataGrid.RowStyle>
+            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
          <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:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -110,7 +115,7 @@
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -118,7 +123,7 @@
             <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -126,7 +131,7 @@
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -134,7 +139,7 @@
             <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -142,48 +147,46 @@
             <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </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:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </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:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </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:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
          </DataGrid.Resources>
-         <DataGrid.RowStyle>
+      </EgtBEAMWALLCORE:EgtDataGrid>
-            <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">
+      <UniformGrid Grid.Row="2"
-         <Button IsDefault="True" Name="OpenBtn"
+                   Columns="3"  
-                 Content="{Binding Open_Msg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <Button Name="OpenBtn"
+                 IsDefault="True"
+                 Content="{Binding Open_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+                 Style="{DynamicResource EgtWPFLib5_Button}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtWPFLib5:EgtCustomWindow>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb

@@ -1,12 +1,6 @@
-Imports System.ComponentModel
+Imports System.Windows
-Imports System.IO
-Imports System.Windows
-Imports System.Windows.Controls
 Imports System.Windows.Input
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
 Imports EgtWPFLib5
-Imports EgtBEAMWALL
 
 Public Class OpenProjectFileDialogV
 
@@ -78,4 +72,4 @@ Public Class OpenProjectFileDialogV
       Me.DialogResult = bDialogResult
    End Sub
 
-End Class
+End Class

EgtBEAMWALL.Core/OptmizerWindow/OptimizerWindow.vb

@@ -0,0 +1,10 @@
+Imports System.Windows
+
+Public Class OptimizerWindow
+   Inherits EgwWPFBaseLib.EgtWindow
+
+   Shared Sub New()
+      DefaultStyleKeyProperty.OverrideMetadata(GetType(OptimizerWindow), New FrameworkPropertyMetadata(GetType(OptimizerWindow)))
+   End Sub
+
+End Class

EgtBEAMWALL.Core/ProjectManager/ProdFile.vb

@@ -1,69 +0,0 @@
-Imports System.IO
-
-Public Class ProdFile
-
-   'Private m_nProjId As Integer = 0
-   'Public ReadOnly Property nProjId As Integer
-   '   Get
-   '      Return m_nProjId
-   '   End Get
-   'End Property
-
-   'Friend ReadOnly Property sProjPath As String
-   '   Get
-   '      Dim sPath As String = String.Empty
-   '      If IsNothing(m_nProjId) OrElse m_nProjId = 0 Then Return String.Empty
-   '      sPath = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & FILENAMESEPARATOR
-   '      If Not IsNothing(m_nProdId) AndAlso m_nProdId > 0 Then
-   '         sPath &= nProjId.ToString("0000")
-   '      End If
-   '      sPath &= FILENAMESEPARATOR & BTLFileName & ".nge"
-   '      Return sPath
-   '   End Get
-   'End Property
-
-   Private m_nProdId As Integer = 0
-   Public ReadOnly Property nProdId As Integer
-      Get
-         Return m_nProdId
-      End Get
-   End Property
-   Friend ReadOnly Property sProdPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(m_nProdId) OrElse m_nProdId = 0 Then Return String.Empty
-         Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
-      End Get
-   End Property
-
-   'Private m_BTLFileName As String = String.Empty
-   'Public ReadOnly Property BTLFileName As String
-   '   Get
-   '      Return m_BTLFileName
-   '   End Get
-   'End Property
-
-   Private m_NewProd As Boolean
-   Friend Property NewProd As Boolean
-      Get
-         Return m_NewProd
-      End Get
-      Set(value As Boolean)
-         m_NewProd = value
-      End Set
-   End Property
-   Public ReadOnly Property ProjectFileName As String
-      Get
-         Return m_nProdId.ToString("0000")
-      End Get
-   End Property
-
-   Sub New(ProdFileName As String)
-      Integer.TryParse(Path.GetFileNameWithoutExtension(ProdFileName), m_nProdId)
-   End Sub
-
-   Friend Sub SetProdId(nProdId As Integer)
-      m_nProdId = nProdId
-   End Sub
-
-End Class

EgtBEAMWALL.Core/SetUpWindow/OnlyProdSetUpWindowV.xaml

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

EgtBEAMWALL.Core/SetUpWindow/OnlyProdSetUpWindowV.xaml.vb

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

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml

@@ -0,0 +1,20 @@
+<Grid x:Class="TitleBar"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="Auto" />
+      <ColumnDefinition Width="Auto" />
+   </Grid.ColumnDefinitions>
+   <Border Grid.ColumnSpan="6"
+           Style="{StaticResource TitleBar_Border}"/>
+   <Image MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
+		    Source="/Resources/EgalwareLogo.ico"/>
+   <ContentControl Grid.Column="1"/>
+   <TextBlock Grid.Column="2"
+		        Text="{Binding sTitle}"
+              Style="{StaticResource TitleBar_TextBlock}"/>
+</Grid>

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml.vb

@@ -0,0 +1,41 @@
+Imports System.Windows
+
+Public Class TitleBar
+
+   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
+   Public Shared ReadOnly TitleProperty As DependencyProperty = DependencyProperty.Register("Title", GetType(String), GetType(TitleBar), New PropertyMetadata(""))
+   Public Property Title() As Boolean
+      Get
+         Return CBool(GetValue(TitleProperty))
+      End Get
+      Set(ByVal value As Boolean)
+         SetValue(TitleProperty, value)
+      End Set
+   End Property
+
+   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
+   Public Shared ReadOnly IsMinimizableProperty As DependencyProperty = DependencyProperty.Register("IsMinimizable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
+   Public Property IsMinimizable() As Boolean
+      Get
+         Return CBool(GetValue(IsMinimizableProperty))
+      End Get
+      Set(ByVal value As Boolean)
+         SetValue(IsMinimizableProperty, value)
+      End Set
+   End Property
+
+   ' Proprietà che permette di attivare e disattivare il bottone di chiusura della finestra
+   Public Shared ReadOnly IsClosableProperty As DependencyProperty = DependencyProperty.Register("IsClosable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
+   Public Property IsClosable() As Boolean
+      Get
+         Return CBool(GetValue(IsClosableProperty))
+      End Get
+      Set(ByVal value As Boolean)
+         SetValue(IsClosableProperty, value)
+         If Not value Then
+            IsMinimizable = False
+         End If
+      End Set
+   End Property
+
+End Class

EgtBEAMWALL.Core/ToolsDbWindow/OnlyProdToolDbWindowV.xaml

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

EgtBEAMWALL.Core/ToolsDbWindow/OnlyProdToolDbWindowV.xaml.vb

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

EgtBEAMWALL.Core/Utility/Configuration.vb

@@ -6,19 +6,6 @@ Public Module Configuration
    ' Test per comunicazione
    Public m_commLib As DataSyncro
 
-   ''' <summary>
-   ''' Flag per impostare la visualizzazione con la singola pagina
-   ''' </summary>
-   Private m_bOnlyProd As Boolean
-   Public ReadOnly Property bOnlyProd As Boolean
-      Get
-         Return m_bOnlyProd
-      End Get
-   End Property
-   Public Sub SetOnlyProd(value As Boolean)
-      m_bOnlyProd = value
-   End Sub
-
    ''' <summary>
    ''' Flag per visualizzare il pulsante Db Attrezzaggi
    ''' </summary>
@@ -45,81 +32,4 @@ Public Module Configuration
       m_bMachConfig = value
    End Sub
 
-   ''' <summary>
-   ''' Flag per impostare la visualizzazione con la singola pagina
-   ''' </summary>
-   Private m_sServerAddressRelease As String
-   Public ReadOnly Property sServerAddressRelease As String
-      Get
-         Return m_sServerAddressRelease
-      End Get
-   End Property
-   Public Sub SetServerAddressRelease(value As String)
-      m_sServerAddressRelease = value
-   End Sub
-
-   ' Versione attuale del programma
-   Public ReadOnly Property ActualVersion As String
-      Get
-         Return My.Application.Info.Version.ToString()
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Funzione che recupera la directory del file INI
-   ''' </summary>
-   Public Sub GetIniFileDirectory()
-      ' Impostazione path radice per i dati
-      Dim m_sDataRoot As String = System.AppDomain.CurrentDomain.BaseDirectory
-      If EgtUILib.GetPrivateProfileString(ConstGen.S_DATA, ConstGen.K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & ConstGen.DAT_FILE_NAME) = 0 Then
-         m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
-      End If
-      ' Impostazione direttorio di configurazione
-      Dim m_sConfigDir As String = m_sDataRoot & "\" & ConstGen.CONF_DIR
-      ' Impostazione path Ini file
-      IniFile.m_sIniFile = m_sConfigDir & "\" & Core.ConstIni.INI_FILE_NAME
-   End Sub
-
-   ''' <summary>
-   ''' Funzione per recuperare bOnlyProd
-   ''' </summary>
-   ''' <param name="Section">Sezione dove si trova la variabile che devo cercare</param>
-   ''' <param name="Key">Variabile che sto cercando</param>
-   ''' <param name="Path">Cartella dove e' presente il file ini</param>
-   ''' <param name="Default_Value">Valore di defaul opzionabile</param>
-   ''' <returns></returns>
-   Public Function Read_Value(Section As String, Key As String, Path As String, Optional Default_Value As String = "") As String
-      Dim Reader_Lines As String() = System.IO.File.ReadAllLines(Path)
-      Dim Current_Section As String = ""
-
-      For Each Reader_Line As String In Reader_Lines
-
-         If Reader_Line.StartsWith("[") AndAlso Reader_Line.EndsWith("]") Then
-            Current_Section = Reader_Line
-         ElseIf Current_Section.Equals($"[{Section}]") Then
-            Dim lineParts As String() = Reader_Line.Split({"="c}, 2)
-
-            If lineParts.Length >= 1 AndAlso lineParts(0) = Key Then
-               Return If(lineParts.Length >= 2, lineParts(1), Default_Value)
-            End If
-         End If
-      Next
-
-      Return Default_Value
-   End Function
-
-   ''' <summary>
-   ''' Metodo che controlla la comunicazione server
-   ''' </summary>
-   ''' <returns></returns>
-   Public Function GetComunication() As Boolean
-      ' eseguo test per comunicazione server (ping, alive)
-      m_commLib = New DataSyncro(EgtBEAMWALL.Core.Configuration.sServerAddressRelease)
-      If m_commLib.CheckRemote() Then
-         Return True
-      Else
-         Return False
-      End If
-   End Function
-
 End Module

EgtBEAMWALL.Core/Utility/Enum.vb

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

EgtBEAMWALL.Core/Utility/ManageView.vb

@@ -1,81 +0,0 @@
-Imports EgtUILib
-
-Public Module ManageView
-
-   ' Tipo di progetto aperto
-   Private m_Type As BWType
-
-   ' Per macchine pareti:
-   ' Posizione vista
-   Private m_nViewDir As VT
-
-   Public Function BWSetView(nView As VT, Optional bRedraw As Boolean = True)
-      ' condizioni che cambiano la vista del progetto
-      Select Case m_Type
-         Case BWType.BEAM
-            EgtSetView(VT.ISO_SW, bRedraw)
-         Case BWType.WALL
-            Select Case nView
-               Case VT.TOP
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(0, -90, bRedraw)              ' equivalente a vista TOP
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(0, 90, bRedraw)               ' equivalente a vista TOP ruotata di 180 su Z
-                  End Select
-               Case VT.FRONT
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(90, -90, bRedraw)              ' equivalente a vista FRONT
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(90, 90, bRedraw)               ' equivalente a vista FRONT ruotata di 180 su Z
-                  End Select
-               Case VT.BACK
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(-90, -90, bRedraw)              ' equivalente a vista BACK
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(-90, 90, bRedraw)               ' equivalente a vista BACK ruotata di 180 su Z
-                  End Select
-               Case VT.RIGHT
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(90, 0, bRedraw)              ' equivalente a vista RIGHT
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(-90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
-                  End Select
-               Case VT.LEFT
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(-90, 0, bRedraw)              ' equivalente a vista RIGHT
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
-                  End Select
-               Case VT.ISO_SW
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
-                  End Select
-               Case Else                                                ' VT.ISO_SW
-                  Select Case m_nViewDir
-                     Case VT.ISO_SW, VT.ISO_SE
-                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-                     Case VT.ISO_NW, VT.ISO_NE
-                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
-                  End Select
-            End Select
-      End Select
-
-   End Function
-
-   Public Sub UpdateMachParam(ViewDir As Integer)
-      m_nViewDir = ViewDir
-   End Sub
-
-   Public Sub UpdateBWType(Type As BWType)
-      m_Type = Type
-   End Sub
-
-End Module

EgtBEAMWALL.Core/Utility/MyMachine.vb

@@ -45,4 +45,4 @@ Public Class MyMachine
       Return True
    End Function
 
-End Class
+End Class

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml

@@ -1,44 +1,49 @@
-<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
+<StackPanel x:Class="ViewPanelV"
-                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+            Style="{StaticResource BTLPartManager_StackPanel}">
-                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/ZoomAll.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
-           Style="{StaticResource ToolBar_Button}"
+           Style="{StaticResource Mach_Button}"
            Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+             Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
-</EgtFloating:EgtFloatingPanel>
+</StackPanel>

EgtBEAMWALL.Core/packages.config

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
+  <package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
   <package id="RestSharp" version="111.2.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -71,7 +71,7 @@
       <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>

EgtBEAMWALL.DataLayer/packages.config

@@ -9,7 +9,7 @@
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
   <package id="MySql.Data.EntityFramework" version="8.0.21" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
   <package id="NLog" version="5.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml

@@ -0,0 +1,52 @@
+<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">
+
+   <Border BorderThickness="2" BorderBrush="LightBlue">
+      <Grid >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.75*"/>
+            <RowDefinition Height="0.15*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="2.5*"/>
+            <RowDefinition Height="0.35*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.35*"/>
+         </Grid.RowDefinitions>
+
+         <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="3*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Border Name="LogoBrd" Grid.Column="1" Background="White">
+               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
+            </Border>
+         </Grid>
+         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
+                    VerticalAlignment="Center" FontSize="18" />
+         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
+                    VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
+                    VerticalAlignment="Center" FontSize="12" />
+         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
+                 Margin="100,0"/>
+
+      </Grid>
+
+   </Border>
+
+</Window>

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -0,0 +1,40 @@
+Imports EgtUILib
+Imports EgtBEAMWALL.Core
+
+Public Class AboutBoxV
+
+   Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      DescriptionLbl.Text = My.Application.Info.Description.ToString()
+      VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
+                                 "." & My.Application.Info.Version.Minor.ToString() &
+                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+                                 My.Application.Info.Version.Revision.ToString()
+      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
+      Dim sInfo As String = String.Empty
+      Dim sKey As String = String.Empty
+      EgtGetKeyInfo(sKey)
+      Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString()
+      Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
+      Dim sLeftDays As String = ""
+      Dim nLeftDays As Integer 
+      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
+      sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
+                       " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine
+      sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+      sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
+      sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
+      Dim sOpSys As String = String.Empty
+      EgtGetOsInfo( sOpSys)
+      sInfo &= sOpSys & Environment.NewLine
+      Dim sCPU As String = String.Empty
+      EgtGetCpuInfo( sCPU)
+      sInfo &= sCPU & Environment.NewLine
+      Dim sScene As String = String.Empty
+      EgtGetSceneInfo(sScene)
+      sInfo &= sScene
+      InfoLbl.Text = sInfo
+      ExitBtn.Content = EgtMsg(10104)          'Ok
+   End Sub
+
+End Class

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml

@@ -0,0 +1,109 @@
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddFeatureWndV"
+                                 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"
+                                 SizeToContent="WidthAndHeight"
+                                 WindowStartupLocation="CenterOwner"
+                                 Title="AddProcess"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+
+   <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>
+      <Border Style="{StaticResource AddFeatureWnd_Border}">
+      <TextBlock Text="{Binding Process_Msg}"
+                 Style="{StaticResource List_TextBlock}"/>
+      </Border>
+      <Border Grid.Row="1" 
+              Style="{StaticResource PRCList_Border}">
+         <ListBox Grid.Row="1"
+                  ItemsSource="{Binding PRCListView}"
+                  SelectedItem="{Binding nSelPRC}"
+                  Style="{StaticResource NewAddFeature_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding ghDesc}"
+                             ToolTip="{Binding ghDesc}"
+                             Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
+                             Style="{StaticResource PRCList_TextBlock}"/>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
+      <Border Grid.Column="1"
+              Style="{StaticResource Custom_Border}">
+         <TextBlock Grid.Column="1"
+                    Text="{Binding Custom_Msg}"
+                    Style="{StaticResource List_TextBlock}"/>
+      </Border>
+      <Border Grid.Row="1" 
+              Grid.Column="1" 
+              Style="{StaticResource MacroCustomList_Border}">
+         <ListBox ItemsSource="{Binding MacroCustomList}"
+                  SelectedIndex="{Binding nSelMacroCustom}"
+                  Style="{StaticResource MacroCustom_ListBox}">
+            <ListBox.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <WrapPanel Style="{StaticResource MacroCustom_WrapPanel}"/>
+               </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <TextBlock Text="{Binding sMacroName}"
+                                Style="{StaticResource Macro_TextBlock}"/>
+                     <Image Grid.Row="1" 
+                            Source="{Binding sMacroDrawPath}"
+                            Style="{StaticResource Macro_Image}"/>
+                  </Grid>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
+      <Border Grid.Column="2" 
+              Style="{StaticResource Default_Border}">
+         <TextBlock Text="{Binding Default_Msg}"
+                    Style="{StaticResource List_TextBlock}"/>
+      </Border>
+      <Border Grid.Row="1" 
+              Grid.Column="2" 
+              Style="{StaticResource MacroDefaultList_Border}">
+         <ListBox ItemsSource="{Binding MacroDefaultList}"
+                  SelectedIndex="{Binding nSelMacroDefault}"
+                  Style="{StaticResource MacroDefault_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding sMacroName}"
+                             Style="{StaticResource MacroDefault_TextBlock}"/>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
+      <UniformGrid Columns="2"
+                   Grid.Row="2"
+                   Grid.ColumnSpan="3"
+                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+         <Button Content="{Binding OK_Msg}"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource EgtWPFLib5_Button}"/>
+         <Button Content="{Binding Cancel_Msg}"
+                 IsCancel="True"
+                 Style="{StaticResource EgtWPFLib5_Button}"/>
+      </UniformGrid>
+   </Grid>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml.vb

@@ -0,0 +1,17 @@
+Public Class AddFeatureWndV
+
+   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.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -0,0 +1,418 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtBEAMWALL.Core
+
+Public Class AddFeatureWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   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
+
+   Private m_SelGRPType As GRPType
+   Public Property SelGRPType As Integer
+      Get
+         Return m_SelGRPType
+      End Get
+      Set(value As Integer)
+         m_SelGRPType = value
+         ' carico lista process
+         Dim TempPRCList As New ObservableCollection(Of Integer)
+         GetBeamPrivateProfileProcessList(m_SelGRPType, TempPRCList)
+         m_PRCList.Clear()
+         For Each PRC In TempPRCList
+            ' leggo gruppi 
+            Dim GRPList As New ObservableCollection(Of Integer)
+            GetBeamPrivateProfileGRPList(m_SelGRPType, PRC, GRPList)
+            m_PRCList.Add(New PRC(If(GRPList.Count > 0, GRPList(0), m_SelGRPType), PRC, GetBeamPrivateProfileName(m_SelGRPType, PRC)))
+         Next
+         If m_SelGRPType = GRPType.L Then
+            nSelPRC = PRCList(m_PrevSelPRCIndex_L)
+         ElseIf m_SelGRPType = GRPType.T Then
+            nSelPRC = PRCList(m_PrevSelPRCIndex_T)
+         End If
+         NotifyPropertyChanged(NameOf(PRCList))
+         NotifyPropertyChanged(NameOf(nSelPRC))
+      End Set
+   End Property
+
+   Private m_PRCList As New ObservableCollection(Of PRC)
+   Public ReadOnly Property PRCList As ObservableCollection(Of PRC)
+      Get
+         Return m_PRCList
+      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
+
+   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
+
+   Private m_nSelPRC As PRC = Nothing
+   Public Property nSelPRC As PRC
+      Get
+         Return m_nSelPRC
+      End Get
+      Set(value As PRC)
+         If value IsNot m_nSelPRC Then
+            m_nSelPRC = value
+            If Not IsNothing(m_nSelPRC) Then
+               If SelGRPType = GRPType.L Then
+                  m_PrevSelPRCIndex_L = PRCList.IndexOf(m_nSelPRC)
+               ElseIf SelGRPType = GRPType.T Then
+                  m_PrevSelPRCIndex_T = PRCList.IndexOf(m_nSelPRC)
+               End If
+            End If
+            NotifyPropertyChanged(NameOf(sDrawPath))
+            ' carico eventuali file Macro
+            MacroCustomList.Clear()
+            MacroDefaultList.Clear()
+            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 Default
+               GetMacroListDefault(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
+               ' ricavo lista file Macro Custom
+               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
+
+   Private m_MacroList_IsEnabled As Boolean
+   Public Property MacroList_IsEnabled As Boolean
+      Get
+         Return m_MacroList_IsEnabled
+      End Get
+      Set(value As Boolean)
+         If value <> m_MacroList_IsEnabled Then
+            m_MacroList_IsEnabled = value
+            NotifyPropertyChanged(NameOf(MacroList_IsEnabled))
+         End If
+      End Set
+   End Property
+
+   Private m_MacroCustomList As New ObservableCollection(Of Object)
+   Public ReadOnly Property MacroCustomList As ObservableCollection(Of Object)
+      Get
+         Return m_MacroCustomList
+      End Get
+   End Property
+
+   Private m_nSelMacroCustom As Integer = -1
+   Public Property nSelMacroCustom As Integer
+      Get
+         Return m_nSelMacroCustom
+      End Get
+      Set(value As Integer)
+         If value <> m_nSelMacroCustom Then
+            m_nSelMacroCustom = value
+         End If
+      End Set
+   End Property
+
+   Public ReadOnly Property sDrawPath As String
+      Get
+         If IsNothing(m_nSelPRC) Then Return ""
+         Dim sDescConstruction As String = String.Empty
+         If m_SelGRPType = GRPType.L Then
+            sDescConstruction = "L"
+         Else
+            sDescConstruction = "T"
+         End If
+         sDescConstruction &= m_nSelPRC.nPRC.ToString("000")
+         Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescConstruction & ".png"
+      End Get
+   End Property
+
+   ' 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
+
+   Public ReadOnly Property OK_Msg As String
+      Get
+         Return EgtMsg(91651)
+      End Get
+   End Property
+
+   Public ReadOnly Property Cancel_Msg As String
+      Get
+         Return EgtMsg(91652)
+      End Get
+   End Property
+
+#End Region
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      ' 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))
+   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
+                     MacroCustomList.Add(New NewMacro(nIdMacroName, sMacroNameFromFileName, Map.refMainWindowVM.MainWindowM.sMacroCustomDir & "\Template\" & sMacroNameFromFileName & ".png"))
+                     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"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      'verifico che tutti i campi contengano un valore valido
+      If Not IsNothing(m_nSelPRC) AndAlso m_nSelPRC.nPRC > 0 Then
+         RaiseEvent m_CloseWindow(True)
+      Else
+         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+      End If
+   End Sub
+
+#End Region ' Ok
+
+#End Region    ' COMMANDS
+
+End Class
+
+Public Class PRC
+
+   ' Processo
+   Private m_nPRC As Integer
+   Friend ReadOnly Property nPRC As Integer
+      Get
+         Return m_nPRC
+      End Get
+   End Property
+
+   ' Gruppo
+   Private m_nGRP As Integer
+   Friend ReadOnly Property nGRP As Integer
+      Get
+         Return m_nGRP
+      End Get
+   End Property
+
+   Private m_nSIDE As Integer = 2
+   Public ReadOnly Property nSIDE As Integer
+      Get
+         Return m_nSIDE
+      End Get
+   End Property
+
+   Private m_nVARIANT As Integer = 0
+   Public ReadOnly Property nVARIANT As Integer
+      Get
+         Return m_nVARIANT
+      End Get
+   End Property
+
+   ' Nome
+   Private m_sName As String
+   Public ReadOnly Property sName As String
+      Get
+         Return m_sName
+      End Get
+   End Property
+
+   Public ReadOnly Property ghDesc As String
+      Get
+         Return If(m_nGRP = 1 OrElse m_nGRP = 2, "T", "L") & m_nPRC.ToString("000") & " " & m_sName
+      End Get
+   End Property
+
+   Sub New(GRP As Integer, PRC As Integer, Name As String)
+      m_nPRC = PRC
+      m_sName = Name
+      m_nGRP = GRP
+   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.Optimizer/AddPartWnd/AddPartWndV.xaml

@@ -0,0 +1,91 @@
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddPartWndV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                                 SizeToContent="WidthAndHeight"
+                                 WindowStartupLocation="CenterOwner"
+                                 Title="AddPartWndV"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <Grid Style="{StaticResource AddPart_Grid}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="Name"
+                    Style="{StaticResource Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding sNAM}"
+                                Style="{StaticResource NAM_TextBox}"/>
+      </Grid>
+      <Grid Grid.Row="1"
+            Style="{StaticResource AddPartWnd_Grid}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="Prod Number"
+                    Style="{StaticResource Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding nPDN}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="2"
+                    Text="Count"
+                    Style="{StaticResource Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="3"
+                                Text="{Binding sCNT}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+      </Grid>
+      <Grid Grid.Row="2"
+            Style="{StaticResource AddPartWnd_Grid}">
+         <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 Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                Text="{Binding sW}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="2"
+                    Text="H"
+                    Style="{StaticResource Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="3"
+                                Text="{Binding sH}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+         <TextBlock Grid.Column="4"
+                    Text="L"
+                    Style="{StaticResource Option_TextBlock}"/>
+         <EgtWPFLib5:EgtTextBox Grid.Column="5"
+                                Text="{Binding sL}"
+                                Style="{StaticResource Dimension_TextBox}"/>
+      </Grid>
+
+      <UniformGrid Grid.Row="3"
+                   Columns="2"
+                   Style="{StaticResource AddPartWnd_UniformGrid}">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource EgtWPFLib5_Button}"/>
+         <Button Content="Cancel"
+                 IsCancel="True"
+                 Style="{StaticResource EgtWPFLib5_Button}"/>
+      </UniformGrid>
+   </Grid>
+</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml.vb

@@ -0,0 +1,17 @@
+Public Class AddPartWndV
+
+   Private WithEvents m_AddPartWndVM As AddPartWndVM
+
+   Sub New(Owner As Window, AddPartWndVM As AddPartWndVM)
+      ' 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.Optimizer/AddPartWnd/AddPartWndVM.vb

@@ -0,0 +1,176 @@
+Imports EgtWPFLib5
+Imports EgtUILib
+
+Public Class AddPartWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   Private m_nPDN As Integer
+   Public Property nPDN As Integer
+      Get
+         Return m_nPDN
+      End Get
+      Set(value As Integer)
+         m_nPDN = value
+      End Set
+   End Property
+
+   Private m_sNAM As String
+   Public Property sNAM As String
+      Get
+         Return m_sNAM
+      End Get
+      Set(value As String)
+         m_sNAM = value
+      End Set
+   End Property
+
+   Private m_dL As Double
+   Public ReadOnly Property dL As Double
+      Get
+         Return m_dL
+      End Get
+   End Property
+   Public Property sL As String
+      Get
+         Return LenToString(m_dL, 3)
+      End Get
+      Set(value As String)
+         Dim dTempL As Double
+         If StringToLenAdv(value, dTempL, True) AndAlso dTempL > 0 Then
+            m_dL = dTempL
+         Else
+            NotifyPropertyChanged(NameOf(sL))
+         End If
+      End Set
+   End Property
+
+   Private m_dW As Double
+   Public ReadOnly Property dW As Double
+      Get
+         Return m_dW
+      End Get
+   End Property
+   Public Property sW As String
+      Get
+         Return LenToString(m_dW, 3)
+      End Get
+      Set(value As String)
+         Dim dTempW As Double
+         If StringToLenAdv(value, dTempW, True) AndAlso dTempW > 0 Then
+            EgtDraw()
+            m_dW = dTempW
+         Else
+            NotifyPropertyChanged(NameOf(sW))
+         End If
+      End Set
+   End Property
+
+   Private m_dH As Double
+   Public ReadOnly Property dH As Double
+      Get
+         Return m_dH
+      End Get
+   End Property
+   Public Property sH As String
+      Get
+         Return LenToString(m_dH, 3)
+      End Get
+      Set(value As String)
+         Dim dTempH As Double
+         If StringToLenAdv(value, dTempH, True) AndAlso dTempH > 0 Then
+            EgtDraw()
+            m_dH = dTempH
+         Else
+            NotifyPropertyChanged(NameOf(sH))
+         End If
+      End Set
+   End Property
+
+   Private m_sMAT As String
+   Public Property sMAT As String
+      Get
+         Return m_sMAT
+      End Get
+      Set(value As String)
+         m_sMAT = value
+      End Set
+   End Property
+
+   Private m_nCNT As Integer
+   Public ReadOnly Property nCNT As Integer
+      Get
+         Return m_nCNT
+      End Get
+   End Property
+   Public Property sCNT As String
+      Get
+         Return m_nCNT
+      End Get
+      Set(value As String)
+         Dim nTempCNT As Integer
+         If Integer.TryParse(value, nTempCNT) AndAlso nTempCNT > 0 Then
+            m_nCNT = nTempCNT
+         Else
+            NotifyPropertyChanged(NameOf(sCNT))
+         End If
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      If Not IsNothing(Map.refProjectVM.BTLStructureVM.BTLPartVMList) Then
+         If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
+            m_dW = Map.refProjectVM.BTLStructureVM.SelBTLPart.dW
+            m_dH = Map.refProjectVM.BTLStructureVM.SelBTLPart.dH
+            m_dL = Map.refProjectVM.BTLStructureVM.SelBTLPart.dL
+         ElseIf Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count > 0 Then
+            m_dW = Map.refProjectVM.BTLStructureVM.BTLPartVMList(0).dW
+            m_dH = Map.refProjectVM.BTLStructureVM.BTLPartVMList(0).dH
+            m_dL = Map.refProjectVM.BTLStructureVM.BTLPartVMList(0).dL
+         End If
+         m_nPDN = Map.refProjectVM.BTLStructureVM.BTLStructureM.NewPDN()
+      End If
+      m_nCNT = 1
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      'verifico che tutti i campi contengano un valore valido
+      If Not IsNothing(m_dL) AndAlso m_dL > 0 AndAlso
+         Not IsNothing(m_dW) AndAlso m_dW >= 0 AndAlso
+         Not IsNothing(m_dH) AndAlso m_dH >= 0 Then
+         RaiseEvent m_CloseWindow(True)
+      Else
+         MessageBox.Show(EgtMsg(61853), EgtMsg(30007))
+      End If
+   End Sub
+
+#End Region ' Ok
+
+#End Region    ' COMMANDS
+
+End Class

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml

@@ -0,0 +1,56 @@
+<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddRawPartWndV"
+                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                                 SizeToContent="WidthAndHeight"
+                                 WindowStartupLocation="CenterOwner"
+                                 Title="AddRawPartWnd"
+                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+   
+   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+      <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}"
+                Style="{StaticResource AddRawPartWnd_ComboBox}"/>
+      <ItemsControl Grid.Row="1"
+                    ItemsSource="{Binding VariableList}">
+         <ItemsControl.ItemTemplate>
+            <DataTemplate>
+               <Grid Style="{StaticResource AddPartWnd_Grid}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Text="{Binding sMsg}"
+                             Style="{StaticResource Option_TextBlock}"/>
+                  <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                         Text="{Binding sValue}"
+                                         Style="{StaticResource Value_TextBox}"/>
+               </Grid>
+            </DataTemplate>
+         </ItemsControl.ItemTemplate>
+      </ItemsControl>
+      <UniformGrid Grid.Row="2"
+                   Columns="2"
+                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+         <Button Grid.Column="1"
+                 Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Style="{StaticResource AddRawPartWnd_Button}"
+                 Margin="0,0,5,0"/>
+         <Button Grid.Column="3"
+                 Content="Cancel"
+                 IsCancel="True"
+                 Style="{StaticResource EgtWPFLib5_Button}"/>
+      </UniformGrid>
+   </Grid>
+
+</EgtBEAMWALLCORE:OptimizerWindow>