Merge branch 'feature/DevExpress-RawPartList' of https://gitlab.steamware.net/egalware-cadcam/interfacce/egtbeamwall into feature/DevExpress-RawPartList

- aggiunta gestione messaggi per componenti DevExpress

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.Windows
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class BTLFeatureM
 
@@ -220,17 +219,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   ' lista dei parametri della feature
-   Protected m_QBTLParamMList As List(Of BTLParamM)
-   Public Property QBTLParamMList As List(Of BTLParamM)
-      Get
-         Return m_QBTLParamMList
-      End Get
-      Set(value As List(Of BTLParamM))
-         m_QBTLParamMList = value
-      End Set
-   End Property
-
 #Region "MESSAGES"
 
    Public ReadOnly Property Name_Msg As String
@@ -372,20 +360,10 @@ Public Class BTLFeatureM
          RaiseEvent PBTLParamAdded(Me, New BTLParamAddedEventArgs(BTLparamM))
       End If
    End Sub
-   Public Sub AddQBTLParam(BTLparamM As BTLParamM)
-      If IsNothing(BTLparamM) Then Return
-      If Not m_QBTLParamMList.Contains(BTLparamM) Then
-         m_QBTLParamMList.Add(BTLparamM)
-         RaiseEvent QBTLParamAdded(Me, New BTLParamAddedEventArgs(BTLparamM))
-      End If
-   End Sub
 
    Public Function GetPBTLParams() As List(Of BTLParamM)
       Return New List(Of BTLParamM)(m_PBTLParamMList)
    End Function
-   Public Function GetQBTLParams() As List(Of BTLParamM)
-      Return New List(Of BTLParamM)(m_QBTLParamMList)
-   End Function
 
    ' funzione che crea l'elenco dei parametri
    Public Sub CreateFeatureParams(NewBTLFeature As BTLFeatureM)
@@ -411,12 +389,11 @@ Public Class BTLFeatureM
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
-      NewBTLFeature.QBTLParamMList = TempList
    End Sub
 
    ' funzione che legge il valore corrente del parametro
    Public Function ReadFeatureParams() As Boolean
-      Return ReadFeatureParams(m_PBTLParamMList) And ReadFeatureParams(m_QBTLParamMList)
+      Return ReadFeatureParams(m_PBTLParamMList)
    End Function
    Private Function ReadFeatureParams(ParamList As List(Of BTLParamM)) As Boolean
       Dim bToRecalc As Boolean = False
@@ -501,13 +478,9 @@ Public Class BTLFeatureM
       Return True
    End Function
 
-   ' funzione che rilegge i parametri Q
-   Public Function ReadQValues()
-      Return ReadFeatureParams(m_QBTLParamMList)
-   End Function
    ' funzione che setta i valori di default a tutti i parametri
    Public Function SetDefaultValues() As Boolean
-      Return SetDefaultValues(m_PBTLParamMList) And SetDefaultValues(m_QBTLParamMList)
+      Return SetDefaultValues(m_PBTLParamMList)
    End Function
    Private Function SetDefaultValues(ParamList As List(Of Core.BTLParamM)) As Boolean
       ' leggo valore parametro da struttura geometrica
@@ -544,16 +517,6 @@ Public Class BTLFeatureM
          vPar = vTempPar
          sPar = If(String.IsNullOrEmpty(sTempPar), " ", sTempPar)
       End If
-      ' Determino parametri Q
-      Dim vTempParQ(m_QBTLParamMList.Count) As String
-      For ParQIndex = 0 To m_QBTLParamMList.Count - 1
-         Dim ParQ As BTLParamM = m_QBTLParamMList(ParQIndex)
-         vTempParQ(ParQIndex) = ParQ.sName & ":" & If(ParQ.nType <> BTLParamType.STRING_, DoubleToString(ParQ.dValue, 3), ParQ.sValue)
-      Next
-      Dim sDO As String = ""
-      If Not bDO Then sDO = 0
-      vTempParQ(m_QBTLParamMList.Count) = "DO:" & sDO
-      vParQ = vTempParQ
       Return True
    End Function
 
@@ -574,10 +537,6 @@ Public Class BTLFeatureM
                                                        frNewRef, vNewParP, sNewPar, vNewParQ, nCrvId, nCrv2Id, bUpdate)
       Dim bOk As Boolean = nFeatureId <> GDB_ID.NULL
       If bOk Then
-         ' riporto parametri Q custom
-         For Each QPar In QBTLParamMList
-            If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
-         Next
          EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
@@ -585,7 +544,7 @@ Public Class BTLFeatureM
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE
-         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
          nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
                                            Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
          SetFeatureId(nFeatureId)

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -958,7 +958,9 @@ Public Class BTLPartM
                NewBTLPart.nState = CalcStates.OK
             Case 22
                NewBTLPart.nState = CalcStates.COLLISION
-            Case 17, 19
+            Case 17
+               NewBTLPart.nState = CalcStates.SECTION
+            Case 19
                NewBTLPart.nState = CalcStates.WARNING
             Case < 0
                NewBTLPart.nState = CalcStates.INFO
@@ -1059,7 +1061,7 @@ Public Class BTLPartM
          ' ripristino inversione
          Inversion(SelectedMachineType)
       End If
-      If bRedraw Then EgtDraw()
+      If bRedraw Then EgtRedraw()
       Return bOk
    End Function
 

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -13,6 +13,7 @@ Public Class BTLFeatureVM
       End Get
    End Property
    Protected m_BTLPartM As BTLPartM
+   Protected m_PartM As PartM
 
    Public ReadOnly Property nFeatureId As Integer
       Get
@@ -162,7 +163,7 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(m_BTLFeatureM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_BTLFeatureM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
@@ -209,6 +210,23 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Private m_bStrategy_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property bStrategy_Visibility As Visibility
+      Get
+         Return m_bStrategy_Visibility
+      End Get
+   End Property
+   Public Sub SetbStrategy_Visibility(value As Boolean)
+      m_bStrategy_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(bStrategy_Visibility))
+   End Sub
+
+   Public ReadOnly Property IsEnabled As Boolean
+      Get
+         Return m_PartM.nProductionState < ItemState.Assigned
+      End Get
+   End Property
+
 #Region "CONSTRUCTOR"
 
    Sub New()

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -25,6 +25,7 @@ Public Module CalcIntegration
       EDIT = 7
       CHECKNOSIM = 8
       TOPOLOGY = 9
+      FLIP_ROT = 10
       OPENTOOLDB = 11 ' Non utilizzato
       OPENMACHINIGDB = 12 ' Non utilizzato
    End Enum
@@ -154,7 +155,7 @@ Public Module CalcIntegration
                      Else
                         vProc(j).Proc.StartInfo.Arguments = """" & vBar(nCurrBar).sBarPath & """ " &
                                                             """" & vBar(nCurrBar).nProjType & """ " &
-                                                            """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType
+                                                            """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType & " " & vBar(nCurrBar).nBarState
                      End If
                      vProc(j).Proc.StartInfo.UseShellExecute = False
 
@@ -219,6 +220,7 @@ Public Module CalcIntegration
                ' se sono in simulazione
                If bIsSimulation Then
                   Dim sOriPath As String = Path.ChangeExtension(vBar(0).sBarPath, ".ori.bwe")
+                  If String.IsNullOrWhiteSpace(sOriPath) Then Return
                   ' se file modificato a mano
                   If File.GetLastWriteTime(sOriPath) < File.GetLastWriteTime(vBar(0).sBarPath) Then
                      ' aggiorno progetto
@@ -395,9 +397,6 @@ Public Module CalcIntegration
       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
 
@@ -476,7 +475,7 @@ Public Module CalcIntegration
 End Module
 
 Public Class Bar
-   Public nBarState As Integer
+   Public nBarState As Integer = -1
    Public nBarId As Integer
    Public sBarPath As String
    Public bBarOk As Boolean

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -8,42 +8,47 @@
       <ColumnDefinition Width="1*"/>
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <StackPanel Style="{StaticResource List_StackPanel}">
+   <StackPanel Orientation="Vertical"
+               Margin="5,5,5,0">
       <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
+                Margin="0,0,0,5"
+                Style="{StaticResource Optimizer_GroupBox}">
          <UniformGrid Rows="2"
-                      Style="{StaticResource General_UniformGrid}">
+                      Margin="3">
             <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
                       SelectedItem="{Binding SelectedLanguage}"
                       DisplayMemberPath="Name" 
-                      Style="{StaticResource General_ComboBox}"/>
+                      Height="25"
+                      Margin="0,0,0,5"
+                      Style="{StaticResource Optmizer_ComboBox}"/>
             <TextBlock Text="{Binding LanguageAdvert_Msg}" 
-                       Style="{StaticResource General_TextBlock}"/>
+                       TextAlignment="Center"
+                       TextWrapping="Wrap"/>
          </UniformGrid>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <TextBlock Text="{Binding MMUnits_Msg}" 
-                    Style="{StaticResource MMUnits_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
                    SelectedIndex="{Binding SelMeasureUnit}" 
-                   Style="{StaticResource UnitMeasureList_ComboBox}"/>
+                   Height="25"
+                   Margin="0,5,0,0"
+                   Style="{StaticResource Optmizer_ComboBox}"/>
       </UniformGrid>
       <GroupBox Header="{Binding Nesting_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
+                Margin="0,0,0,5"
+                Style="{StaticResource Optimizer_GroupBox}">
          <StackPanel>
             <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                         Margin="0,5,0,5">
                <TextBlock Text="{Binding SectionTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
             </UniformGrid>
             <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                         Margin="0,0,0,5">
                <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
                <EgtWPFLib5:EgtTextBox Grid.Row="1" 
                                       Grid.Column="1"
@@ -52,13 +57,14 @@
          </StackPanel>
       </GroupBox>
       <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <TextBlock Text="{Binding PrintLabel_Msg}"
-                    Style="{StaticResource MMUnits_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    VerticalAlignment="Center"/>
          <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Style="{StaticResource General_CheckBox}"/>
+                   Margin="0,5,0,0"/>
       </UniformGrid>
-      <GroupBox Header="Backup And Restore"
+      <GroupBox Header="{Binding BackupRestore_Msg}"
                 Style="{StaticResource Optimizer_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
@@ -67,63 +73,64 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Grid Style="{StaticResource General_Grid}">
+            <Grid Margin="0,2,0,5">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <CheckBox x:Name="ExternalBackup_CheckBox"
                          IsChecked="{Binding bExternalBackupActive}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
+                         VerticalAlignment="Center"/>
                <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          Style="{StaticResource Ext_TextBlock}"/>
+                          Text="{Binding External_Msg}"
+                          VerticalAlignment="Center"/>
             </Grid>
             <Grid Grid.Row="1"
-                  Style="{StaticResource General_Grid}">
+                  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}"
-                        Style="{StaticResource General_TextBox}"/>
+                        Margin="0,0,2.5,0"/>
                <Button Grid.Column="1"
                        Content="..."
-                       Foreground="{StaticResource BeamWall_White}"
                        Command="{Binding ChooseExternalBackupFolderPath_Command}"
                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Style="{StaticResource General_Button}"/>
+                       Foreground="{StaticResource BeamWall_White}"
+                       Height="20"
+                       Width="20"
+                       Margin="2.5,0,0,0"
+                       Style="{StaticResource Optimizer_Button}"/>
             </Grid>
             <Grid Grid.Row="2">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
+               <TextBlock Text="{Binding Remainder_Msg}"/>
                <ComboBox Grid.Column="1"
                          ItemsSource="{Binding ReminderList}"
                          SelectedItem="{Binding SelReminder}"
-                         Style="{StaticResource GeneralConfiguration_ComboBox}" />
+                         Margin="0,0,0,5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
             </Grid>
             <StackPanel Grid.Row="3"
-                        Style="{StaticResource PartManager_StackPanel}">
-               <Button Content="Backup"
+                        Orientation="Horizontal">
+               <Button Content="{Binding Backup_Msg}"
                        Command="{Binding Backup_Command}"
-                       Style="{StaticResource MovePartInRawPartWnd_Button}"/>
-               <Button Content="Restore"
+                       Height="30"
+                       Width="80"
+                       Margin="0,0,5,0"
+                       Style="{StaticResource Optimizer_Button}"/>
+               <Button Content="{Binding Restore_Msg}"
                        Command="{Binding Restore_Command}"
-                       Style="{StaticResource EgtWPFLib5_Button}"/>
+                       Height="30"
+                       Width="80"/>
             </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

@@ -14,36 +14,38 @@
    </Grid.RowDefinitions>
 
    <StackPanel Orientation="Horizontal">
-      <GroupBox Style="{StaticResource MachineConfiguration_GroupBox}">
+      <GroupBox Padding="5,10,5,5" 
+                Style="{StaticResource NoHeader_GroupBox}">
          <EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
       </GroupBox>
    </StackPanel>
 
    <StackPanel Grid.Row="1"
                Visibility="{Binding MachineParameter_Visibility}"
-               Style="{StaticResource PartManager_StackPanel}">
+               Orientation="Horizontal">
       <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <StackPanel x:Name="GroupStackPanel"
-                           Style="{StaticResource PartManager_StackPanel}"/>
+                           Orientation="Horizontal"/>
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
          <ItemsControl.ItemTemplate>
             <DataTemplate>
                <GroupBox Header="{Binding sName}" 
-                         Style="{StaticResource MachineParam_GroupBox}">
+                         VerticalAlignment="Top"
+                         Style="{StaticResource Optimizer_GroupBox}">
                   <ItemsControl Name="MachParamsItemsControl" 
                                 ItemsSource="{Binding MachParamList}" 
-                                Style="{StaticResource MachinePanel_ItemsControl}">
+                                Margin="0,5,0,0">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                           <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
+                           <WrapPanel Orientation="Vertical"/>
                         </ItemsPanelTemplate>
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Style="{StaticResource MachParam_Grid}">
+                           <Grid Margin="0,0,5,5">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="*" />
                                  <ColumnDefinition Width="*" />
@@ -51,14 +53,18 @@
                               </Grid.ColumnDefinitions>
                               <TextBlock Text="{Binding sName}"
                                          ToolTip="{Binding sName}"
-                                         Style="{StaticResource MachinePanel_TextBlock}"/>
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="150"
+                                         Style="{StaticResource MachParam_TextBlock}"/>
                               <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                                      Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Style="{StaticResource MachineConfiguration_TextBox}"/>
+                                                     Width="60"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding sDescription}"
                                          ToolTip="{Binding sDescription}"
-                                         Style="{StaticResource Description_TextBlock}"/>
+                                         TextWrapping="WrapWithOverflow"
+                                         Width="148"
+                                         Style="{StaticResource MachParam_TextBlock}"/>
                            </Grid>
                         </DataTemplate>
                      </ItemsControl.ItemTemplate>
@@ -73,9 +79,14 @@
            Command="{Binding SaveCommand}"
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource SaveMachinePanel_Button}">
+           HorizontalAlignment="Right"
+           VerticalAlignment="Bottom"
+           Height="50"
+           Width="50"
+           Margin="50"
+           Style="{StaticResource Optimizer_Button}">
       <Image Source="/Resources/ProjectManager/Save.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+             Stretch="Uniform"/>
    </Button>
 
 </Grid>

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -309,4 +309,7 @@
    ' parametri modifica percorsi free contour
    Public Const PATH_SIDEANGLAYER As String = "SideAngLayer"
 
+   ' Strategia
+   Public Const AI_SETUP As String = "AISETUP"
+   Public Const STRATEGY As String = "STRATEGY"
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -1,10 +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 DATAGRIDCOLUMNS_FILE_NAME As String = "DataGridColumns.json"
 
-   Public Const S_FEATURELIST As String = "DG_FeatureList"
-   Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"
    Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
    Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
    Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM"
@@ -12,8 +9,6 @@
    Public Const S_PARTINRAWPARTLIST_BEAM As String = "DG_PartInRawPartList_BEAM"
    Public Const S_PARTINRAWPARTLIST_WALL As String = "DG_PartInRawPartList_WALL"
    Public Const S_PARAMETERLIST_P As String = "DG_ParameterList_P"
-   Public Const S_PARAMETERLIST_Q As String = "DG_ParameterList_Q"
-   Public Const S_DUPLOPARAMETERLIST_Q As String = "DG_DuploParameterList_Q"
    Public Const S_RAWPARTLIST_SUPERVISOR As String = "DG_RawPartList_SUPERVISOR"
    Public Const S_PARTINRAWPARTLIST_SUPERVISOR As String = "DG_PartInRawPartList_SUPERVISOR"
    Public Const S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR As String = "DG_FeatureInPartInRawPartList_SUPERVISOR"
@@ -23,11 +18,8 @@
    Public Const S_STATISTICS_PART As String = "DG_Statistics_PART"
    Public Const S_OPTIMIZERSTATISTICS As String = "DG_OptimizerStatistics"
    Public Const S_RAWPARTSTATISTICS As String = "DG_RawPartStatistics"
-   Public Const S_BEAMMACHININGS As String = "DG_BeamMachinings"
    Public Const S_SPARAMLIST_BEAM As String = "DG_SParamList_BEAM"
    Public Const S_SPARAMLIST_WALL As String = "DG_SParamList_WALL"
-   Public Const S_SECTXMATLIST_BEAM As String = "DG_SectXMatList_BEAM"
-   Public Const S_SECTXMATLIST_WALL As String = "DG_SectXMatList_WALL"
    Public Const S_VARIABLESLIST As String = "DG_VariablesList"
    Public Const S_MDICOMMANDS As String = "DG_MDICommands"
    Public Const S_MACHINELOG As String = "DG_MachineLog"

EgtBEAMWALL.Core/Constants/ConstDims.vb

@@ -2,13 +2,9 @@
 
    Public Const DIMENSIONS_FILE_NAME As String = "Dimensions.ini"
 
-   Public Const PROJECT_VIEW As String = "Project_View"
-   Public Const PROJECT_OPTIMIZER As String = "Project_Optimizer"
    Public Const LEFTPANEL_VIEW As String = "LeftPanel_View"
-   Public Const LEFTPANEL_OPTIMIZER As String = "LeftPanel_Optimizer"
-   Public Const TOPPANEL_OPTIMIZER As String = "TopPanel_Optimizer"
    Public Const LEFTPANEL_SUPERVISOR As String = "LeftPanel_Supervisor"
    Public Const PROJECT_SUPERVISOR As String = "Project_Supervisor"
-   Public Const PROJECT_ONLYPROD As String = "Project_OnlyProd"
+   Public Const PROJECT_AEDIFICA As String = "Project_Aedifica"
 
 End Class

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -19,7 +19,7 @@ Public Module ConstGen
    Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
-   Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
+   Public Const LIC_FILE_NAME As String = "Aedifica.lic"
    Public Const S_LICENCE As String = "Licence"
    Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
@@ -57,8 +57,8 @@ Public Module ConstGen
    End Enum
 
    ' File di log generale
-   Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.OptimizerLog#.txt"
-   Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
+   Public Const VWOPTGENLOG_FILE_NAME As String = "Aedifica.OptimizerLog#.txt"
+   Public Const SUPGENLOG_FILE_NAME As String = "Aedifica.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
    Public Const CONF_DIR As String = "Config"
@@ -110,4 +110,7 @@ Public Module ConstGen
    Public Const CUSTOMERCONFIG_FILE As String = "CustomerConfig"
    ' File contenente i parametri generali
    Public Const GENERALPARAMETERS_FILE As String = "GeneralParameters"
+   ' Info per temi
+   Public Const THEMES_FOLDER As String = "Themes"
+   Public Const DICTIONARY_FILENAME As String = "Dictionary.xaml"
 End Module

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -13,7 +13,8 @@
 
 Public Module ConstIni
 
-   Public Const INI_FILE_NAME As String = "EgtBEAMWALL.ini"
+   Public Const INI_FILE_NAME As String = "Aedifica.ini"
+   Public Const CONFIG_FILE_NAME As String = "Config.ini"
 
    Public Const K_NETKEY As String = "NetKey"
    Public Const K_MAXCAMINST As String = "MaxCamInstances"
@@ -56,6 +57,7 @@ Public Module ConstIni
    Public Const K_CALCPATH As String = "CalcPath"
    Public Const K_BEAMBASEDIR As String = "BaseDir"
    Public Const K_BEAMBWEEXEC As String = "BweExec"
+   Public Const K_FLIPROTEXEC As String = "FlipRotExec"
 
    Public Const S_WALL As String = "Wall"
    Public Const S_WALLNEW As String = "WallNew"
@@ -100,6 +102,8 @@ Public Module ConstIni
    Public Const K_ENABLE As String = "Enable"
    Public Const K_ZEBRAUTILITIES As String = "ZebraUtilities"
    Public Const K_TEMPLATE As String = "Template"
+   Public Const K_PRINTERMODE As String = "Mode"
+   Public Const K_NETWORKADDRESS As String = "NetworkAddress"
 
    Public Const S_BEAM_LIST As String = "Beam_List"
    Public Const S_WALL_LIST As String = "Wall_List"
@@ -107,6 +111,7 @@ Public Module ConstIni
    Public Const S_WAREHOUSE As String = "Warehouse"
    Public Const K_TYPE As String = "Type"
    Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
+   Public Const K_DEFAULTLENGTH As String = "DefaultLength"
 
    Public Const S_SECTION As String = "Section_Checked"
    Public Const S_IMAGE As String = "Image_Checked"
@@ -118,7 +123,6 @@ Public Module ConstIni
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const K_ONLYPROD As String = "OnlyProd"
    Public Const K_MODIFYSETUP As String = "ModifySetup"
    Public Const K_MACHCONFIG As String = "MachConfig"
 
@@ -134,4 +138,6 @@ Public Module ConstIni
    Public Const K_DEFAULTCONFIG As String = "DefaultConfiguration"
 
    Public Const K_VERIFYIMPORTBTL As String = "VerifyImportBTL"
+
+   Public Const K_THEMA As String = "Thema"
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -56,8 +56,8 @@
     <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 Include="EgwWPFBaseLib, Version=3.1.7.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgwWPFBaseLib.3.1.7.3\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>
@@ -182,7 +182,7 @@
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="OptmizerWindow\OptimizerWindow.vb" />
+    <Compile Include="OptimizerWindow\OptimizerWindow.vb" />
     <Compile Include="TitleBar\TitleBarV.xaml.vb">
       <DependentUpon>TitleBarV.xaml</DependentUpon>
     </Compile>
@@ -326,6 +326,6 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>
+    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\Aedifica\EgtBEAMWALL.Core.dll</PostBuildEvent>
   </PropertyGroup>
 </Project>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml

@@ -10,30 +10,32 @@
                                  Width="750" Height="450"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+      <Grid Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+         <Grid Margin="5,5,5,0">
             <Grid.RowDefinitions>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             <TabControl>
                <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
+                  <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <ListBox ItemsSource="{Binding BasicColors}"
                               SelectedItem="{Binding SelColor}"
-                              Style="{StaticResource EgtColorPicker_ListBox}">
+                              HorizontalAlignment="Center"
+                              BorderThickness="0">
                         <ListBox.ItemsPanel>
                            <ItemsPanelTemplate>
                               <UniformGrid Columns="13"/>
@@ -42,7 +44,11 @@
                         <ListBox.ItemTemplate>
                            <DataTemplate>
                               <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                                         Stroke="{StaticResource BeamWall_Black}"
+                                         StrokeThickness="0.5"
+                                         Height="20"
+                                         Width="20"
+                                         Margin="2"/>
                            </DataTemplate>
                         </ListBox.ItemTemplate>
                         <ListBox.ItemContainerStyle>
@@ -77,14 +83,15 @@
                   </EgtWPFLib5:EgtHexList>
                </TabItem>
                <TabItem Header="{Binding ColorPickerTheme_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
+                  <Grid HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <ListBox ItemsSource="{Binding BasicColorsTheme}"
                               SelectedItem="{Binding SelColorTheme}"
-                              Style="{StaticResource BasicColor_ListBox}">
+                              BorderThickness="0">
                         <ListBox.ItemsPanel>
                            <ItemsPanelTemplate>
                               <UniformGrid Columns="13"/>
@@ -93,7 +100,11 @@
                         <ListBox.ItemTemplate>
                            <DataTemplate>
                               <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                                         Stroke="{StaticResource BeamWall_Black}"
+                                         StrokeThickness="0.5"
+                                         Height="20"
+                                         Width="20"
+                                         Margin="2"/>
                            </DataTemplate>
                         </ListBox.ItemTemplate>
                         <ListBox.ItemContainerStyle>
@@ -108,14 +119,16 @@
             </TabControl>
          </Grid>
          <Grid Grid.Column="1"
-               Style="{StaticResource CustomerColor_Grid}">
+               Margin="5,0,0,0">
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <TextBlock Text="{Binding CustomColor_Msg}"
-                       Style="{StaticResource EgtColorPicker_TextBlock}"/>
+                       Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                       Margin="5,18,5,10"
+                       Style="{StaticResource DialogWindow_TextBlock}"/>
             <Grid Grid.Row="1">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
@@ -123,7 +136,9 @@
                </Grid.RowDefinitions>
                <ListBox ItemsSource="{Binding CustomColors}"
                         SelectedItem="{Binding SelCustomColor}"
-                        Style="{StaticResource CustomerColor_ListBox}">
+                        Background="Transparent"
+                        BorderThickness="0"
+                        HorizontalAlignment="Center">
                   <ListBox.ItemsPanel>
                      <ItemsPanelTemplate>
                         <UniformGrid Columns="13"/>
@@ -132,7 +147,11 @@
                   <ListBox.ItemTemplate>
                      <DataTemplate>
                         <Rectangle Fill="{Binding Fill}"
-                                   Style="{StaticResource EgtColorPicker_Rectangle}"/>
+                                   Stroke="{StaticResource BeamWall_Black}"
+                                   StrokeThickness="0.5"
+                                   Height="20"
+                                   Width="20"
+                                   Margin="2"/>
                      </DataTemplate>
                   </ListBox.ItemTemplate>
                   <ListBox.ItemContainerStyle>
@@ -144,23 +163,29 @@
                </ListBox>
             </Grid>
             <Grid Grid.Row="2"
-                  Style="{StaticResource CurrColor_Grid}">
+                  Margin="0,20,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <Grid Style="{StaticResource AddColor_Grid}">
+               <Grid HorizontalAlignment="Left"
+                     Margin="0,10,5,0">
                   <Grid.RowDefinitions>
                      <RowDefinition Height="1*"/>
                      <RowDefinition Height="Auto"/>
                   </Grid.RowDefinitions>
                   <Rectangle Fill="{Binding CurrColor}"
-                             Style="{StaticResource CurrColor_Rectangle}"/>
+                             Stroke="{StaticResource BeamWall_Black}"
+                             StrokeThickness="0.5"
+                             Height="70"
+                             Width="100"
+                             Margin="0"/>
                   <Button Grid.Row="1"
                           x:Name="SaveColor"                          
                           Content="{Binding AddCColor_Msg}"
                           Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource EgtColorPicker_TextButton}"/>
+                          Height="30"
+                          Margin="0,10,0,0"/>
                </Grid>
                <Grid Grid.Column="1">
                   <Grid.ColumnDefinitions>
@@ -174,45 +199,79 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
                   <TextBlock Text="{Binding Red_Msg}"
-                             Style="{StaticResource RedColor_TextBlock}"/>
+                             HorizontalAlignment="Right"
+                             Margin="0,10,5,0"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Column="1" 
                            Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource RedColor_TextBox}"/>
+                           IsReadOnly="False"
+                           HorizontalAlignment="Right"
+                           VerticalContentAlignment="Center"
+                           TextAlignment="Center"
+                           Width="65"
+                           Margin="0,5,5,0"/>
                   <TextBlock Grid.Row="1"
                              Text="{Binding Green_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
+                             HorizontalAlignment="Right"
+                             Margin="5,5,5,0"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Column="1"
                            Grid.Row="1"
                            Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
+                           IsReadOnly="False"
+                           HorizontalAlignment="Right"
+                           VerticalContentAlignment="Center"
+                           TextAlignment="Center"
+                           Width="65"
+                           Margin="5,5,5,0"/>
                   <TextBlock Grid.Row="2"
                              Text="{Binding Blu_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
+                             HorizontalAlignment="Right"
+                             Margin="5,5,5,0"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Row="2"
                            Grid.Column="1"
                            Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
+                           IsReadOnly="False"
+                           HorizontalAlignment="Right"
+                           VerticalContentAlignment="Center"
+                           TextAlignment="Center"
+                           Width="65"
+                           Margin="5,5,5,0"/>
                   <TextBlock Grid.Row="3"
                              Text="{Binding Hexadecimal_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
+                             HorizontalAlignment="Right"
+                             Margin="5,5,5,0"
+                             Style="{StaticResource DialogWindow_TextBlock}"/>
                   <TextBox Grid.Row="3"
                            Grid.Column="1"                           
                            Text="{Binding Hexadecimal}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
+                           IsReadOnly="False"
+                           HorizontalAlignment="Right"
+                           VerticalContentAlignment="Center"
+                           TextAlignment="Center"
+                           Width="65"
+                           Margin="5,5,5,0"/>
                </Grid>
             </Grid>
          </Grid>
       </Grid>
       <UniformGrid Grid.Row="2"  
                    Rows="1"
-                   Style="{StaticResource EgtColorPicker_UniformGrid}">
+                   Margin="10,10,10,5">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+                 Height="24"
+                 Width="64"
+                 Margin="2.5,0,2.5,2"
+                 Style="{StaticResource Optimizer_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+                 Height="24"
+                 Width="64"
+                 Margin="2.5,0,2.5,2"
+                 Style="{StaticResource Optimizer_Button}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -1,6 +1,5 @@
 Imports EgtWPFLib5
 Imports System.Windows
-Imports System.Windows.Forms
 
 Public Class EgtColorPickerV
 
@@ -8,7 +7,7 @@ Public Class EgtColorPickerV
 
    Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
 
-   Private Shadows DialogResult As DialogResult
+   Private Shadows DialogResult As Boolean
 
    Public Property CustomColors As Integer()
       Get
@@ -45,7 +44,7 @@ Public Class EgtColorPickerV
 
 #Region "EVENTS"
 
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
+   Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtColorPickerVM.OnCloseWindow
       Me.DialogResult = DialogResult
       Me.Close()
    End Sub
@@ -58,7 +57,7 @@ Public Class EgtColorPickerV
    ''' Apre una finestra EgtColorPicker
    ''' </summary>
    ''' <returns></returns>
-   Public Overloads Function ShowDialog() As DialogResult
+   Public Overloads Function ShowDialog() As Boolean
       MyBase.ShowDialog()
       Return Me.DialogResult
    End Function

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -64,7 +64,7 @@ Public Class EgtDataGrid
                newItems(index).InitColumn(col)
                context.Columns.Add(col)
             Catch ex As Exception
-               MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
             End Try
          Next
 
@@ -159,7 +159,7 @@ Public Class EgtDataGrid
                         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)
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
                   End Try
                Next
             End If

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -6,58 +6,89 @@
                                  Title="{Binding sTitle}"
                                  WindowStartupLocation="CenterOwner"
                                  ShowInTaskbar="False"
-                                 Height="500" Width="800"
+                                 Height="650" Width="1000"
                                  Style="{StaticResource OptimizerWindow.Dialog}">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+      <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}"/>
+                 HorizontalAlignment="Right"
+                 BorderBrush="Transparent"
+                 BorderThickness="1"
+                 Height="24"
+                 Width="64"
+                 FontSize="12"
+                 Margin="2.5,0,5,0">
+            <Image Source="{StaticResource Restore_Image}"
+                   Height="15"
+                   Stretch="Uniform"/>
          </Button>
          <TextBlock Grid.Column="1"
                     Text="{Binding sSelPath}"
-                    Style="{StaticResource EgtManageDialog_TextBlock}"/>
+                    HorizontalAlignment="Left"
+                    Margin="5"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <ComboBox Grid.Column="2"
                    ItemsSource="{Binding ViewModeList}"
                    SelectedItem="{Binding SelViewMode}"
-                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
+                   HorizontalAlignment="Right"
+                   BorderThickness="1"
+                   Height="25"
+                   Width="200"
+                   IsSynchronizedWithCurrentItem="True"
+                   Margin="2.5,5,2.5,5">
+            <ComboBox.ItemTemplate>
+               <DataTemplate>
+                  <StackPanel Orientation="Horizontal">
+                     <Image Source="{Binding Image}"
+                            Stretch="Uniform"/>
+                     <TextBlock Text="{Binding Name}"
+                                HorizontalAlignment="Left"
+                                Margin="10,0,0,0"
+                                Style="{StaticResource DialogWindow_TextBlock}"/>
+                  </StackPanel>
+               </DataTemplate>
+            </ComboBox.ItemTemplate>
+         </ComboBox>
       </Grid>
       <Grid Grid.Row="1"
-            Style="{StaticResource AddRawPartWnd_Grid}">
+            Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="4*"/>
          </Grid.ColumnDefinitions>
          <TreeView x:Name="FileTree" 
                    ItemsSource="{Binding RootList}"                   
-                   Style="{StaticResource EgtManageDialog_TreeView}">
+                   BorderBrush="{StaticResource BeamWall_White}"
+                   FontSize="15"
+                   Margin="10">
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
                                          ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <Image Source="{Binding sIconSource}"
-                            Style="{StaticResource Button_Image}"/>
+                            Height="15"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <Image Source="{Binding sIconSource}"
-                            Style="{StaticResource Button_Image}"/>
+                            Height="15"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sName}"
                                 Style="{StaticResource DialogWindow_TextBlock}"/>
                   </StackPanel>
@@ -72,7 +103,9 @@
          </TreeView>
          <TabControl Grid.Column="1"
                      SelectedIndex="{Binding nSelTab}"
-                     Style="{StaticResource EgtManageDialog_TabControl}">
+                     Background="Transparent"
+                     BorderBrush="{StaticResource BeamWall_White}"
+                     BorderThickness="0">
             <TabControl.ItemContainerStyle>
                <Style TargetType="{x:Type TabItem}">
                   <Setter Property="Visibility" Value="Collapsed"/>
@@ -86,13 +119,15 @@
                   <ListBox.Resources>
                      <DataTemplate x:Key="ListTemplateView" 
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtManageDialog_Grid}">
+                        <Grid Height="20"
+                              Margin="5,5,5,0">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>
                            <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
+                                  Height="15"
+                                  Stretch="Uniform"/>
                            <TextBlock Grid.Column="1"
                                       Text="{Binding sName}"
                                       Style="{StaticResource DialogWindow_TextBlock}"/>
@@ -100,28 +135,38 @@
                      </DataTemplate>
                      <DataTemplate x:Key="TilesTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtDirectory_Grid}">
+                        <Grid Height="50"
+                              Width="250"
+                              Margin="5,5,5,0">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="1*"/>
                            </Grid.ColumnDefinitions>
                            <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
+                                  Height="15"
+                                  Stretch="Uniform"/>
                            <UniformGrid Grid.Column="1"
                                         Rows="3"
-                                        Style="{StaticResource EgtManageDialog_UniformGrid}">
+                                        Margin="2.5,0,2.5,5">
                               <TextBlock Text="{Binding sName}"
-                                         Style="{StaticResource Info_TextBlock}"/>
+                                         HorizontalAlignment="Left"
+                                         TextAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
                               <TextBlock Text="{Binding ghTypeItem}"
-                                         Style="{StaticResource Info_TextBlock}"/>
+                                         HorizontalAlignment="Left"
+                                         TextAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
                               <TextBlock Text="{Binding sDimension}"
-                                         Style="{StaticResource Info_TextBlock}"/>
+                                         HorizontalAlignment="Left"
+                                         TextAlignment="Left"
+                                         Style="{StaticResource DialogWindow_TextBlock}"/>
                            </UniformGrid>
                         </Grid>
                      </DataTemplate>
                      <DataTemplate x:Key="ContentTemplateView"
                                    DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource ContentTemplate_Grid}">
+                        <Grid Height="50"
+                              Margin="5,5,5,0">
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1*"/>
                               <RowDefinition Height="Auto"/>
@@ -133,26 +178,36 @@
                                  <ColumnDefinition Width="1*"/>
                               </Grid.ColumnDefinitions>
                               <Image Source="{Binding sIconSource}"
-                                     Style="{StaticResource Button_Image}"/>
+                                     Height="15"
+                                     Stretch="Uniform"/>
                               <UniformGrid Grid.Column="1"
                                            Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
+                                           Margin="2.5,0,2.5,5">
                                  <TextBlock Text="{Binding sName}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                            HorizontalAlignment="Left"
+                                            TextAlignment="Left"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                            HorizontalAlignment="Left"
+                                            TextAlignment="Left"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                               <UniformGrid Grid.Column="2"
                                            Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
+                                           Margin="2.5,0,2.5,5">
                                  <TextBlock Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                            HorizontalAlignment="Left"
+                                            TextAlignment="Left"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                                  <TextBlock Text="{Binding sDimension}"
-                                            Style="{StaticResource Info_TextBlock}"/>
+                                            HorizontalAlignment="Left"
+                                            TextAlignment="Left"
+                                            Style="{StaticResource DialogWindow_TextBlock}"/>
                               </UniformGrid>
                            </Grid>
                            <Border Grid.Row="1"
-                                   Style="{StaticResource EgtManageDialog_Border}"/>
+                                   BorderBrush="{StaticResource Border.Static.Alto.Border}"
+                                   BorderThickness="1"/>
                         </Grid>
                      </DataTemplate>
                   </ListBox.Resources>
@@ -196,7 +251,7 @@
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
+                                       <WrapPanel Orientation="Vertical"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -208,7 +263,7 @@
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource ProjectH_WrapPanel}"/>
+                                       <WrapPanel Orientation="Horizontal"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -220,7 +275,8 @@
                               <Setter Property="ItemsPanel">
                                  <Setter.Value>
                                     <ItemsPanelTemplate>
-                                       <StackPanel Style="{StaticResource EgtManageDialog_StackPanel}"/>
+                                       <StackPanel Orientation="Vertical"
+                                                   HorizontalAlignment="Stretch"/>
                                     </ItemsPanelTemplate>
                                  </Setter.Value>
                               </Setter>
@@ -241,25 +297,13 @@
                          SelectedItem="{Binding ItemSelected}"
                          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
                          CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                         ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                          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}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -270,10 +314,13 @@
                                     <ColumnDefinition Width="1*"/>
                                  </Grid.ColumnDefinitions>
                                  <Image Source="{Binding sIconSource}"
-                                        Style="{StaticResource Source_Image}"/>
+                                        Height="15"
+                                        Stretch="Uniform"
+                                        Margin="2.5,0,2.5,0"/>
                                  <TextBlock Grid.Column="1"
                                             Text="{Binding sName}"
-                                            Style="{StaticResource NameImage_TextBlock}"/>
+                                            VerticalAlignment="Center"
+                                            Margin="2.5,0,0,0"/>
                               </Grid>
                            </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
@@ -283,8 +330,7 @@
                                          ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
@@ -293,8 +339,7 @@
                                          ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
@@ -303,8 +348,7 @@
                                          ElementStyle="{StaticResource DataGridR_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
@@ -317,33 +361,55 @@
          </TabControl>
       </Grid>
       <Grid Grid.Row="2" 
-            Style="{StaticResource AddRawPartWnd_Grid}">
+            Margin="5,5,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding FileName_Msg}"
-                    Style="{StaticResource FileName_TextBlock}"/>
+                    HorizontalAlignment="Right"
+                    Margin="5"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
          <TextBox Grid.Column="1"
                   Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource SaveFileName_TextBox}"/>
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Center"
+                  VerticalContentAlignment="Center"
+                  TextAlignment="Left"
+                  FontWeight="Normal"
+                  FontFamily="12"
+                  Height="22"
+                  Margin="2.5,2.5,2.5,5"/>
          <ComboBox Grid.Column="2"
                    ItemsSource="{Binding FilterList}"
                    SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
                    DisplayMemberPath="sNameExstension"
-                   Style="{StaticResource FilterList_ComboBox}"/>
+                   HorizontalAlignment="Right"
+                   BorderThickness="1"
+                   Height="25"
+                   Width="200"
+                   IsSynchronizedWithCurrentItem="True"
+                   Margin="10,2.5,2.5,5"/>
       </Grid>
       <UniformGrid Grid.Row="3"  
                    Rows="1"
-                   Style="{StaticResource Command_UniformGrid}">
+                   Margin="2.5,0,2.5,2.5">
          <Button IsDefault="True"
                  Content="OK"
                  Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtManageDialogOK_HalfRound_Button}"/>
+                 HorizontalAlignment="Right"
+                 Height="24"
+                 Width="64"
+                 Margin="15,0,2.5,2"
+                 Style="{StaticResource Optimizer_Button}"/>
          <Button Content="Cancel"
                  Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtManageDialogCancel_HalfRound_Button}"/>
+                 HorizontalAlignment="Left"
+                 Height="24"
+                 Width="64"
+                 Margin="2.5,0,0,2"
+                 Style="{StaticResource Optimizer_Button}"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -1,6 +1,6 @@
-Imports EgtWPFLib5
-Imports System.Windows.Forms
-Imports System.Windows.Input
+Imports System.Windows.Input
+Imports EgtWPFLib5
+Imports System.Windows
 
 Public Class EgtManageFileDialogV
 
@@ -8,7 +8,7 @@ Public Class EgtManageFileDialogV
 
    Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
 
-   Private Shadows DialogResult As DialogResult
+   Private Shadows DialogResult As Boolean
 
    ''' <summary>
    ''' Stringa che specifica il titolo da mostrare
@@ -31,6 +31,15 @@ Public Class EgtManageFileDialogV
       End Set
    End Property
 
+   Public Property SelFilter As EgtExstension
+      Get
+         Return m_EgtManageFileDialogVM.SelFilter
+      End Get
+      Set(value As EgtExstension)
+         m_EgtManageFileDialogVM.SelFilter = value
+      End Set
+   End Property
+
    Public Property InitialDirectory As String
       Get
          Return m_EgtManageFileDialogVM.sInitialDirectory
@@ -103,31 +112,31 @@ Public Class EgtManageFileDialogV
       End Set
    End Property
 
-#End Region    ' FIELDS & PROPERTIES
+#End Region    ' Fields & Properties
 
 #Region "CONTRUCTORS"
 
-   Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
+   Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
       InitializeComponent()
       Me.DataContext = EgtManageFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_EgtManageFileDialogVM = EgtManageFileDialogVM
    End Sub
 
-#End Region
+#End Region    ' Constructor
 
 #Region "EVENTS"
 
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
+   Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtManageFileDialogVM.OnCloseWindow
       Me.DialogResult = DialogResult
       Me.Close()
    End Sub
 
-#End Region
+#End Region    ' Events
 
 #Region "METHODS"
 
-   Public Overloads Function ShowDialog() As DialogResult
+   Public Overloads Function ShowDialog() As Boolean
       MyBase.ShowDialog()
       Return Me.DialogResult
    End Function
@@ -136,6 +145,6 @@ Public Class EgtManageFileDialogV
       m_EgtManageFileDialogVM.MouseDoubleClick()
    End Sub
 
-#End Region    '  METHODS
+#End Region    '  Methods
 
 End Class

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml

@@ -9,12 +9,12 @@
                                  ShowInTaskbar="False"
                                  Style="{StaticResource OptimizerWindow.Dialog}">
 
-   <Grid Style="{StaticResource EgtMessageBox_Grid}">
+   <Grid Margin="2.5,2.5,2.5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid Style="{StaticResource MessageBox_Grid}">
+      <Grid Margin="20">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
@@ -22,11 +22,13 @@
          <Image Source="{Binding sIconSource}"/>
          <TextBlock Grid.Column="1"
                     Text="{Binding sMessage}"
-                    Style="{StaticResource EgtMessageBox_TextBlock}"/>
+                    Margin="5,0,5,0"
+                    Style="{StaticResource DialogWindow_TextBlock}"/>
       </Grid>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding ButtonList}"
-                    Style="{StaticResource EgtMessageBox_ItemsControl}">
+                    HorizontalAlignment="Center"
+                    Margin="0,0,0,10">
          <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                <UniformGrid Rows="1"/>
@@ -37,7 +39,10 @@
                <Button IsDefault="{Binding bIsDefault}"
                        Content="{Binding sMessage}"
                        Command="{Binding Command_Command}"
-                       Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
+                       Height="24"
+                       Width="64"
+                       Margin="2.5,0,2.5,2"
+                       Style="{StaticResource Optimizer_Button}"/>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -1,5 +1,6 @@
-Imports EgtWPFLib5
-Imports System.Windows
+Imports System.Windows
+Imports System.Windows.Threading
+Imports EgtWPFLib5
 
 Public Class EgtMessageBoxV
 
@@ -25,6 +26,18 @@ Public Class EgtMessageBoxV
 
 #Region "METHODS"
 
+   Protected Overrides Sub OnSourceInitialized(e As EventArgs)
+      MyBase.OnSourceInitialized(e)
+      Me.WindowStartupLocation = WindowStartupLocation.CenterScreen
+   End Sub
+
+   Private Sub Window_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      Dispatcher.BeginInvoke(Sub()
+                                Me.Topmost = True
+                                Me.Activate()
+                             End Sub, DispatcherPriority.ContextIdle)
+   End Sub
+
    ''' <summary>
    ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
    ''' </summary>
@@ -99,7 +112,7 @@ Public Class EgtMessageBoxV
 
 #Region "EVENTS"
 
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
+   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.OnCloseWindow
       Me.DialogResult = DialogResult
       Me.Close()
    End Sub

EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb

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

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -23,27 +23,37 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding TotText_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding StepText_Msg}"
                  Visibility="{Binding StepText_Visibility}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
       <Grid Grid.Row="3"
             Visibility="{Binding StepProgress_Visibility}">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Grid Style="{StaticResource EgtManageDialog_Grid}"/>
+         <Grid Height="20"
+               Margin="5,5,5,0"/>
          <ProgressBar Grid.Row="1"
                       Value="{Binding StepProgress_Value}"
-                      Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                      Minimum="0"
+                      Maximum="100"
+                      Height="20"
+                      Margin="40,0,40,0"/>
       </Grid>
       <ProgressBar Grid.Row="5"
                    Value="{Binding TotProgress_Value}"
-                   Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                   Minimum="0"
+                   Maximum="100"
+                   Height="20"
+                   Margin="40,0,40,0"/>
       <TextBlock Grid.Row="7"
                  Text="{Binding TotProgress_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -214,7 +214,6 @@ Public Class MyMachGroupPanelM
       Dim DuploArray() As Integer
       Dim RotArray(DuploList.Count) As Integer
       Dim FlipArray(DuploList.Count) As Integer
-      Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
       DuploArray = DuploList.ToArray()
       ' recupero ROT (gradi) e FLIP (0/1) per non perderli
       For Duploindex = 0 To DuploArray.Length - 1
@@ -224,8 +223,6 @@ Public Class MyMachGroupPanelM
          EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
          If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
          If nBWType = BWType.WALL Then
-            ' salvo parametri Q
-            QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
             ' ciclo sugli outline
             nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
             If nOutlineLayer <> GDB_ID.NULL Then
@@ -248,42 +245,10 @@ Public Class MyMachGroupPanelM
                         nPRId = nGlobPRId
                         nGlobPRId += 1
                      End If
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nOutlineId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
                   End If
                   nOutlineId = EgtGetNext(nOutlineId)
                End While
             End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nFeatureId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
          End If
       Next
       ' aggiornamento dei Duplo
@@ -293,50 +258,6 @@ Public Class MyMachGroupPanelM
          ' ripristino info rot e flip
          EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
          EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If nBWType = BWType.WALL Then
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-               While nOutlineId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nOutlineId = EgtGetNext(nOutlineId)
-               End While
-            End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
       Next
    End Sub
 

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -267,13 +267,13 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(MyMachGroupM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(MyMachGroupM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
    Public ReadOnly Property CALC_FALL_Visibility As Visibility
       Get
-         Return If(MyMachGroupM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(MyMachGroupM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
@@ -400,7 +400,7 @@ Public MustInherit Class MyMachGroupVM
       Get
          Select Case nProduction_State
             Case ItemState.ND
-               Return Brushes.White
+               Return Brushes.Transparent  ' Brushes.White
             Case ItemState.Assigned
                Return Brushes.LightGray
             Case ItemState.Confirmed
@@ -538,6 +538,7 @@ Public MustInherit Class MyMachGroupVM
       MyMachGroupM.nCALC_ROT = 0
       MyMachGroupM.nCALC_FALL = 0
       MyMachGroupM.sCALC_MSG = ""
+      MyMachGroupM.nCALC_TIME = 0
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -195,9 +195,14 @@ Public MustInherit Class PartVM
          Return m_SelFeatureVM
       End Get
       Set(value As BTLFeatureVM)
+         If Not IsNothing(m_SelFeatureVM) Then
+            Dim OldSelFeatureVM As BTLFeatureVM = m_SelFeatureVM
+            EgtResetMark(OldSelFeatureVM.nFeatureId)
+         End If
          m_SelFeatureVM = value
          If Not IsNothing(m_SelFeatureVM) Then
             DirectCast(m_SelFeatureVM, BTLFeatureVM).SelGeomFeature()
+            EgtSetMark(m_SelFeatureVM.nFeatureId)
          Else
             EgtDeselectAll()
          End If
@@ -314,13 +319,13 @@ Public MustInherit Class PartVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(m_PartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_PartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
    Public ReadOnly Property CALC_FALL_Visibility As Visibility
       Get
-         Return If(m_PartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_PartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
@@ -463,7 +468,7 @@ Public MustInherit Class PartVM
       Get
          Select Case nProduction_State
             Case ItemState.ND
-               Return Brushes.White
+               Return Brushes.Transparent   ' Brushes.White
             Case ItemState.Assigned
                Return Brushes.LightGray
             Case ItemState.Confirmed
@@ -478,6 +483,12 @@ Public MustInherit Class PartVM
       End Get
    End Property
 
+   Public ReadOnly Property ButtonIsEnabled As Boolean
+      Get
+         Return m_PartM.nProductionState < ItemState.Assigned
+      End Get
+   End Property
+
 #End Region    ' Supervisor
 
    ' definizione comandi

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -8,34 +8,50 @@
       <ColumnDefinition Width="1*"/>
    </Grid.ColumnDefinitions>
 
-   <Grid Style="{StaticResource CalcPanel_Grid}">
+   <Grid Margin="0,0,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <TextBlock Text="Macchina corrente" 
-                 Style="{StaticResource CurrMach_TextBlock}"/>
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 VerticalAlignment="Center"
+                 Margin="0,0,5,0"/>
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox Grid.Column="1"
-                ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Style="{StaticResource CalcPanel_ComboBox}"/>
+                ItemsSource="{Binding Path=MachineList}" 
+                SelectedItem="{Binding Path=SelectedMachine}" 
+                DisplayMemberPath="Name"
+                SelectedValuePath="Name"
+                Height="22"
+                Width="150"
+                Style="{StaticResource Optmizer_ComboBox}"/>
    </Grid>
    <StackPanel Grid.Column="1" 
-               Style="{StaticResource MachinePanel_StackPanel}">
+               Orientation="Horizontal"
+               HorizontalAlignment="Center">
       <Button Content="{Binding ToolDBMsg}"
               ToolTip="{Binding ToolDBToolTip}"
               Command="{Binding ToolDbCommand}"
-              Style="{StaticResource GeneralConfiguration_Button}"/>
+              Height="30"
+              Width="80"
+              Margin="5,0,5,0"
+              Style="{StaticResource Optimizer_Button}"/>
       <Button Content="{Binding SetUpMsg}"
               Command="{Binding SetUpCommand}" 
               ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource GeneralConfiguration_Button}"
-              Visibility="{Binding SetUp_Visibility}"/>
+              Visibility="{Binding SetUp_Visibility}"
+              Height="30"
+              Width="80"
+              Margin="5,0,5,0"
+              Style="{StaticResource Optimizer_Button}"/>
       <Button Content="{Binding ParameterMachineMsg}"
               ToolTip="{Binding ParameterMachineMsg}"
               Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource ParameterMachine_Button}"/>
+              Height="30"
+              Width="140"
+              Margin="5,0,0,0"
+              Style="{StaticResource Optimizer_Button}"/>
    </StackPanel>
 
 </Grid>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml

@@ -38,23 +38,29 @@
                     Command="{Binding NewCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                     IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
             <Button Content="{Binding SaveMsg}" 
                     Command="{Binding SaveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                     IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
             <Button Content="{Binding RemoveMsg}" 
                     Command="{Binding RemoveCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                     IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
          </UniformGrid>
 
          <TreeView Grid.Row="1"
                    Name="MachiningsTreeView"
                    ItemsSource="{Binding Path=MachiningsList}"
-                   Style="{StaticResource MachiningDB_TreeView}">
+                   Background="{StaticResource TreeView.Static.Background}">
             <TreeView.ItemContainerStyle>
                <Style TargetType="{x:Type TreeViewItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
@@ -65,24 +71,29 @@
             <TreeView.Resources>
                <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" 
                                          ItemsSource="{Binding Items}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
+                  <Grid Height="20">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
                      <Image Source="{Binding PictureString}" 
-                            Style="{StaticResource MachiningDB_Image}"/>
+                            Height="20"
+                            Width="20"
+                            Margin="0,0,5,0"/>
                      <TextBlock Grid.Column="1" 
                                 Text="{Binding Name}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                                VerticalAlignment="Center"
+                                FontSize="15"
+                                Margin="0,-2,5,0"/>
                      <Ellipse Grid.Column="2" 
                               Fill="{Binding FamilyColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
+                              Height="20"
+                              Width="20"/>
                   </Grid>
                </HierarchicalDataTemplate>
                <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
+                  <Grid Height="20">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="1*"/>
@@ -90,10 +101,13 @@
                      </Grid.ColumnDefinitions>
                      <TextBlock Grid.Column="1" 
                                 Text="{Binding NamePar}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
+                                VerticalAlignment="Center"
+                                FontSize="15"
+                                Margin="0,-2,5,0"/>
                      <Ellipse Grid.Column="2" 
                               Fill="{Binding ToolColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
+                              Height="20"
+                              Width="20"/>
                   </Grid>
                </DataTemplate>
             </TreeView.Resources>
@@ -103,14 +117,20 @@
                       Columns="3">
             <Button Content="{Binding ImportMsg}" 
                     Command="{Binding ImportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
             <Button Content="{Binding ExportMsg}" 
                     Command="{Binding ExportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
             <Button Content="{Binding ResetMsg}" 
                     Command="{Binding ReloadMachiningCommand}" 
                     CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"
-                    Style="{StaticResource MachiningDB_Button}"/>
+                    Height="30"
+                    Width="64"
+                    Style="{StaticResource Optimizer_Button}"/>
          </UniformGrid>
 
       </Grid>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb

@@ -13,7 +13,7 @@ Public Class MachiningDbWindowV
       m_MachiningDbWindowVM = MachiningDbWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.OnCloseWindow
       Me.DataContext = Nothing
       Me.DialogResult = bDialogResult
       Me.Close()

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -10,14 +10,14 @@ Imports System.Windows
 ' Review the values of the assembly attributes
 
 #If DEBUG Then
-<Assembly: AssemblyTitle("EgtBEAMWALL.Core Debug AnyCPU")>
+<Assembly: AssemblyTitle("Aedifica.Core Debug AnyCPU")>
 #Else
-<Assembly: AssemblyTitle("EgtBEAMWALL.Core Release AnyCPU")>
+<Assembly: AssemblyTitle("Aedifica.Core Release AnyCPU")>
 #End If
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
-<Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyProduct("Aedifica.Core")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2026 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.11.10")>
-<Assembly: AssemblyFileVersion("2.7.11.10")>
+<Assembly: AssemblyVersion("3.1.8.2")>
+<Assembly: AssemblyFileVersion("3.1.8.2")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -3,9 +3,10 @@
                                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                  xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
                                  Title="{Binding Title}"
                                  ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                                 WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                                  MinHeight="500" MinWidth="500"
                                  DataContext="{Binding RelativeSource={RelativeSource Self}}"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
@@ -23,7 +24,8 @@
 
       <GroupBox Header="{Binding Filters_Msg}"
                 Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource NewOpenProjectFile_GroupBox}">
+                Margin="5"
+                Style="{StaticResource Optimizer_GroupBox}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -37,21 +39,32 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
+                         Height="22"
+                         MinWidth="55"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
                <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource DayTypeList_ComboBox}"/>
+                            Height="22"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                   <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                              Orientation="Horizontal">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                                VerticalAlignment="Center"
+                                Margin="2.5,0,2.5,0"/>
                      <DatePicker SelectedDate="{Binding dtStartDate}"                                 
                                  CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                                VerticalAlignment="Center"
+                                Margin="2.5,0,2.5,0"/>
                      <DatePicker SelectedDate="{Binding dtEndDate}"                                 
                                  CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
@@ -60,7 +73,7 @@
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
+                         VerticalAlignment="Center"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -70,40 +83,50 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Height="25"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
+                                      TextWrapping="Wrap"
+                                      Margin="5"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             Margin="10,5,10,0"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
+                            Height="22"
+                            MinWidth="55"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
       <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
+              Margin="1"
+              Style="{StaticResource Optimizer_Border}"/>
 
-      <EgtBEAMWALLCORE: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"
-                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+      <EgwWPFBaseLib:EgwDataGrid Grid.Row="1"
+                                 x:Name="MainDataGrid"
+                                 ItemsSource="{Binding ProjectList}" 
+                                 SelectedItem="{Binding SelProject}"
+                                 SelectionMode="Single"
+                                 Margin="5"
+                                 ColumnLayouts="{Binding ProdColumns}"
+                                 RowDetailsVisibilityMode="Visible"
+                                 CellEditEnding="MainDataGrid_CellEditEnding"
+                                 AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                 AlternationCount="2"
+                                 ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
+                                 Style="{StaticResource Optimizer_DataGrid}"
+                                 CellStyle="{StaticResource CellDataGrid_NewOpenProject}">
          <DataGrid.Resources>
             <!-- ProdId -->
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
@@ -124,9 +147,22 @@
                      <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
                                    IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource Small_ToggleButton}">
-                        <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource Lock_Image}"/>
+                                   Height="20"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                        <Image Source="/Resources/PartManager/Locked.png"
+                               Height="15"
+                               Stretch="Uniform">
+                           <Image.Style>
+                              <Style TargetType="{x:Type Image}">
+                                 <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
+                                       <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
+                                    </DataTrigger>
+                                 </Style.Triggers>
+                              </Style>
+                           </Image.Style>
+                        </Image>
                      </ToggleButton>
                   </Grid>
                </DataGridTextColumn.Header>
@@ -149,7 +185,9 @@
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
                             Visibility="{Binding Archived_Visibility}"
-                            Style="{StaticResource Archived_Image}"/>
+                            Height="15"
+                            Width="15"
+                            Stretch="UniformToFill"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
                <DataGridTemplateColumn.Header>
@@ -166,11 +204,15 @@
          </DataGrid.RowStyle>
          <DataGrid.RowDetailsTemplate>
             <DataTemplate>
-               <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             Style="{StaticResource ProjFileList_ItemsControl}">
+               <ItemsControl ItemsSource="{Binding ProjFileList}" 
+                             HorizontalAlignment="Left"
+                             BorderThickness="0"
+                             Padding="0"
+                             Margin="50,-1,0,0">
                   <ItemsControl.ItemTemplate>
                      <DataTemplate>
-                        <Grid Style="{StaticResource ProjFileList_Grid}">
+                        <Grid TextBlock.FontWeight="Normal"
+                              TextBlock.FontSize="12">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
                               <ColumnDefinition Width="1*"/>
@@ -180,10 +222,11 @@
                               <RowDefinition Height="1*"/>
                            </Grid.RowDefinitions>
                            <Grid Grid.ColumnSpan="2"
-                                 Style="{StaticResource Gray_Grid}"/>
+                                 Background="{StaticResource BeamWall_Gray}"
+                                 Margin="40,0,40,0"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Style="{StaticResource NewOpenProjectFile_Grid}">
+                                 Margin="2">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -195,18 +238,21 @@
                                  <RowDefinition Height="1*"/>
                               </Grid.RowDefinitions>
                               <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                                         Foreground="{StaticResource TextBlock.Static.DarkGray.Foreground}"
+                                         Margin="0,0,20,0"/>
                               <TextBlock Grid.Column="1"
                                          Text="{Binding sBTLFileName}"/>
                               <TextBlock Grid.Row="1"
                                          Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                                         Foreground="{StaticResource TextBlock.Static.DarkGray.Foreground}"
+                                         Margin="0,0,20,0"/>
                               <TextBlock Grid.Row="1"
                                          Grid.Column="1"                                         
                                          Text="{Binding sListName}"/>
                               <TextBlock Grid.Column="2"
                                          Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                                         Foreground="{StaticResource TextBlock.Static.DarkGray.Foreground}"
+                                         Margin="0,0,20,0"/>
                               <TextBlock Grid.Column="3"
                                          Text="{Binding dtExportDate}"/>
                            </Grid>
@@ -216,26 +262,30 @@
                </ItemsControl>
             </DataTemplate>
          </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+      </EgwWPFBaseLib:EgwDataGrid>
 
       <UniformGrid Grid.Row="2"
                    Columns="4" 
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <Button Name="OpenBtn"
                  IsDefault="True"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </UniformGrid>
 
    </Grid>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -41,40 +41,30 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
-   Protected m_ProdColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProdColumns As ObservableCollection(Of EgtDataGridColumn)
+   Protected m_ProdColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
+   Public Property ProdColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
       Get
          Return m_ProdColumns
       End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
+      Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
          m_ProdColumns = value
       End Set
    End Property
 
-   Private m_colProdFile_Name As EgtDataGridColumn
-   Public ReadOnly Property colProdFile_Name As EgtDataGridColumn
+   Private m_colProdFile_Name As EgwWPFBaseLib.ColumnLayout
+   Public ReadOnly Property colProdFile_Name As EgwWPFBaseLib.ColumnLayout
       Get
          Return m_colProdFile_Name
       End Get
    End Property
 
-   Private m_colArchived_Name As EgtDataGridColumn
-   Public ReadOnly Property colArchived_Name As EgtDataGridColumn
+   Private m_colArchived_Name As EgwWPFBaseLib.ColumnLayout
+   Public ReadOnly Property colArchived_Name As EgwWPFBaseLib.ColumnLayout
       Get
          Return m_colArchived_Name
       End Get
    End Property
 
-   Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProjColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProjColumns = value
-      End Set
-   End Property
-
    Protected m_ProjectType As ProjectType
 
    Protected m_sFilter As String
@@ -388,9 +378,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Boolean)
          m_bViewArchived = value
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
-         If Not IsNothing( m_colArchived_Name) Then
-             m_colArchived_Name.Visible = value
-             RefreshProjectList()
+         If Not IsNothing(m_colArchived_Name) Then
+            m_colArchived_Name.IsVisible = value
+            RefreshProjectList()
          End If
       End Set
    End Property
@@ -551,10 +541,11 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       ProdItem.m_delIsModifiedSetUp = AddressOf SetIsEditNameActive
       ' carico colonne
       LoadColumns()
-      m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
-      m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_ARCHIVED)
+      m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Key = COL_NAME)
+      m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Key = COL_ARCHIVED)
       ' leggo valori per filtri
-      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
+      Dim IniDayType As DayTypes = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
+      m_SelDayType = If(IniDayType <> DayTypes.PERIOD, IniDayType, DayTypes.LASTMONTH)
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
@@ -565,7 +556,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          Case DayTypes.LAST6MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
             m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-         Case DayTypes.PERIOD
+         Case Else    ' DayTypes.LASTMONTH
             Dim sStartDate As String = "0"
             Dim lStartDate As Long = 0
             GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
@@ -589,7 +580,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
    Protected Sub LoadColumns()
       ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       ' carico campi su cui eseguire il filtro di ricerca
       m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
       m_SelBTLDateType = BTLDateTypes.CREATEDATE
@@ -601,29 +592,14 @@ Public MustInherit Class NewOpenProjectFileDialogVM
                                                                     New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
       m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
       NotifyPropertyChanged(NameOf(SelFilterType))
-      'End If
-      ' setto la visibilità delle colonne delle EgtDataGrid
-      For Each col In ProjColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-      For Each col In ProdColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
    End Sub
 
    Friend Function VerifySelected() As Boolean
+      ' Salvo modifiche a colonne
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       If IsNothing(SelProject) Then Return False
       Dim AllFilesInDir As IEnumerable(Of String) = Nothing
-      If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
-         If Not IsNothing(SelProject.ProdFileVM) Then
-            If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
-         ElseIf SelProject.ProjFileList.Count > 0 Then
-            If String.IsNullOrWhiteSpace(SelProject.ProjFileList(0).sProjDirPath) OrElse Not Directory.Exists(SelProject.ProjFileList(0).sProjDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProjFileList(0).sProjDirPath)
-         Else Return False
-         End If
-      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
+      If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
          If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
          AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
       Else

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -3,6 +3,7 @@
                                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                  xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
+                                 xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
                                  Title="{Binding Title}"
                                  ResizeMode="NoResize" TitleBarHeight="30"
                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
@@ -23,7 +24,8 @@
 
       <GroupBox Header="Filters"
                 Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource OpenProjectFile_GroupBox}">
+                BorderBrush="{StaticResource BeamWall_RegentStBlue}"
+                Margin="5">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -36,21 +38,31 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Height="25"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
                <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource OpenProjectFile_ComboBox}"/>
+                            Height="25"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                   <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                              Orientation="Horizontal">
                      <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                                VerticalAlignment="Center"
+                                Margin="2.5,0,2.5,0"/>
                      <DatePicker SelectedDate="{Binding dtStartDate}"                                 
                                  CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
+                                Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                                VerticalAlignment="Center"
+                                Margin="2.5,0,2.5,0"/>
                      <DatePicker SelectedDate="{Binding dtEndDate}"                                 
                                  CalendarStyle="{StaticResource Filter_Calendar}"
                                  Style="{StaticResource Filter_DatePicker}"/>
@@ -65,37 +77,46 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Height="25"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource Optmizer_ComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
                                       Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
+                                      TextWrapping="Wrap"
+                                      Margin="5"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             Margin="10,5,10,0"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource RowQTY_ComboBox}"/>
+                            Width="55"
+                            Style="{StaticResource Optmizer_ComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
       <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
+              Margin="1"
+              Style="{StaticResource Optimizer_Border}"/>
 
-      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                                   ItemsSource="{Binding ProjectList}" 
-                                   SelectedItem="{Binding SelProject}"
-                                   SelectionMode="Single"
-                                   Margin="5"
-                                   BindingColumns="{Binding ProjectColumns}"
-                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                   AlternationCount="2"
-                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+      <EgwWPFBaseLib:EgwDataGrid Grid.Row="1"
+                                 ItemsSource="{Binding ProjectList}" 
+                                 SelectedItem="{Binding SelProject}"
+                                 SelectionMode="Single"
+                                 Margin="5"
+                                 ColumnLayouts="{Binding ProjectColumns}"
+                                 AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                 AlternationCount="2"
+                                 ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
+                                 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}"/>
@@ -103,14 +124,14 @@
             </Style>
          </DataGrid.RowStyle>
          <DataGrid.Resources>
-            <!-- ProjId -->
+            <!-- ProjId --><!--
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
                      <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
+            </DataGridTextColumn>-->
             <!-- ProdId -->
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
@@ -119,14 +140,14 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
-            <!-- Project Name -->
+            <!-- Project Name --><!--
             <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
                      <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
+            </DataGridTextColumn>-->
             <!-- BTL FileName -->
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
@@ -135,22 +156,22 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
-            <!-- ListName -->
+            <!-- ListName --><!--
             <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
                      <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- Exported date -->
+            </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 EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
+            </DataGridTextColumn>-->
             <!-- Creation date -->
             <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
@@ -163,28 +184,31 @@
                   <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!-- Name (per Prod) -->
+            <!-- Name (per Prod) --><!--
             <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
                <DataGridTextColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
-            </DataGridTextColumn>
+            </DataGridTextColumn>-->
          </DataGrid.Resources>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+      </EgwWPFBaseLib:EgwDataGrid>
 
       <UniformGrid Grid.Row="2"
                    Columns="3"  
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <Button Name="OpenBtn"
                  IsDefault="True"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </UniformGrid>
 
    </Grid>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb

@@ -69,6 +69,8 @@ Public Class OpenProjectFileDialogV
    End Sub
 
    Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      ' Salvo modifiche a colonne
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, m_OpenProjFileDialogVM.ProjectColumns)
       Me.DialogResult = bDialogResult
    End Sub
 

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -42,12 +42,12 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Protected m_GoToProd As Boolean = False
 
-   Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
+   Protected m_ProjectColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
+   Public Property ProjectColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
       Get
          Return m_ProjectColumns
       End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
+      Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
          m_ProjectColumns = value
       End Set
    End Property
@@ -408,6 +408,8 @@ Public MustInherit Class OpenProjectFileDialogVM
 #End Region    ' FIELDS & PROPERTIES
 
    Sub New()
+      ' carico colonne
+      LoadColumns()
       ' leggo valori per filtri
       m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
       Select Case m_SelDayType
@@ -420,18 +422,21 @@ Public MustInherit Class OpenProjectFileDialogVM
          Case DayTypes.LAST6MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
             m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-         Case DayTypes.PERIOD
-            Dim sStartDate As String = "0"
-            Dim lStartDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
-            Long.TryParse(sStartDate, lStartDate)
-            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
-            Dim sEndDate As String = "0"
-            Dim lEndDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
-            Long.TryParse(sEndDate, lEndDate)
-            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
-            m_Date_Visibility = Visibility.Visible
+         Case Else   'DayTypes.LASTMONTH
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
+            'Case DayTypes.PERIOD
+            '   Dim sStartDate As String = "0"
+            '   Dim lStartDate As Long = 0
+            '   GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
+            '   Long.TryParse(sStartDate, lStartDate)
+            '   m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
+            '   Dim sEndDate As String = "0"
+            '   Dim lEndDate As Long = 0
+            '   GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
+            '   Long.TryParse(sEndDate, lEndDate)
+            '   m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
+            '   m_Date_Visibility = Visibility.Visible
       End Select
    End Sub
 
@@ -441,51 +446,28 @@ Public MustInherit Class OpenProjectFileDialogVM
    Public Overridable Sub RefreshProjectList()
    End Sub
 
-   Protected Sub LoadColumns(ProjectType As ProjectType)
-      If ProjectType = ProjectType.PROJ Then
-         ' carico le colonne della datagrid
-         GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjectColumns)
-         ' carico campi su cui eseguire il filtro di ricerca
-         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
-         m_SelBTLDateType = BTLDateTypes.CREATEDATE
-         NotifyPropertyChanged(NameOf(BTLDateTypeList))
-         NotifyPropertyChanged(NameOf(SelBTLDateType))
-         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                       New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
-                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
-      ElseIf ProjectType = ProjectType.PROD Then
-         ' carico le colonne della datagrid
-         GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProjectColumns)
-         ' carico campi su cui eseguire il filtro di ricerca
-         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
-         m_SelBTLDateType = BTLDateTypes.CREATEDATE
-         NotifyPropertyChanged(NameOf(BTLDateTypeList))
-         NotifyPropertyChanged(NameOf(SelBTLDateType))
-         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
-      End If
-      ' setto la visibilità delle colonne delle EgtDataGrid
-      For Each col In ProjectColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
+   Protected Sub LoadColumns()
+      ' carico le colonne della datagrid
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
+      ' carico campi su cui eseguire il filtro di ricerca
+      m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
+      m_SelBTLDateType = BTLDateTypes.CREATEDATE
+      NotifyPropertyChanged(NameOf(BTLDateTypeList))
+      NotifyPropertyChanged(NameOf(SelBTLDateType))
+      m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+                                                                    New IdNameStruct(FilterTypes.ID, Id_Msg),
+                                                                    New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+                                                                    New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+      m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+      NotifyPropertyChanged(NameOf(SelFilterType))
    End Sub
 
    Friend Function VerifySelected() As Boolean
+      ' Salvo modifiche a colonne
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
       If IsNothing(SelProject) Then Return False
       Dim AllFilesInDir As IEnumerable(Of String) = Nothing
-      If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
-         If String.IsNullOrWhiteSpace(SelProject.sProjDirPath) OrElse Not Directory.Exists(SelProject.sProjDirPath) Then Return False
-         ' verifico se esiste ProdId
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.sProjDirPath)
-      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
+      If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
          If String.IsNullOrWhiteSpace(SelProject.sProdDirPath) OrElse Not Directory.Exists(SelProject.sProdDirPath) Then Return False
          AllFilesInDir = Directory.EnumerateFiles(SelProject.sProdDirPath)
       Else
@@ -501,25 +483,13 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Protected Function ProjectFilter(Proj As Object) As Boolean
       Dim bProjectOk As Boolean = True
-      If m_ProjectType = ProjectType.PROJ Then
-         Dim CurrProj As ProjFileVM = DirectCast(Proj, ProjFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse
-            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      ElseIf m_ProjectType = ProjectType.PROD Then
-         Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      End If
+      Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+         (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+         (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       Return bProjectOk
    End Function
 

EgtBEAMWALL.Core/Themes/DarkDictionary.xaml

@@ -0,0 +1,552 @@
+<ResourceDictionary 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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
+   </ResourceDictionary.MergedDictionaries>
+
+   <!--#region Colori per EgtWPFLib5-->
+
+   <SolidColorBrush x:Key="TextBox.Static.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+
+   <!--#endregion Colori per EgtWPFLib5-->
+
+   <!--#region Colori Button-->
+
+   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="{StaticResource BeamWall_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="{StaticResource BeamWall_TropicalBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="{StaticResource BeamWall_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="{StaticResource BeamWall_WildSand_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
+
+   <SolidColorBrush x:Key="Button.TitleBar.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="Button.MainMenu.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="Button.MainMenu.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.General.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.PrManagerNew.Background" Color="Transparent"/>
+
+   <!--#endregion Colori Button-->
+
+   <!--#region Colori ScrollBar-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ScrollBar-->
+
+   <!--#region Colori ComboBox-->
+
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_Selago_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_FrenchPass_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+
+   <!--#endregion Colori ComboBox-->
+
+   <!--#region Colori Expander-->
+
+   <SolidColorBrush x:Key="Expander.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+
+   <!--#endregion Colori Expander-->
+
+   <!--#region Colori ListBox-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeature.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroCustom.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroDefault.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.FeatureManager.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.LeftPanel.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.Strategy.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTL.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori ListBox-->
+
+   <!--#region Colori TabItem-->
+
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori TabItem-->
+
+   <!--#region Colori TabControl-->
+
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="TabControl.Static.Generic.Background" 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>
+
+   <LinearGradientBrush x:Key="TabControl.Optimizer.Background" 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>
+
+   <!--#endregion Colori TabControl-->
+
+   <!--#region Colori ScrollViewer-->
+
+   <LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori ScrollViewer-->
+
+   <!--#region Colori Grid-->
+
+   <LinearGradientBrush x:Key="Grid.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="Grid.Static.ExpanderDown.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Grid.Static.ExpanderUp.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Grid.Statistics.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Grid.UserAdmin.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <!--#endregion Colori Grid-->
+
+   <!--#region Colori GridSplitter-->
+
+   <SolidColorBrush x:Key="GridSplitter.Width.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="GridSplitter.Height.Background" Color="Transparent"/>
+
+   <!--#endregion Colori GridSplitter-->
+
+   <!--#region Colori TreeView-->
+
+   <LinearGradientBrush x:Key="TreeView.Static.Background" 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>
+
+   <SolidColorBrush x:Key="TreeView.Static.EgtManageDialog.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori TreeView-->
+
+   <!--#region Colori TextBlock-->
+
+   <SolidColorBrush x:Key="TextBlock.Static.First.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Second.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Third.Foreground" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Fouth.Foreground" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.UserAdmin.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.StrategyModify.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.CALC_ROT.Foreground" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Prod.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Prod.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.RawPartList.Foreground" Color="{StaticResource BeamWall_Orange_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Error.Foreground" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_0.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_1.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndexIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion TextBlock-->
+
+   <!--#region Colori StackPanel-->
+
+   <SolidColorBrush x:Key="StackPanel.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.BTLTotParts.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLTotTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLRemainingTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.Statistics.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori StackPanel-->
+
+   <!--#region Colori GroupBox-->
+
+   <SolidColorBrush x:Key="GroupBox.Static.Border" Color="{StaticResource BeamWall_Geyser_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.Static.OpenProjec.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.PDFPreview.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.MachinePanel.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <!--#endregion Colori GroupBox-->
+
+   <!--#region Colori Border-->
+
+   <SolidColorBrush x:Key="Border.Static.GroupBox.First.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Border.Static.GroupBox.Second.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.Optmizer.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Background" Color="{StaticResource BeamWall_Casper_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Border" Color="{StaticResource BeamWall_Casper_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.AboutBoxV.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.AboutBox.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ButtonTitleBar.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.EgwWindow.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ControlTemplete.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Border.ControlTemplete.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <LinearGradientBrush x:Key="Border.WithoutTitleBar.Background" 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>
+
+   <SolidColorBrush x:Key="Border.EgtHexItem.Border" Color="{StaticResource BeamWall_Gold_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Parameter.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.Parameter.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.NewAddFeature.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.AlternationIndex.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ItemContainer.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainer.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Strategy.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ForcedStrategyBTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTLPart.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.TotalTime.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Border.TotalTime.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.DoneTime.Background" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+   <SolidColorBrush x:Key="Border.DoneTime.Border" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+
+   <SolidColorBrush x:Key="Border.RemainingTime.Background" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+   <SolidColorBrush x:Key="Border.RemainingTime.Border" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ProjectType.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Border.ProjectType.Border" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.AddFeature.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.PRC.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Custom.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroCustom.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Default.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroDefault.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.BTLPartManager.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.BTLPartManager.Border" Color="{StaticResource BeamWall_Teal_Color}"/>
+
+   <SolidColorBrush x:Key="Border.SetUp.Border" Color="{StaticResource BeamWall_Indigo_Color}"/>
+
+   <SolidColorBrush x:Key="Border.TopPanel.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.TopPanel.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori Border-->
+
+   <!--#region Colori Rectangle-->
+
+   <SolidColorBrush x:Key="Rectangle.Static.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="Rectangle.EgtColorPicker.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori Rectangle-->
+
+   <!--#region Colori StatusBar-->
+
+   <SolidColorBrush x:Key="StatusBar.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori StatusBar-->
+
+   <!--#region Colori DatePicker-->
+
+   <SolidColorBrush x:Key="DatePicker.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePicker.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePickerTextBox.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori DatePicker-->
+
+   <!--#region Colori Calendar-->
+
+   <LinearGradientBrush x:Key="Calendar.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="Calendar.Static.Border" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori Calendar-->
+
+   <!--#region Colori DataGrid-->
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Background" Color="{StaticResource BeamWall_Teal_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Background" Color="{StaticResource BeamWall_Downy_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="DataGrid.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <!--#endregion Colori DataGrid-->
+
+   <!--#region Colori OptimizerWindow-->
+
+   <LinearGradientBrush x:Key="OptimizerWindow.Static.Background" 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>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <!--#endregion Colori OtimizerWindow-->
+
+   <!--#region Colori EgtCustomWindow-->
+
+   <LinearGradientBrush x:Key="EgtCustomWindow.Static.Background" 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>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarBorder" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarForeground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori EgtCustomWindow-->
+
+   <!--#region Colori EgtFloatingPanel-->
+
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Background" Color="{StaticResource BeamWall_Gray_Color}"/>
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori EgtFloatingPanel-->
+
+   <!--#region Colori EgtHexItem-->
+
+   <SolidColorBrush x:Key="EgtHexItem.Static.Background" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="EgtHexItem.Static.Border" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori EgtHexItem-->
+
+   <!--#region Colori Ellipse-->
+
+   <SolidColorBrush x:Key="Ellipse.Static.Fill" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.Parameter.Fill" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Ellipse.ParameterIsChecked.Fill" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.UpdateBTL.Fill" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <!--#endregion Colori Ellipse-->
+
+   <!--#region Colori ToggleButton-->
+
+   <SolidColorBrush x:Key="ToggleButton.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori ToggleButton-->
+
+   <!--#region Colori UniformGrid-->
+
+   <SolidColorBrush x:Key="UniformGrid.LeftPanel.Background" Color="{DynamicResource BeamWall_LinkWater_Color}"/>
+
+   <!--#endregion UniformGrid-->
+
+   <!--#region Colori ToolTip-->
+
+   <SolidColorBrush x:Key="ToolTip.PParameters.Background" Color="{DynamicResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ToolTip.PParameters.Foreground" Color="{DynamicResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ToolTip-->
+
+</ResourceDictionary>

EgtBEAMWALL.Core/Themes/DefaultDictionary.xaml

@@ -0,0 +1,552 @@
+<ResourceDictionary 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:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
+   </ResourceDictionary.MergedDictionaries>
+
+   <!--#region Colori per EgtWPFLib5-->
+
+   <SolidColorBrush x:Key="TextBox.Static.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+
+   <!--#endregion Colori per EgtWPFLib5-->
+
+   <!--#region Colori Button-->
+
+   <SolidColorBrush x:Key="ButtonBasic.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Static.Border" Color="{StaticResource BeamWall_DoveGray_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Background" Color="{StaticResource BeamWall_FrenchPass_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.MouseOver.Border" Color="{StaticResource BeamWall_BostonBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Background" Color="{StaticResource BeamWall_TropicalBlue_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Pressed.Border" Color="{StaticResource BeamWall_Calypso_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Background" Color="{StaticResource BeamWall_WildSand_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ButtonBasic.Disabled.Foreground" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Button.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Button.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Button.Disabled.Background" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Border" Color="{StaticResource BeamWall_Glacier_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="{StaticResource BeamWall_White_Color}" Opacity="0.5"/>
+
+   <SolidColorBrush x:Key="Button.TitleBar.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="Button.MainMenu.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="Button.MainMenu.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.General.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Button.PrManagerNew.Background" Color="Transparent"/>
+
+   <!--#endregion Colori Button-->
+
+   <!--#region Colori ScrollBar-->
+
+   <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Glyph" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Static.Thumb" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.MouseOver.Thumb" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Thumb" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Disabled.Glyph" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ScrollBar.Button.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ScrollBar-->
+
+   <!--#region Colori ComboBox-->
+
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="{StaticResource BeamWall_Bombay_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_Selago_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="{StaticResource BeamWall_Seagull_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_HawkesBlue_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_FrenchPass_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource BeamWall_Silver_Color}"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+
+   <!--#endregion Colori ComboBox-->
+
+   <!--#region Colori Expander-->
+
+   <SolidColorBrush x:Key="Expander.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="{StaticResource BeamWall_AliceBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="{StaticResource BeamWall_PattensBlue_Color}"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="{StaticResource BeamWall_Mercury_Color}" Opacity="0.5"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="{StaticResource BeamWall_RegentStBlue_Color}" Opacity="0.5"/>
+
+   <!--#endregion Colori Expander-->
+
+   <!--#region Colori ListBox-->
+
+   <SolidColorBrush x:Key="ListBox.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeature.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.NewAddFeatureNotSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroCustom.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.MacroDefault.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.FeatureManager.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.LeftPanel.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="ListBox.Strategy.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.StrategyNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTL.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.ForcedStrategyBTLNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ListBox.BTLPartNoSelected.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="Item.MouseOver.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Item.MouseOver.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedActive.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+   <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori ListBox-->
+
+   <!--#region Colori TabItem-->
+
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Background" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <LinearGradientBrush x:Key="TabItem.Selected.Background" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.85"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="1"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource BeamWall_Gallery_Color}"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori TabItem-->
+
+   <!--#region Colori TabControl-->
+
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="TabControl.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <LinearGradientBrush x:Key="TabControl.Static.Generic.Background" 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>
+
+   <LinearGradientBrush x:Key="TabControl.Optimizer.Background" 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>
+
+   <!--#endregion Colori TabControl-->
+   
+   <!--#region Colori ScrollViewer-->
+
+   <LinearGradientBrush x:Key="ScrollViewer.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Silver_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Alto_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori ScrollViewer-->
+
+   <!--#region Colori Grid-->
+
+   <LinearGradientBrush x:Key="Grid.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="Grid.Static.ExpanderDown.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Grid.Static.ExpanderUp.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Grid.Statistics.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Grid.UserAdmin.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <!--#endregion Colori Grid-->
+
+   <!--#region Colori GridSplitter-->
+
+   <SolidColorBrush x:Key="GridSplitter.Width.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="GridSplitter.Height.Background" Color="Transparent"/>
+
+   <!--#endregion Colori GridSplitter-->
+   
+   <!--#region Colori TreeView-->
+
+   <LinearGradientBrush x:Key="TreeView.Static.Background" 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>
+
+   <SolidColorBrush x:Key="TreeView.Static.EgtManageDialog.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori TreeView-->
+
+   <!--#region Colori TextBlock-->
+
+   <SolidColorBrush x:Key="TextBlock.Static.First.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Second.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Third.Foreground" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Static.Fouth.Foreground" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.UserAdmin.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.StrategyModify.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.CALC_ROT.Foreground" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Prod.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.Prod.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.RawPartList.Foreground" Color="{StaticResource BeamWall_Orange_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.Error.Foreground" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_0.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndex_1.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="TextBlock.AlternationIndexIsSelected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion TextBlock-->
+
+   <!--#region Colori StackPanel-->
+
+   <SolidColorBrush x:Key="StackPanel.Static.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.BTLTotParts.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLTotTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="StackPanel.BTLRemainingTime.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="StackPanel.Statistics.Background" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori StackPanel-->
+   
+   <!--#region Colori GroupBox-->
+
+   <SolidColorBrush x:Key="GroupBox.Static.Border" Color="{StaticResource BeamWall_Geyser_Color}"/>
+   
+   <SolidColorBrush x:Key="GroupBox.Static.OpenProjec.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+
+   <SolidColorBrush x:Key="GroupBox.PDFPreview.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   
+   <SolidColorBrush x:Key="GroupBox.MachinePanel.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <!--#endregion Colori GroupBox-->
+
+   <!--#region Colori Border-->
+
+   <SolidColorBrush x:Key="Border.Static.GroupBox.First.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="Border.Static.GroupBox.Second.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.Optmizer.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.EgtManageDialog.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Background" Color="{StaticResource BeamWall_Casper_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.TitleBar.Border" Color="{StaticResource BeamWall_Casper_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Static.AboutBoxV.Border" Color="{StaticResource BeamWall_RegentStBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.Static.AboutBox.Border" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ButtonTitleBar.Background" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.EgwWindow.Border" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ControlTemplete.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Border.ControlTemplete.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <LinearGradientBrush x:Key="Border.WithoutTitleBar.Background" 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>
+
+   <SolidColorBrush x:Key="Border.EgtHexItem.Border" Color="{StaticResource BeamWall_Gold_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Parameter.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.Parameter.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.NewAddFeature.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.AlternationIndex.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ItemContainer.Background" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainer.Border" Color="{StaticResource BeamWall_LinkWater_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.ItemContainerIsSelected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Strategy.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.ForcedStrategyBTL.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.BTLPart.Border" Color="Transparent"/>
+
+   <SolidColorBrush x:Key="Border.TotalTime.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="Border.TotalTime.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.DoneTime.Background" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+   <SolidColorBrush x:Key="Border.DoneTime.Border" Color="{StaticResource BeamWall_FruitSalad_Color}"/>
+
+   <SolidColorBrush x:Key="Border.RemainingTime.Background" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+   <SolidColorBrush x:Key="Border.RemainingTime.Border" Color="{StaticResource BeamWall_FuelYellow_Color}"/>
+
+   <SolidColorBrush x:Key="Border.ProjectType.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="Border.ProjectType.Border" Color="{StaticResource BeamWall_DarkGray_Color}"/>
+
+   <SolidColorBrush x:Key="Border.AddFeature.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.PRC.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Custom.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroCustom.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.Default.Background" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Border.MacroDefault.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="Border.BTLPartManager.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="Border.BTLPartManager.Border" Color="{StaticResource BeamWall_Teal_Color}"/>
+
+   <SolidColorBrush x:Key="Border.SetUp.Border" Color="{StaticResource BeamWall_Indigo_Color}"/>
+
+   <SolidColorBrush x:Key="Border.TopPanel.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+   <SolidColorBrush x:Key="Border.TopPanel.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori Border-->
+
+   <!--#region Colori Rectangle-->
+
+   <SolidColorBrush x:Key="Rectangle.Static.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <SolidColorBrush x:Key="Rectangle.EgtColorPicker.Stroke" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori Rectangle-->
+
+   <!--#region Colori StatusBar-->
+
+   <SolidColorBrush x:Key="StatusBar.Static.Background" Color="{StaticResource BeamWall_Alto_Color}"/>
+
+   <!--#endregion Colori StatusBar-->
+
+   <!--#region Colori DatePicker-->
+
+   <SolidColorBrush x:Key="DatePicker.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePicker.Static.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="DatePickerTextBox.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori DatePicker-->
+
+   <!--#region Colori Calendar-->
+
+   <LinearGradientBrush x:Key="Calendar.Static.Background" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+      <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="Calendar.Static.Border" EndPoint="0.5,1" StartPoint="0.35,0">
+      <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+      <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+      <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+      <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+   </LinearGradientBrush>
+
+   <!--#endregion Colori Calendar-->
+   
+   <!--#region Colori DataGrid-->
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Background" Color="{StaticResource BeamWall_Teal_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Main.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Background" Color="{StaticResource BeamWall_Keppel_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.Feature.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Background" Color="{StaticResource BeamWall_Downy_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.PParam.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Background" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="DataGridColumnHeader.Static.RawPart.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="DataGrid.Static.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="DataGrid.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>
+
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="RowDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Background" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="CellDataGrid.Selected.Border" Color="{StaticResource BeamWall_FountainBlue_Color}"/>
+
+   <!--#endregion Colori DataGrid-->
+   
+   <!--#region Colori OptimizerWindow-->
+   
+   <LinearGradientBrush x:Key="OptimizerWindow.Static.Background" 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>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Foreground" Color="{StaticResource BeamWall_White_Color}"/>
+   <SolidColorBrush x:Key="OptimizerWindow.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   
+   <!--#endregion Colori OtimizerWindow-->
+   
+   <!--#region Colori EgtCustomWindow-->
+
+   <LinearGradientBrush x:Key="EgtCustomWindow.Static.Background" 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>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.Border" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarBorder" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="EgtCustomWindow.Static.TitleBarForeground" Color="{StaticResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori EgtCustomWindow-->
+   
+   <!--#region Colori EgtFloatingPanel-->
+
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Background" Color="{StaticResource BeamWall_Gray_Color}"/>
+   <SolidColorBrush x:Key="EgtFloatingPanel.Static.Border" Color="{StaticResource BeamWall_Gray_Color}"/>
+
+   <!--#endregion Colori EgtFloatingPanel-->
+
+   <!--#region Colori EgtHexItem-->
+
+   <SolidColorBrush x:Key="EgtHexItem.Static.Background" Color="{StaticResource BeamWall_CornflowerBlue_Color}"/>
+   <SolidColorBrush x:Key="EgtHexItem.Static.Border" Color="{StaticResource BeamWall_Black_Color}"/>
+
+   <!--#endregion Colori EgtHexItem-->
+
+   <!--#region Colori Ellipse-->
+
+   <SolidColorBrush x:Key="Ellipse.Static.Fill" Color="{StaticResource BeamWall_Blue_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.Parameter.Fill" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="Ellipse.ParameterIsChecked.Fill" Color="{StaticResource BeamWall_Kashmir_Color}"/>
+
+   <SolidColorBrush x:Key="Ellipse.UpdateBTL.Fill" Color="{StaticResource BeamWall_Red_Color}"/>
+
+   <!--#endregion Colori Ellipse-->
+   
+   <!--#region Colori ToggleButton-->
+
+   <SolidColorBrush x:Key="ToggleButton.Static.Background" Color="Transparent"/>
+
+   <!--#endregion Colori ToggleButton-->
+   
+   <!--#region Colori UniformGrid-->
+
+   <SolidColorBrush x:Key="UniformGrid.LeftPanel.Background" Color="{DynamicResource BeamWall_LinkWater_Color}"/>
+
+   <!--#endregion UniformGrid-->
+   
+   <!--#region Colori ToolTip-->
+
+   <SolidColorBrush x:Key="ToolTip.PParameters.Background" Color="{DynamicResource BeamWall_Glacier_Color}"/>
+   <SolidColorBrush x:Key="ToolTip.PParameters.Foreground" Color="{DynamicResource BeamWall_White_Color}"/>
+
+   <!--#endregion Colori ToolTip-->
+   
+</ResourceDictionary>

EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceM.vb

@@ -0,0 +1,11 @@
+Public Class ThemesDataServiceM
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Property Name As String
+   Public Property Path As String
+   Public Property AssemblyName As String
+
+#End Region    ' Fields & Properties
+
+End Class

EgtBEAMWALL.Core/ThemesDataService/ThemesDataServiceVM.vb

@@ -0,0 +1,101 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Resources
+Imports System.Windows
+Imports EgtUILib
+
+Public Class ThemesDataServiceVM
+
+#Region "FIELDS & PROPERTIES"
+
+   Private ReadOnly m_Themes As New ObservableCollection(Of ThemesDataServiceM)()
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      ScanResources()
+      ScanDisk(THEMES_FOLDER)
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "METHODS"
+
+   ''' <summary>
+   ''' Restiusce il nome derivato dalla cartella
+   ''' </summary>
+   ''' <param name="path"></param>
+   ''' <param name="pathChar"></param>
+   ''' <param name="fileEnding"></param>
+   ''' <returns></returns>
+   Private Function GetNameFromPath(ByVal path As String, ByVal Optional pathChar As Char = "/"c, ByVal Optional fileEnding As String = "Theme.xaml") As String
+      Dim name As String = path.Substring(path.LastIndexOf(pathChar) + 1)
+      name = name.Substring(0, name.Length - fileEnding.Length)
+      name = Char.ToUpper(name(0)) & If(name.Length > 1, name.Substring(1), "")
+      Return name
+   End Function
+
+   ''' <summary>
+   ''' Ricerca i file dizionario contente il tema
+   ''' </summary>
+   ''' <param name="fileEnding"></param>
+   Private Sub ScanResources(ByVal Optional fileEnding As String = DICTIONARY_FILENAME)
+      Dim assembly = System.Reflection.Assembly.GetExecutingAssembly()
+      Dim resourceNames = assembly.GetManifestResourceNames()
+
+      For Each resourceName In resourceNames
+         Dim [set] As New ResourceSet(assembly.GetManifestResourceStream(resourceName))
+
+         For Each item As DictionaryEntry In [set]
+            Dim fileName As String = item.Key.ToString()
+
+            If fileName.ToLower().EndsWith(fileEnding.ToLower()) Then
+               m_Themes.Add(New ThemesDataServiceM() With {
+                   .Name = GetNameFromPath(fileName),
+                   .Path = "pack://application:,,,/WpfTheme;component/" & fileName
+               })
+            End If
+         Next
+      Next
+   End Sub
+
+   ''' <summary>
+   ''' Ricerca  i temi presenti nel programma
+   ''' </summary>
+   ''' <param name="relativePath"></param>
+   Private Sub ScanDisk(ByVal relativePath As String)
+      If Directory.Exists(AppDomain.CurrentDomain.BaseDirectory & relativePath) Then
+         Dim themeFiles = Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory & relativePath, "*" & DICTIONARY_FILENAME, SearchOption.AllDirectories)
+
+         For Each fileName In themeFiles
+            m_Themes.Add(New ThemesDataServiceM() With {
+                .Name = GetNameFromPath(fileName, "\"c),
+                .Path = fileName
+            })
+         Next
+      End If
+   End Sub
+
+   ''' <summary>
+   ''' Funzione che permette di selezionare e applicare il tema
+   ''' </summary>
+   ''' <param name="theme"></param>
+   Public Sub SetTheme(ByVal theme As ThemesDataServiceM)
+      If theme Is Nothing Then
+         EgtOutLog("Error setting theme: Attempting to set theme to null.")
+         Return
+      End If
+
+      Try
+         Dim uri As New Uri($"pack://application:,,,/{theme.AssemblyName};component/{theme.Path}", UriKind.Absolute)
+         Application.Current.Resources.MergedDictionaries(1).Source = uri
+      Catch ex As Exception
+         EgtOutLog("Error setting theme: " & ex.Message)
+      End Try
+   End Sub
+
+#End Region    ' Methods
+
+End Class

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml

@@ -10,7 +10,9 @@
       <ColumnDefinition Width="Auto" />
    </Grid.ColumnDefinitions>
    <Border Grid.ColumnSpan="6"
-           Style="{StaticResource TitleBar_Border}"/>
+           Background="{StaticResource BeamWall_Casper}"
+           BorderBrush="{StaticResource BeamWall_Casper}"
+           BorderThickness="0"/>
    <Image MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
 		    Source="/Resources/EgalwareLogo.ico"/>
    <ContentControl Grid.Column="1"/>

EgtBEAMWALL.Core/Utility/DimensionsIniFile.vb

@@ -1,7 +1,7 @@
-Imports System.Windows
-Imports EgtWPFLib5
+Imports System.Collections.ObjectModel
+Imports System.Windows
 Imports EgtUILib
-Imports System.Collections.ObjectModel
+Imports EgtWPFLib5
 
 Public Module DimensionsIniFile
 
@@ -32,6 +32,11 @@ Public Module DimensionsIniFile
          End If
          Index += 1
       End While
+      If GridDimsList.Count = 0 Then
+         For Ind As Integer = 0 To 4
+            GridDimsList.Add(New GridDimension(GridName, Ind, 0, New GridLength(1, GridUnitType.Star)))
+         Next
+      End If
       For Each GridDimsItem In GridDimsList
          GridDimsItem.GridDimensions = GridDimsList
       Next
@@ -54,8 +59,4 @@ Public Module DimensionsIniFile
       Return WritePrivateProfileString(GridName, Index, sValue, m_sDimensionsIniFile)
    End Function
 
-   Private Function GetGridLengthFromIndexAndType(GridDimsList As List(Of GridDimension), Index As Integer, DimType As DimensionType) As GridDimension
-      Return GridDimsList.FirstOrDefault(Function(x) x.Index = Index And x.DimType = DimType)
-   End Function
-
 End Module

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -5,6 +5,7 @@
    WARNING = 2
    ERROR_ = 3
    COLLISION = 4
+   SECTION = 5
 End Enum
 
 Public Enum EventType

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml

@@ -1,49 +1,56 @@
 <StackPanel x:Class="ViewPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+            Orientation="Vertical">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding ZoomAllCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource ZoomAll_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding TopViewCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromTOP_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding FrontViewCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromFRONT_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding RightViewCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromRIGHT_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding BackViewCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromBACK_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding LeftViewCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromLEFT_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
-           Style="{StaticResource Mach_Button}"
-           Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Command="{Binding IsoViewSWCommand}"
+           Height="30"
+           Width="30">
+      <Image Source="{StaticResource LookFromISO_SW_Image}"
+             Stretch="Uniform"/>
    </Button>
 
 </StackPanel>

EgtBEAMWALL.Core/packages.config

@@ -1,7 +1,7 @@
 <?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="EgwWPFBaseLib" version="3.1.7.3" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
   <package id="RestSharp" version="111.2.0" targetFramework="net472" />

EgtBEAMWALL.DataLayer/Controllers/BTLPartController.cs

@@ -409,7 +409,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log =  NLog.LogManager
+                                       .Setup()
+                                       .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                       .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -146,7 +146,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
 

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -257,7 +257,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/LogSupportController.cs

@@ -187,7 +187,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs

@@ -809,7 +809,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -461,7 +461,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -1128,7 +1128,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
 

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -967,7 +967,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -293,7 +293,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Istanza logger
         /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private NLog.Logger Log = NLog.LogManager
+                                      .Setup()
+                                      .LoadConfigurationFromFile(DbConfig.NLOG_PATH + @"\NLog.config")
+                                      .GetCurrentClassLogger();
 
         #endregion Private Fields
     }

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -12,7 +12,7 @@ namespace EgtBEAMWALL.DataLayer
     {
         #region Public Fields
 
-        public static string DATABASE_NAME = "EgtBwDb";
+        public static string DATABASE_NAME = "AedificaDb";
 
         public static int DATABASE_PROCESS_TIMEOUT = 5;
         public static string DATABASE_PWD = "viacremasca";
@@ -23,6 +23,8 @@ namespace EgtBEAMWALL.DataLayer
         public static string DATABASE_USER = "EgtUser";
         public static string ZIP_PWD = "viacremasca-viacremasca-viacremasca-viacremasca";
 
+        public static string NLOG_PATH = "";
+
         #endregion Public Fields
 
         #region Public Properties
@@ -245,7 +247,7 @@ namespace EgtBEAMWALL.DataLayer
             // se nulla metto amster come nKey...
             masterKey = string.IsNullOrEmpty(masterKey) ? nKey : masterKey;
             DATABASE_SERV = server;
-            DATABASE_NAME = $"EgtBwDb_{masterKey}";
+            DATABASE_NAME = $"AedificaDb_{masterKey}";
             DATABASE_USER = $"user_{nKey}";
             DATABASE_PWD = $"pwd_{sKey}";
             ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
@@ -258,18 +260,9 @@ namespace EgtBEAMWALL.DataLayer
         /// Aggiorna conf NLog x target DIR
         /// </summary>
         /// <param name="logDir"></param>
-        public static void SetupLogDir(string logDir)
+        public static void SetupLogDir(string NLogPath)
         {
-            string appDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string filePath = Path.Combine(appDir, "NLog.config");
-            // leggo il file NLog
-            string rawData = File.ReadAllText(filePath);
-
-            // sostituzione livello minimo da selezione
-            rawData = rawData.Replace("${basedir}", logDir);
-
-            // ri-scrivo file NLog
-            File.WriteAllText(filePath, rawData);
+            NLOG_PATH = NLogPath;
         }
 
         #endregion Public Methods

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -238,7 +238,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.DataLayer.dll</PostBuildEvent>
+    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\Aedifica\EgtBEAMWALL.DataLayer.dll</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Egalware s.r.l.")]
 [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2026 by Egalware s.r.l.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.1.1")]
-[assembly: AssemblyFileVersion("2.7.1.1")]
+[assembly: AssemblyVersion("3.1.8.2")]
+[assembly: AssemblyFileVersion("3.1.8.2")]

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml

@@ -1,11 +1,17 @@
 <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">
+        Title="AboutBox" 
+        Height="400" 
+        Width="360" 
+        WindowStyle="None"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False" 
+        WindowStartupLocation="CenterOwner">
 
-   <Border BorderThickness="2" BorderBrush="LightBlue">
-      <Grid >
+   <Border BorderBrush="{StaticResource Border.Static.RegentStBlue.Border}"
+           BorderThickness="2">
+      <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
             <ColumnDefinition Width="5*"/>
@@ -24,29 +30,54 @@
             <RowDefinition Height="0.35*"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="1" Grid.Row="1">
+         <Grid Grid.Row="1"
+               Grid.Column="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.Column="1"
+                    BorderBrush="{StaticResource Border.Static.White.Border}">
+               <Image Source="{StaticResource AboutBox_Image}" 
+                      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"
+         <TextBlock Grid.Row="3"
+                    Grid.Column="1"
+                    Name="DescriptionLbl"   
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="18"/>
+         <TextBlock Grid.Row="4"
+                    Grid.Column="1"
+                    Name="VersionLbl" 
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="18"/>
+         <TextBlock Grid.Row="5"
+                    Grid.Column="1"
+                    Name="CopyrightLbl" 
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="12"/>
+         <TextBox Grid.Row="6"
+                  Grid.Column="1" 
+                  Name="InfoLbl" 
+                  IsReadOnly="True"
+                  Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  FontSize="12"
+                  TextWrapping="Wrap"/>
+         <Button Grid.Row="8"
+                 Grid.Column="1"
+                 Name="ExitBtn"                   
+                 IsCancel="True"
                  Margin="100,0"/>
-
       </Grid>
-
    </Border>
-
 </Window>

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports EgtBEAMWALL.Core
 
 Public Class AboutBoxV
 

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml

@@ -18,12 +18,20 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Border Style="{StaticResource AddFeatureWnd_Border}">
+      <Border Background="{StaticResource Border.Static.Kashmir.Background}"
+              CornerRadius="4,0,0,4"
+              Margin="0,2,0,2">
       <TextBlock Text="{Binding Process_Msg}"
-                 Style="{StaticResource List_TextBlock}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 FontSize="20"
+                 Margin="10,0,10,0"
+                 Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
-              Style="{StaticResource PRCList_Border}">
+              BorderBrush="{StaticResource Border.Static.Glacier.Border}"
+              BorderThickness="2,2,0,2"
+              CornerRadius="4,0,0,4">
          <ListBox Grid.Row="1"
                   ItemsSource="{Binding PRCListView}"
                   SelectedItem="{Binding nSelPRC}"
@@ -34,26 +42,43 @@
                   <TextBlock Text="{Binding ghDesc}"
                              ToolTip="{Binding ghDesc}"
                              Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
-                             Style="{StaticResource PRCList_TextBlock}"/>
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             TextAlignment="Justify"
+                             TextWrapping="Wrap"
+                             Margin="10,5,10,0"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
       <Border Grid.Column="1"
-              Style="{StaticResource Custom_Border}">
+              Background="{StaticResource Border.Static.Kashmir.Background}"
+              BorderThickness="0,2,0,2">
          <TextBlock Grid.Column="1"
                     Text="{Binding Custom_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="1" 
-              Style="{StaticResource MacroCustomList_Border}">
+              BorderBrush="{StaticResource Border.Static.Glacier.Border}"
+              BorderThickness="0,2,0,2"
+              CornerRadius="0">
          <ListBox ItemsSource="{Binding MacroCustomList}"
                   SelectedIndex="{Binding nSelMacroCustom}"
-                  Style="{StaticResource MacroCustom_ListBox}">
+                  Background="Transparent"
+                  BorderThickness="0"
+                  Height="610"
+                  Width="980"
+                  Margin="5"
+                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
-                  <WrapPanel Style="{StaticResource MacroCustom_WrapPanel}"/>
+                  <WrapPanel Orientation="Horizontal"
+                             IsItemsHost="True"/>
                </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
             <ListBox.ItemTemplate>
@@ -64,23 +89,37 @@
                         <RowDefinition Height="1*"/>
                      </Grid.RowDefinitions>
                      <TextBlock Text="{Binding sMacroName}"
-                                Style="{StaticResource Macro_TextBlock}"/>
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top"
+                                FontSize="14"
+                                Margin="5"
+                                Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                      <Image Grid.Row="1" 
                             Source="{Binding sMacroDrawPath}"
-                            Style="{StaticResource Macro_Image}"/>
+                            Width="300"
+                            Margin="5,0,5,5"/>
                   </Grid>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
       </Border>
       <Border Grid.Column="2" 
-              Style="{StaticResource Default_Border}">
+              Background="{StaticResource Border.Static.Kashmir.Background}"
+              CornerRadius="0,4,4,0"
+              Padding="0,10,0,10"
+              Margin="0,2,0,2">
          <TextBlock Text="{Binding Default_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Margin="10,0,10,0"
+                    Style="{StaticResource ForegroundWhite_TextBlock}"/>
       </Border>
       <Border Grid.Row="1" 
               Grid.Column="2" 
-              Style="{StaticResource MacroDefaultList_Border}">
+              BorderBrush="{StaticResource Border.Static.Glacier.Border}"
+              BorderThickness="0,2,2,2"
+              CornerRadius="0,4,4,0">
          <ListBox ItemsSource="{Binding MacroDefaultList}"
                   SelectedIndex="{Binding nSelMacroDefault}"
                   Style="{StaticResource MacroDefault_ListBox}"
@@ -88,7 +127,12 @@
             <ListBox.ItemTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding sMacroName}"
-                             Style="{StaticResource MacroDefault_TextBlock}"/>
+                             HorizontalAlignment="Left"
+                             VerticalAlignment="Top"
+                             TextAlignment="Justify"
+                             Width="239"
+                             Margin="2.5"
+                             Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
@@ -96,14 +140,16 @@
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
+                   Margin="5">
          <Button Content="{Binding OK_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -106,11 +106,7 @@ Public Class AddFeatureWndVM
                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
+               MacroList_IsEnabled = If(MacroCustomList.Count > 0, True, False)
             End If
          End If
          NotifyPropertyChanged(NameOf(nSelPRC))
@@ -314,7 +310,7 @@ Public Class AddFeatureWndVM
       If Not IsNothing(m_nSelPRC) AndAlso m_nSelPRC.nPRC > 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
       End If
    End Sub
 

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndV.xaml

@@ -16,19 +16,24 @@
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Style="{StaticResource AddPart_Grid}">
+      <Grid HorizontalAlignment="Center"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="Name"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sNAM}"
-                                Style="{StaticResource NAM_TextBox}"/>
+                                TextWrapping="Wrap"
+                                Width="200"/>
       </Grid>
       <Grid Grid.Row="1"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -36,19 +41,31 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="Prod Number"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding nPDN}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                TextWrapping="Wrap"
+                                Height="25"
+                                Width="50"/>
          <TextBlock Grid.Column="2"
                     Text="Count"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sCNT}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                TextWrapping="Wrap"
+                                Height="25"
+                                Width="50"/>
       </Grid>
       <Grid Grid.Row="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -58,34 +75,54 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="W"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                 Text="{Binding sW}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                TextWrapping="Wrap"
+                                Height="25"
+                                Width="50"/>
          <TextBlock Grid.Column="2"
                     Text="H"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="3"
                                 Text="{Binding sH}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                TextWrapping="Wrap"
+                                Height="25"
+                                Width="50"/>
          <TextBlock Grid.Column="4"
                     Text="L"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <EgtWPFLib5:EgtTextBox Grid.Column="5"
                                 Text="{Binding sL}"
-                                Style="{StaticResource Dimension_TextBox}"/>
+                                VerticalContentAlignment="Center"
+                                TextWrapping="Wrap"
+                                Height="25"
+                                Width="65"/>
       </Grid>
 
       <UniformGrid Grid.Row="3"
                    Columns="2"
-                   Style="{StaticResource AddPartWnd_UniformGrid}">
+                   Margin="0,5,0,5">
          <Button Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </UniformGrid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb

@@ -147,7 +147,7 @@ Public Class AddPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -165,11 +165,11 @@ Public Class AddPartWndVM
          Not IsNothing(m_dH) AndAlso m_dH >= 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61853), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61853), EgtMsg(30007))
       End If
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndV.xaml

@@ -4,11 +4,11 @@
                                  xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
+                                 WindowStartupLocation="CenterScreen"
                                  Title="AddRawPartWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-   
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -18,38 +18,46 @@
                 SelectedItem="{Binding SelDimension}"
                 DisplayMemberPath="sDimension"
                 Visibility="{Binding DimensionsList_Visibility}"
-                Style="{StaticResource AddRawPartWnd_ComboBox}"/>
+                Margin="0,0,0,5"
+                Style="{StaticResource Optmizer_ComboBox}"/>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding VariableList}">
          <ItemsControl.ItemTemplate>
             <DataTemplate>
-               <Grid Style="{StaticResource AddPartWnd_Grid}">
+               <Grid Margin="0,0,0,5">
                   <Grid.ColumnDefinitions>
                      <ColumnDefinition Width="1*"/>
                      <ColumnDefinition Width="Auto"/>
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="{Binding sMsg}"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                             HorizontalAlignment="Center"
+                             VerticalAlignment="Center"
+                             Margin="10,5,10,0"/>
                   <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                          Text="{Binding sValue}"
-                                         Style="{StaticResource Value_TextBox}"/>
+                                         TextWrapping="Wrap"
+                                         Width="65"/>
                </Grid>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>
       <UniformGrid Grid.Row="2"
                    Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
+                   Margin="0,0,0,5">
          <Button Grid.Column="1"
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource AddRawPartWnd_Button}"
-                 Margin="0,0,5,0"/>
+                 Height="30"
+                 Width="80"
+                 Margin="0,0,5,0"
+                 Style="{StaticResource Optimizer_Button}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </UniformGrid>
    </Grid>
 

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -143,7 +143,7 @@ Public Class AddRawPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -159,7 +159,7 @@ Public Class AddRawPartWndVM
       For Each Variable In m_VariableList
          If (Variable.nType = Variable.VariableType.STRING_ AndAlso IsNothing(Variable.sValue)) OrElse
             ((Variable.nType = Variable.VariableType.DOUBLE_ OrElse Variable.nType = Variable.VariableType.LENGTH) AndAlso IsNothing(Variable.dValue)) Then
-            MessageBox.Show(If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
             Return
          End If
       Next
@@ -167,7 +167,7 @@ Public Class AddRawPartWndVM
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/Application.xaml

@@ -1,11 +1,14 @@
 <Application x:Class="Application"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer">
+             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
 
    <Application.Resources>
       <ResourceDictionary>
          <ResourceDictionary.MergedDictionaries>
+            <!--<ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/DarkDictionary.xaml"/>
+            <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/DefaultDictionary.xaml"/>-->
+            <ResourceDictionary Source="/EgwRedmineAPI;component/Themes/Generic.xaml"/>
             <ResourceDictionary Source="pack://application:,,,/EgtBEAMWALL.Core;component/Themes/Generic.xaml"/>
             <ResourceDictionary Source="Utility/Dictionary.xaml"/>
          </ResourceDictionary.MergedDictionaries>

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml

@@ -18,9 +18,32 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-            <ComboBox ItemsSource="{Binding StrategySetupList}" 
-                      SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource BTLDataWnd_ComboBox}"/>
+            <StackPanel Orientation="Horizontal"
+                        HorizontalAlignment="Center">
+               <ComboBox ItemsSource="{Binding StrategySetupList}" 
+                         SelectedItem="{Binding SelStrategySetup, UpdateSourceTrigger=PropertyChanged}"
+                         Foreground="{StaticResource BeamWall_Black}"
+                         HorizontalAlignment="Center"
+                         FontSize="15"
+                         Height="30"
+                         Width="160"
+                         Margin="0,10,0,10"
+                         Style="{StaticResource Optmizer_ComboBox}">
+                  <ComboBox.ItemContainerStyle>
+                     <Style TargetType="{x:Type ComboBoxItem}">
+                        <EventSetter Event="PreviewMouseDown" Handler="ComboBoxItem_PreviewMouseDown"/>
+                     </Style>
+                  </ComboBox.ItemContainerStyle>
+               </ComboBox>
+               <TextBlock Text="{Binding ErrText}"
+                          Foreground="{StaticResource BeamWall_Red}"
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          TextAlignment="Justify"
+                          TextWrapping="Wrap"
+                          FontSize="13"
+                          Margin="10,0,0,0"/>
+            </StackPanel>
             <Grid Grid.Row="1">
                <Grid.RowDefinitions>
                   <RowDefinition Height="Auto"/>
@@ -31,18 +54,28 @@
                </Grid.ColumnDefinitions>
                <OPTIMIZER:ProjectParametersV Grid.RowSpan="2" 
                                              Margin="0,10,0,0"
-                                             Tag="{Binding GeneralParametersList}"
-                                             IsEnabled="{Binding GeneralParametersIsEnable}"/>
+                                             Tag="{Binding GeneralParametersList}"/>
                <UniformGrid Grid.Column="1"
-                            Rows="2" 
-                            Style="{StaticResource BTLDataWnd_UniformGrid}">
-                  <CheckBox IsChecked="{Binding bSaveGeneralParameters, UpdateSourceTrigger=PropertyChanged}" 
-                            Style="{StaticResource BTLDataWnd_CheckBox}"/>
+                            Columns="2" 
+                            VerticalAlignment="Bottom"
+                            Margin="0,0,5,0">
                   <Button Command="{Binding Ok_Command}"
                           ToolTip="{Binding SaveAsToolTip}"
-                          Style="{StaticResource BTLDataWnd_Button}">
-                     <Image Source="/Resources/NewPage/Ok.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                          Height="40"
+                          Width="40"
+                          Margin="0,0,5,5"
+                          Style="{StaticResource Optimizer_Button}">
+                     <Image Source="{StaticResource Ok_Image}"
+                            Stretch="Uniform"/>
+                  </Button>
+                  <Button Command="{Binding Cancel_Command}"
+                          ToolTip="{Binding SaveAsToolTip}"
+                          Height="40"
+                          Width="40"
+                          Margin="0,0,0,5"
+                          Style="{StaticResource Optimizer_Button}">
+                     <Image Source="{StaticResource Delete_Image}"
+                            Stretch="Uniform"/>
                   </Button>
                </UniformGrid>
             </Grid>
@@ -53,119 +86,207 @@
                       Columns="6" 
                       Rows="7">
             <TextBlock Text="{Binding PROJNUM_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sPROJNUM, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sPROJNUM, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding PROJNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sPROJNAME, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sPROJNAME, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding PROJPART_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sPROJPART, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sPROJPART, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding PROJGUID_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sPROJGUID, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sPROJGUID, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150" 
+                                   Margin="5"/>
             <TextBlock Text="{Binding LISTNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sLISTNAME, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sLISTNAME, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding CUSTOMER_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sCUSTOMER, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sCUSTOMER, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding ARCHITECT_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sARCHITECT, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sARCHITECT, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding EDITOR_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEDITOR, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sEDITOR, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding DELIVDATE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sDELIVDATE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding sDELIVDATE, UpdateSourceTrigger=Explicit,
+                                                  RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}}}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding EXPDATE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEXPDATE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sEXPDATE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding EXPTIME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEXPTIME, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sEXPTIME, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding EXPRELEASE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEXPRELEASE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sEXPRELEASE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding LANGUAGE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sLANGUAGE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sLANGUAGE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding RANGE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocRANGE,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocRANGE,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelRANGE,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelRANGE,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding PROCESSINGQUALITY_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocPROCESSINGQUALITY,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocPROCESSINGQUALITY,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelPROCESSINGQUALITY,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelPROCESSINGQUALITY,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding COMPUTERNAME_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sCOMPUTERNAME, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sCOMPUTERNAME, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding USER_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sUSER, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sUSER, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding SRCFILE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sSRCFILE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sSRCFILE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding EXPFILE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sEXPFILE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sEXPFILE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
             <TextBlock Text="{Binding RECESS_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <ComboBox Grid.Column="1"
-                      ItemsSource="{Binding ocRECESS,
+                      ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                            Path=Tag.ocRECESS,
                                             Mode=OneWay}"
-                      SelectedIndex="{Binding SelRECESS,
+                      SelectedIndex="{Binding RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:BTLDataWndV}},
+                                              Path=Tag.SelRECESS,
                                               Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Style="{StaticResource PartParam_ComboBox}"/>
+                      Height="22"
+                      Width="150"/>
             <TextBlock Text="{Binding USERATTRIBUTE_MSG}"
-                       Style="{StaticResource PartParam_TextBlock}"/>
+                       VerticalAlignment="Center"
+                       Margin="10,0,10,0"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                   Text="{Binding sUSERATTRIBUTE, UpdateSourceTrigger=Explicit}"
-                                   Style="{StaticResource PartParam_TextBox}"/>
+                                   Text="{Binding CurrBTLStructure.sUSERATTRIBUTE, UpdateSourceTrigger=LostFocus}"
+                                   TextWrapping="Wrap"
+                                   Width="150"
+                                   Margin="5"/>
 
          </UniformGrid>
       </TabItem>

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb

@@ -6,6 +6,7 @@
       ' This call is required by the designer.
       InitializeComponent()
       Me.DataContext = BTLDataWndVM
+      Me.Tag = Map.refProjectVM.BTLStructureVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_BTLDataWndVM = BTLDataWndVM
    End Sub
@@ -14,4 +15,15 @@
       Me.DialogResult = bDialogResult
    End Sub
 
+   Private Sub ComboBoxItem_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      Dim SelStrategy As ComboBoxItem = DirectCast(sender, ComboBoxItem)
+      If Not IsNothing(Map.refBTLDataWndVM.SelStrategySetup) AndAlso Map.refBTLDataWndVM.SelStrategySetup.Equals(SelStrategy.Content) Then
+         Map.refStrategyManagerVM.SelStrategySetup.sName = SelStrategy.Content
+         Map.refStrategyManagerVM.SelStrategySetup.Read()
+         Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
+         Map.refBTLDataWndVM.ReadCustomGeneralParameters(SelStrategy.Content)
+         Map.refBTLDataWndVM.SelStrategySetup = SelStrategy.Content
+      End If
+   End Sub
+
 End Class

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb

@@ -11,6 +11,8 @@ Public Class BTLDataWndVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
+
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
    Private m_StrategySetupList As New ObservableCollection(Of String)
@@ -20,18 +22,19 @@ Public Class BTLDataWndVM
       End Get
    End Property
 
+   Private m_OldSelStrategySetup As String
    Private m_SelStrategySetup As String
    Public Property SelStrategySetup As String
       Get
          Return m_SelStrategySetup
       End Get
       Set(value As String)
+         m_OldSelStrategySetup = m_SelStrategySetup
          If m_SelStrategySetup <> value Then
-            EgtSetInfo(m_nBTLInfoLayerId, "AISETUP", value)
-            WriteMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, value & ".json")
             Map.refStrategyManagerVM.SelStrategySetup.sName = value
             Map.refStrategyManagerVM.SelStrategySetup.Read()
-            Map.refProdManagerVM.Save()
+            Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList)
+            ReadCustomGeneralParameters(value)
          End If
          m_SelStrategySetup = value
          NotifyPropertyChanged(NameOf(SelStrategySetup))
@@ -56,45 +59,35 @@ Public Class BTLDataWndVM
       End Set
    End Property
 
-   Private m_bSaveGeneralParameters As Boolean
-   Public Property bSaveGeneralParameters As Boolean
+   Private m_IsBTLDataWnd As Boolean = False
+   Public ReadOnly Property IsBTLDataWnd As Boolean
       Get
-         Return m_bSaveGeneralParameters
+         Return m_IsBTLDataWnd
       End Get
-      Set(value As Boolean)
-         m_bSaveGeneralParameters = value
-         If m_bSaveGeneralParameters Then
-            SetGeneralParametersIsEnable(True)
-         Else
-            SetGeneralParametersIsEnable(False)
-            Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(Map.refStrategyManagerVM.SelStrategyType.Id)
-            Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json"
-            If File.Exists(sGeneralParametersFilePath) Then
-               Dim sReadedFiles As String = File.ReadAllText(sGeneralParametersFilePath)
-               Dim JsonGeneralParametersList As List(Of JsonGeneralParameters) = JsonConvert.DeserializeObject(Of List(Of JsonGeneralParameters))(sReadedFiles)
-               m_GeneralParametersList = New ObservableCollection(Of ProjectParameters)((From JsonGeneralParameter In JsonGeneralParametersList
-                                                                                         Select JsonGeneralParameter.Deserialize(Map.refStrategyManagerVM.SelStrategyType.Id)).ToList())
-            End If
-         End If
-         NotifyPropertyChanged(NameOf(bSaveGeneralParameters))
-      End Set
    End Property
-   Friend Sub SetbSaveGeneralParameters(value As Boolean)
-      m_bSaveGeneralParameters = value
-      NotifyPropertyChanged(NameOf(bSaveGeneralParameters))
+   Friend Sub SetIsBTLDataWnd(value As Boolean)
+      m_IsBTLDataWnd = value
+      NotifyPropertyChanged(NameOf(IsBTLDataWnd))
    End Sub
 
-   Private m_GeneralParametersIsEnable As Boolean = False
-   Public ReadOnly Property GeneralParametersIsEnable As Boolean
+   Private m_sErrText As String = String.Empty
+   Public ReadOnly Property ErrText As String
       Get
-         Return m_GeneralParametersIsEnable
+         Return m_sErrText
       End Get
    End Property
-   Friend Sub SetGeneralParametersIsEnable(value As Boolean)
-      m_GeneralParametersIsEnable = value
-      NotifyPropertyChanged(NameOf(GeneralParametersIsEnable))
+   Friend Sub SetErrText(value As String)
+      m_sErrText = value
+      NotifyPropertyChanged(NameOf(ErrText))
    End Sub
 
+   Private m_CurrBTLStructure As BTLStructureVM
+   Public ReadOnly Property CurrBTLStructure As BTLStructureVM
+      Get
+         Return m_CurrBTLStructure
+      End Get
+   End Property
+
 #Region "Parametri generici"
 
    Public m_sPROJNUM As String
@@ -569,125 +562,26 @@ Public Class BTLDataWndVM
 
    ' Definizione comandi
    Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
 
-   Sub New(nProjId As Integer)
-      ' leggo cartella dei setup delle strategie
-      Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(ProjectManagerVM.CurrProd.nType, True)
-      Dim AISetupPaths As String() = Directory.GetFiles(AISetupDirPath)
-      For Each AiSetup In AISetupPaths
-         m_StrategySetupList.Add(Path.GetFileNameWithoutExtension(AiSetup))
-      Next
+   Sub New(nType As BWType)
+      ' leggo file default config
+      Map.refMainWindowVM.MainWindowM.GetDefaultConfigDirPath(nType, True)
+   End Sub
 
-      ' cerco tra i layer BTLInfo
-      Dim nCurrBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-      While nCurrBTLInfoLayerId <> GDB_ID.NULL
-         ' verifico se il layer appartiene al ProjId
-         Dim nBTLInfoLayerProjId As Integer
-         EgtGetInfo(nCurrBTLInfoLayerId, BTL_PRT_PROJ, nBTLInfoLayerProjId)
-         If nBTLInfoLayerProjId = nProjId Then
-            m_nBTLInfoLayerId = nCurrBTLInfoLayerId
-            Exit While
-         End If
-         nCurrBTLInfoLayerId = EgtGetNextName(nCurrBTLInfoLayerId, BTLINFO)
-      End While
+   Sub New(BTLStructure As BTLStructureVM)
+      Map.SetRefBTLDataWndVM(Me)
+      m_CurrBTLStructure = BTLStructure
+      SetIsBTLDataWnd(True)
       ' leggo parametri Btl
       ReadBtlParams()
-
-      ' Controllo se presente file default config
-      Dim sDefaultConfigFile As String = String.Empty
-      Dim sTrimDefaultConfig As String = String.Empty
-      If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
-         sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
-         m_SelStrategySetup = sTrimDefaultConfig
-         EgtSetInfo(m_nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
-      End If
-
-      Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(Map.refStrategyManagerVM.SelStrategyType.Id)
-      Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json"
-      If File.Exists(sGeneralParametersFilePath) Then
-         Dim sReadedFiles As String = File.ReadAllText(sGeneralParametersFilePath)
-         Dim JsonGeneralParametersList As List(Of JsonGeneralParameters) = JsonConvert.DeserializeObject(Of List(Of JsonGeneralParameters))(sReadedFiles)
-         m_GeneralParametersList = New ObservableCollection(Of ProjectParameters)((From JsonGeneralParameter In JsonGeneralParametersList
-                                                                                   Select JsonGeneralParameter.Deserialize(Map.refStrategyManagerVM.SelStrategyType.Id)).ToList())
-         For Each GenericItem As ProjectParameters In m_GeneralParametersList
-            Select Case GenericItem.sMinUserLevel
-               Case UserLevel.ADVANCED
-                  Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed))
-               Case Else
-                  If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
-                     Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
-                     Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
-                  End If
-            End Select
-         Next
-         NotifyPropertyChanged(NameOf(GeneralParametersList))
-      End If
-
-      ' Leggo info se presenti
-      Dim sInfo As String = String.Empty
-      For Each GeneralParameter In m_GeneralParametersList
-         Select Case GeneralParameter.GetType()
-            Case GetType(BooleanGenericParameter)
-               SetbSaveGeneralParameters(True)
-               SetGeneralParametersIsEnable(True)
-               Dim sTmpBoolValue As Boolean = DirectCast(GeneralParameter, BooleanGenericParameter).bValue
-               If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue) Then
-                  DirectCast(GeneralParameter, BooleanGenericParameter).bValue = sTmpBoolValue
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(DoubleGenericParameter)
-               SetbSaveGeneralParameters(True)
-               SetGeneralParametersIsEnable(True)
-               Dim sTmpDoubleValue As String = DirectCast(GeneralParameter, DoubleGenericParameter).sValue
-               If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue) Then
-                  DirectCast(GeneralParameter, DoubleGenericParameter).sValue = sTmpDoubleValue
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(ComboGenericParameter)
-               SetbSaveGeneralParameters(True)
-               SetGeneralParametersIsEnable(True)
-               Dim sTmpComboValue As String = DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue
-               If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) Then
-                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(StringGenericParameter)
-               SetbSaveGeneralParameters(True)
-               SetGeneralParametersIsEnable(True)
-               Dim sTmpStringValue As String = DirectCast(GeneralParameter, StringGenericParameter).sValue
-               If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue) Then
-                  DirectCast(GeneralParameter, StringGenericParameter).sValue = sTmpStringValue
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(ListGenericParameter)
-               SetbSaveGeneralParameters(True)
-               SetGeneralParametersIsEnable(True)
-               For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
-                  If Item.bIsActive Then
-                     sInfo &= Item.sUUID & "," & Item.sName & ";"
-                     Dim sTmpInfo As String = sInfo
-                     If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo) Then
-                        sInfo = sTmpInfo
-                        SetbSaveGeneralParameters(False)
-                        SetGeneralParametersIsEnable(False)
-                        Return
-                     End If
-                  End If
-               Next
-         End Select
-      Next
+      ' leggo file default config
+      Map.refMainWindowVM.MainWindowM.GetDefaultConfigDirPath(ProjectManagerVM.CurrProd.nType, True)
+      Read(ProjectManagerVM.CurrProd.nType)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -723,11 +617,228 @@ Public Class BTLDataWndVM
       EgtGetInfo(m_nBTLInfoLayerId, BTL_GEN_USERATTRIBUTE, m_sUSERATTRIBUTE)
    End Sub
 
+   Friend Sub Read(nType As BWType)
+      m_GeneralParametersList.Clear()
+      m_StrategySetupList.Clear()
+      ' leggo cartella dei setup delle strategie
+      Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True)
+      Dim AISetupPaths As String() = Directory.GetFiles(AISetupDirPath).Where(Function(f) Path.GetExtension(f).ToLower() <> ".ini").ToArray()
+      For Each AiSetup In AISetupPaths
+         m_StrategySetupList.Add(Path.GetFileNameWithoutExtension(AiSetup))
+      Next
+
+      ' cerco tra i layer BTLInfo
+      m_nBTLInfoLayerId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+
+      ' Leggo parametri generali
+      Dim sDefaultConfigFile As String = String.Empty
+      If EgtGetInfo(m_nBTLInfoLayerId, AI_SETUP, sDefaultConfigFile) Then
+         If m_StrategySetupList.Contains(sDefaultConfigFile) Then
+            m_SelStrategySetup = sDefaultConfigFile
+            SetErrText(String.Empty)
+         Else
+            SetErrText(EgtMsg(62113) & sDefaultConfigFile & EgtMsg(62114))
+         End If
+      ElseIf EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then
+         m_SelStrategySetup = sDefaultConfigFile
+      End If
+      If Not EgtExistsInfo(m_nBTLInfoLayerId, AI_SETUP) AndAlso Not IsNothing(m_SelStrategySetup) Then EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+
+      GetGeneralParamtersList(nType)
+
+      Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True)
+
+      Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & SelStrategySetup & ".json"
+      ReadGeneralConfiguration(sStrategyConfigurationFilePath)
+
+      ' Leggo info se presenti
+      Dim sInfo As String = String.Empty
+      For Each GeneralParameter In m_GeneralParametersList
+         Select Case GeneralParameter.GetType()
+            Case GetType(BooleanGenericParameter)
+               Dim sTmpBoolValue As Boolean = DirectCast(GeneralParameter, BooleanGenericParameter).bValue
+               If EgtExistsInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge) Then
+                  EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue)
+               Else
+                  DirectCast(GeneralParameter, BooleanGenericParameter).bValue = sTmpBoolValue
+               End If
+            Case GetType(DoubleGenericParameter)
+               Dim sTmpDoubleValue As String = DirectCast(GeneralParameter, DoubleGenericParameter).sValue
+               If EgtExistsInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge) Then
+                  EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue)
+               Else
+                  DirectCast(GeneralParameter, DoubleGenericParameter).sValue = sTmpDoubleValue
+               End If
+            Case GetType(ComboGenericParameter)
+               Dim sTmpComboValue As String = String.Empty
+               If Not IsNothing(DirectCast(GeneralParameter, ComboGenericParameter).SelValue) Then
+                  sTmpComboValue = DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue
+               Else
+                  sTmpComboValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList(0).sValue
+               End If
+               Dim sTmpValueInfo As String = String.Empty
+               If EgtExistsInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge) Then
+                  EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sTmpValueInfo)
+                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList.FirstOrDefault(Function(x) x.sValue = sTmpValueInfo)
+               Else
+                  If IsNothing(DirectCast(GeneralParameter, ComboGenericParameter).SelValue) Then
+                     DirectCast(GeneralParameter, ComboGenericParameter).SelValue = New ComboParameter
+                  End If
+                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
+               End If
+            Case GetType(StringGenericParameter)
+               Dim sTmpStringValue As String = DirectCast(GeneralParameter, StringGenericParameter).sValue
+               If EgtExistsInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge) Then
+                  EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue)
+               Else
+                  DirectCast(GeneralParameter, StringGenericParameter).sValue = sTmpStringValue
+               End If
+            Case GetType(ListGenericParameter)
+               For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
+                  If Item.bIsActive Then
+                     sInfo &= Item.sUUID & "," & Item.sName & ";"
+                     If EgtExistsInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge) Then
+                        EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ListGenericParameter).sValue)
+                     Else
+                        DirectCast(GeneralParameter, ListGenericParameter).sValue = sInfo
+                     End If
+                  End If
+               Next
+         End Select
+      Next
+      NotifyPropertyChanged(NameOf(GeneralParametersList))
+   End Sub
+
+   Friend Sub ReadCustomGeneralParameters(SelStrategySetup As String)
+      SetErrText(String.Empty)
+      GetGeneralParamtersList(Map.refStrategyManagerVM.SelStrategyType.Id)
+
+      Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(Map.refStrategyManagerVM.SelStrategyType.Id, False)
+
+      Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & SelStrategySetup & ".json"
+      ReadGeneralConfiguration(sStrategyConfigurationFilePath)
+
+      NotifyPropertyChanged(NameOf(GeneralParametersList))
+   End Sub
+
+   Friend Sub SaveInfoBTL(nType As BWType)
+      Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True)
+      Dim sDefaultConfigFile As String = String.Empty
+      Dim sTmpStrategySetup As String = String.Empty
+      ' Controllo se presente file default config
+      If IsNothing(m_SelStrategySetup) Then
+         If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then
+            m_SelStrategySetup = sDefaultConfigFile
+            EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+         Else
+            ' restituisce la lista dei file presenti nella cartella con le relative informazioni
+            Dim StrategySetupListFile As List(Of FileInfo) = m_StrategySetupList.Where(Function(f) File.Exists(AISetupDirPath & "\" & f & ".json")).
+                                                                                 Select(Function(f) New FileInfo(AISetupDirPath & "\" & f & ".json")).
+                                                                                 OrderByDescending(Function(fi) fi.LastWriteTime).ToList()
+            ' restituisce l'ultimo file modificato
+            If StrategySetupListFile.Any() Then
+               sDefaultConfigFile = Path.GetFileNameWithoutExtension(StrategySetupListFile.First().Name)
+            End If
+            sTmpStrategySetup = m_StrategySetupList.FirstOrDefault(Function(x) x = sDefaultConfigFile)
+            m_SelStrategySetup = sTmpStrategySetup
+            If Not IsNothing(m_SelStrategySetup) Then EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+         End If
+      End If
+
+      SetInfoGeneralParameters()
+   End Sub
+
+   Private Sub SaveInfo()
+      EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+      SetInfoGeneralParameters()
+   End Sub
+
+   Private Sub ReadGeneralConfiguration(sStrategyConfigurationFilePath As String)
+      If File.Exists(sStrategyConfigurationFilePath) Then
+         Dim sReadedFile As String = File.ReadAllText(sStrategyConfigurationFilePath)
+
+         Dim JsonRoot As CustomJsonRoot = Nothing
+         Try
+            JsonRoot = JsonConvert.DeserializeObject(Of CustomJsonRoot)(sReadedFile)
+         Catch ex As Exception
+            JsonRoot = Nothing
+            Return
+         End Try
+
+         For Each ProjectItem In JsonRoot.GENERAL
+            Dim DefaultProject As ProjectParameters = m_GeneralParametersList.FirstOrDefault(Function(x) x.sName = ProjectItem.sName)
+            If Not IsNothing(DefaultProject) Then
+               DefaultProject.ReadConfiguration(ProjectItem, m_GeneralParametersList)
+            Else
+               EgtOutLog("Parametro Generale: " & ProjectItem.sName & " non presente")
+            End If
+         Next
+      End If
+   End Sub
+
+   Private Sub GetGeneralParamtersList(nTypeId As BWType)
+      Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(nTypeId)
+      Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json"
+      If File.Exists(sGeneralParametersFilePath) Then
+         Dim sReadedFiles As String = File.ReadAllText(sGeneralParametersFilePath)
+         Dim JsonGeneralParametersList As List(Of JsonGeneralParameters) = JsonConvert.DeserializeObject(Of List(Of JsonGeneralParameters))(sReadedFiles)
+         m_GeneralParametersList = New ObservableCollection(Of ProjectParameters)((From JsonGeneralParameter In JsonGeneralParametersList
+                                                                                   Select JsonGeneralParameter.Deserialize(Map.refStrategyManagerVM.SelStrategyType.Id)).ToList())
+
+         UserLevelControl(m_GeneralParametersList)
+      End If
+   End Sub
+
+   Private Sub UserLevelControl(GeneralParametersList As ObservableCollection(Of ProjectParameters))
+      For Each GenericItem As ProjectParameters In GeneralParametersList
+         Select Case GenericItem.sMinUserLevel
+            Case UserLevel.ADVANCED
+               Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False))
+            Case UserLevel.ADMINISTRATOR
+               Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False))
+            Case Else
+               If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
+                  Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False))
+                  Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE)
+               End If
+         End Select
+      Next
+   End Sub
+
+   Private Sub SetInfoGeneralParameters()
+      Dim sInfo As String = String.Empty
+      For Each GeneralParameter In m_GeneralParametersList
+         Select Case GeneralParameter.GetType()
+            Case GetType(BooleanGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify)
+            Case GetType(DoubleGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify)
+            Case GetType(ComboGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify)
+            Case GetType(StringGenericParameter)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue)
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify)
+            Case GetType(ListGenericParameter)
+               For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
+                  If Item.bIsActive Then
+                     sInfo &= Item.sUUID & "," & Item.sName & ";"
+                     EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo)
+                  End If
+               Next
+               EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify)
+         End Select
+      Next
+      NotifyPropertyChanged(NameOf(GeneralParametersList))
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -739,53 +850,39 @@ Public Class BTLDataWndVM
    End Property
 
    Public Sub Ok()
-      Dim sInfo As String = String.Empty
-      If m_bSaveGeneralParameters Then
-         For Each GeneralParameter In GeneralParametersList
-            Select Case GeneralParameter.GetType()
-               Case GetType(BooleanGenericParameter)
-                  EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue)
-               Case GetType(DoubleGenericParameter)
-                  EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue)
-               Case GetType(ComboGenericParameter)
-                  EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue)
-               Case GetType(StringGenericParameter)
-                  EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue)
-               Case GetType(ListGenericParameter)
-                  For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
-                     If Item.bIsActive Then
-                        sInfo &= Item.sUUID & "," & Item.sName & ";"
-                        EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo)
-                     End If
-                  Next
-            End Select
-         Next
-      Else
-         For Each GeneralParameter In m_GeneralParametersList
-            Select Case GeneralParameter.GetType()
-               Case GetType(BooleanGenericParameter)
-                  EgtRemoveInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge)
-               Case GetType(DoubleGenericParameter)
-                  EgtRemoveInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge)
-               Case GetType(ComboGenericParameter)
-                  EgtRemoveInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge)
-               Case GetType(StringGenericParameter)
-                  EgtRemoveInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge)
-               Case GetType(ListGenericParameter)
-                  For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
-                     If Item.bIsActive Then
-                        sInfo &= Item.sUUID & "," & Item.sName & ";"
-                        EgtRemoveInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge)
-                     End If
-                  Next
-            End Select
-         Next
+      ' Messaggio ripristino verifica se presente
+      If Not IsNothing(m_OldSelStrategySetup) AndAlso m_SelStrategySetup <> m_OldSelStrategySetup Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62579), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+            Map.refProjectVM.ResetGeneralParameters()
+         Else
+            Return
+         End If
       End If
-      Map.refProdManagerVM.Save()
+      SetIsBTLDataWnd(True)
+      SaveInfo()
+      Map.refPartListVM.ResetCalc()
+      Map.refSceneHostVM.SaveProject()
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
+
+#Region "Cancel_Command"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(False)
+   End Sub
+
+#End Region ' Cancel_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml

@@ -1,50 +1,55 @@
-<Border x:Class="BTLPartManagerV"
+<Border x:Class="BTLPartManagerV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         DataContext="{StaticResource BTLPartManagerVM}"
-        Style="{StaticResource BTLPartManager_Border}">
+        Background="{StaticResource Border.Static.FountainBlue.Background}"
+        BorderBrush="{StaticResource Border.Static.Teal.Border}"
+        BorderThickness="2"
+        CornerRadius="5"
+        Margin="0"
+        Padding="0">
 
    <StackPanel Orientation="Horizontal"
-               Style="{StaticResource BTLPartManager_StackPanel}">
+               Margin="0">
       <Button Command="{Binding CopyPart_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding CopyPart_ToolTip}"
-              IsEnabled="{Binding CopyPart_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/LeftPanel/CopyPart.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              IsEnabled="{Binding CopyPart_IsEnabled}">
+         <Image Source="{StaticResource CopyPart_Image}"
+                Height="20"
+                Width="20"
+                Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding RemovePart_ToolTip}"
-              IsEnabled="{Binding RemovePart_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Remove.png"
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              IsEnabled="{Binding RemovePart_IsEnabled}">
+         <Image Source="{StaticResource Remove_Image}"
+                Height="20"
+                Width="20"
+                Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
-              Click="ClosePopUp_Click"
               Command="{Binding Simulate_Command}"
-              IsEnabled="{Binding Simulate_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Simulate.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              IsEnabled="{Binding Simulate_IsEnabled}">
+         <Image Source="{StaticResource Simulate_Image}"
+                Height="20"
+                Width="20"
+                Stretch="Uniform"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
-              Click="ClosePopUp_Click"
               Command="{Binding Edit_Command}"
-              IsEnabled="{Binding Edit_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Edit.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              IsEnabled="{Binding Edit_IsEnabled}">
+         <Image Source="{StaticResource Edit_Image}"
+                Height="20"
+                Width="20"
+                Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding ResetCalc_ToolTip}"
-              IsEnabled="{Binding CALCPanel_IsEnabled}"
-              Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png" 
-                Style="{StaticResource BTLDataWnd_Image}"/>
+              IsEnabled="{Binding CALCPanel_IsEnabled}">
+         <Image Source="{StaticResource ResetCalc_Image}"
+                Height="20"
+                Width="20"
+                Stretch="Uniform"/>
       </Button>
    </StackPanel>
 

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml.vb

@@ -1,14 +1,3 @@
 Public Class BTLPartManagerV
 
-   Private Sub ClosePopUp_Click(sender As Object, e As RoutedEventArgs)
-      Dim Button As Button = DirectCast(sender, Button)
-      Dim StackPanel As StackPanel = DirectCast(Button.Parent, StackPanel)
-      Dim OnlyProdBTLPartManagerV As BTLPartManagerV = DirectCast(StackPanel.Parent, BTLPartManagerV)
-      Dim Popup As Primitives.Popup = DirectCast(OnlyProdBTLPartManagerV.Parent, Primitives.Popup)
-
-      If Not IsNothing(Popup) Then
-         Popup.IsOpen = False
-      End If
-   End Sub
-
 End Class

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -1,16 +1,20 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
+Imports System.IO
 Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.Optimizer.MainMenuVM
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports Newtonsoft.Json
 
 Public Class BTLPartManagerVM
    Inherits VMBase
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_BTLDataWndVM As BTLDataWndVM
+   Public ReadOnly Property BTLDataWndVM As BTLDataWndVM
+      Get
+         Return m_BTLDataWndVM
+      End Get
+   End Property
+
    Private m_BTLPartManager_IsEnabled As Boolean = True
    Public ReadOnly Property BTLPartManager_IsEnabled As Boolean
       Get
@@ -20,7 +24,7 @@ Public Class BTLPartManagerVM
 
    Public ReadOnly Property CopyPart_IsEnabled As Boolean
       Get
-         Return m_BTLPartManager_IsEnabled AndAlso Not IsNothing(Map.refShowBeamPanelVM) AndAlso Not Map.refShowBeamPanelVM.bShowAll AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 1
+         Return m_BTLPartManager_IsEnabled AndAlso Not IsNothing(Map.refShowBeamPanelVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 1
       End Get
    End Property
 
@@ -175,108 +179,11 @@ Public Class BTLPartManagerVM
       Map.refMyStatusBarVM.SetOutputMessage(sProgress)
    End Sub
 
-   Private Sub GetGeneralParameters()
-      ' leggo cartella dei setup delle strategie
-      Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(ProjectManagerVM.CurrProd.nType, True)
-      Dim AISetupPaths As String() = Directory.GetFiles(AISetupDirPath)
-      For Each AiSetup In AISetupPaths
-         Map.refProjectVM.StrategySetupList.Add(Path.GetFileNameWithoutExtension(AiSetup))
-      Next
-
-      Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(Map.refStrategyManagerVM.SelStrategyType.Id)
-      Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json"
-      If File.Exists(sGeneralParametersFilePath) Then
-         Dim sReadedFiles As String = File.ReadAllText(sGeneralParametersFilePath)
-         Dim JsonGeneralParametersList As List(Of JsonGeneralParameters) = JsonConvert.DeserializeObject(Of List(Of JsonGeneralParameters))(sReadedFiles)
-         Map.refProjectVM.GeneralParametersList = New ObservableCollection(Of ProjectParameters)((From JsonGeneralParameter In JsonGeneralParametersList
-                                                                                                  Select JsonGeneralParameter.Deserialize(Map.refStrategyManagerVM.SelStrategyType.Id)).ToList())
-         For Each GenericItem As ProjectParameters In Map.refProjectVM.GeneralParametersList
-            Select Case GenericItem.sMinUserLevel
-               Case UserLevel.ADVANCED
-                  Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed))
-               Case Else
-                  If Not Map.refMainMenuVM.UserAdmin_IsChecked Then
-                     Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed))
-                     Map.refMainMenuVM.SetUnloackImage("pack://application:,,,/Resources/NewPage/padlock.png")
-                  End If
-            End Select
-         Next
-         NotifyPropertyChanged(NameOf(Map.refProjectVM.GeneralParametersList))
-      End If
-
-      ' Leggo info se presenti
-      Dim sInfo As String = String.Empty
-      EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, "AISETUP", Map.refProjectVM.SelStrategySetup)
-      If IsNothing(Map.refProjectVM.SelStrategySetup) Then
-         Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-         EgtGetInfo(nBTLInfoLayerId, "AISETUP", Map.refProjectVM.SelStrategySetup)
-      End If
-      For Each GeneralParameter In Map.refProjectVM.GeneralParametersList
-         Select Case GeneralParameter.GetType()
-            Case GetType(BooleanGenericParameter)
-               Map.refProjectVM.SetbSaveGeneralParameters(True)
-               Map.refProjectVM.SetGeneralParametersIsEnable(True)
-               Dim sTmpBoolValue As Boolean = DirectCast(GeneralParameter, BooleanGenericParameter).bValue
-               If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue) Then
-                  DirectCast(GeneralParameter, BooleanGenericParameter).bValue = sTmpBoolValue
-                  Map.refProjectVM.SetbSaveGeneralParameters(False)
-                  Map.refProjectVM.SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(DoubleGenericParameter)
-               Map.refProjectVM.SetbSaveGeneralParameters(True)
-               Map.refProjectVM.SetGeneralParametersIsEnable(True)
-               Dim sTmpDoubleValue As String = DirectCast(GeneralParameter, DoubleGenericParameter).sValue
-               If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue) Then
-                  DirectCast(GeneralParameter, DoubleGenericParameter).sValue = sTmpDoubleValue
-                  Map.refProjectVM.SetbSaveGeneralParameters(False)
-                  Map.refProjectVM.SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(ComboGenericParameter)
-               Map.refProjectVM.SetbSaveGeneralParameters(True)
-               Map.refProjectVM.SetGeneralParametersIsEnable(True)
-               Dim sTmpComboValue As String = DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue
-               If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) Then
-                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
-                  Map.refProjectVM.SetbSaveGeneralParameters(False)
-                  Map.refProjectVM.SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(StringGenericParameter)
-               Map.refProjectVM.SetbSaveGeneralParameters(True)
-               Map.refProjectVM.SetGeneralParametersIsEnable(True)
-               Dim sTmpStringValue As String = DirectCast(GeneralParameter, StringGenericParameter).sValue
-               If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue) Then
-                  DirectCast(GeneralParameter, StringGenericParameter).sValue = sTmpStringValue
-                  Map.refProjectVM.SetbSaveGeneralParameters(False)
-                  Map.refProjectVM.SetGeneralParametersIsEnable(False)
-                  Return
-               End If
-            Case GetType(ListGenericParameter)
-               Map.refProjectVM.SetbSaveGeneralParameters(True)
-               Map.refProjectVM.SetGeneralParametersIsEnable(True)
-               For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
-                  If Item.bIsActive Then
-                     sInfo &= Item.sUUID & "," & Item.sName & ";"
-                     Dim sTmpInfo As String = sInfo
-                     If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, sInfo) Then
-                        sInfo = sTmpInfo
-                        Map.refProjectVM.SetbSaveGeneralParameters(False)
-                        Map.refProjectVM.SetGeneralParametersIsEnable(False)
-                        Return
-                     End If
-                  End If
-               Next
-         End Select
-      Next
-   End Sub
-
 #End Region    ' Methods
 
 #Region "COMMANDS"
 
-#Region "CopyPart"
+#Region "CopyPart_Command"
 
    Public ReadOnly Property CopyPart_Command As ICommand
       Get
@@ -294,14 +201,15 @@ Public Class BTLPartManagerVM
       ' creo copia
       Dim NewPart As BTLPartM = SelPart.Copy()
       If Not IsNothing(NewPart) Then
+         If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then Map.refProjectVM.UpdatePart(NewPart.nPartId)
          ' selezione ultimo che e' quello appena creato
          Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1), False, True)
       End If
    End Sub
 
-#End Region    ' CopyPart
+#End Region    ' CopyPart_Command
 
-#Region "RemovePart"
+#Region "RemovePart_Command"
 
    Public ReadOnly Property RemovePart_Command As ICommand
       Get
@@ -313,64 +221,12 @@ Public Class BTLPartManagerVM
    End Property
 
    Public Sub RemovePartCmd()
-      If IsNothing(ProjectManagerVM.CurrProd) Then Return
-      If MessageBox.Show(EgtMsg(62573), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
-         If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
-            Dim CurrSelBTLParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
-            For RemoveIndex = CurrSelBTLParts.Count - 1 To 0 Step -1
-               RemovePart(CurrSelBTLParts(RemoveIndex), RemoveIndex = 0)
-            Next
-         End If
-      Else
-         Return
-      End If
+      Map.refProjectVM.BTLStructureVM.DeletePart()
    End Sub
 
-   Public Sub RemovePart(BTLPartToDelete As BTLPartVM, bSelPrevious As Boolean)
-      ' verifico se ci sono già copie in grezzi
-      Dim nDuploCount As Integer = 0
-      If EgtDuploCount(BTLPartToDelete.nPartId, nDuploCount) AndAlso nDuploCount > 0 Then
-         ' avviso che il pezzo non è cancellabile perchè in produzione
-         MessageBox.Show(String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
-         Return
-      End If
-      ' verifico se rimuovere sezione dalla lista
-      If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x IsNot BTLPartToDelete AndAlso x.Section = BTLPartToDelete.Section) Then
-         Map.refProjectVM.BTLStructureVM.SectionList.Remove(BTLPartToDelete.Section)
-         Map.refProjectVM.BTLStructureVM.SelSection = SectionXMaterial.Empty
-      End If
-      ' Eseguo cancellazione
-      EgtBeamSetPart(BTLPartToDelete.nPartId)
-      ' seleziono elemento precedente
-      Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete)
-      Dim FilteredIndex As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.IndexOf(BTLPartToDelete)
-      Map.refProjectVM.BTLStructureVM.SelBTLParts.Remove(BTLPartToDelete)
-      If EgtBeamErasePart() Then
-         If bSelPrevious Then
-            If FilteredIndex = 0 Then
-               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
-                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(1))
-               Else
-                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
-               End If
-            ElseIf FilteredIndex = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 1 Then
-               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
-                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 2))
-               Else
-                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
-               End If
-            Else
-               Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(FilteredIndex - 1))
-            End If
-         End If
-         ' rimuovo dalla lista pezzi
-         Map.refProjectVM.BTLStructureVM.BTLPartVMList.RemoveAt(Index)
-      End If
-   End Sub
+#End Region    ' RemovePart_Command
 
-#End Region    ' RemovePart
-
-#Region "SimulateCommand"
+#Region "Simulate_Command"
 
    Public ReadOnly Property Simulate_Command As ICommand
       Get
@@ -396,7 +252,7 @@ Public Class BTLPartManagerVM
          Dim TempBarList(0) As EgtBEAMWALL.Core.Bar
          Dim Bar As New EgtBEAMWALL.Core.Bar With {.nBarId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId,
                                                   .nProgramPage = ProjectType.PROJ,
-                                                  .nProjType = ProjType,
+                                                  .nProjType = ProjType + 10,
                                                   .bBarOk = True,
                                                   .nMachineName = ProjectManagerVM.CurrProd.sMachine,
                                                   .nCmdType = CalcIntegration.CmdTypes.SIMULATE,
@@ -415,9 +271,9 @@ Public Class BTLPartManagerVM
       Return True
    End Function
 
-#End Region ' SimulateCommand
+#End Region ' Simulate_Command
 
-#Region "Edit"
+#Region "Edit_Command"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -429,18 +285,45 @@ Public Class BTLPartManagerVM
    End Property
 
    Friend Sub Edit()
-      GetGeneralParameters()
-      Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Collapsed)
-      Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed)
+      If IsNothing(Map.refBTLDataWndVM) Then Return
+      If IsNothing(Map.refProjectVM) Then Return
+      If IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
+      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Return
+      If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM) Then Return
+      If Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId < -1 Then Return
+      If IsNothing(ProjectManagerVM.CurrProd) Then Return
+
+      If IsNothing(Map.refBTLDataWndVM) Then
+         m_BTLDataWndVM = New BTLDataWndVM(Map.refProjectVM.BTLStructureVM)
+      End If
+      Map.refBTLDataWndVM.SetIsBTLDataWnd(False)
+      Dim bValuePart As Boolean = False
+      For Each GeneralParam As ProjectParameters In Map.refProjectVM.GeneralParametersList
+         bValuePart = False
+         EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParam.sNameNge & "_FORCED", bValuePart)
+         If bValuePart Then Exit For
+      Next
+
+      If bValuePart Then
+         Map.refProjectVM.GetGeneralParameters(bValuePart)
+      Else
+         Map.refProjectVM.Read(ProjectManagerVM.CurrProd.nType)
+      End If
+
+      Map.refProjectVM.SetRawPartManagerVisibility(False)
+      Map.refProjectVM.SetFeatureListVisibility(False)
+      Map.refShowBeamPanelVM.SetShowBuilding(False)
+      Map.refProjectVM.SetSceneShowBuldingVisibility(False)
+      Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(False)
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGER)
       ' Disabilito LeftPanel
       Map.refProjectVM.SetLeftPanel_IsEnabled(False)
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)
    End Sub
 
-#End Region ' Edit
+#End Region ' Edit_Command
 
-#Region "ResetCalc"
+#Region "ResetCalc_Command"
 
    Public ReadOnly Property ResetCalc_Command As ICommand
       Get
@@ -453,14 +336,22 @@ Public Class BTLPartManagerVM
 
    Public Sub ResetCalc()
       If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+      Map.refCALCPanelVM.SetCalculating(False)
       Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
       If IsNothing(SelPart) Then Return
       If SelPart.nGlobalState <> CalcStates.NOTCALCULATED Then
+         ' Resetto info
+         If Map.refProjectVM.InfoNgeValue.Count > 0 Then
+            For Each InfoNgePart As String In Map.refProjectVM.InfoNgeValue
+               EgtRemoveInfo(SelPart.nPartId, InfoNgePart)
+            Next
+         End If
          SelPart.ResetCalcTotalPart()
       End If
    End Sub
 
-#End Region    ' ResetCalc
+#End Region    ' ResetCalc_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb

@@ -209,8 +209,9 @@ Public Class BTLFeatureVM
          Return m_BTLFeatureM.bDO
       End Get
       Set(value As Boolean)
-         Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
          If value <> m_BTLFeatureM.bDO Then
+            Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
             If EgtBeamEnableProcess(nFeatureId, value, Not m_bDO_MultipleUpdate) Then
                m_BTLFeatureM.bDO = value
                ' setto feature da ricalcolare
@@ -224,7 +225,10 @@ Public Class BTLFeatureVM
                   Item.NotifyPropertyChanged(NameOf(Item.sMsg))
                Next
             End If
+            If Not IsNothing(m_BTLPartM) AndAlso Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then Map.refProjectVM.UpdatePart(m_BTLPartM.nPartId)
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
             If Not m_bDO_MultipleUpdate Then EgtDraw()
+
             ' aggiorno stato abilitazione del bottone modifica free contour
             Map.refFeatureManagerVM.SetEditIsEnabled()
          End If
@@ -293,6 +297,12 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public ReadOnly Property sFeature_Name As String
+      Get
+         Return $"[{nSelGRP}-{nPRC:000}] {sName}"
+      End Get
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property Edit_ToolTip As String
@@ -319,21 +329,25 @@ Public Class BTLFeatureVM
       m_BTLFeatureM = BTLFeatureM
       AddHandler m_BTLFeatureM.PBTLParamAdded, AddressOf OnPBTLParamAdded
       m_BTLPartM = BTLPartM
+      m_PartM = Nothing
       CreatePBTLParamVMList()
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+      NotifyPropertyChanged(NameOf(bStrategy_Visibility))
       m_MenuList.Add(New MenuItemVm(Me))
    End Sub
 
-   Sub New(BTLFeatureM As BTLFeatureM)
+   Sub New(BTLFeatureM As BTLFeatureM, PartM As PartM)
       m_BTLFeatureM = BTLFeatureM
       m_BTLPartM = Nothing
+      m_PartM = PartM
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+      NotifyPropertyChanged(NameOf(bStrategy_Visibility))
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -477,7 +491,7 @@ Public Class BTLFeatureVM
 
 #Region "COMMANDS"
 
-#Region "DeleteFeature"
+#Region "DeleteFeature_Command"
 
    Public ReadOnly Property DeleteFeature_Command As ICommand
       Get
@@ -492,9 +506,9 @@ Public Class BTLFeatureVM
       Map.refFeatureListManagerVM.RemoveFeature()
    End Sub
 
-#End Region ' DeleteFeature
+#End Region ' DeleteFeature_Command
 
-#Region "Edit"
+#Region "Edit_Command"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -506,13 +520,17 @@ Public Class BTLFeatureVM
    End Property
 
    Public Sub Edit()
+      Map.refProjectVM.SetPParametersVisibility(False)
+      ' Disabilito pulsante assemblato
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
+      Map.refProjectVM.SetSceneShowBuldingVisibility(False)
       ' attivo modalita' contorno libero
       Map.refFreeContourManagerVM.Open()
    End Sub
 
-#End Region ' Edit
+#End Region ' Edit_Command
 
-#Region "Save"
+#Region "Save_Command"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -531,11 +549,15 @@ Public Class BTLFeatureVM
       End Select
       ' disattivo modalita' contorno libero
       Map.refFreeContourManagerVM.Close(True)
+      Map.refProjectVM.SetPParametersVisibility(True)
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+      EgtSetMark(nFeatureId)
+      EgtDraw()
    End Sub
 
-#End Region ' Save
+#End Region ' Save_Command
 
-#Region "Cancel"
+#Region "Cancel_Command"
 
    Public ReadOnly Property Cancel_Command As ICommand
       Get
@@ -549,11 +571,13 @@ Public Class BTLFeatureVM
    Public Sub Cancel()
       ' disattivo modalita' contorno libero
       Map.refFreeContourManagerVM.Close(False)
+      Map.refProjectVM.SetPParametersVisibility(True)
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
    End Sub
 
-#End Region ' Cancel
+#End Region ' Cancel_Command
 
-#Region "Strategy"
+#Region "Strategy_Command"
 
    Public ReadOnly Property Strategy_Command As ICommand
       Get
@@ -567,14 +591,15 @@ Public Class BTLFeatureVM
    Public Sub Strategy()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.STRATEGYMANAGER)
       ' Disabilito LeftPanel
+      Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(False)
       Map.refProjectVM.SetLeftPanel_IsEnabled(False)
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)
       Map.refForcedStrategyPanelVM.Init(BTLFeatureM)
    End Sub
 
-#End Region ' Strategy
+#End Region ' Strategy_Command
 
-#Region "EditFeature"
+#Region "EditFeature_Command"
 
    Public ReadOnly Property EditFeature_Command As ICommand
       Get
@@ -585,25 +610,27 @@ Public Class BTLFeatureVM
       End Get
    End Property
 
-   Friend Sub EditFeature()
+   Friend Sub EditFeature(Feature As BTLFeatureVM)
       If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then
+         Map.refProjectVM.BTLStructureVM.SelBTLPart.SetSelFeature(Feature)
          Map.refForcedStrategyPanelVM.Init(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.BTLFeatureM)
       End If
       ' se modalità building, la tolgo
       If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-         Map.refShowBeamPanelVM.SetShowBuilding(False)
+         Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False
       End If
-      Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Collapsed)
+      Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(False)
+      Map.refProjectVM.SetRawPartManagerVisibility(False)
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGERBTL)
       Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.STRATEGYMANAGERBTL)
+      Map.refFeatureManagerVM.SetEditIsEnabled()
       ' Disabilito LeftPanel
       Map.refProjectVM.SetLeftPanel_IsEnabled(False)
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)
       EgtDraw()
    End Sub
 
-#End Region ' EditFeature
+#End Region ' EditFeature_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb

@@ -132,7 +132,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
                   NotifyPropertyChanged(NameOf(sValue))
                   Return
                End If
@@ -147,9 +147,9 @@ Public Class BTLParamVM
                Dim nDoneCnt As Integer = DbControllers.m_ProjController.getCountItemState(ProjectManagerVM.CurrProd.nProdId, nPartId, ItemState.Assigned)
                ' controllo se i pezzi sono lavorati se si messaggio di warning altrimenti messaggio informativo
                If nDoneCnt > 0 Then
-                  MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
                ElseIf INPROD > 0 Then
-                  MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
                End If
                UpdateParamValue(dNewValue, "")
             Case Else
@@ -194,7 +194,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
                   NotifyPropertyChanged(NameOf(sDefault))
                   Return
                End If

EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb

@@ -16,6 +16,7 @@ Public Class BTLPartVM
          Return m_BTLPartM
       End Get
    End Property
+
    Private m_BTLStructureM As BTLStructureM
 
    Public ReadOnly Property nPartId As Integer
@@ -90,7 +91,7 @@ Public Class BTLPartVM
                      Else
                         Dim MachGroupModel = Nothing
                         If Not IsNothing(Map.refProdManagerVM) Then
-                           MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProj.nProdId, nMachgroupId)
+                           MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(ProjectManagerVM.CurrProd.nProdId, nMachgroupId)
                         End If
                         If Not IsNothing(MachGroupModel) AndAlso MachGroupModel.State > ItemState.ND Then
                            bDuploInProduction = True
@@ -100,12 +101,12 @@ Public Class BTLPartVM
                   End If
                Next
                If bDuploInProduction Then
-                  MessageBox.Show("Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62586), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
                   Return False
                End If
                ' lo impedisco
                ' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
-               If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
+               If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
                   MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
                   DeleteDuplo_Otmizer(DuploList)
                Else
@@ -184,7 +185,12 @@ Public Class BTLPartVM
    Public Property sL As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
+         End If
+         If EgtBeamGetBuildingIsOn() Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -242,7 +248,12 @@ Public Class BTLPartVM
    Public Property sW As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
+         End If
+         If EgtBeamGetBuildingIsOn() Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -300,7 +311,12 @@ Public Class BTLPartVM
    Public Property sH As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If EgtGetCurrentContext() = Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx() Then
+            If Not Map.refSceneShowBuldingVM.MapInfo.TryGetValue(nPartId, nOrigGroupId) Then
+               EgtOutLog(nPartId & " non presente")
+            End If
+         End If
+         If EgtBeamGetBuildingIsOn() Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -1165,7 +1181,7 @@ Public Class BTLPartVM
             If nTempADDED >= nINPROD Then
                m_BTLPartM.nADDED = nTempADDED
             Else
-               MessageBox.Show(EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
             End If
          End If
          NotifyPropertyChanged(NameOf(sADDED))
@@ -1344,7 +1360,7 @@ Public Class BTLPartVM
          Select Case m_BTLPartM.nGlobalState
             Case CalcStates.ERROR_, CalcStates.COLLISION
                Return Brushes.Red
-            Case CalcStates.WARNING
+            Case CalcStates.WARNING, CalcStates.SECTION
                Return Brushes.Orange
             Case CalcStates.INFO, CalcStates.OK
                Return Brushes.Green
@@ -1358,13 +1374,13 @@ Public Class BTLPartVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
    Public ReadOnly Property CALC_FALL_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
@@ -1379,6 +1395,8 @@ Public Class BTLPartVM
                Return "w"
             Case CalcStates.INFO
                Return "i"
+            Case CalcStates.SECTION
+               Return "x"
             Case Else
                Return ""
          End Select
@@ -1390,7 +1408,7 @@ Public Class BTLPartVM
          Select Case m_BTLPartM.m_nGlobalState
             Case CalcStates.ERROR_, CalcStates.COLLISION
                Return Brushes.Red
-            Case CalcStates.WARNING
+            Case CalcStates.WARNING, CalcStates.SECTION
                Return Brushes.Orange
             Case CalcStates.INFO
                Return Brushes.Green
@@ -1409,7 +1427,7 @@ Public Class BTLPartVM
    Public ReadOnly Property Section As SectionXMaterial
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -1531,7 +1549,10 @@ Public Class BTLPartVM
          Return m_SelBTLFeatureVM
       End Get
       Set(value As BTLFeatureVM)
-         If Not IsNothing(m_PrevSelBTLFeatureVM) Then m_PrevSelBTLFeatureVM.DeselGeomFeature()
+         If Not IsNothing(m_PrevSelBTLFeatureVM) Then
+            m_PrevSelBTLFeatureVM.DeselGeomFeature()
+            EgtResetMark(m_PrevSelBTLFeatureVM.nFeatureId)
+         End If
          m_SelBTLFeatureVM = value
          If Not IsNothing(m_SelBTLFeatureVM) Then
             m_SelBTLFeatureVM.SelGeomFeature()
@@ -1541,11 +1562,9 @@ Public Class BTLPartVM
             If Not IsNothing(SelBTLFeatureVM.SelPBTLParam) Then SelBTLFeatureVM.SelPBTLParam = Nothing
             ' rinfresco bottoni freecontour
             m_SelBTLFeatureVM.RefreshFCMBtnVisibility()
-            Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Visible)
-            Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Collapsed)
             ' Controlo se nPRC è 900 rendo visibile combobox Variant
             If m_SelBTLFeatureVM.nPRC = 900 Then
-               Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible)
+               Map.refFeatureManagerVM.SetVariant_Visibility(True)
                Dim nVariant As Integer = 0
                If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
                   m_SelBTLFeatureVM.nSelVARIANT = nVariant
@@ -1558,24 +1577,65 @@ Public Class BTLPartVM
                   Map.refPParameterListVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
                End If
             Else
-               Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
+               Map.refFeatureManagerVM.SetVariant_Visibility(False)
             End If
          End If
          If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
+         If Not IsNothing(m_SelBTLFeatureVM) Then
+            SetSelFeatureMsg(EgtMsg(5356) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
+            SetDeselFeatureMsg(EgtMsg(5357) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
+         End If
          EgtDraw()
          NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
          ' se modalità building, la tolgo
          If Not IsNothing(m_SelBTLFeatureVM) AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-            Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed)
-            Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
+            Map.refProjectVM.SetSceneShowBuldingVisibility(False)
             Map.refShowBeamPanelVM.SetShowBuilding(False)
-            Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible)
-            If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible)
-
+            Map.refProjectVM.SetManagerTabVisibility(True)
+            Map.refProjectVM.SetFeatureListVisibility(False)
+            Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(True)
          End If
       End Set
    End Property
 
+   Friend Sub SetSelFeature(value As BTLFeatureVM)
+      If Not IsNothing(m_PrevSelBTLFeatureVM) Then m_PrevSelBTLFeatureVM.DeselGeomFeature()
+      m_SelBTLFeatureVM = value
+      If Not IsNothing(m_SelBTLFeatureVM) Then
+         m_SelBTLFeatureVM.SelGeomFeature()
+         m_PrevSelBTLFeatureVM = value
+         Map.refPParameterListVM.SetCurrDraw(DirectCast(m_SelBTLFeatureVM, BTLFeatureVM).sDrawPath)
+         ' deseleziono i parametri
+         If Not IsNothing(SelBTLFeatureVM.SelPBTLParam) Then SelBTLFeatureVM.SelPBTLParam = Nothing
+         ' rinfresco bottoni freecontour
+         m_SelBTLFeatureVM.RefreshFCMBtnVisibility()
+         ' Controlo se nPRC è 900 rendo visibile combobox Variant
+         If m_SelBTLFeatureVM.nPRC = 900 Then
+            Map.refFeatureManagerVM.SetVariant_Visibility(True)
+            Dim nVariant As Integer = 0
+            If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
+               m_SelBTLFeatureVM.nSelVARIANT = nVariant
+            End If
+            If m_SelBTLFeatureVM.nSelVARIANT > 0 AndAlso
+                  System.IO.File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png") Then
+               ' imposto path disegno da mostrare in BottomPanel
+               Map.refPParameterListVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png")
+            Else
+               Map.refPParameterListVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
+            End If
+         Else
+            Map.refFeatureManagerVM.SetVariant_Visibility(False)
+         End If
+      End If
+      If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
+      If Not IsNothing(m_SelBTLFeatureVM) Then
+         SetSelFeatureMsg(EgtMsg(5356) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
+         SetDeselFeatureMsg(EgtMsg(5357) & " [" & m_SelBTLFeatureVM.nSelGRP & "-" & m_SelBTLFeatureVM.nPRC.ToString("000") & "] " & m_SelBTLFeatureVM.sName)
+      End If
+      EgtDraw()
+      NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+   End Sub
+
    Private m_Calc_PartEnd As Boolean = False
    Public ReadOnly Property Calc_PartEnd As Boolean
       Get
@@ -1604,34 +1664,6 @@ Public Class BTLPartVM
       End Get
    End Property
 
-   Private m_bOpenFeatureList As Boolean = False
-   Public Property bOpenFeatureList As Boolean
-      Get
-         Return m_bOpenFeatureList
-      End Get
-      Set(value As Boolean)
-         m_bOpenFeatureList = value
-      End Set
-   End Property
-   Friend Sub SetOpenFeatureList(Value As Boolean)
-      m_bOpenFeatureList = Value
-      NotifyPropertyChanged(NameOf(bOpenFeatureList))
-   End Sub
-
-   Private m_IsSettingBtnOpen As Boolean = False
-   Public Property IsSettingBtnOpen As Boolean
-      Get
-         Return m_IsSettingBtnOpen
-      End Get
-      Set(value As Boolean)
-         m_IsSettingBtnOpen = value
-      End Set
-   End Property
-   Friend Sub SetIsSettingBtnOpen(bIsSettingBtnOpen As Boolean)
-      m_IsSettingBtnOpen = bIsSettingBtnOpen
-      NotifyPropertyChanged(NameOf(IsSettingBtnOpen))
-   End Sub
-
    Public Property IsInverted As Boolean
       Get
          Return BTLPartM.nINVERTED = 180
@@ -1639,6 +1671,12 @@ Public Class BTLPartVM
       Set(value As Boolean)
          ' eseguo inversione
          m_BTLPartM.Inversion(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
+         ' Resetto info
+         If Map.refProjectVM.InfoNgeValue.Count > 0 Then
+            For Each InfoNgePart As String In Map.refProjectVM.InfoNgeValue
+               EgtRemoveInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId, InfoNgePart)
+            Next
+         End If
          ' setto part e tutte le feature da ricalcolare
          ResetCalcTotalPart()
          EgtDraw()
@@ -1647,6 +1685,14 @@ Public Class BTLPartVM
          NotifyPropertyChanged(NameOf(IsInverted))
       End Set
    End Property
+   Friend Sub SetInverted(value As Boolean)
+      ' eseguo inversione
+      m_BTLPartM.Inversion(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
+      EgtRedraw()
+      ' imposto lock
+      bLockInversion = True
+      NotifyPropertyChanged(NameOf(IsInverted))
+   End Sub
 
    Private m_IsRowEnabled As Boolean = True
    Public ReadOnly Property IsRowEnabled As Boolean
@@ -1659,15 +1705,57 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(IsRowEnabled))
    End Sub
 
+   Private m_SelFeatureMsg As String = String.Empty
+   Public ReadOnly Property SelFeatureMsg As String
+      Get
+         Return m_SelFeatureMsg
+      End Get
+   End Property
+   Friend Sub SetSelFeatureMsg(value As String)
+      m_SelFeatureMsg = value
+      NotifyPropertyChanged(NameOf(SelFeatureMsg))
+   End Sub
+
+   Private m_DeselFeatureMsg As String = String.Empty
+   Public ReadOnly Property DeselFeatureMsg As String
+      Get
+         Return m_DeselFeatureMsg
+      End Get
+   End Property
+   Friend Sub SetDeselFeatureMsg(value As String)
+      m_DeselFeatureMsg = value
+      NotifyPropertyChanged(NameOf(DeselFeatureMsg))
+   End Sub
+
+   Public ReadOnly Property bStrategy_Visibility As Visibility
+      Get
+         Return m_SelBTLFeatureVM.bStrategy_Visibility
+      End Get
+   End Property
+
+   Private m_bStrategyModify_Visibility As Visibility = Visibility.Hidden
+   Public ReadOnly Property StrategyModify_Visibility As Visibility
+      Get
+         Return m_bStrategyModify_Visibility
+      End Get
+   End Property
+   Friend Sub SetStrategyModify_Visibility(value As Boolean)
+      m_bStrategyModify_Visibility = If(value, Visibility.Visible, Visibility.Hidden)
+      NotifyPropertyChanged(NameOf(StrategyModify_Visibility))
+   End Sub
+
    ' Definizione comandi
    Private m_cmdInvert As ICommand
    Private m_cmdBackRotation As ICommand
    Private m_cmdForwardRotation As ICommand
    Private m_cmdXRotation As ICommand
    Private m_cmdPartColour As ICommand
-   Private m_cmdShowPopUpSettingBtnCmd As ICommand
    Private m_cmdVerify As ICommand
    Private m_cmdAddToRawPart As ICommand
+   Private m_cmdSelectAllFeature As ICommand
+   Private m_cmdDeselectAllFeature As ICommand
+   Private m_cmdSelectItemFeature As ICommand
+   Private m_cmdDeselectItemFeature As ICommand
 
 #Region "MESSAGES"
 
@@ -1683,6 +1771,18 @@ Public Class BTLPartVM
       End Get
    End Property
 
+   Public ReadOnly Property SelectAll_Msg As String
+      Get
+         Return EgtMsg(63034)
+      End Get
+   End Property
+
+   Public ReadOnly Property DeselectAll_Msg As String
+      Get
+         Return EgtMsg(63035)
+      End Get
+   End Property
+
    Public ReadOnly Property ForwardRotation_ToolTip As String
       Get
          Return EgtMsg(61997)
@@ -1759,7 +1859,7 @@ Public Class BTLPartVM
       AddHandler m_BTLFeatureVMList.CollectionChanged, AddressOf OnBTLFeatureVMListChanged
    End Sub
 
-   Public Sub Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bVerifyDuplo As Boolean = True)
+   Public Sub Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bVerifyDuplo As Boolean = True, Optional bResetCalc As Boolean = True)
       Dim OldSection As SectionXMaterial = Section
       If m_BTLPartM.Rotation(IsPositive, SelectedMachineType, bRedraw, dAng) Then
          ' aggiorno visualizzazione dimensioni
@@ -1767,7 +1867,15 @@ Public Class BTLPartVM
          NotifyPropertyChanged(NameOf(sH))
          NotifyPropertyChanged(NameOf(sL))
          ' setto part e tutte le feature da ricalcolare
-         ResetCalcTotalPart()
+         If bResetCalc Then
+            ' Resetto info
+            If Map.refProjectVM.InfoNgeValue.Count > 0 Then
+               For Each InfoNgePart As String In Map.refProjectVM.InfoNgeValue
+                  EgtRemoveInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId, InfoNgePart)
+               Next
+            End If
+            ResetCalcTotalPart()
+         End If
          ' aggiorno sezioni
          Map.refProjectVM.BTLStructureVM.UpdateSection(Section, OldSection)
       End If
@@ -1787,7 +1895,9 @@ Public Class BTLPartVM
             nState = CalcStates.OK
          Case 22
             nState = CalcStates.COLLISION
-         Case 17, 19
+         Case 17
+            nState = CalcStates.SECTION
+         Case 19
             nState = CalcStates.WARNING
          Case < 0
             nState = CalcStates.INFO
@@ -1812,6 +1922,7 @@ Public Class BTLPartVM
       m_BTLPartM.nCALC_ROT = 0
       m_BTLPartM.nCALC_FALL = 0
       m_BTLPartM.sCALC_MSG = ""
+      m_BTLPartM.nCALC_TIME = 0
       ' aggiorno lista feature in iconcina calcolo
       BTLFeatureVMList_View.Refresh()
       NotifyPropertyChanged(NameOf(Calc_BorderBrush))
@@ -2091,7 +2202,7 @@ Public Class BTLPartVM
          For Each sPart In ToAddList
             sMessage &= " - " & sPart & Environment.NewLine
          Next
-         If MessageBox.Show(sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             For Each PartVM In ToAddVM
                PartVM.AddNewPartToAdded()
             Next
@@ -2102,11 +2213,26 @@ Public Class BTLPartVM
       Return True
    End Function
 
+   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
+      ' salvo sezione impostata
+      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
+      ' ruoto
+      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
+      ' imposto lock
+      bLockRotation = True
+      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
+      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
+         ' se esiste, imposto sezione inversa
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
+         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
+      End If
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
-#Region "Invert"
+#Region "Invert_Command"
 
    Public ReadOnly Property Invert_Command As ICommand
       Get
@@ -2128,41 +2254,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(sINVERTED))
    End Sub
 
-#End Region ' Invert
+#End Region ' Invert_Command
 
-#Region "BackRotation"
-
-   Public ReadOnly Property BackRotation_Command As ICommand
-      Get
-         If m_cmdBackRotation Is Nothing Then
-            m_cmdBackRotation = New Command(AddressOf BackRotationCmd)
-         End If
-         Return m_cmdBackRotation
-      End Get
-   End Property
-
-   Public Sub BackRotationCmd()
-      BackRotation(True)
-   End Sub
-
-   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
-      ' salvo sezione impostata
-      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-      ' ruoto
-      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
-      ' imposto lock
-      bLockRotation = True
-      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
-      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
-         ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
-         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
-      End If
-   End Sub
-
-#End Region ' BackRotation
-
-#Region "ForwardRotation"
+#Region "ForwardRotation_Command"
 
    Public ReadOnly Property ForwardRotation_Command As ICommand
       Get
@@ -2177,10 +2271,10 @@ Public Class BTLPartVM
       ForwardRotation(True)
    End Sub
 
-   Public Sub ForwardRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
+   Public Sub ForwardRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bResetCalc As Boolean = True)
       ' salvo sezione impostata
       Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-      Rotation(True, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
+      Rotation(True, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw, dAng, True, bResetCalc)
       ' imposto lock
       bLockRotation = True
       ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
@@ -2191,7 +2285,7 @@ Public Class BTLPartVM
       End If
    End Sub
 
-#End Region ' ForwardRotation
+#End Region ' ForwardRotation_Command
 
    ' Comando inutilizzato ma conservato per eventuale rotazione a causa di importazione con rotazione sbagliata
 #Region "XRotation"
@@ -2234,7 +2328,7 @@ Public Class BTLPartVM
 
 #End Region ' XRotation
 
-#Region "PartColour"
+#Region "PartColour_Command"
 
    Public ReadOnly Property PartColour_Command As ICommand
       Get
@@ -2256,44 +2350,19 @@ Public Class BTLPartVM
 
    Private Function SelectColor(Col As Color3d, ByRef NewCol As Color3d) As Boolean
       ' Creo dialogo colori
-      'Dim ColorDlg As New System.Windows.Forms.ColorDialog With {
-      '   .FullOpen = True,
-      '   .Color = Col.ToColor()
-      '}
       Dim ColorDlg As New EgtColorPickerV(Application.Current.MainWindow, New EgtColorPickerVM()) With {
          .Color = Col.ToColor()
       }
       ' Visualizzo dialogo
-      If ColorDlg.ShowDialog() <> Forms.DialogResult.OK Then Return False
+      If ColorDlg.ShowDialog() = False Then Return False
       ' Recupero colore scelto
-      NewCol.FromString(ColorDlg.Color.R & "," & ColorDlg.Color.G & "," & ColorDlg.Color.B & "," & ColorDlg.Color.A) 'NewCol.FromColor(ColorDlg.Color)
+      NewCol.FromColor(ColorDlg.Color)
       Return True
    End Function
 
-#End Region ' PartColour
+#End Region ' PartColour_Command
 
-#Region "ShowPopUpSettingBtnCommand"
-
-   Public ReadOnly Property ShowPopUpSettingBtnCommand As ICommand
-      Get
-         If m_cmdShowPopUpSettingBtnCmd Is Nothing Then
-            m_cmdShowPopUpSettingBtnCmd = New Command(AddressOf ShowPopUpSettingBtn)
-         End If
-         Return m_cmdShowPopUpSettingBtnCmd
-      End Get
-   End Property
-
-   Public Sub ShowPopUpSettingBtn(ByVal param As Object)
-      If m_IsSettingBtnOpen Then
-         SetIsSettingBtnOpen(False)
-      Else
-         SetIsSettingBtnOpen(True)
-      End If
-   End Sub
-
-#End Region    ' ShowPopUpSettingBtnCommand
-
-#Region "Verify"
+#Region "Verify_Command"
 
    Public ReadOnly Property Verify_Command As ICommand
       Get
@@ -2306,13 +2375,14 @@ Public Class BTLPartVM
 
    Friend Sub Verify()
       If IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Return
-      Map.refCALCPanelVM.Verify(ProjectType.PROJ)
+      Map.refProjectVM.BTLStructureVM.SelBTLPart.SetIsRowEnabled(False)
+      Map.refCALCPanelVM.Verify(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM)
       Return
    End Sub
 
-#End Region ' Verify
+#End Region ' Verify_Command
 
-#Region "AddToRawPart"
+#Region "AddToRawPart_Command"
 
    Public ReadOnly Property AddToRawPart_Command As ICommand
       Get
@@ -2343,7 +2413,7 @@ Public Class BTLPartVM
       If IsNothing(SelMachGroup) Then Return
       ' se pareti e piu' di uno selezionato, esco
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
-         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
          Return
       End If
       ' se MachGroup gia' mandato in produzione, esco
@@ -2362,13 +2432,13 @@ Public Class BTLPartVM
          ' verifico sezione e materiale
          For Each Part In SelParts
             If Part.Section <> BeamMachGroup.Section Then
-               MessageBox.Show(EgtMsg(61866), EgtMsg(30007))
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61866), EgtMsg(30007))
                Return
             End If
          Next
          ' verifico lunghezza totale
          If Not VerifyTotLength(BeamMachGroup, SelParts) Then
-            MessageBox.Show(EgtMsg(61867), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61867), EgtMsg(30007))
             Return
          End If
          If AddPartToBeam(BeamMachGroup, SelParts) Then
@@ -2386,7 +2456,7 @@ Public Class BTLPartVM
          Dim WallMachGroup As MyMachGroupVM = SelMachGroup
          ' verifico spessore
          If SelPart.Section <> WallMachGroup.Section Then
-            MessageBox.Show(EgtMsg(61868), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61868), EgtMsg(30007))
             Return
          End If
          If AddPartToWall(WallMachGroup, SelPart) Then
@@ -2415,6 +2485,8 @@ Public Class BTLPartVM
    End Function
 
    Friend Function AddPartToBeam(BeamMachGroup As MyMachGroupVM, PartsToAdd As List(Of BTLPartVM)) As Boolean
+      EgtBeamShowFacesName(False)
+      EgtBeamShowLoadingSide(False, False)
       ' ordino i pezzi da aggiungere
       PartsToAdd = PartsToAdd.OrderBy(Function(x) x.dL).ToList()
       ' creo copie dei pezzi
@@ -2605,7 +2677,91 @@ Public Class BTLPartVM
       Return True
    End Function
 
-#End Region    ' AddToRawPart
+#End Region   ' AddToRawPart_Command
+
+#Region "SelectAllFeature_Command"
+
+   Public ReadOnly Property SelectAllFeature_Command As ICommand
+      Get
+         If m_cmdSelectAllFeature Is Nothing Then
+            m_cmdSelectAllFeature = New Command(AddressOf SelectAllFeature)
+         End If
+         Return m_cmdSelectAllFeature
+      End Get
+   End Property
+
+   Friend Sub SelectAllFeature()
+      bDOALL = True
+      NotifyPropertyChanged(NameOf(bDOALL))
+   End Sub
+
+#End Region ' SelectAllFeature_Command
+
+#Region "DeselectAllFeature_Command"
+
+   Public ReadOnly Property DeselectAllFeature_Command As ICommand
+      Get
+         If m_cmdDeselectAllFeature Is Nothing Then
+            m_cmdDeselectAllFeature = New Command(AddressOf DeselectAllFeature)
+         End If
+         Return m_cmdDeselectAllFeature
+      End Get
+   End Property
+
+   Friend Sub DeselectAllFeature()
+      bDOALL = False
+      NotifyPropertyChanged(NameOf(bDOALL))
+   End Sub
+
+#End Region ' DeselectAllFeature_Command
+
+#Region "SelectItemFeature_Command"
+
+   Public ReadOnly Property SelectItemFeature_Command As ICommand
+      Get
+         If m_cmdSelectItemFeature Is Nothing Then
+            m_cmdSelectItemFeature = New Command(AddressOf SelectItemFeature)
+         End If
+         Return m_cmdSelectItemFeature
+      End Get
+   End Property
+
+   Friend Sub SelectItemFeature()
+      For Each ItemFeature As BTLFeatureVM In m_BTLFeatureVMList
+         If ItemFeature.sName = m_SelBTLFeatureVM.sName Then
+            ItemFeature.bDO = True
+         Else
+            ItemFeature.bDO = False
+         End If
+         NotifyPropertyChanged(NameOf(ItemFeature.bDO))
+      Next
+   End Sub
+
+#End Region ' SelectItemFeature_Command
+
+#Region "DeselectItemFeature_Command"
+
+   Public ReadOnly Property DeselectItemFeature_Command As ICommand
+      Get
+         If m_cmdDeselectItemFeature Is Nothing Then
+            m_cmdDeselectItemFeature = New Command(AddressOf DeselectItemFeature)
+         End If
+         Return m_cmdDeselectItemFeature
+      End Get
+   End Property
+
+   Friend Sub DeselectItemFeature()
+      For Each ItemFeature As BTLFeatureVM In m_BTLFeatureVMList
+         If Not ItemFeature.sName = m_SelBTLFeatureVM.sName Then
+            ItemFeature.bDO = True
+         Else
+            ItemFeature.bDO = False
+         End If
+         NotifyPropertyChanged(NameOf(ItemFeature.bDO))
+      Next
+   End Sub
+
+#End Region ' DeselectItemFeature_Command
 
 #End Region    ' COMMANDS
 
@@ -2641,18 +2797,6 @@ Public Class BTLPartVM
          Next
       End If
    End Sub
-   Private Sub OnBTLQParamVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
-      If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
-         For Each BTLParamVM As BTLParamVM In e.NewItems
-            AddHandler BTLParamVM.PropertyChanged, AddressOf OnBTLQParamVMPropertyChanged
-         Next
-      End If
-      If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
-         For Each BTLParamVM As BTLParamVM In e.OldItems
-            RemoveHandler BTLParamVM.PropertyChanged, AddressOf OnBTLQParamVMPropertyChanged
-         Next
-      End If
-   End Sub
 
    Private Sub OnBTLFeatureVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
@@ -2673,12 +2817,6 @@ Public Class BTLPartVM
             CalcGlobalUpdate(True)
       End Select
    End Sub
-   Private Sub OnBTLQParamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      Select Case e.PropertyName
-         Case NameOf(sender.dValue), NameOf(sender.sValue)
-            CalcGlobalUpdate(True)
-      End Select
-   End Sub
 
 #End Region    ' EVENTS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb

@@ -108,11 +108,11 @@ Public Class BTLStructureVM
          Map.refProjectVM.MacroFeature_IsEnabled = True
          ' se modalità building, la tolgo
          If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-            ShowBuilding(False, False)
             Map.refShowBeamPanelVM.SetShowBuilding(False)
-            Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed)
-            Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible)
-            If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible)
+            Map.refProjectVM.SetSceneShowBuldingVisibility(False)
+            Map.refProjectVM.SetManagerTabVisibility(True)
+            Map.refProjectVM.SetFeatureListVisibility(False)
+            Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(True)
          End If
          SceneSelPartSelection()
          ' seleziono pezzo in Db geometrico
@@ -121,11 +121,8 @@ Public Class BTLStructureVM
          Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
          Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
          EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
-         ' imposto tipo di grid selezionata
-         Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PART)
          ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
          If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
-            Dim MachGroupList As New List(Of MyMachGroupVM)
             For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
                Dim bFound As Boolean = False
                For Each Part As PartVM In Machgroup.PartVMList
@@ -146,14 +143,33 @@ Public Class BTLStructureVM
       End If
       ' seleziono la prima feature
       If Not IsNothing(BtlPart) AndAlso Not IsNothing(BtlPart.BTLFeatureVMList) AndAlso BtlPart.BTLFeatureVMList.Count > 0 Then SelBTLPart.SelBTLFeatureVM = BtlPart.BTLFeatureVMList(0)
-      ' aggiorno stato selezionato tutto
-      Map.refShowBeamPanelVM.bShowAll = False
+      ' Mostro le strategie forzate
+      Dim bValue As Boolean = False
+      Dim bValueForced As Boolean = False
+      For Each FeatureParam As BTLFeatureVM In SelBTLPart.BTLFeatureVMList
+         bValue = False
+         EgtGetInfo(FeatureParam.nFeatureId, ConstBeam.STRATEGY & FeatureParam.nFeatureId & "_FORCED", bValue)
+         If bValue Then
+            SelBTLPart.SetStrategyModify_Visibility(True)
+            FeatureParam.SetbStrategy_Visibility(True)
+         End If
+         For Each StrategySetupParam As StrategySetup In Map.refStrategyManagerVM.StrategySetupList
+            For Each StrategyFeatureParam As StrategyFeature In StrategySetupParam.StrategyFeatureList
+               For Each TopologyParam As Topology In StrategyFeatureParam.TopologyList
+                  For Each StrategyParam As Strategy In TopologyParam.StrategyList
+                     For Each Param As StrategyParameter In StrategyParam.ParameterList
+                        bValueForced = False
+                        EgtGetInfo(FeatureParam.nFeatureId, StrategyParam.sStrategyId & "_" & Param.sNameNge & "_FORCED", bValueForced)
+                        If bValueForced Then FeatureParam.SetbStrategy_Visibility(True)
+                     Next
+                  Next
+               Next
+            Next
+         Next
+      Next
       Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)
       NotifyPropertyChanged(NameOf(SelBTLPart))
-      If Not bIsReselect AndAlso m_SelBTLParts.Count = 1 Then
-         BtlPart.SetOpenFeatureList(True)
-      End If
    End Sub
    Private Sub DeselectBTLPart(BtlPart As BTLPartVM)
       ' se necessario tolgo solido dal precedentemente selezionato
@@ -169,12 +185,6 @@ Public Class BTLStructureVM
          BtlPart.SelBTLFeatureVM = Nothing
       End If
       EgtDraw()
-      If m_SelBTLParts.Count = 1 Then
-         m_SelBTLParts(0).SetOpenFeatureList(True)
-      End If
-      If BtlPart.bOpenFeatureList Then
-         BtlPart.SetOpenFeatureList(False)
-      End If
    End Sub
 
    Private m_SelBTLPart As BTLPartVM = Nothing
@@ -746,6 +756,7 @@ Public Class BTLStructureVM
    Private m_cmdDeletePart As ICommand
    Private m_cmdData As ICommand
    Private m_cmdAddPart As ICommand
+   Private m_cmdChangeParameter As ICommand
    Private m_cmdUpdateBTL As ICommand
 
 #Region "Messages"
@@ -764,7 +775,7 @@ Public Class BTLStructureVM
 
    Public ReadOnly Property Data_ToolTip As String
       Get
-         Return EgtMsg(61897)
+         Return EgtMsg(61898)
       End Get
    End Property
 
@@ -802,6 +813,19 @@ Public Class BTLStructureVM
       If BTLStructureM.nAsseBaseId = GDB_ID.NULL Then
          Map.refShowBeamPanelVM.SetShowBuilding(False)
       End If
+      If Not IsNothing(Map.refProdManagerVM.BTLDataWnd) Then
+         Dim bValue As Boolean = False
+         Dim bValueForced As Boolean = False
+         For Each BTLPart As BTLPartVM In m_BTLPartVMList
+            For Each GeneralParameter As ProjectParameters In Map.refProdManagerVM.BTLDataWnd.GeneralParametersList
+               bValue = False
+               bValueForced = False
+               EgtGetInfo(m_BTLStructureM.nBTLInfoId, GeneralParameter.sNameNge & "_FORCED", bValue)
+               EgtGetInfo(BTLPart.nPartId, GeneralParameter.sNameNge & "_FORCED", bValueForced)
+               If bValueForced Then BTLPart.SetStrategyModify_Visibility(True)
+            Next
+         Next
+      End If
    End Sub
 
 #End Region    ' Constructor
@@ -869,70 +893,6 @@ Public Class BTLStructureVM
       DisableMgr.ReEnable()
    End Sub
 
-   Friend Sub ShowAll(Optional bRedraw As Boolean = True, Optional bOnlySelected As Boolean = False)
-      ' disabilito impostazione modificato
-      Dim DisableMgr As New DisableModifiedMgr
-      If Not IsNothing(SelBTLPart) Then
-         ' se pezzo solido, lo riporto normale
-         Configuration.DeselectSolid()
-         ' tolgo pezzo selezionato
-         SelBTLPart.SelBTLFeatureVM = Nothing
-      End If
-      ' mostro tutti i pezzi
-      ' creo lista id presenti
-      Dim BTLPartIdList As List(Of Integer) = (From Part In BTLPartVMList
-                                               Select Part.nPartId).ToList()
-      BTLPartIdList.Sort()
-      Dim nGeomPartId As Integer = EgtGetFirstPart()
-      While nGeomPartId <> GDB_ID.NULL
-         Dim CurrPart As BTLPartVM = BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nGeomPartId)
-         If Not IsNothing(CurrPart) AndAlso Not bOnlySelected Then
-            Dim nMode As Integer
-            EgtGetMode(CurrPart.nPartId, nMode)
-            If nMode <> GDB_MD.STD Then
-               EgtSetMode(CurrPart.nPartId, GDB_MD.STD)
-            End If
-         Else
-            EgtSetMode(nGeomPartId, GDB_MD.HIDDEN)
-         End If
-         nGeomPartId = EgtGetNextPart(nGeomPartId)
-      End While
-      ' ripristino precedente impostazione modificato
-      DisableMgr.ReEnable()
-      Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
-      EgtZoom(ZM.ALL, bRedraw)
-      ' imposto stato per ShowBeamPanel
-      If Not bOnlySelected Then Map.refShowBeamPanelVM.bShowAll = True
-   End Sub
-
-   Friend Sub HideAll(Optional bRedraw As Boolean = True)
-      ' disabilito impostazione modificato
-      Dim DisableMgr As New DisableModifiedMgr
-      If Not IsNothing(SelBTLPart) Then
-         ' se pezzo solido, lo riporto normale
-         Configuration.DeselectSolid(GDB_ID.NULL, True)
-         ' tolgo pezzo selezionato
-         SelBTLPart.SelBTLFeatureVM = Nothing
-      End If
-      SetSelBTLPart(Nothing)
-      ' nascondo tutti i pezzi
-      Dim nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim nMode As Integer
-         EgtGetMode(nPartId, nMode)
-         If nMode <> GDB_MD.HIDDEN Then
-            EgtSetMode(nPartId, GDB_MD.HIDDEN)
-         End If
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      ' ripristino precedente impostazione modificato
-      DisableMgr.ReEnable()
-      Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
-      EgtZoom(ZM.ALL, bRedraw)
-      ' imposto stato per ShowBeamPanel
-      Map.refShowBeamPanelVM.bShowAll = True
-   End Sub
-
    Friend Sub ShowBuilding(nIdAsseBase As Integer, bShow As Boolean, Optional bRedraw As Boolean = True)
       ' disabilito impostazione modificato
       Dim DisableMgr As New DisableModifiedMgr
@@ -1088,6 +1048,7 @@ Public Class BTLStructureVM
    End Function
 
    Friend Sub UpdateSection(NewPartSection As SectionXMaterial, OldPartSection As SectionXMaterial)
+      Dim tmpSectionList As New List(Of SectionXMaterial)
       If IsNothing(BTLPartVMList) Then Return
       ' verifico se era unico con vecchia sezione
       If Not m_BTLPartVMList.Any(Function(x) x.Section = OldPartSection) Then
@@ -1099,8 +1060,13 @@ Public Class BTLStructureVM
       End If
       ' verifico se esiste già nuova sezione
       If Not m_SectionList.Any(Function(x) x = NewPartSection) Then
-         m_SectionList.Add(NewPartSection)
+         tmpSectionList.Add(NewPartSection)
       End If
+      Application.Current.Dispatcher.Invoke(Sub()
+                                               For Each SectionItem As SectionXMaterial In tmpSectionList
+                                                  m_SectionList.Add(SectionItem)
+                                               Next
+                                            End Sub)
    End Sub
 
    ' funzione che aggiorna totale tempi a fine calcolo
@@ -1149,13 +1115,77 @@ Public Class BTLStructureVM
       End If
    End Sub
 
+   Public Sub RemovePart(BTLPartToDelete As BTLPartVM, bSelPrevious As Boolean)
+      ' verifico se ci sono già copie in grezzi
+      Dim nDuploCount As Integer = 0
+      If EgtDuploCount(BTLPartToDelete.nPartId, nDuploCount) AndAlso nDuploCount > 0 Then
+         ' avviso che il pezzo non è cancellabile perchè in produzione
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      ' verifico se rimuovere sezione dalla lista
+      If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x IsNot BTLPartToDelete AndAlso x.Section = BTLPartToDelete.Section) Then
+         Map.refProjectVM.BTLStructureVM.SectionList.Remove(BTLPartToDelete.Section)
+         Map.refProjectVM.BTLStructureVM.SelSection = SectionXMaterial.Empty
+      End If
+      ' Eseguo cancellazione
+      EgtBeamSetPart(BTLPartToDelete.nPartId)
+      If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then RemoveScenePart(BTLPartToDelete)
+      ' seleziono elemento precedente
+      Dim Index As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList.IndexOf(BTLPartToDelete)
+      Dim FilteredIndex As Integer = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.IndexOf(BTLPartToDelete)
+      Map.refProjectVM.BTLStructureVM.SelBTLParts.Remove(BTLPartToDelete)
+      If EgtBeamErasePart() Then
+         If bSelPrevious Then
+            If FilteredIndex = 0 Then
+               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(1))
+               Else
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
+               End If
+            ElseIf FilteredIndex = Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 1 Then
+               If Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count > 1 Then
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View.Count - 2))
+               Else
+                  Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Nothing)
+               End If
+            Else
+               Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList_View(FilteredIndex + 1))
+            End If
+         End If
+         EgtDraw()
+         ' rimuovo dalla lista pezzi
+         Map.refProjectVM.BTLStructureVM.BTLPartVMList.RemoveAt(Index)
+      End If
+   End Sub
+
+   Private Sub RemoveScenePart(BTLPartToDelete As BTLPartVM)
+      ' Rimuovo pezzo dalla scena
+      Dim IdAsseBase As Integer = 0
+      Dim DeletePartId As Integer = 0
+      If Not Map.refProdManagerVM.ListProjAsseBase.TryGetValue(BTLPartToDelete.nPROJ, IdAsseBase) Then
+         Return
+      End If
+      ' Setto il nuovo contesto
+      EgtSetCurrentContext(Map.refSceneShowBuldingVM.SceneShowBulding.GetCtx())
+      If EgtBeamGetBuildingIsOn(IdAsseBase) Then EgtBeamShowBuilding(IdAsseBase, False)
+      If Map.refSceneShowBuldingVM.MapInfo.TryGetValue(BTLPartToDelete.nPartId, DeletePartId) Then
+         EgtErase(DeletePartId)
+         Map.refSceneShowBuldingVM.MapInfo.Remove(BTLPartToDelete.nPartId)
+      End If
+      EgtBeamShowBuilding(IdAsseBase, True)
+      EgtZoom(ZM.ALL)
+      ' Ritorno al contesto corrente
+      EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
 
-#Region "DeletePart"
+#Region "DeletePart_Command"
 
-   Public ReadOnly Property DeletePart_Command As ICommand
+   Public ReadOnly Property DeletePart_Command() As ICommand
       Get
          If m_cmdDeletePart Is Nothing Then
             m_cmdDeletePart = New Command(AddressOf DeletePart)
@@ -1165,12 +1195,22 @@ Public Class BTLStructureVM
    End Property
 
    Public Sub DeletePart()
-      Map.refBTLPartManagerVM.RemovePartCmd()
+      If IsNothing(ProjectManagerVM.CurrProd) Then Return
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62573), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+         If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
+            Dim CurrSelBTLParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
+            For RemoveIndex = CurrSelBTLParts.Count - 1 To 0 Step -1
+               RemovePart(CurrSelBTLParts(RemoveIndex), RemoveIndex = 0)
+            Next
+         End If
+      Else
+         Return
+      End If
    End Sub
 
-#End Region ' DeletePart
+#End Region ' DeletePart_Command
 
-#Region "Data"
+#Region "Data_Command"
 
    Public ReadOnly Property Data_Command As ICommand
       Get
@@ -1182,13 +1222,13 @@ Public Class BTLStructureVM
    End Property
 
    Friend Sub Data(nProjId As Integer)
-      Dim BTLDataWnd As New BTLDataWndV(Application.Current.MainWindow, New BTLDataWndVM(nProjId))
+      Dim BTLDataWnd As New BTLDataWndV(Application.Current.MainWindow, New BTLDataWndVM(Map.refProjectVM.BTLStructureVM))
       BTLDataWnd.ShowDialog()
    End Sub
 
-#End Region ' Data
+#End Region ' Data_Command
 
-#Region "AddPart"
+#Region "AddPart_Command"
 
    Public ReadOnly Property AddPart_Command As ICommand
       Get
@@ -1236,12 +1276,60 @@ Public Class BTLStructureVM
                Map.refProjectVM.BTLStructureVM.SectionList.Add(NewPartVM.Section)
             End If
          End If
+         If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then Map.refProjectVM.UpdatePart(nNewPartId)
       End If
    End Sub
 
-#End Region    ' AddPart
+#End Region    ' AddPart_Command
 
-#Region "UpdateBTL"
+#Region "ChangeParameter"
+
+   Public ReadOnly Property ChangeParameter_Command As ICommand
+      Get
+         If m_cmdChangeParameter Is Nothing Then
+            m_cmdChangeParameter = New Command(AddressOf ChangeParameter)
+         End If
+         Return m_cmdChangeParameter
+      End Get
+   End Property
+
+   Friend Sub ChangeParameter()
+      If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
+      Dim ChangeParameterWndVM As New ChangeParameterWndVM
+      Dim ChangeParameterWnd As New ChangeParameterWndV(Application.Current.MainWindow, ChangeParameterWndVM)
+      If ChangeParameterWnd.ShowDialog() Then
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.CHANGEPARAM, 1, EgtMsg(63014), "", 100)       ' Modifying parameters
+         ' faccio passare pezzi
+         If Not IsNothing(ChangeParameterWndVM.SelParam) Then
+            For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
+               For Each Feature In Part.BTLFeatureVMList.Where(Function(x) x.nPRC = ChangeParameterWndVM.SelPRC.nPRC AndAlso CalcBeamPrivateProfileGRP(x.nSelGRP) = ChangeParameterWndVM.SelPRC.nGRP)
+                  If ChangeParameterWndVM.SelParam.BTLParamM.nType = BTLParamType.CHECKBOX AndAlso Feature.bDO = ChangeParameterWndVM.SelParam.bActualValue Then
+                     Feature.bDO = ChangeParameterWndVM.SelParam.bNewValue
+                  Else
+                     Dim ParamList As ObservableCollection(Of BTLParamVM) = Feature.PBTLParamVMList
+                     For Each Param In ParamList.Where(Function(x) x.sName = ChangeParameterWndVM.SelParam.sName)
+                        Select Case Param.nType
+                           Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
+                              If Math.Abs(Param.dValue - ChangeParameterWndVM.SelParam.dActualValue) < EPS_SMALL Then
+                                 Param.UpdateParamValue(ChangeParameterWndVM.SelParam.dNewValue, "")
+                              End If
+                           Case BTLParamType.STRING_
+                              If Param.sValue = ChangeParameterWndVM.SelParam.sActualValue Then
+                                 Param.UpdateParamValue(0, ChangeParameterWndVM.SelParam.sNewValue)
+                              End If
+                        End Select
+                     Next
+                  End If
+               Next
+            Next
+         End If
+         LoadingWndHelper.CloseLoadingWnd(ActiveIds.CHANGEPARAM)
+      End If
+   End Sub
+
+#End Region ' ChangeParameter
+
+#Region "UpdateBTL_Command"
 
    Public ReadOnly Property UpdateBTL_Command As ICommand
       Get
@@ -1256,59 +1344,61 @@ Public Class BTLStructureVM
       If IsNothing(CurrProd) Then Return
       ' verifico se progetto modificato, e chiedo se salvare
       If CurrProd.bIsNew Or EgtGetModified() OrElse Map.refCALCPanelVM.IsMachineModified() Then
-         Select Case MessageBox.Show(EgtMsg(61877), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61877), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                Map.refProdManagerVM.Save()
             Case MessageBoxResult.Cancel
                Return
             Case Else   ' No
-               MessageBox.Show(EgtMsg(61892), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61892), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
                Return
          End Select
       End If
 
       ' se vista tutti i pezzi
-      Dim bShowBuilding As Boolean = False
-      Dim bShowSolid As Boolean = False
-      Dim nSelPartId As Integer = GDB_ID.NULL
-      If Map.refShowBeamPanelVM.bShowAll Then
-         ' verifico se assemblato e lo annullo per salvataggio
-         bShowBuilding = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
-         If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-         ' se vista singolo pezzo
-      Else
-         bShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-         If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
-         ' se pezzo selezionato lo segno e metto vista tutti
-         If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
-            nSelPartId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId
-         End If
-         Map.refProjectVM.BTLStructureVM.ShowAll(False)
-      End If
+      'Dim bShowBuilding As Boolean = False
+      'Dim bShowSolid As Boolean = False
+      'Dim nSelPartId As Integer = GDB_ID.NULL
+      'If Map.refShowBeamPanelVM.bShowAll Then
+      '   ' verifico se assemblato e lo annullo per salvataggio
+      '   bShowBuilding = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
+      '   If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
+      '   ' se vista singolo pezzo
+      'Else
+      '   bShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
+      '   If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
+      '   ' se pezzo selezionato lo segno e metto vista tutti
+      '   If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
+      '      nSelPartId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId
+      '   End If
+      '   Map.refProjectVM.BTLStructureVM.ShowAll(False)
+      'End If
 
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTUPDATEDIR, "", sDir)
       If bWithDlg Then
          ' apro finestra scelta file
          Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
+               .Title = EgtMsg(61834),
                .DefaultExt = ".btl",
                .Filter = "BTL (*.btl)|*.btl" &
                          "|BTLX (*.btlx)|*.btlx",
                .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
                .CheckFileExists = True,
                .ValidateNames = True}
+
          If BTLDlg.ShowDialog() Then
             sFile = BTLDlg.FileName
          Else
-            ' se assemblato lo ripristino
-            If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-            If nSelPartId <> GDB_ID.NULL Then
-               Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
-               If Not IsNothing(SelPart) Then
-                  If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
-               End If
-            End If
-            EgtZoom(ZM.ALL)
+            '' se assemblato lo ripristino
+            'If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
+            'If nSelPartId <> GDB_ID.NULL Then
+            '   Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
+            '   If Not IsNothing(SelPart) Then
+            '      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
+            '   End If
+            'End If
+            'EgtZoom(ZM.ALL)
             Return
          End If
       End If
@@ -1397,6 +1487,9 @@ Public Class BTLStructureVM
             nAsseBaseSubNodeId = EgtGetNext(nAsseBaseSubNodeId)
          End While
 
+         ' imposto numero del progetto su assebase
+         EgtSetInfo(AsseBaseId, PROJ, nProjId)
+
          ' salvo il file BTL da cui abbiamo rimosso BtlInfo come file NGE
          EgtSaveFile(Map.refMainWindowVM.MainWindowM.sTempDir & "\" & UPDATEBTL_NGE, NGE.CMPTEXT)
 
@@ -1416,16 +1509,16 @@ Public Class BTLStructureVM
                         EgtDeleteContext(nTempCtx)
                         ' rileggo la struttura BTL
                         ReloadBTLStructure()
-                        ' se assemblato lo ripristino
-                        If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-                        If nSelPartId <> GDB_ID.NULL Then
-                           Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
-                           If Not IsNothing(SelPart) Then
-                              'SelPart.IsSelected = True
-                              If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
-                           End If
-                        End If
-                        EgtZoom(ZM.ALL)
+                        '' se assemblato lo ripristino
+                        'If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
+                        'If nSelPartId <> GDB_ID.NULL Then
+                        '   Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
+                        '   If Not IsNothing(SelPart) Then
+                        '      'SelPart.IsSelected = True
+                        '      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
+                        '   End If
+                        'End If
+                        'EgtZoom(ZM.ALL)
                         Return
                      End If
                      ' salvo lo stato del bottone per accodare
@@ -1478,6 +1571,8 @@ Public Class BTLStructureVM
             While nAddedPartId <> GDB_ID.NULL
                ' incremento il PDN del Part aggiunto rispetto al PDN maggiore attualmente presente
                EgtSetInfo(nAddedPartId, BTL_PRT_PDN, Map.refProjectVM.BTLStructureVM.BTLStructureM.NewPDN() + nIncrPDN)
+               ' scrivo in ogni pezzo ProjId
+               EgtSetInfo(nAddedPartId, BTL_PRT_PROJ, nProjId)
                ' recupero layer del box
                Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nAddedPartId, "Box")
                ' recupero box del layer box
@@ -1533,23 +1628,23 @@ Public Class BTLStructureVM
                ' rileggo la struttura BTL
                ReloadBTLStructure()
                ' se assemblato lo ripristino
-               If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-               If nSelPartId <> GDB_ID.NULL Then
-                  Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
-                  If Not IsNothing(SelPart) Then
-                     If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
-                  End If
-               End If
-               EgtZoom(ZM.ALL)
+               'If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
+               'If nSelPartId <> GDB_ID.NULL Then
+               '   Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
+               '   If Not IsNothing(SelPart) Then
+               '      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
+               '   End If
+               'End If
+               'EgtZoom(ZM.ALL)
                Return
             End If
+            ' sovrascrivo i Part nel progetto aperto con i Part checkati nella lista
             If UpdateBTLWndVM.BTLPartList.Count > 0 Then
-               ' sovrascrivo i Part nel progetto aperto con i Part checkati nella lista
-               Dim BTLPartToOverwriteWithList As New ObservableCollection(Of BTLPartToUpdate)
+               Dim BTLPartToUpdateId As New List(Of Integer)
                ' Elimino dal TempCtx i Part non checkati
                For Each BTLPartToOverwriteWith In UpdateBTLWndVM.BTLPartList
                   If BTLPartToOverwriteWith.bInsert Then
-                     BTLPartToOverwriteWithList.Add(BTLPartToOverwriteWith)
+                     BTLPartToUpdateId.Add(BTLPartToOverwriteWith.nPartId)
                   Else
                      ' elimino pezzo copia
                      Dim nCurrPartId = EgtGetCurrPart()
@@ -1562,37 +1657,20 @@ Public Class BTLStructureVM
                ' nei soli Part checkati del BTL nella finestra UpdateBTLWnd
                Dim NewAsseBaseSubNodeDict As New Dictionary(Of Integer, Integer)
                For Each AsseBaseSubNodeItem In AsseBaseSubNodeDict
-                  For Each BTLPartToOverwriteWithItem In BTLPartToOverwriteWithList
-                     Dim bExitFor As Boolean = False
-                     For Each UIDItem In BTLPartToOverwriteWithItem.UIDList
-                        If AsseBaseSubNodeItem.Value = UIDItem Then
-                           NewAsseBaseSubNodeDict.Add(AsseBaseSubNodeItem.Key, AsseBaseSubNodeItem.Value)
-                           bExitFor = True
-                           Exit For
-                        End If
-                     Next
-                     If bExitFor Then Exit For
-                  Next
-               Next
-               ' confronto la lista appena costruita con quella originale ed elimino dal contesto i sottonodi con i valori non più presenti
-               For Each AsseBaseSubNodeItem In AsseBaseSubNodeDict
-                  If Not NewAsseBaseSubNodeDict.ContainsValue(AsseBaseSubNodeItem.Value) Then
+                  Dim Sou As Integer = 0
+                  EgtGetInfo(AsseBaseSubNodeItem.Key, "!SOU", Sou)
+                  If BTLPartToUpdateId.Contains(Sou) Then
+                     NewAsseBaseSubNodeDict.Add(AsseBaseSubNodeItem.Key, AsseBaseSubNodeItem.Value)
+                  Else
                      EgtErase(AsseBaseSubNodeItem.Key)
                   End If
                Next
 
-               ' salvo il file NGE inserito a cui abbiamo rimosso i Part non checkati e gli AsseBase non più associati
-               EgtSaveFile(Map.refMainWindowVM.MainWindowM.sTempDir & "\" & UPDATEBTL_NGE, NGE.CMPTEXT)
-
-               ' torno sul contesto corrente
-               EgtDeleteContext(nTempCtx)
-               EgtSetCurrentContext(nCurrCtx)
-
                ' aggiungo informazioni su pezzi
                Dim nPartId As Integer = EgtGetFirstPart(GDB_ID.ROOT)
                While nPartId <> GDB_ID.NULL
                   ' scrivo in ogni pezzo ProjId
-                  EgtSetInfo(nPartId, BTL_PRT_PROJ, ProjectManagerVM.CurrProd.nProjId)
+                  EgtSetInfo(nPartId, BTL_PRT_PROJ, nProjId)
                   ' scrivo Id negli outline 
                   Dim nPRId As Integer = 1
                   Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
@@ -1609,14 +1687,31 @@ Public Class BTLStructureVM
                   End If
                   nPartId = EgtGetNextPart(nPartId)
                End While
-               ' scrivo info proj e type su layer BtlInfo
-               Dim nBTLInfoLayer As Integer = EgtGetLastNameInGroup(GDB_ID.ROOT, BTLINFO)
-               EgtSetInfo(nBTLInfoLayer, BTL_PRT_PROJ, ProjectManagerVM.CurrProd.nProjId)
-               EgtSetInfo(nBTLInfoLayer, BTL_GEN_PROJTYPE, nType)
+
+               ' salvo il file NGE inserito a cui abbiamo rimosso i Part non checkati e gli AsseBase non più associati
+               EgtSaveFile(Map.refMainWindowVM.MainWindowM.sTempDir & "\" & UPDATEBTL_NGE, NGE.CMPTEXT)
+
+               ' torno sul contesto corrente
+               EgtDeleteContext(nTempCtx)
+               EgtSetCurrentContext(nCurrCtx)
 
                ' rileggo la struttura BTL del progetto corrente per non avere quella del contesto temporaneo ancora presente
                ReloadBTLStructure()
 
+               ' salvo gli id degli AsseBase presenti nel progetto corrente
+               Dim AsseBaseIdList As New List(Of Integer)
+               Dim AsseBaseList As New List(Of Integer)
+               AsseBaseId = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
+               While AsseBaseId <> GDB_ID.NULL
+                  AsseBaseIdList.Add(AsseBaseId)
+                  Dim tmpAsseBaseId = EgtGetFirstInGroup(AsseBaseId)
+                  While tmpAsseBaseId <> GDB_ID.NULL
+                     AsseBaseList.Add(tmpAsseBaseId)
+                     tmpAsseBaseId = EgtGetNext(tmpAsseBaseId)
+                  End While
+                  AsseBaseId = EgtGetNextName(AsseBaseId, ASSEBASE)
+               End While
+
                ' elimino i pezzi da sovrascrivere nel progetto corrente
                For Each BTLPartToOverwriteWith In UpdateBTLWndVM.BTLPartList
                   If BTLPartToOverwriteWith.bInsert Then
@@ -1627,6 +1722,13 @@ Public Class BTLStructureVM
                         Dim nCurrPartId = EgtGetCurrPart()
                         EgtErase(nPartToDeleteId)
                         nCurrPartId = EgtGetCurrPart()
+                        For Each AsseBaseListItem As Integer In AsseBaseList
+                           Dim Sou As Integer = GDB_ID.NULL
+                           EgtGetInfo(AsseBaseListItem, "!SOU", Sou)
+                           If Sou = nPartToDeleteId Then
+                              EgtErase(AsseBaseListItem)
+                           End If
+                        Next
                         ' verifico se rimuovere sezione dalla lista
                         If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x IsNot BTLPartToUpdate AndAlso x.Section = BTLPartToUpdate.Section) Then
                            Map.refProjectVM.BTLStructureVM.SectionList.Remove(BTLPartToUpdate.Section)
@@ -1639,28 +1741,6 @@ Public Class BTLStructureVM
                   End If
                Next
 
-               ' salvo gli id degli AsseBase presenti nel progetto corrente
-               Dim AsseBaseIdList As New List(Of Integer)
-               AsseBaseId = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
-               While AsseBaseId <> GDB_ID.NULL
-                  AsseBaseIdList.Add(AsseBaseId)
-                  ' elimino i sottonodi di AsseBase da sovrascrivere
-                  AsseBaseId = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
-                  nAsseBaseSubNodeId = EgtGetFirstInGroup(AsseBaseId)
-                  'While nAsseBaseSubNodeId <> GDB_ID.NULL
-                  '   If NewAsseBaseSubNodeDict.ContainsKey(nAsseBaseSubNodeId) Then
-                  '      ' se sottonodo da cancellare salvo il suo id e ricavo il seguente prima di cancellarlo
-                  '      Dim nCurrAsseBaseSubNodeId = nAsseBaseSubNodeId
-                  '      nAsseBaseSubNodeId = EgtGetNext(nCurrAsseBaseSubNodeId)
-                  '      bOk = EgtErase(nCurrAsseBaseSubNodeId)
-                  '   Else
-                  '      ' altrimenti ricavo il seguente e basta
-                  '      nAsseBaseSubNodeId = EgtGetNext(nAsseBaseSubNodeId)
-                  '   End If
-                  'End While
-                  AsseBaseId = EgtGetNextName(AsseBaseId, ASSEBASE)
-               End While
-
                ' calcolo BBox globale del progetto corrente
                Dim b3Parts As New BBox3d
                Dim nProjPartId As Integer = EgtGetFirstPart()
@@ -1688,7 +1768,7 @@ Public Class BTLStructureVM
                   Dim nAsseBaseToEraseId As Integer = 0
                   EgtGetInfo(nAsseBaseId, BTL_PRT_PROJ, nAsseBaseProjId)
                   ' se AsseBase di questo step del ciclo è nuovo e suo ProjId uguale a quello del progetto corrente
-                  If Not AsseBaseIdList.Contains(nAsseBaseId) AndAlso nAsseBaseProjId = CurrProd.nProdId Then
+                  If Not AsseBaseIdList.Contains(nAsseBaseId) AndAlso nAsseBaseProjId = nProjId Then
                      ' riloco i sottonodi del nuovo AsseBase nell'AsseBase del progetto aperto col medesimo ProjId
                      Dim AsseBaseSubNodeId As Integer = EgtGetFirstInGroup(nAsseBaseId)
                      While AsseBaseSubNodeId <> GDB_ID.NULL
@@ -1698,7 +1778,7 @@ Public Class BTLStructureVM
                            Dim SameAsseBaseProjId As Integer
                            EgtGetInfo(FindAsseBaseId, BTL_PRT_PROJ, SameAsseBaseProjId)
                            ' se l'ho trovato esco dal While (FindAsseBaseId è l'id dell'AsseBase in cui vogliamo rilocare i sottonodi)
-                           If SameAsseBaseProjId = CurrProd.nProdId Then Exit While
+                           If SameAsseBaseProjId = nProjId Then Exit While
                            FindAsseBaseId = EgtGetNextName(FindAsseBaseId, ASSEBASE)
                         End While
                         ' salvo id dell'AsseBase corrente per ottenere il seguente prima di rilocarlo
@@ -1761,25 +1841,31 @@ Public Class BTLStructureVM
          ' copio il file originale scelto nel dialog per l'Update nella cartella Proj del progetto corrente
          If File.Exists(sFile) Then
             'Dim sDestPath As String = ProjectManagerVM.CurrProj.sProjDirPath & "\" & Path.GetFileNameWithoutExtension(sFile)
-            Dim sDestPath As String = CurrProd.sProdDirPath & "\Projs\" & ProjectManagerVM.CurrProd.nProjIdList(0).ToString("0000") & "\" & Path.GetFileNameWithoutExtension(sFile)
-            While File.Exists(sDestPath & ".btl")
-               sDestPath &= "_1"
-            End While
+            Dim sDestPath As String = CurrProd.sProdDirPath & "\Projs\" & nProjId.ToString("0000") & "\" & Path.GetFileNameWithoutExtension(sFile)
+            If File.Exists(sDestPath & ".btl") Then
+               Dim nIndex As Integer = 1
+               While File.Exists(sDestPath & ".btl")
+                  sDestPath &= "_" & nIndex.ToString()
+               End While
+            End If
             File.Copy(sFile, sDestPath & ".btl", False)
          End If
       End If
-      ' se assemblato lo ripristino
-      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-      If nSelPartId <> GDB_ID.NULL Then
-         Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
-         If Not IsNothing(SelPart) Then
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
-         End If
+      '' se assemblato lo ripristino
+      'If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
+      'If nSelPartId <> GDB_ID.NULL Then
+      '   Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
+      '   If Not IsNothing(SelPart) Then
+      '      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
+      '   End If
+      'End If
+      If Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count > 0 Then
+         Map.refProjectVM.BTLStructureVM.SelectBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(0))
       End If
       EgtZoom(ZM.ALL)
    End Sub
 
-#End Region ' UpdateBTL
+#End Region ' UpdateBTL_Command
 
 #End Region    ' Commands
 

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndV.xaml

@@ -19,8 +19,10 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding Msg_Text}"
-                 Style="{StaticResource Msg_TextBlock}"/>
-      <Grid Style="{StaticResource BlockedWnd_Grid}">
+                 TextAlignment="Center"
+                 Margin="40,0,40,0"
+                 Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
+      <Grid Margin="5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -33,12 +35,14 @@
                  IsDefault="True"
                  Command="{Binding Save_Command}"
                  Visibility="{Binding Buttons_Visibility}"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Grid.Column="3" 
                  Content="{Binding DoNotSave_Msg}"
                  Command="{Binding DoNotSave_Command}"
                  Visibility="{Binding Buttons_Visibility}"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </Grid>      
    </Grid>
    

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb

@@ -112,7 +112,7 @@ Public Class BlockedWndVM
 
 #Region "COMMANDS"
 
-#Region "Save"
+#Region "Save_Command"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -130,9 +130,9 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' Save
+#End Region    ' Save_Command
 
-#Region "DoNotSave"
+#Region "DoNotSave_Command"
 
    Public ReadOnly Property DoNotSave_Command As ICommand
       Get
@@ -148,7 +148,7 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' DoNotSave
+#End Region    ' DoNotSave_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb

@@ -3,6 +3,7 @@ Imports System.IO
 Imports System.Threading
 Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.Core.CalcIntegration
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgwMultiEngineManager.Data
@@ -70,6 +71,17 @@ Public Class CALCPanelVM
       NotifyPropertyChanged(NameOf(ChooseMachine_Visibility))
    End Sub
 
+   Private m_ChooseMachine_IsEnabled As Boolean = False
+   Public ReadOnly Property ChooseMachine_IsEnabled As Boolean
+      Get
+         Return m_ChooseMachine_IsEnabled
+      End Get
+   End Property
+   Friend Sub SetChooseMachine_IsEnabled(IsEnabled As Boolean)
+      m_ChooseMachine_IsEnabled = IsEnabled
+      NotifyPropertyChanged(NameOf(ChooseMachine_IsEnabled))
+   End Sub
+
    ' Lista delle macchine disponibili per il tipo di progetto corrente
    Private m_MachineList As New ObservableCollection(Of Machine)
    Public Property MachineList As ObservableCollection(Of Machine)
@@ -95,6 +107,17 @@ Public Class CALCPanelVM
       End Set
    End Property
 
+   Private m_bCalculating As Boolean = False
+   Friend ReadOnly Property bCalculating As Boolean
+      Get
+         Return m_bCalculating
+      End Get
+   End Property
+   Friend Sub SetCalculating(value As Boolean)
+      m_bCalculating = value
+      NotifyPropertyChanged(NameOf(bCalculating))
+   End Sub
+
    ' Definizione comandi
    Private m_cmdChooseMachine As ICommand
    Private m_cmdOk As ICommand
@@ -122,6 +145,7 @@ Public Class CALCPanelVM
    Sub New()
       ' imposto riferimento in Map
       Map.SetRefCALCPanelVM(Me)
+      SetChooseMachine_IsEnabled(False)
       Core.CalcIntegration.SetMaxCamInstances(Map.refMainWindowVM.MainWindowM.GetMaxCamInstances())
       AddHandler Core.CalcIntegration.Calc_ProcessResult, AddressOf Calc_ProcessResult
       AddHandler Core.CalcIntegration.Calc_Ended, AddressOf Calc_Ended
@@ -138,9 +162,9 @@ Public Class CALCPanelVM
       ProcessResults(e.m_Result)
    End Sub
 
-   Private Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
+   Friend Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
       If e.End_ = CalcEndEventArgs.Results.ERROR_ OrElse e.End_ = CalcEndEventArgs.Results.NULL Then
-         MessageBox.Show("Execution error (all processes are disabled)")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
       End If
       If e.End_ = CalcEndEventArgs.Results.EDIT Then
          Map.refMyStatusBarVM.SetOutputMessage("Editor closed")
@@ -150,10 +174,31 @@ Public Class CALCPanelVM
       If e.CmdType = CmdTypes.CHECKGEN Then
          Map.refProdManagerVM.Save()
       End If
-      ' se modalita' assemblato attiva
-      If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
-         ' lo rimonto
-         Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
+      Map.refProjectVM.SetCalcRunning(False)
+      Map.refMyStatusBarVM.ResetStopProgress()
+      ' se lanciato dal produci, eseguo produci
+      If m_FromProduce <> ProduceType.NULL Then
+         Select Case m_FromProduce
+            Case ProduceType.PRODUCE
+               Map.refRawPartManagerVM.ProduceRawPart()
+            Case ProduceType.PRODUCEALL
+               Map.refRawPartManagerVM.ProduceAllRawPart()
+         End Select
+         m_FromProduce = ProduceType.NULL
+      End If
+   End Sub
+
+   Friend Sub Calc_Ended(CmdType As CmdTypes)
+      'If e.End_ = CalcEndEventArgs.Results.ERROR_ OrElse e.End_ = CalcEndEventArgs.Results.NULL Then
+      '   EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
+      'End If
+      If CmdType = CmdTypes.EDIT Then
+         Map.refMyStatusBarVM.SetOutputMessage("Editor closed")
+         m_ReloadEditedFile = True
+      End If
+      ' se verify o verifyall, salvo il progetto per conservarne gli stati calcolati
+      If CmdType = CmdTypes.CHECKGEN OrElse CmdType = CmdTypes.CHECKNOSIM Then
+         Map.refProdManagerVM.Save()
       End If
       Map.refProjectVM.SetCalcRunning(False)
       Map.refMyStatusBarVM.ResetStopProgress()
@@ -270,16 +315,18 @@ Public Class CALCPanelVM
             Else
                ' Inizializzo i pezzi del gruppo di lavoro in verifica
                Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(nBarId)
-               For Each Part As PartVM In Machgroup.PartVMList
-                  Part.CalcPartUpdate(0, 0, "")
-                  ' Resetto feature in collisione
-                  For Each Feature As BTLFeatureVM In Part.FeatureVMList
-                     If Feature.nState = CalcStates.COLLISION Then
-                        Feature.ResetFeatureError()
-                     End If
+               If Not IsNothing(Machgroup) Then
+                  For Each Part As PartVM In Machgroup.PartVMList
+                     Part.CalcPartUpdate(0, 0, "")
+                     ' Resetto feature in collisione
+                     For Each Feature As BTLFeatureVM In Part.FeatureVMList
+                        If Feature.nState = CalcStates.COLLISION Then
+                           Feature.ResetFeatureError()
+                        End If
+                     Next
                   Next
-               Next
-               Machgroup.CalcMachGroupUpdate(0, 0, "")
+                  Machgroup.CalcMachGroupUpdate(0, 0, "")
+               End If
             End If
             ' Ciclo ...
             Dim nCUTID As Integer = -1
@@ -377,6 +424,7 @@ Public Class CALCPanelVM
             If nProgramPage = ProjectType.PROJ Then
                ' aggiorno il pezzo
                Dim BTLPart As BTLPartVM = GetBTLPartVMFromBTLPartId(nBarId)
+               BTLPart.SetIsRowEnabled(True)
                BTLPart.CalcGlobalUpdate()
                ' lancio aggiornamento tempo su BTL
                Map.refProjectVM.BTLStructureVM.CalcGlobalTime()
@@ -385,6 +433,7 @@ Public Class CALCPanelVM
                For Each Part In Machgroup.PartVMList
                   Part.CalcGlobalUpdate()
                Next
+               Machgroup.SetIsRowEnabled(True)
                Machgroup.CalcGlobalUpdate()
                ' lancio aggiornamento tempo su MachgroupPanel
                Map.refProjectVM.MachGroupPanelVM.CalcGlobalTime()
@@ -393,11 +442,25 @@ Public Class CALCPanelVM
          End If
 
       Else
+         ' do errore
          bErrors = True
          nLastErr = 25
          sLastMsg = "Execution Error"
-      End If
+         ' riattivo comunque righe
+         If nProgramPage = ProjectType.PROJ Then
+            Dim BTLPart As BTLPartVM = GetBTLPartVMFromBTLPartId(nBarId)
+            BTLPart.SetIsRowEnabled(True)
+            BTLPart.CalcGlobalUpdate()
+         Else
+            Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(nBarId)
+            For Each Part In Machgroup.PartVMList
+               Part.CalcGlobalUpdate()
+            Next
+            Machgroup.SetIsRowEnabled(True)
+            Machgroup.CalcGlobalUpdate()
+         End If
 
+      End If
    End Sub
 
    Private Shared Function GetVal(sText As String, sKey As String) As Integer?
@@ -487,7 +550,7 @@ Public Class CALCPanelVM
             (nMachType = 3 And Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(ProjectManagerVM.CurrProd)) Then
             MachineList.Add(Machine)
             ' Se il nome Macchina coincide setto la macchina selezionata con la macchina associata al progetto
-            If Machine.Name = sMachineName Then
+            If String.Equals(Machine.Name, sMachineName, StringComparison.OrdinalIgnoreCase) Then
                SelectedMachine = MachineList(MachineList.IndexOf(Machine))
                m_OrigSelectedMachine = SelectedMachine
             End If
@@ -520,7 +583,7 @@ Public Class CALCPanelVM
       m_OrigSelectedMachine = SelectedMachine
    End Sub
 
-   Friend Sub Verify(ProgramPage As ProjectType)
+   Friend Sub Verify(ProgramPage As ProjectType, CmdType As Integer)
       If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return
       Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
       Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
@@ -536,15 +599,16 @@ Public Class CALCPanelVM
          End If
       Else
          Dim ExecThread As New Thread(Sub()
-                                         VerifyWithEngine(ProgramPage)
+                                         VerifyWithEngine(ProgramPage, CmdType)
                                       End Sub)
          ExecThread.Start()
       End If
 
    End Sub
 
-   Private Sub VerifyProjWithEngine(CurrPart As BTLPartVM)
+   Private Sub VerifyProjWithEngine(CurrPart As BTLPartVM, CmdType As Integer)
       If Not CurrPart.bDO Then Return
+      CurrPart.SetIsRowEnabled(False)
       Dim Args As New Dictionary(Of String, String)
       Args.Add("BarId", CurrPart.nPartId)
       Args.Add("ProgramPage", ProjectType.PROJ)
@@ -562,7 +626,7 @@ Public Class CALCPanelVM
                Dim sBTLPartFilePath As String = BarPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
                If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
             End If
-            nCmdType = CalcIntegration.CmdTypes.CHECKNOSIM
+            nCmdType = CmdType
       End Select
       Args.Add("CmdType", nCmdType)
       Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL
@@ -572,17 +636,30 @@ Public Class CALCPanelVM
          Case BWType.WALL
             ExecEnvironment = EXECENVIRONMENTS.WALL
       End Select
+      ' Imposto contesto scena principale
+      Dim CurrContext As Integer = EgtGetCurrentContext()
+      Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx()
+      If CurrContext <> MainSceneContext Then
+         EgtSetCurrentContext(MainSceneContext)
+      End If
       Dim Request As New QuestionDTO(1, ExecEnvironment, Args)
       Request.Args("BarPath") = CreateNewProjectFromPart(CurrPart.nPartId, BarPath)
+      EgtSetCurrentContext(CurrContext)
       EgtOutLog("Creato progetto " & CurrPart.nPartId)
       If Request.ExecEnvironment <> EXECENVIRONMENTS.NULL Then
-         MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
+         If Not MyExecProcessManager.ExecProcessManagerList.ContainsKey(Request.ExecEnvironment) Then
+            EgtOutLog(EgtMsg(62588))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62588), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
+         End If
       End If
    End Sub
 
    Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM)
       ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
       If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Return
+      CurrMachGroup.SetIsRowEnabled(False)
       Dim Args As New Dictionary(Of String, String)
       Args.Add("BarId", CurrMachGroup.Id)
       Args.Add("ProgramPage", ProjectType.PROD)
@@ -612,15 +689,27 @@ Public Class CALCPanelVM
          Case BWType.WALL
             ExecEnvironment = EXECENVIRONMENTS.WALL
       End Select
+      ' Imposto contesto scena principale
+      Dim CurrContext As Integer = EgtGetCurrentContext()
+      Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx()
+      If CurrContext <> MainSceneContext Then
+         EgtSetCurrentContext(MainSceneContext)
+      End If
       Dim Request As New QuestionDTO(1, ExecEnvironment, Args)
       Request.Args("BarPath") = CreateNewProjectFromMachGroup(CurrMachGroup.Id, BarPath, CurrMachGroup.nGlobalState)
+      EgtSetCurrentContext(CurrContext)
       EgtOutLog("Creato progetto " & CurrMachGroup.Id)
       If Request.ExecEnvironment <> EXECENVIRONMENTS.NULL Then
-         MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
+         If Not MyExecProcessManager.ExecProcessManagerList.ContainsKey(Request.ExecEnvironment) Then
+            EgtOutLog(EgtMsg(62588))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62588), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         Else
+            MyExecProcessManager.ExecProcessManagerList(Request.ExecEnvironment).ArgumentsEnqueue(Request)
+         End If
       End If
    End Sub
 
-   Private Sub VerifyWithEngine(ProgramPage As ProjectType)
+   Private Sub VerifyWithEngine(ProgramPage As ProjectType, CmdType As Integer)
       Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
       ' lancio calcolo
       Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL
@@ -630,9 +719,15 @@ Public Class CALCPanelVM
          Case BWType.WALL
             ExecEnvironment = EXECENVIRONMENTS.WALL
       End Select
+      ' Blocco scena dell'assemblato
+      Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
+      Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
+      Map.refMyStatusBarVM.StartLoading(EgtMsg(62576), False)
+      Map.refMyStatusBarVM.MaximumValue = 1
       If ProgramPage = ProjectType.PROJ Then
          If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return
-         VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.SelBTLPart)
+         VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.SelBTLPart, CmdType)
       ElseIf ProgramPage = ProjectType.PROD Then
          ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
          If Map.refMachGroupPanelVM.SelectedMachGroup.nProduction_State >= ItemState.Assigned Then Return
@@ -723,7 +818,7 @@ Public Class CALCPanelVM
       Map.refMyStatusBarVM.SetOutputMessage(sProgress)
    End Sub
 
-   Friend Sub VerifyAll(ProgramPage As ProjectType)
+   Friend Sub VerifyAll(ProgramPage As ProjectType, CmdType As Integer)
       Dim ProjType As BWType = ProjectManagerVM.CurrProd.nType
       If GetMainPrivateProfileInt(S_GENERAL, "UseCam5", 0) = 1 Then
          Dim BarList() As EgtBEAMWALL.Core.Bar = Nothing
@@ -738,34 +833,32 @@ Public Class CALCPanelVM
          End If
       Else
          Dim ExecThread As New Thread(Sub()
-                                         VerifyAllWithEngine(ProgramPage)
+                                         VerifyAllWithEngine(ProgramPage, CmdType)
                                       End Sub)
          ExecThread.Start()
       End If
-
    End Sub
 
-   Private Sub VerifyAllWithEngine(ProgramPage As ProjectType)
+   Private Sub VerifyAllWithEngine(ProgramPage As ProjectType, CmdType As Integer)
       Dim QuestionList As New List(Of QuestionDTO)
+      ' Blocco scena dell'assemblato
+      Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False)
+      Map.refSceneBuildingVM.SetViewPanel_IsEnable(False)
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False
+      Map.refMyStatusBarVM.StartLoading(EgtMsg(62576), False)
       If ProgramPage = ProjectType.PROJ Then
+         Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count
          For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
             If Not Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex).bDO Then Continue For
-            VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex))
+            VerifyProjWithEngine(Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex), CmdType)
          Next
-         For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1
-            Map.refProjectVM.BTLStructureVM.BTLPartVMList(PartIndex).SetIsRowEnabled(True)
-         Next
-         Map.refLeftPanelVM.SetCALCPanel_IsEnabled(True)
       ElseIf ProgramPage = ProjectType.PROD Then
+         Map.refMyStatusBarVM.MaximumValue = Map.refMachGroupPanelVM.MachGroupVMList.Count
          For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
             ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra
-            If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Return
+            If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Continue For
             VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex))
          Next
-         For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1
-            DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).SetIsRowEnabled(True)
-         Next
-         Map.refRawPartManagerVM.SetCALCPanel_IsEnabled(True)
       End If
    End Sub
 
@@ -848,7 +941,7 @@ Public Class CALCPanelVM
    Friend Sub ChooseMachine()
       ' rendo visibile la CmBx per la scelta e il pulsante di conferma solo se il Proj corrente non ha associato alcun Prod
       If ProjectManagerVM.CurrProd.nProjId > 0 Then
-         MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       Else
          SetChooseMachine_Visibility(True)
       End If
@@ -919,9 +1012,8 @@ Public Class CALCPanelVM
          End If
          nPartId = EgtGetNextPart(nPartId)
       End While
-      ' Se OnlyProdPage rimuovo MachGroup
       If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
-         If MessageBox.Show(EgtMsg(61779), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61779), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
             For Index As Integer = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 To 0 Step -1
                Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Index)
                CurrMachGroup.DeleteMachGroup()
@@ -930,6 +1022,18 @@ Public Class CALCPanelVM
       End If
       ' rigenero struttura BTL
       Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId))
+      For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
+         Part.ResetCalcTotalPart()
+         Part.SetStrategyModify_Visibility(False)
+         For Each Feature As BTLFeatureVM In Part.BTLFeatureVMList
+            Map.refForcedStrategyPanelVM.ResetForcedStrategy(Feature.nFeatureId)
+         Next
+      Next
+      If Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count > 0 Then
+         Map.refProjectVM.BTLStructureVM.SetSelBTLPart(Map.refProjectVM.BTLStructureVM.BTLPartVMList(0))
+      End If
+      Map.refProjectVM.BTLStructureVM.LoadFilters()
+      Map.refMyStatusBarVM.RefreshMachName()
    End Sub
 
 #End Region ' Ok

EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml

@@ -1,19 +1,22 @@
 <StackPanel x:Class="CalcPanelV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource PartManager_StackPanel}">
+            Orientation="Horizontal">
    
    <Button ToolTip="{Binding ChooseMachine_ToolTip}"
            Command="{Binding ChooseMachine_Command}"
-           IsEnabled="{Binding CALCPanel_IsEnabled}"
+           IsEnabled="{Binding ChooseMachine_IsEnabled}"
            Visibility="{Binding ChooseMachineBtn_Visibility}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/CALCPanel/ChooseMachine.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource ChooseMachine_Image}"
+             Stretch="Uniform"/>
    </Button>
 
-   <Grid Visibility="{Binding ChooseMachine_Visibility}"
-         Style="{StaticResource CalcPanel_Grid}">
+   <Grid Visibility="{Binding ChooseMachine_Visibility}"         
+         Margin="0,0,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto"/>
          <ColumnDefinition Width="Auto"/>
@@ -23,11 +26,18 @@
                 DisplayMemberPath="Name"
                 SelectedItem="{Binding Path=SelectedMachine}" 
                 SelectedValuePath="Name"
-                Style="{StaticResource CalcPanel_ComboBox}"/>
+                Height="22"
+                Width="150"
+                Style="{StaticResource Optmizer_ComboBox}"/>
       <Button Grid.Column="1"
               Content="OK"
               Command="{Binding Ok_Command}"
-              Style="{StaticResource CalcPanel_Button}"/>
+              FontWeight="Light"
+              FontSize="10"
+              Height="30"
+              Width="30"
+              Margin="5,2,5,2"
+              Style="{StaticResource Optimizer_Button}"/>
    </Grid>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml

@@ -7,15 +7,15 @@
                                  Title="ChangeMaterialWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid Grid.Row="0"
-            Style="{StaticResource ChangeMaterialWnd_Grid}">
+      <Grid HorizontalAlignment="Center"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -25,28 +25,41 @@
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <TextBlock Text="{Binding ProjMaterial_Msg}"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding ProjMaterialList}"
-                   SelectedItem="{Binding SelProjMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                   SelectedItem="{Binding SelProjMaterial}" 
+                   Height="24"
+                   MinWidth="55"
+                   Width="150"
+                   Margin="5,-2,0,5"/>
       </Grid>
       <Grid Grid.Row="1"
-            Style="{StaticResource ChangeMaterialWnd_Grid}">
+            HorizontalAlignment="Center"
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <TextBlock Text="{Binding WjMaterial_Msg}"
-                    Style="{StaticResource Option_TextBlock}"/>
+                    Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Margin="10,5,10,0"/>
          <ComboBox Grid.Column="1"
                    ItemsSource="{Binding WhMaterialList}"
                    SelectedItem="{Binding SelWhMaterial}"                   
-                   Style="{StaticResource ProjMaterial_ComboBox}"/>
+                   Height="24"
+                   MinWidth="55"
+                   Width="150"
+                   Margin="5,-2,0,5"/>
       </Grid>
 
       <Grid Grid.Row="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -58,11 +71,13 @@
                  Content="{Binding Ok_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Grid.Column="3"
                  Content="{Binding Cancel_Msg}"
                  IsCancel="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </Grid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb

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

EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndV.xaml

@@ -5,11 +5,11 @@
                                  xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                                  SizeToContent="Height"
                                  WindowStartupLocation="CenterOwner"
-                                 Width="300"
+                                 Width="400"
                                  Title="ChangeParameterWnd"
                                  Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
 
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
+   <Grid Margin="5,5,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="2*"/>
@@ -27,37 +27,58 @@
       </Grid.RowDefinitions>
 
       <TextBlock Text="Process"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,5,10,0"/>
       <ComboBox Grid.Column="1"
                 ItemsSource="{Binding PRCList}"
                 SelectedItem="{Binding SelPRC}"
                 DisplayMemberPath="ghDesc"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Height="24"
+                MinWidth="55"
+                Margin="5,-2,0,5"/>
 
       <TextBlock Grid.Row="2"
                  Text="Parameter"
-                 Style="{StaticResource Option_TextBlock}"/>
-      <ComboBox Grid.Row="2" Grid.Column="1"
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,5,10,0"/>
+      <ComboBox Grid.Row="2" 
+                Grid.Column="1"
                 ItemsSource="{Binding ParamList}"
                 SelectedItem="{Binding SelParam}"
                 DisplayMemberPath="sNameAndDescription"
-                Style="{StaticResource PRCList_ComboBox}"/>
+                HorizontalAlignment="Stretch"
+                Height="24"
+                MinWidth="55"
+                Margin="5,-2,0,5"/>
 
       <TextBlock Grid.Row="4" 
                  Text="Actual value"
-                 Style="{StaticResource Option_TextBlock}"/>
-      <EgtWPFLib5:EgtTextBox Grid.Row="4" Grid.Column="1"
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,5,10,0"/>
+      <EgtWPFLib5:EgtTextBox Grid.Row="4" 
+                             Grid.Column="1"
                              Text="{Binding SelParam.sActualValue}"
                              Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
       <CheckBox Grid.Row="4" 
                 Grid.Column="1"
                 IsChecked="{Binding SelParam.bActualValue}"
                 Visibility="{Binding SelParam.IsCheckBox_Visibility}"
-                Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"/>
 
       <TextBlock Grid.Row="6" 
                  Text="New Value"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,5,10,0"/>
       <EgtWPFLib5:EgtTextBox Grid.Row="6" 
                              Grid.Column="1"
                              Text="{Binding SelParam.sNewValue}"
@@ -66,11 +87,12 @@
                 Grid.Column="1"
                 IsChecked="{Binding SelParam.bNewValue}"
                 Visibility="{Binding SelParam.IsCheckBox_Visibility}"
-                Style="{StaticResource FeatureInPartInRawPartList_CheckBox}"/>
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"/>
 
       <Grid Grid.Row="8" 
             Grid.ColumnSpan="2"
-            Style="{StaticResource AddPartWnd_Grid}">
+            Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
@@ -82,11 +104,13 @@
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"                 
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
+                 Height="30"
+                 Width="80"/>
       </Grid>
    </Grid>
 </EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -108,7 +108,7 @@ Public Class ChangeParameterWndVM
          Not IsNothing(m_SelParam) AndAlso m_SelParam.sName <> "" Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
       End If
    End Sub
 

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -2,7 +2,7 @@
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-           DataContext="{DynamicResource ConfigurationPageVM}">
+           DataContext="{StaticResource ConfigurationPageVM}">
 
    <OPTIMIZER:MachinePanelV DataContext="{Binding MachinePanelVM}"/>
    

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -1,10 +1,9 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports System.IO.Compression
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports EgtBEAMWALL.Core
-Imports MS.Internal
-Imports Ionic.Zip
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -25,23 +24,10 @@ Public Class ConfigurationPageVM
       Set(value As Integer)
          m_SelConfigSubPage = value
          If m_SelConfigSubPage = ConfigSubPages.GENERAL Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
-            SetGeneral_Visibility(Visibility.Visible)
-            SetStrategyManager_Visibility(Visibility.Collapsed)
-            SetPDFEditor_Visibility(Visibility.Collapsed)
-         ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
-            SetGeneral_Visibility(Visibility.Collapsed)
-            SetStrategyManager_Visibility(Visibility.Collapsed)
-            SetPDFEditor_Visibility(Visibility.Collapsed)
+            SetPDFEditor_Visibility(False)
          ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then
-            ' Controllo se il file CustomConfig Json è stato modificato
-            If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson()
-            SetPDFEditor_Visibility(Visibility.Visible)
-            SetGeneral_Visibility(Visibility.Collapsed)
-            SetStrategyManager_Visibility(Visibility.Collapsed)
+            SetPDFEditor_Visibility(True)
+            SetStrategyManager_Visibility(False)
          End If
       End Set
    End Property
@@ -82,6 +68,7 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public OrigSelectedLanguage As Language
    Private m_SelectedLanguage As Language
    Public Property SelectedLanguage As Language
       Get
@@ -94,6 +81,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Public nOrigSelMeasureUnit As Integer = If(EgtUiUnitsAreMM(), MeasureUnitOpt.MM, MeasureUnitOpt.INCH)
    Public Property SelMeasureUnit As Integer
       Get
          Return If(EgtUiUnitsAreMM(), MeasureUnitOpt.MM, MeasureUnitOpt.INCH)
@@ -108,6 +96,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Public sOrigSectionTime As String
    Private m_SectionTime As Double
    Public Property SectionTime As String
       Get
@@ -121,6 +110,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Public sOrigPartTime As String
    Private m_PartTime As Double
    Public Property PartTime As String
       Get
@@ -134,6 +124,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Public bOrigPrintLabel_IsChecked As Boolean
    Private m_bPrintLabel_IsChecked As Boolean
    Public Property bPrintLabel_IsChecked As String
       Get
@@ -158,6 +149,7 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public bOrigExternalBackupActive As Boolean
    Private m_bExternalBackupActive As Boolean
    Public Property bExternalBackupActive As Boolean
       Get
@@ -169,6 +161,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Public sOrigExternalBackupFolderPath As String
    Private m_ExternalBackupFolderPath As String
    Public Property ExternalBackupFolderPath As String
       Get
@@ -187,6 +180,7 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public OrigSelReminder As IdNameStruct
    Private m_SelReminder As IdNameStruct
    Public Property SelReminder As IdNameStruct
       Get
@@ -198,25 +192,14 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   Private m_bGeneral_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property General_Visibility As Visibility
-      Get
-         Return m_bGeneral_Visibility
-      End Get
-   End Property
-   Friend Sub SetGeneral_Visibility(value As Visibility)
-      m_bGeneral_Visibility = value
-      NotifyPropertyChanged(NameOf(General_Visibility))
-   End Sub
-
    Private m_bStrategyManager_Visibility As Visibility = Visibility.Visible
    Public ReadOnly Property StrategyManager_Visibility As Visibility
       Get
          Return m_bStrategyManager_Visibility
       End Get
    End Property
-   Friend Sub SetStrategyManager_Visibility(value As Visibility)
-      m_bStrategyManager_Visibility = value
+   Friend Sub SetStrategyManager_Visibility(value As Boolean)
+      m_bStrategyManager_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(StrategyManager_Visibility))
    End Sub
 
@@ -226,8 +209,8 @@ Public Class ConfigurationPageVM
          Return m_bMachine_Visibility
       End Get
    End Property
-   Friend Sub SetMachine_Visibility(value As Visibility)
-      m_bMachine_Visibility = value
+   Friend Sub SetMachine_Visibility(value As Boolean)
+      m_bMachine_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(Machine_Visibility))
    End Sub
 
@@ -237,8 +220,8 @@ Public Class ConfigurationPageVM
          Return m_bPDFEditor_Visibility
       End Get
    End Property
-   Friend Sub SetPDFEditor_Visibility(value As Visibility)
-      m_bPDFEditor_Visibility = value
+   Friend Sub SetPDFEditor_Visibility(value As Boolean)
+      m_bPDFEditor_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(PDFEditor_Visibility))
    End Sub
 
@@ -248,8 +231,8 @@ Public Class ConfigurationPageVM
          Return m_MachineParameter_Visibility
       End Get
    End Property
-   Friend Sub SetMachineParameter_Visibility(value As Visibility)
-      m_MachineParameter_Visibility = value
+   Friend Sub SetMachineParameter_Visibility(value As Boolean)
+      m_MachineParameter_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(MachineParameter_Visibility))
    End Sub
 
@@ -264,6 +247,39 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   'Private ReadOnly m_ThemesDataService As New ThemesDataServiceVM()
+
+   'Private m_Themes As New ObservableCollection(Of ThemesDataServiceM)
+   'Public Property Themes As ObservableCollection(Of ThemesDataServiceM)
+   '   Get
+   '      Return m_Themes
+   '   End Get
+   '   Set(value As ObservableCollection(Of ThemesDataServiceM))
+   '      If Not m_Themes.Equals(value) Then
+   '         m_Themes = value
+   '      End If
+   '   End Set
+   'End Property
+
+   'Private m_SelectedThema As Integer = 0
+   'Private m_SelectedTheme As ThemesDataServiceM
+   'Public Property SelectedTheme As ThemesDataServiceM
+   '   Get
+   '      Return m_SelectedTheme
+   '   End Get
+   '   Set(value As ThemesDataServiceM)
+   '      m_ThemesDataService.SetTheme(value)
+   '      m_SelectedTheme = value
+   '      ' salvo in file ini la scelta del tema corrente
+   '      Dim IndexThema As Integer = Themes.IndexOf(m_SelectedTheme)
+   '      If IndexThema < 0 Then
+   '         IndexThema = 0
+   '      End If
+   '      WriteMainPrivateProfileString(S_GENERAL, K_THEMA, IndexThema.ToString())
+   '      m_SelectedThema = IndexThema
+   '   End Set
+   'End Property
+
    ' Definizione comandi
    Private m_cmdSave As ICommand
    Private m_cmdChooseExternalBackupFolderPath As ICommand
@@ -490,11 +506,59 @@ Public Class ConfigurationPageVM
       End Get
    End Property
 
+   Public ReadOnly Property TemaAdvert_Msg As String
+      Get
+         Return EgtMsg(110008)   ' Il nuovo tema diventerà corrente quando verrà selezionato.
+      End Get
+   End Property
+
+   Public ReadOnly Property Tema_Msg As String
+      Get
+         Return EgtMsg(110009)   ' Tema
+      End Get
+   End Property
+
+   Public ReadOnly Property Import_Msg As String
+      Get
+         Return EgtMsg(63042)
+      End Get
+   End Property
+
+   Public ReadOnly Property Backup_Msg As String
+      Get
+         Return EgtMsg(63022)
+      End Get
+   End Property
+
+   Public ReadOnly Property Restore_Msg As String
+      Get
+         Return EgtMsg(63025)
+      End Get
+   End Property
+
+   Public ReadOnly Property Remainder_Msg As String
+      Get
+         Return EgtMsg(63043)
+      End Get
+   End Property
+
+   Public ReadOnly Property External_Msg As String
+      Get
+         Return EgtMsg(63044)
+      End Get
+   End Property
+
+   Public ReadOnly Property BackupRestore_Msg As String
+      Get
+         Return EgtMsg(63045)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #End Region    ' Fields & Properties
 
-#Region "Constructor"
+#Region "CONSTRUCTOR"
 
    Sub New()
       ' imposto riferimento in Map
@@ -523,20 +587,30 @@ Public Class ConfigurationPageVM
             Exit For
          End If
       Next
+      OrigSelectedLanguage = m_SelectedLanguage
       ' leggo SectionTime e PartTime
       GetMainPrivateProfileString(S_NEST, K_SECTIONTIME, "", SectionTime)
+      sOrigSectionTime = SectionTime
       GetMainPrivateProfileString(S_NEST, K_PARTTIME, "", PartTime)
+      sOrigPartTime = PartTime
       m_bPrintLabel_IsChecked = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE, 0) <> 0)
+      bOrigPrintLabel_IsChecked = m_bPrintLabel_IsChecked
       ' leggo dati per backup
       GetMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, "", m_ExternalBackupFolderPath)
+      sOrigExternalBackupFolderPath = m_ExternalBackupFolderPath
       Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1)
       SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
+      OrigSelReminder = SelReminder
       Dim nExternalBackupActive As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, 0)
       m_bExternalBackupActive = nExternalBackupActive > 0
-      SetMachineParameter_Visibility(Visibility.Collapsed)
-      SetMachine_Visibility(Visibility.Collapsed)
+      bOrigExternalBackupActive = m_bExternalBackupActive
+      SetMachineParameter_Visibility(False)
+      SetMachine_Visibility(False)
       ' Recupero flag per verificare se fare solo l'importazione del btl o anche la verifica
       m_bVerifyImportBTL_IsChecked = GetMainPrivateProfileInt(S_GENERAL, K_VERIFYIMPORTBTL, 0) <> 0
+      '' imposto il tema 
+      'm_SelectedThema = GetMainPrivateProfileInt(S_GENERAL, K_THEMA, 0)
+      'LoadThemes()
       NotifyPropertyChanged(NameOf(bExternalBackupActive))
    End Sub
 
@@ -569,6 +643,57 @@ Public Class ConfigurationPageVM
       Return False
    End Function
 
+   Friend Function SaveConfigPage() As Boolean
+      If OrigSelectedLanguage.Name <> m_SelectedLanguage.Name OrElse
+         sOrigSectionTime <> SectionTime OrElse
+         sOrigPartTime <> PartTime OrElse
+         bOrigPrintLabel_IsChecked <> m_bPrintLabel_IsChecked OrElse
+         sOrigExternalBackupFolderPath <> m_ExternalBackupFolderPath OrElse
+         OrigSelReminder.Name <> SelReminder.Name OrElse
+         bOrigExternalBackupActive <> m_bExternalBackupActive OrElse
+         nOrigSelMeasureUnit <> SelMeasureUnit Then
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62593), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question)
+            Case MessageBoxResult.Yes
+               VerifyConfigPageModification()
+               Return True
+            Case MessageBoxResult.No
+               Return False
+         End Select
+      End If
+      Return True
+   End Function
+
+   '''' <summary>
+   '''' Seleziona il tema se presente
+   '''' </summary>
+   '''' <param name="IndexThema"></param>
+   'Public Sub SetThema(IndexThema As Integer)
+   '   If m_Themes.Count > 0 Then
+   '      m_ThemesDataService.SetTheme(m_Themes(IndexThema))
+   '   End If
+   'End Sub
+
+   '''' <summary>
+   '''' Fuzione che carica i temi del dizionario
+   '''' </summary>
+   'Private Sub LoadThemes()
+   '   ' Popolo la lista temi
+   '   m_Themes.Add(New ThemesDataServiceM() With {
+   '                .Name = "Default",
+   '                .Path = "Themes/DefaultDictionary.xaml",
+   '                .AssemblyName = "EgtBEAMWALL.Core"
+   '                })
+   '   m_Themes.Add(New ThemesDataServiceM() With {
+   '                .Name = "Dark",
+   '                .Path = "Themes/DarkDictionary.xaml",
+   '                .AssemblyName = "EgtBEAMWALL.Core"
+   '                })
+   '   ' Seleziono elemento in ComboBox
+   '   m_SelectedTheme = m_Themes(m_SelectedThema)
+   '   ' Attivo il tema letto sopra
+   '   SetThema(m_SelectedThema)
+   'End Sub
+
 #End Region ' Methods
 
 #Region "COMMANDS"
@@ -608,7 +733,7 @@ Public Class ConfigurationPageVM
                                                                    .DefaultExt = ".folder",
                                                                    .OverwritePrompt = False,
                                                                    .FileName = "Select this ",
-                                                                   .Title = "Backup & Restore File Path"}
+                                                                   .Title = EgtMsg(63039)}
       If FileDialog.ShowDialog() Then
          m_ExternalBackupFolderPath = Path.GetDirectoryName(FileDialog.FileName)
          WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
@@ -692,35 +817,40 @@ Public Class ConfigurationPageVM
       Try
          DataLayer.DbConfig.DataBaseDumpToFile(sBackupZipPath)
       Catch ex As Exception
-         MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          bOk = False
       End Try
       If bOk AndAlso File.Exists(sBackupZipPath) Then
          If bLoadingWindow Then LoadingWndHelper.UpdateLoadingWnd(ActiveIds.BACKUP, 2, EgtMsg(63024), 15, 100)        ' Projects backup
          ' backup dei progetti correnti
          Try
-            Using zip As New Ionic.Zip.ZipFile(sBackupFolder, Console.Out)
-               zip.AlternateEncodingUsage = ZipOption.Always
-               zip.AlternateEncoding = Text.Encoding.UTF8
-               zip.CompressionMethod = CompressionMethod.None
-               ' aggiungo Db
-               zip.AddItem(sBackupZipPath, "")
-               ' aggiungo cartella progetti
-               Dim sProjectFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\"
-               Dim sKey As String = ""
-               EgtGetKeyInfo(sKey)
-               sKey = sKey.Replace(" ", "")
-               Dim sUserFolder As String = ""
-               If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
-                  sUserFolder = sKey.Substring(3, 6)
-                  sProjectFolder &= sUserFolder
-               End If
-               zip.AddItem(sProjectFolder, sUserFolder)
-               ' salvo lo zip
-               zip.Save()
+            Using zipStream As FileStream = New FileStream(sBackupFolder, FileMode.Create)
+               Using archive As ZipArchive = New ZipArchive(zipStream, ZipArchiveMode.Create)
+                  Dim dbEntry As ZipArchiveEntry = archive.CreateEntry(Path.GetFileName(sBackupZipPath), CompressionLevel.NoCompression)
+                  Using entryStream = dbEntry.Open()
+                     Using fileStream = File.OpenRead(sBackupZipPath)
+                        fileStream.CopyTo(entryStream)
+                     End Using
+                  End Using
+
+                  Dim sProjectFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\"
+                  Dim sKey As String = ""
+                  EgtGetKeyInfo(sKey)
+                  sKey = sKey.Replace(" ", "")
+
+                  Dim sUserFolder As String = ""
+                  If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
+                     sUserFolder = sKey.Substring(3, 6)
+                     sProjectFolder &= sUserFolder
+                  End If
+
+                  If Directory.Exists(sProjectFolder) Then
+                     AddDirectoryToZip(archive, sProjectFolder, sUserFolder)
+                  End If
+               End Using
             End Using
          Catch ex As Exception
-            MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             bOk = False
          End Try
       End If
@@ -733,7 +863,7 @@ Public Class ConfigurationPageVM
          If Directory.Exists(m_ExternalBackupFolderPath) Then
             CopyForExternalBackup(sBackupFolder, m_ExternalBackupFolderPath)
          Else
-            MessageBox.Show(EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
          End If
       End If
       'chiudo finestra di caricamento
@@ -750,6 +880,21 @@ Public Class ConfigurationPageVM
       End Using
    End Sub
 
+   Private Sub AddDirectoryToZip(archive As ZipArchive, folderPath As String, entryRoot As String)
+      Dim files As String() = Directory.GetFiles(folderPath, "*.*", SearchOption.AllDirectories)
+
+      For Each file As String In files
+         Dim relativePath As String = entryRoot & "\" & file.Substring(folderPath.Length).TrimStart("\"c)
+         Dim entry As ZipArchiveEntry = archive.CreateEntry(relativePath, CompressionLevel.NoCompression)
+
+         Using entryStream = entry.Open()
+            Using fileStream = System.IO.File.OpenRead(file)
+               fileStream.CopyTo(entryStream)
+            End Using
+         End Using
+      Next
+   End Sub
+
 #End Region ' Backup
 
 #Region "Restore"
@@ -765,11 +910,11 @@ Public Class ConfigurationPageVM
 
    Public Sub Restore()
       ' recupero processo del supervisore
-      Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
+      Dim sSupervisorName As String = "Aedifica.SupervisorR32"
       Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
       ' verifico che sia chiuso
       If localProc.Length > 0 Then
-         MessageBox.Show(EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
          Return
       End If
       m_bRestoreRunning = True
@@ -815,22 +960,22 @@ Public Class ConfigurationPageVM
          Next
       End If
       If String.IsNullOrEmpty(sRestorePath) Then
-         MessageBox.Show(EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
          m_bRestoreRunning = False
          Return
       End If
-      If MessageBox.Show(String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
          m_bRestoreRunning = False
          Return
       End If
       Dim bDoBackup = False
-      Select Case MessageBox.Show(EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
+      Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
          Case MessageBoxResult.Yes
             bDoBackup = True
          Case MessageBoxResult.No
             bDoBackup = False
          Case MessageBoxResult.Cancel
-            MessageBox.Show(EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
             m_bRestoreRunning = False
             Return
       End Select
@@ -862,14 +1007,12 @@ Public Class ConfigurationPageVM
       Dim bOk As Boolean = True
       ' apro file zip
       Try
-         Using zip As New Ionic.Zip.ZipFile(sRestorePath, Console.Out)
-            ' estraggo file da zip
-            zip.ExtractAll(sRestoreDir)
-         End Using
+         If Directory.Exists(sRestoreDir) Then Directory.Delete(sRestoreDir, True)
+         ZipFile.ExtractToDirectory(sRestorePath, sRestoreDir)
       Catch ex1 As Exception
          EgtOutLog("Error! Impossible importing Recovery file " & sRestorePath & "!")
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         MessageBox.Show(EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
          bOk = False
       End Try
       Dim sBackupTempPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\DbRestore"
@@ -879,7 +1022,7 @@ Public Class ConfigurationPageVM
          Try
             DataLayer.DbConfig.DataBaseRestoreFromFile(sRestoreDir & "\DbBackup.zip", "", sBackupTempPath)
          Catch ex As Exception
-            MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
             bOk = False
          End Try
       End If

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml

@@ -3,7 +3,7 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-           DataContext="{DynamicResource ConfigurationPageVM}">
+           DataContext="{StaticResource ConfigurationPageVM}">
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
@@ -16,36 +16,57 @@
       <TabControl Grid.RowSpan="2" 
                   Grid.ColumnSpan="2"
                   SelectedIndex="{Binding SelConfigSubPage}"
-                  Style="{StaticResource Optimizer_TabControl}">
+                  Background="{StaticResource TabControl.Static.Generic.Background}"
+                  TabStripPlacement="Top"
+                  Margin="5,5,2.5,5">
+         <TabControl.Style>
+            <Style TargetType="{x:Type TabControl}">
+               <Style.Resources>
+                  <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource Optimizer_TabItem}"/>
+               </Style.Resources>
+            </Style>
+         </TabControl.Style>
          <TabItem>
             <TabItem.Header>
-               <StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource ConfigurationProgram_TextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
-                  </Button>
-               </StackPanel>
+               <TextBlock Text="{Binding General_Msg}"
+                          FontSize="15"/>
             </TabItem.Header>
             <TabItem.Content>
-               <EgtBEAMWALLCORE:General_ConfigurationPageV/>
+               <StackPanel Orientation="Horizontal"
+                           Margin="5">
+                  <EgtBEAMWALLCORE:General_ConfigurationPageV/>
+                  <Button Command="{Binding SaveCommand}"
+                          ToolTip="{Binding SaveToolTip}"
+                          VerticalAlignment="Top"
+                          Height="40"
+                          Width="40"
+                          Margin="10,15,10,10"
+                          Style="{StaticResource Optimizer_Button}">
+                     <Image Source="{StaticResource Save_Image}"
+                            Stretch="Uniform"/>
+                  </Button>
+
+               </StackPanel>
+
             </TabItem.Content>
          </TabItem>
          <TabItem>
             <TabItem.Header>
-               <StackPanel Style="{StaticResource ConfigurationProgram_StackPanel}">
+               <StackPanel Orientation="Horizontal"
+                           Margin="5">
                   <TextBlock Text="{Binding PDFEditor_Msg}"
-                             Style="{StaticResource ConfigurationProgram_TextBlock}"/>
+                             FontSize="15"/>
                   <Button Command="{Binding SaveCommand}"
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding PDFEditor_Visibility}"
-                          Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
-                            Style="{StaticResource BTLDataWnd_Image}"/>
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          Height="25"
+                          Width="25"
+                          Margin="5,0,0,0"
+                          Style="{StaticResource Optimizer_Button}">
+                     <Image Source="{StaticResource Save_Image}"
+                            Stretch="Uniform"/>
                   </Button>
                </StackPanel>
             </TabItem.Header>

EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj

@@ -66,6 +66,20 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\EgtBEAMWALL.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x86\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Optimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtBEAMWALL.Core">
       <HintPath>..\EgtBEAMWALL.Core\bin\Debug\EgtBEAMWALL.Core.dll</HintPath>
@@ -90,6 +104,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Printing" />
@@ -184,6 +199,9 @@
     <Compile Include="Panel\TopPanelV.xaml.vb">
       <DependentUpon>TopPanelV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PopUp\RawPartListPopUpV.xaml.vb">
+      <DependentUpon>RawPartListPopUpV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ProdManager\ProdManagerV.xaml.vb">
       <DependentUpon>ProdManagerV.xaml</DependentUpon>
     </Compile>
@@ -231,6 +249,7 @@
     <Compile Include="SceneHost\SceneHostV.xaml.vb">
       <DependentUpon>SceneHostV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SceneShowBulding\InstrumentPanelShowBuildingVM.vb" />
     <Compile Include="SceneShowBulding\SceneBuildingV.xaml.vb">
       <DependentUpon>SceneBuildingV.xaml</DependentUpon>
     </Compile>
@@ -239,7 +258,12 @@
       <DependentUpon>SceneShowBuldingV.xaml</DependentUpon>
     </Compile>
     <Compile Include="SceneShowBulding\SceneShowBuldingVM.vb" />
+    <Compile Include="SceneShowBulding\ShowPanelShowBuildingVM.vb" />
     <Compile Include="SceneShowBulding\ViewPanelShowBuildingVM.vb" />
+    <Compile Include="SetUpDB\SetUpDBV.xaml.vb">
+      <DependentUpon>SetUpDBV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SetUpDB\SetUpDBVM.vb" />
     <Compile Include="SetUp\SetUpSupportClass.vb" />
     <Compile Include="SetUp\SetUpV.xaml.vb">
       <DependentUpon>SetUpV.xaml</DependentUpon>
@@ -272,7 +296,6 @@
     <Compile Include="Statistics\PDFEditorV.xaml.vb">
       <DependentUpon>PDFEditorV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Statistics\PDFFlowHelper.vb" />
     <Compile Include="Statistics\StatisticsV.xaml.vb">
       <DependentUpon>StatisticsV.xaml</DependentUpon>
     </Compile>
@@ -305,6 +328,9 @@
     <Compile Include="SupervisorCommThread\SupervisorComm.vb" />
     <Compile Include="SupervisorCommThread\SupervisorCommThread.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
+    <Compile Include="ToolsDbWindow\ToolDbWindowV.xaml.vb">
+      <DependentUpon>ToolDbWindowV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
     <Compile Include="UpdateBTLWnd\UpdateBTLWndV.xaml.vb">
       <DependentUpon>UpdateBTLWndV.xaml</DependentUpon>
@@ -316,6 +342,7 @@
     <Compile Include="UpdateBTLWnd\UpdateOrAppendWndVM.vb" />
     <Compile Include="Utility\Configuration.vb" />
     <Compile Include="Utility\CurrentMachine.vb" />
+    <Compile Include="Utility\CustomDXGridLocalizer.vb" />
     <Compile Include="Utility\DbControllers.vb" />
     <Compile Include="Utility\Dictionary.xaml.vb">
       <DependentUpon>Dictionary.xaml</DependentUpon>
@@ -495,6 +522,7 @@
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
@@ -672,6 +700,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PopUp\RawPartListPopUpV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProdManager\ProdManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -724,6 +756,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SetUpDB\SetUpDBV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SetUp\SetUpV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -788,6 +824,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ToolsDbWindow\ToolDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UpdateBTLWnd\UpdateBTLWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -878,7 +918,6 @@
     <Resource Include="Resources\DrawPanel\Swept.png" />
     <Resource Include="Resources\DrawPanel\Text.png" />
     <Resource Include="Resources\DrawPanel\ThickCurve.png" />
-    <Resource Include="Resources\Egalware.ico" />
     <Resource Include="Resources\EgtBEAMWALL.ico" />
     <Resource Include="Resources\EgtDialog\Folder.png" />
     <Resource Include="Resources\EgtDialog\New.png" />
@@ -894,9 +933,7 @@
     <Resource Include="Resources\InstrumentPanel\Analyze.png" />
     <Resource Include="Resources\InstrumentPanel\ChangeParam.png" />
     <Resource Include="Resources\InstrumentPanel\GetDist.png" />
-    <Resource Include="Resources\InstrumentPanel\Ott.png" />
     <Resource Include="Resources\InstrumentPanel\Statistics.png" />
-    <Resource Include="Resources\InstrumentPanel\Vis.png" />
     <Resource Include="Resources\LeftPanel\AddFeature.png" />
     <Resource Include="Resources\LeftPanel\AddPart.png" />
     <Resource Include="Resources\LeftPanel\AddToRawPart.png" />
@@ -904,25 +941,12 @@
     <Resource Include="Resources\LeftPanel\CopyPart.png" />
     <Resource Include="Resources\LeftPanel\MacroFeature.png" />
     <Resource Include="Resources\LeftPanel\NewRawPart.png" />
-    <Resource Include="Resources\LeftPanel\NewRawPartAuto.png" />
-    <Resource Include="Resources\LeftPanel\RemoveFeature.png" />
-    <Resource Include="Resources\LeftPanel\RemovePart.png" />
     <Resource Include="Resources\MainMenu\Send.png" />
     <Resource Include="Resources\MovePartInRawPart\MoveLeftParts.png" />
     <Resource Include="Resources\MovePartInRawPart\MoveRightParts.png" />
     <Resource Include="Resources\OpenProjectFileDialog\Archived.png" />
-    <Resource Include="Resources\OptimizePanel\FlipRot.png" />
-    <Resource Include="Resources\OptimizePanel\UnlockFlip.png" />
-    <Resource Include="Resources\OptimizePanel\UnlockRotation.png" />
     <Resource Include="Resources\OptimizePanel\Warehouse.png" />
-    <Resource Include="Resources\PartManager\Clock.png" />
-    <Resource Include="Resources\PartManager\LeftInvert.png" />
-    <Resource Include="Resources\PartManager\LeftRotate.png" />
-    <Resource Include="Resources\PartManager\Locked.old.png" />
     <Resource Include="Resources\PartManager\Locked.png" />
-    <Resource Include="Resources\PartManager\RightInvert.png" />
-    <Resource Include="Resources\PartManager\RightRotate.png" />
-    <Resource Include="Resources\PartManager\Unlocked.old.png" />
     <Resource Include="Resources\PartManager\Unlocked.png" />
     <Resource Include="Resources\PDFEditor\Delete.png" />
     <Resource Include="Resources\PDFEditor\MoveDown.png" />
@@ -930,18 +954,8 @@
     <Resource Include="Resources\PDFEditor\PDFPreview.png" />
     <Resource Include="Resources\PDFEditor\PrintPDF.png" />
     <Resource Include="Resources\ProjectManager\AddProj.png" />
-    <Resource Include="Resources\ProjectManager\ExportProject.png" />
-    <Resource Include="Resources\ProjectManager\GoToProd.png" />
-    <Resource Include="Resources\ProjectManager\GoToProj.png" />
-    <Resource Include="Resources\ProjectManager\ImportBTL.png" />
-    <Resource Include="Resources\ProjectManager\ImportProject.png" />
-    <Resource Include="Resources\ProjectManager\New.png" />
-    <Resource Include="Resources\ProjectManager\Open.png" />
-    <Resource Include="Resources\ProjectManager\Options.png" />
     <Resource Include="Resources\ProjectManager\Save.png" />
-    <Resource Include="Resources\ProjectManager\SaveAs.png" />
     <Resource Include="Resources\ProjectManager\UpdateBTL.png" />
-    <Resource Include="Resources\ShowBeamPanel\ShowAll.png" />
     <Resource Include="Resources\ShowBeamPanel\ShowBuilding.png" />
     <Resource Include="Resources\ShowBeamPanel\ShowSolid.png" />
     <Resource Include="Resources\ShowPanel\RenderingHL.png" />
@@ -950,15 +964,9 @@
     <Resource Include="Resources\Statistics\CopyToClipboard.png" />
     <Resource Include="Resources\Statistics\PrintPDF.png" />
     <Resource Include="Resources\TopPanel\CopyRawPart.png" />
-    <Resource Include="Resources\TopPanel\MoveDownPart.png" />
     <Resource Include="Resources\TopPanel\MovePartInRawPart.png" />
-    <Resource Include="Resources\TopPanel\MoveUpPart.png" />
     <Resource Include="Resources\TopPanel\ProduceAllRawPart.png" />
     <Resource Include="Resources\TopPanel\ProduceRawPart.png" />
-    <Resource Include="Resources\TopPanel\RemoveAllRawPart.png" />
-    <Resource Include="Resources\TopPanel\RemovePart.old.png" />
-    <Resource Include="Resources\TopPanel\RemovePart.png" />
-    <Resource Include="Resources\TopPanel\RemoveRawPart.png" />
     <Resource Include="Resources\TopPanel\ReorderPart.png" />
     <Resource Include="Resources\TreeView\Folder.png" />
     <Resource Include="Resources\ViewPanel\LookFromBACK.png" />
@@ -972,24 +980,34 @@
     <Resource Include="Resources\ViewPanel\LookFromRIGHT.png" />
     <Resource Include="Resources\ViewPanel\LookFromTOP.png" />
     <Resource Include="Resources\ViewPanel\ZoomAll.png" />
-    <Resource Include="Resources\ViewPanel\ZoomIn.png" />
-    <Resource Include="Resources\ViewPanel\ZoomOut.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\down.png" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle">
       <Version>1.8.5</Version>
     </PackageReference>
-    <PackageReference Include="DotNetZip">
-      <Version>1.16.0</Version>
+    <PackageReference Include="DevExpress.Wpf.Core">
+      <Version>25.2.6</Version>
+    </PackageReference>
+    <PackageReference Include="DevExpress.Wpf.Grid">
+      <Version>25.2.6</Version>
+    </PackageReference>
+    <PackageReference Include="DevExpress.Wpf.PdfViewer">
+      <Version>25.2.6</Version>
     </PackageReference>
     <PackageReference Include="EgwMultiEngineManager.Core">
-      <Version>2.7.10.1</Version>
+      <Version>3.1.1.2</Version>
     </PackageReference>
     <PackageReference Include="EgwMultiEngineManager.Data">
-      <Version>2.7.10.1</Version>
+      <Version>3.1.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="EgwRedmineAPI">
+      <Version>3.1.8.1</Version>
     </PackageReference>
     <PackageReference Include="EgwWPFBaseLib">
-      <Version>2.7.11-beta.4</Version>
+      <Version>3.1.8-beta.4</Version>
     </PackageReference>
     <PackageReference Include="EntityFramework">
       <Version>6.4.4</Version>
@@ -1037,9 +1055,6 @@
   <ItemGroup>
     <Resource Include="Resources\LeftPanel\All_Filter.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\Cancel.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewPage\Ok.png" />
   </ItemGroup>
@@ -1103,21 +1118,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewPage\MoveUp.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\MoveLeft.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\MoveRight.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewPage\Inversion.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\deselectall.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\selectall.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewPage\configuration.png" />
   </ItemGroup>
@@ -1130,12 +1133,6 @@
   <ItemGroup>
     <Resource Include="Resources\NewPage\padlock-unlock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\play.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewPage\add.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\NewPage\diskette.png" />
   </ItemGroup>
@@ -1145,18 +1142,82 @@
   <ItemGroup>
     <Resource Include="Resources\NewPage\adjustment.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\openfolder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\fileimport.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\newdocument.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\export.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\import.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SplashScreen\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\clock.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Desktop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Download.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Windows.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\HardDrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Content.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Details.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\List.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtDialog\Tiles.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\VerifyAllRotation.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\arrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\EditIntestazione.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewPage\disketteas.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\MainMenu\TicketManager.png" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerR32.exe
-IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerD32.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerR64.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.OptimizerD64.exe
-IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwMultiEngineManager.Data.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Data.dll
-IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwMultiEngineManager.Data.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Data.dll
-IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwMultiEngineManager.Core.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Core.dll
-IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwMultiEngineManager.Core.dll c:\EgtProg\EgtBEAMWALL\EgwMultiEngineManager.Core.dll
-IF "$(ConfigurationName)" == "Debug" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Debug\EgwWPFBaseLib.dll c:\EgtProg\EgtBEAMWALL\EgwWPFBaseLib.dll
-IF "$(ConfigurationName)" == "Release" copy c:\EgtDev\EgtBEAMWALL\EgtBEAMWALL.Optimizer\bin\x86\Release\EgwWPFBaseLib.dll c:\EgtProg\EgtBEAMWALL\EgwWPFBaseLib.dll</PostBuildEvent>
+    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerR32.exe
+IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerD32.exe
+IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Aedifica\EgtBEAMWALL.OptimizerR64.exe
+IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\Aedifica\Aedifica.OptimizerD64.exe
+IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwMultiEngineManager.Data.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Data.dll
+IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwMultiEngineManager.Data.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Data.dll
+IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwMultiEngineManager.Core.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Core.dll
+IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwMultiEngineManager.Core.dll" c:\EgtProg\Aedifica\EgwMultiEngineManager.Core.dll
+IF "$(ConfigurationName)" == "Debug" copy "$(TargetDir)EgwWPFBaseLib.dll" c:\EgtProg\Aedifica\EgwWPFBaseLib.dll
+IF "$(ConfigurationName)" == "Release" copy "$(TargetDir)EgwWPFBaseLib.dll" c:\EgtProg\Aedifica\EgwWPFBaseLib.dll</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>

EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb

@@ -1,4 +1,5 @@
 Imports System.IO
+Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Core.ConstIni
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -15,6 +16,13 @@ Module MyExecProcessManager
       End Get
    End Property
 
+   Private m_sInfoNgePartList As New List(Of String)
+   Public ReadOnly Property sInfoNgePartList As List(Of String)
+      Get
+         Return m_sInfoNgePartList
+      End Get
+   End Property
+
    Friend Function Init() As Boolean
       ' creazione manager dei processi
       Dim sCamExePath As String = ""
@@ -37,6 +45,7 @@ Module MyExecProcessManager
       Dim sEnvironment As String = ""
       Dim sPipeLuaFile As String = ""
       Dim nMaxCamInstances As Integer = 0
+      Dim bDebug As Boolean = False
       While GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_ENVIRONMENT, "", sEnvironment) > 0 AndAlso
             GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_PIPELUAFILE, "", sPipeLuaFile) AndAlso
             GetMainPrivateProfileString(S_EXECGROUP & nGroupIndex.ToString(), K_MAXCAMINSTANCES, "", nMaxCamInstances)
@@ -57,7 +66,10 @@ Module MyExecProcessManager
             nGroupIndex += 1
             Continue While
          End If
-         Dim NewExecProcessManager As New ExecProcessManager(nGroupIndex, Environment, sCamExePath, PipeLuaPath, nMaxCamInstances, ExecProcessManager.ReturnModes.EVENT_, False)
+         ' leggo se modalita' debug
+         Dim nDebug As Integer = GetMainPrivateProfileInt(S_EXECGROUP & nGroupIndex.ToString(), K_DEBUG, 0)
+         bDebug = (nDebug = 1)
+         Dim NewExecProcessManager As New ExecProcessManager(nGroupIndex, Environment, sCamExePath, PipeLuaPath, nMaxCamInstances, ExecProcessManager.ReturnModes.EVENT_, bDebug)
          AddHandler NewExecProcessManager.m_AnswerReceived, AddressOf ExecProcessManager_AnswerReceived
          NewExecProcessManager.StartExecutionThread()
          m_ExecProcessManagerList.Add(Environment, NewExecProcessManager)
@@ -67,13 +79,67 @@ Module MyExecProcessManager
    End Function
 
    Private Sub ExecProcessManager_AnswerReceived(Answer As AnswerDTO)
+      m_sInfoNgePartList.Clear()
+      Map.refMyStatusBarVM.SetLoadingProgress_Visibility(True)
       Dim sBarPath As String = Answer.Args("BarPath")
       Dim nProgramPage As Integer = -1
       Integer.TryParse(Answer.Args("ProgramPage"), nProgramPage)
       Dim nBarId As Integer = -1
       Integer.TryParse(Answer.Args("BarId"), nBarId)
       EgtOutLog("Risultato progetto " & nBarId)
-      Map.refCALCPanelVM.ProcessResults(sBarPath, nProgramPage, nBarId)
+      CALCPanelVM.ProcessResults(sBarPath, nProgramPage, nBarId)
+      If Answer.Args.Count > 5 Then
+         Dim PartItem As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nBarId)
+         Dim nPreInvert As Integer = -1
+         Dim bPreInvert As Boolean = False
+         If Answer.Args.ContainsKey("PREINVERT") Then
+            Integer.TryParse(Answer.Args("PREINVERT"), nPreInvert)
+         End If
+         Dim nPreRotate As Integer = -1
+         If Answer.Args.ContainsKey("PREROTATE90") Then
+            Integer.TryParse(Answer.Args("PREROTATE90"), nPreRotate)
+         End If
+         If nPreInvert > 0 Then
+            If nPreInvert = 1 Then bPreInvert = True
+            If PartItem.IsInverted Then bPreInvert = False
+            PartItem.SetInverted(bPreInvert)
+         End If
+         If nPreRotate > 0 Then
+            Dim dAng As Integer = nPreRotate * 90
+            Application.Current.Dispatcher.BeginInvoke(Sub()
+                                                          PartItem.ForwardRotation(True, True, dAng, False)
+                                                       End Sub)
+         End If
+
+         Dim prefix As String = "INFONGEPART_"
+
+         m_sInfoNgePartList = Answer.Args.Where(Function(k) k.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)).Select(Function(k) k.Value).ToList()
+
+         For Each InfoNgePartItem As String In m_sInfoNgePartList
+            Dim sKeyVal() As String = InfoNgePartItem.Trim().Split("="c)
+            EgtSetInfo(PartItem.nPartId, sKeyVal(0), sKeyVal(1))
+            Map.refProjectVM.InfoNgeValue.Add(sKeyVal(0))
+         Next
+
+      End If
+      ' Gestione progressbar per verificare l'inizio e la fine della verifica
+      Dim BeamManager As ExecProcessManager = m_ExecProcessManagerList(EXECENVIRONMENTS.BEAM)
+      Dim nQuestionInQueue As Integer = BeamManager.nQuestionInQueue
+      Dim nFreeOrWaitingAnswerProcesses As Integer = BeamManager.nFreeOrWaitingAnswerProcesses
+      Dim nRunningProcesses As Integer = BeamManager.nRunningProcesses
+      Map.refMyStatusBarVM.SetLoadingProgress(Map.refMyStatusBarVM.MaximumValue - nQuestionInQueue - (nRunningProcesses - nFreeOrWaitingAnswerProcesses))
+      If nQuestionInQueue = 0 AndAlso nFreeOrWaitingAnswerProcesses = nRunningProcesses Then
+         Dim CmdType As CmdTypes = CmdTypes.CHECKGEN
+         If Answer.Args.ContainsKey("CmdType") Then
+            CmdType = Answer.Args("CmdType")
+         End If
+         Map.refCALCPanelVM.Calc_Ended(CmdType)
+         Map.refMyStatusBarVM.EndLoading(EgtMsg(62577), 2)
+         Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True)
+         Map.refSceneBuildingVM.SetViewPanel_IsEnable(True)
+         Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
+         Map.refCALCPanelVM.SetCalculating(False)
+      End If
    End Sub
 
    Friend Function Close()

EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml

@@ -1,29 +1,39 @@
 <StackPanel x:Class="FeatureListManagerV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            DataContext="{StaticResource FeatureListManagerVM}"
-            Style="{StaticResource FeatureListManager_StackPanel}">
+            DataContext="{StaticResource FeatureListManagerVM}"            
+            Orientation="Vertical"
+            HorizontalAlignment="Left">
    
    <Button Command="{Binding CopyFeature_Command}"
            ToolTip="{Binding CopyFeature_ToolTip}"
-           IsEnabled="{Binding CopyFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/CopyFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource CopyFeature_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
-           IsEnabled="{Binding AddFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/AddFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource AddFeature_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
-           IsEnabled="{Binding RemoveFeature_IsEnabled}"
-           Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/NewPage/Remove.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,2.5,2.5"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource Remove_Image}"
+             Stretch="Uniform"/>
    </Button>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb

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

EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml

@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-      Style="{StaticResource FeatureManager_Grid}">
+      Margin="2,4,0,2">
    
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
@@ -20,7 +20,7 @@
 
    <Expander Header="{Binding Face_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.SIDEList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelSIDE, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -30,7 +30,7 @@
    <Expander Grid.Column="1"
              Header="{Binding Group_Msg}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Style="{StaticResource FeatureManager_Expander}">
+             Width="80">
       <ListBox ItemsSource="{Binding Tag.GRPList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                SelectedItem="{Binding Tag.nSelGRP, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
                IsEnabled="{Binding FeatureManager_IsEnabled}"
@@ -41,46 +41,71 @@
               Text="{Binding Priority_Msg}"
               IsEnabled="{Binding FeatureManager_IsEnabled}"
               Visibility="{Binding Priority_Visibility}"
-              Style="{StaticResource Option_TextBlock}"/>
+              Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              Margin="10,5,10,0"/>
    <EgtWPFLib5:EgtTextBox Grid.Column="3"
                           Text="{Binding Tag.sPriority, 
                                          RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}},
                                          UpdateSourceTrigger=Explicit}"
                           IsEnabled="{Binding FeatureManager_IsEnabled}"
                           Visibility="{Binding Priority_Visibility}"
-                          Style="{StaticResource Dimension_TextBox}"/>
+                          TextWrapping="Wrap"
+                          VerticalAlignment="Center"
+                          Height="25"/>
    <TextBlock Grid.Column="4"
               Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-              Style="{StaticResource FeatureManager_TextBlock}"/>
+              HorizontalAlignment="Center"
+              VerticalAlignment="Top"
+              TextTrimming="CharacterEllipsis"
+              Margin="5,5,0,0"
+              Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
    <ComboBox Grid.Column="5"
              ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
              IsEnabled="{Binding FeatureManager_IsEnabled}"
              Visibility="{Binding Variant_Visibility}"
-             Style="{StaticResource Feature_ComboBox}"/>
+             Height="24"
+             MinWidth="55"
+             Margin="5,-2,0,5"/>
    <Button Grid.Column="6"
            Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            IsEnabled="{Binding Edit_IsEnabled}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
+           Height="30"
+           Width="80"
+           Margin="5,0,5,0"
+           Style="{StaticResource Optimizer_Button}"/>
    <Button Grid.Column="7"
            Content="{Binding Save_Msg}"
            Command="{Binding Tag.Save_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
+           Height="30"
+           Width="80"
+           Margin="5,0,5,0"
+           Style="{StaticResource Optimizer_Button}"/>
    <Button Grid.Column="8"
            Content="{Binding Cancel_Msg}"
            Command="{Binding Tag.Cancel_Command, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
            Visibility="{Binding Tag.SaveCancel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:FeatureManagerV}}}"
-           Style="{StaticResource GeneralConfiguration_Button}"/>
+           Height="30"
+           Width="80"
+           Margin="5,0,5,0"
+           Style="{StaticResource Optimizer_Button}"/>
    <Button Grid.Column="9" 
            Command="{Binding MacroFeature_Command}"
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
-           Style="{StaticResource MacroFeaturen_Button}">
-      <Image Source="/Resources/LeftPanel/MacroFeature.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           HorizontalAlignment="Right"
+           FontWeight="Light"
+           Height="30"
+           Width="30"
+           Margin="2.5,2.5,10,2.5"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource MacroFeature_Image}"
+             Stretch="Uniform"/>
    </Button>
 
 </Grid>

EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerVM.vb

@@ -23,8 +23,8 @@ Public Class FeatureManagerVM
          Return m_Variant_Visibility
       End Get
    End Property
-   Public Sub SetVariant_Visibility(value As Visibility)
-      m_Variant_Visibility = value
+   Public Sub SetVariant_Visibility(value As Boolean)
+      m_Variant_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(Variant_Visibility))
    End Sub
 

EgtBEAMWALL.Optimizer/ForcedStrategyBTL/ForcedStrategyBTLV.xaml

@@ -9,19 +9,24 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+              Margin="-9,-8,2,0"
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   Style="{StaticResource ForcedStrategyBTL_ListBox}">
             <ListBox.Resources>
                <DataTemplate DataType="{x:Type Optimizer:Strategy}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                            Height="100"
+                            Width="100"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sStrategyName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="13"/>
                   </StackPanel>
                </DataTemplate>
             </ListBox.Resources>
@@ -29,10 +34,15 @@
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Margin="0,-12,-10,0"
+                Style="{StaticResource ProjectParameters_GroupBox}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       FontWeight="Bold"
+                       FontSize="13"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          </GroupBox.Header>
          <Optimizer:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml

@@ -12,19 +12,24 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Border Grid.RowSpan="2"
-              Style="{StaticResource ForcedStrategyBTL_Border}">
+              Margin="-9,0,2,0"
+              Style="{StaticResource Optimizer_Border}">
          <ListBox ItemsSource="{Binding StrategyList}"
                   SelectedItem="{Binding SelStrategy}"
                   Style="{StaticResource ForcedStrategyBTL_ListBox}">
             <ListBox.Resources>
                <DataTemplate DataType="{x:Type OPTIMIZER:Strategy}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
+                  <StackPanel Orientation="Horizontal">
                      <RadioButton IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                   GroupName="ForcedStrategy"/>
                      <Image Source="{Binding sStrategyImagePath}"
-                            Style="{StaticResource ForcedStrategyBTL_Image}"/>
+                            Height="100"
+                            Width="100"
+                            Stretch="Uniform"/>
                      <TextBlock Text="{Binding sStrategyName}"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                FontSize="13"/>
                   </StackPanel>
                </DataTemplate>
             </ListBox.Resources>
@@ -32,27 +37,40 @@
       </Border>
       
       <GroupBox Grid.Column="1" 
-                Style="{StaticResource ForcedStrategyBTL_GroupBox}">
+                Margin="0"
+                Style="{StaticResource ProjectParameters_GroupBox}">
          <GroupBox.Header>
             <TextBlock Text="{Binding SelStrategy.sStrategyName}" 
-                       Style="{StaticResource ForcedStrategyBTL_TextBlock}"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       FontWeight="Bold"
+                       FontSize="13"
+                       Style="{StaticResource ForegroundCorduroy_TextBlock}"/>
          </GroupBox.Header>
          <OPTIMIZER:ParameterStrategyV Tag="{Binding SelStrategy}"/>
       </GroupBox>
 
       <StackPanel Grid.Row="2"
                   Grid.ColumnSpan="2"
-                  HorizontalAlignment="Right"
-                  Style="{StaticResource PartManager_StackPanel}">
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
-                 Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/NewPage/Ok.png" Stretch="Uniform"/>
+                 Height="30"
+                 Width="30"
+                 Margin="5,2,5,2"
+                 Style="{StaticResource Optimizer_Button}">
+            <Image Source="{StaticResource Ok_Image}"
+                   Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding Cancel_Command}"
                  ToolTip="{Binding Cancel_Msg}"
-                 Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/PDFEditor/Delete.png" Stretch="Uniform"/>
+                 Height="30"
+                 Width="30"
+                 Margin="5,2,5,2"
+                 Style="{StaticResource Optimizer_Button}">
+            <Image Source="{StaticResource Delete_Image}"
+                   Stretch="Uniform"/>
          </Button>
       </StackPanel>
 

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb

@@ -29,10 +29,22 @@ Public Class ForcedStrategyPanelVM
       End Get
       Set(value As Strategy)
          m_SelStrategy = value
+         SetUpdate_Visibility(False)
          NotifyPropertyChanged(NameOf(SelStrategy))
       End Set
    End Property
 
+   Private m_bUpdate_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Update_Visibility As Visibility
+      Get
+         Return m_bUpdate_Visibility
+      End Get
+   End Property
+   Friend Sub SetUpdate_Visibility(value As Boolean)
+      m_bUpdate_Visibility = If(value, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(Update_Visibility))
+   End Sub
+
    Private m_CurrentFeature As BTLFeatureM
 
    ' Definizione Comandi
@@ -73,7 +85,7 @@ Public Class ForcedStrategyPanelVM
       LoadStrategyListFromTopology(Feature.nFeatureId, Feature.nPRC, nTmpGRP)
       ' leggo eventuali parametri forzati
       Dim sStrategyID As String = ""
-      EgtGetInfo(m_CurrentFeature.nFeatureId, "STRATEGY", sStrategyID)
+      EgtGetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY, sStrategyID)
       If String.IsNullOrWhiteSpace(sStrategyID) Then Return
       Dim ForcedStrategy As Strategy = m_StrategyList.FirstOrDefault(Function(x) x.sStrategyId = sStrategyID)
       If IsNothing(ForcedStrategy) Then
@@ -133,23 +145,6 @@ Public Class ForcedStrategyPanelVM
       If File.Exists(sAvailableStrategiesFilePath) Then
          sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
          Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
-         'nGRP = CalcBeamPrivateProfileGRP(nGRP)
-         Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
-         If IsNothing(JsonAvailableStrategyFeature) Then Return False
-         Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
-         If IsNothing(JsonAvailableTopology) Then
-            ' ricavo topologia da feature
-            FindTopologyFromFeature(nFeatureId, sTopologyName)
-            JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
-         End If
-         If IsNothing(JsonAvailableTopology) Then Return False
-         m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
-                                                                 Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
-      End If
-      If File.Exists(sAvailableStrategiesFilePath) Then
-         sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
-         Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
-         'nGRP = CalcBeamPrivateProfileGRP(nGRP)
          Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
          If IsNothing(JsonAvailableStrategyFeature) Then Return False
          Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
@@ -168,7 +163,7 @@ Public Class ForcedStrategyPanelVM
       If Not EgtGetInfo(nPartId, PROJ, nPartProjId) OrElse nPartProjId <= 0 Then Return False
       Dim nBTLInfoLayerId As Integer = GetCurrProjBtlInfoLayerId(nPartProjId)
       Dim sStrategySetupName As String = ""
-      EgtGetInfo(nBTLInfoLayerId, "AISETUP", sStrategySetupName)
+      EgtGetInfo(nBTLInfoLayerId, AI_SETUP, sStrategySetupName)
       If Not String.IsNullOrWhiteSpace(sStrategySetupName) Then
          ' carico custom
          Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(ProjectManagerVM.CurrProd.nType, True)
@@ -191,7 +186,6 @@ Public Class ForcedStrategyPanelVM
                   If File.Exists(sAvailableStrategiesFilePath) Then
                      sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
                      Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
-                     'nGRP = CalcBeamPrivateProfileGRP(nGRP)
                      Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
                      If IsNothing(JsonAvailableStrategyFeature) Then Return False
                      Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
@@ -211,7 +205,6 @@ Public Class ForcedStrategyPanelVM
                End If
             End If
 
-            'Dim JsonStrategyFeatureList As List(Of JsonStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonStrategyFeature))(sReadedFile)
             Dim JsonStrategyFeature As JsonStrategyFeature = JsonFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
             If IsNothing(JsonStrategyFeature) Then Return False
             Dim JsonTopology As JsonTopology = JsonStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
@@ -273,9 +266,28 @@ Public Class ForcedStrategyPanelVM
    End Function
 
    Friend Sub ForcedStrategy()
+      If IsNothing(m_CurrentFeature) Then Return
+      If m_CurrentFeature.nFeatureId < 0 Then Return
+      If IsNothing(m_SelStrategy) Then Return
+      Dim StrategyType As Integer = 0
+      If TypeOf m_CurrentFeature.ParentPart Is BTLPartM Then
+         StrategyType = 1
+      ElseIf TypeOf m_CurrentFeature.ParentPart Is PartM Then
+         StrategyType = 2
+      Else Return
+      End If
+      If StrategyType = 1 AndAlso
+         (IsNothing(Map.refProjectVM.BTLStructureVM) OrElse
+          IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) OrElse
+          IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM)) Then Return
+      If StrategyType = 2 AndAlso
+         (IsNothing(Map.refProjectVM.MachGroupPanelVM) OrElse
+          IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup) OrElse
+          IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart) OrElse
+          IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM)) Then Return
       ' cancello precedenti valori
       Dim sPrecStrategyID As String = ""
-      EgtGetInfo(m_CurrentFeature.nFeatureId, "STRATEGY", sPrecStrategyID)
+      EgtGetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY, sPrecStrategyID)
       If Not String.IsNullOrWhiteSpace(sPrecStrategyID) Then
          Dim PrecInfo As String() = {}
          EgtGetAllInfo(m_CurrentFeature.nFeatureId, PrecInfo)
@@ -286,20 +298,38 @@ Public Class ForcedStrategyPanelVM
       End If
       If Not IsNothing(m_SelStrategy) Then
          If m_SelStrategy.sStrategyId = AUTOMATICSTRATEGYID Then
-            EgtRemoveInfo(m_CurrentFeature.nFeatureId, "STRATEGY")
+            m_SelStrategy.SetbIsStrategyModify(False)
+            EgtRemoveInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY)
+            EgtRemoveInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY & m_CurrentFeature.nFeatureId & "_FORCED")
+            If StrategyType = 1 Then
+               Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(False)
+               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(False)
+            End If
          Else
-            EgtSetInfo(m_CurrentFeature.nFeatureId, "STRATEGY", SelStrategy.sStrategyId)
+            m_SelStrategy.SetbIsStrategyModify(True)
+            If StrategyType = 1 Then
+               Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True)
+               Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True)
+            ElseIf StrategyType = 2 Then
+               Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True)
+            End If
+            EgtSetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY, SelStrategy.sStrategyId)
+            EgtSetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY & m_CurrentFeature.nFeatureId & "_FORCED", SelStrategy.bIsStrategyModify)
             Dim sInfo As String = String.Empty
             For Each Param In SelStrategy.ParameterList
                Select Case Param.GetType()
                   Case GetType(BooleanStrategyParameter)
                      EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, BooleanStrategyParameter).bValue)
+                     EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge & "_FORCED", DirectCast(Param, BooleanStrategyParameter).bIsBooleanModify)
                   Case GetType(DoubleStrategyParameter)
                      EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, DoubleStrategyParameter).sValue)
+                     EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge & "_FORCED", DirectCast(Param, DoubleStrategyParameter).bIsDoubleModify)
                   Case GetType(ComboStrategyParameter)
                      EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, ComboStrategyParameter).SelValue.sValue)
+                     EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge & "_FORCED", DirectCast(Param, ComboStrategyParameter).bIsComboBoxModify)
                   Case GetType(StringStrategyParameter)
                      EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, DirectCast(Param, StringStrategyParameter).sValue)
+                     EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge & "_FORCED", DirectCast(Param, StringStrategyParameter).bIsStringModify)
                   Case GetType(ListStrategyParameter)
                      For Each Item As ToolParameter In DirectCast(Param, ListStrategyParameter).ListValue
                         If Item.bIsActive Then
@@ -307,12 +337,29 @@ Public Class ForcedStrategyPanelVM
                            EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge, sInfo)
                         End If
                      Next
+                     EgtSetInfo(m_CurrentFeature.nFeatureId, m_SelStrategy.sStrategyId & "_" & Param.sNameNge & "_FORCED", DirectCast(Param, ListStrategyParameter).bIsListModify)
                End Select
             Next
          End If
       End If
    End Sub
 
+   Friend Sub ResetForcedStrategy(nFeatureId As Integer)
+      ' cancello precedenti valori
+      Dim sPrecStrategyID As String = ""
+      EgtGetInfo(nFeatureId, ConstBeam.STRATEGY, sPrecStrategyID)
+      If Not String.IsNullOrWhiteSpace(sPrecStrategyID) Then
+         Dim PrecInfo As String() = {}
+         EgtGetAllInfo(nFeatureId, PrecInfo)
+         Dim PrecStrategyInfo As String() = PrecInfo.Where(Function(x) x.StartsWith(sPrecStrategyID)).ToArray()
+         For Each Info In PrecStrategyInfo
+            EgtRemoveInfo(nFeatureId, Info.Split("="c)(0))
+         Next
+         EgtRemoveInfo(nFeatureId, ConstBeam.STRATEGY)
+         EgtRemoveInfo(nFeatureId, ConstBeam.STRATEGY & nFeatureId & "_FORCED")
+      End If
+   End Sub
+
 #End Region    ' Methods
 
 #Region "COMMANDS"
@@ -332,8 +379,10 @@ Public Class ForcedStrategyPanelVM
       ForcedStrategy()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       ' Abilito LeftPanel
+      Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(True)
       Map.refProjectVM.SetLeftPanel_IsEnabled(True)
       Map.refProjectVM.SetLeftPanel_Opacity(1)
+      Map.refSceneHostVM.SaveProject()
    End Sub
 
 #End Region ' Ok_Command
@@ -352,6 +401,7 @@ Public Class ForcedStrategyPanelVM
    Public Sub Cancel()
       Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER)
       ' Abilito LeftPanel
+      Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(True)
       Map.refProjectVM.SetLeftPanel_IsEnabled(True)
       Map.refProjectVM.SetLeftPanel_Opacity(1)
    End Sub

EgtBEAMWALL.Optimizer/FreeContourInput/FreeContourInputV.xaml

@@ -1,16 +1,35 @@
 <UserControl x:Class="FreeContourInputV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Style="{StaticResource FreeContourInput_UserControl}">
+             Height="32"
+             Margin="5"
+             VerticalAlignment="Top">
    
-   <StackPanel Style="{StaticResource FreeContourInput_StackPanel}">
+   <StackPanel Orientation="Horizontal">
+      <StackPanel.Style>
+         <Style TargetType="{x:Type StackPanel}">
+            <Style.Triggers>
+               <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
+                  <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
+               </DataTrigger>
+            </Style.Triggers>
+         </Style>
+      </StackPanel.Style>
       
       <TextBlock Text="{Binding Message}"
                  Visibility="{Binding Message_Visibility}"
-                 Style="{StaticResource Option_TextBlock}"/>
+                 Foreground="{StaticResource TextBlock.Static.Corduroy.Foreground}"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Margin="10,5,10,0"/>
       <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged}"
                Visibility="{Binding Text_Visibility}" 
-               Style="{StaticResource FreeContour_TextBox}">
+               HorizontalContentAlignment="Center"
+               VerticalContentAlignment="Center"
+               TextWrapping="Wrap"
+               Height="22"
+               Width="200"
+               Margin="5,0,5,0">
          <TextBox.InputBindings>
             <KeyBinding Key="Enter" Command="{Binding Done_Command, UpdateSourceTrigger=PropertyChanged}"/>
             <KeyBinding Key="S" Modifiers="Control" Command="{Binding Show_Command}"/>
@@ -19,25 +38,33 @@
       <CheckBox Content="{Binding CheckBoxText}" 
                 IsChecked="{Binding IsChecked}"
                 Visibility="{Binding Check_Visibility}" 
-                Style="{StaticResource FreeContourInput_CheckBox}"/>
+                VerticalAlignment="Center"
+                Margin="5,0,5,0"/>
       <ComboBox ItemsSource="{Binding ComboItemsList}" 
                 SelectedIndex="{Binding ComboSelectedIndex}"
                 Visibility="{Binding Combo_Visibility}" 
-                Style="{StaticResource FreeContourInput_ComboBox}"/>
-      <Grid Style="{StaticResource FreeContourInput_Grid}">
+                Margin="5,0,5,0"
+                Style="{StaticResource Optmizer_ComboBox}"/>
+      <Grid Margin="5,0,5,0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding Show_Command}" 
-                 Visibility="{Binding ShowBtn_Visibility}"
                  Content="{Binding ShowMsg}" 
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Visibility="{Binding ShowBtn_Visibility}"
+                 Height="30"
+                 Width="80"
+                 Margin="5,0,5,0"
+                 Style="{StaticResource Optimizer_Button}"/>
          <Button Grid.Column="1"
                  Command="{Binding Done_Command}" 
-                 Visibility="{Binding DoneBtn_Visibility}"
                  Content="{Binding OkMsg}" 
-                 Style="{StaticResource GeneralConfiguration_Button}"/>
+                 Visibility="{Binding DoneBtn_Visibility}"
+                 Height="30"
+                 Width="80"
+                 Margin="5,0,5,0"
+                 Style="{StaticResource Optimizer_Button}"/>
       </Grid>
    </StackPanel>
 </UserControl>

EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml

@@ -1,76 +1,113 @@
 <StackPanel x:Class="FreeContourManagerV"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+            Orientation="Horizontal"
+            Margin="2,5,2,5">
 
    <ComboBox ItemsSource="{Binding TypeList}"
              SelectedIndex="{Binding SelType, Delay=1}"
-             Style="{StaticResource ProdType_ComboBox}"/>
+             Height="22"
+             Width="160"
+             Margin="5,0,5,0"
+             Style="{StaticResource Optmizer_ComboBox}"/>
    <ComboBox ItemsSource="{Binding PathList}"
              SelectedIndex="{Binding SelPath}"
              Visibility="{Binding PathList_Visibility}"
-             Style="{StaticResource ProdPath_ComboBox}"/>
+             Height="22"
+             Width="100"
+             Margin="0,0,5,0"
+             Style="{StaticResource Optmizer_ComboBox}"/>
    <Button Command="{Binding Line2P_Command}"
            ToolTip="{Binding Line2P_ToolTip}"
            IsEnabled="{Binding Line2P_IsEnabled}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Line2P.png" 
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource Line2P_Image}" 
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Delete_Command}"
            ToolTip="{Binding Delete_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Delete.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource DeleteD_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ModifyCurve_Command}"
            ToolTip="{Binding ModifyCurve_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ModifyCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource ModifyCurve_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding AddPointCurve_Command}"
            ToolTip="{Binding AddPointCurve_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/AddPointCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource AddPointCurve_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemovePointCurve_Command}"
            ToolTip="{Binding RemovePointCurve_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource RemovePointCurve_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ChangeStart_Command}"
            ToolTip="{Binding ChangeStart_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ChangeStart.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource ChangeStart_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding InvertCurve_Command}"
            ToolTip="{Binding InvertCurve_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/InvertCurve.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource InvertCurve_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Move_Command}"
            ToolTip="{Binding Move_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Move.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource Move_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding Rotate_Command}"
            ToolTip="{Binding Rotate_ToolTip}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Rotate.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource RotateD_Image}"
+             Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding TextAngle_Command}"
            ToolTip="{Binding TextAngle_ToolTip}" 
            Visibility="{Binding TextAngle_Visibility}"
-           Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Text.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+           Height="30"
+           Width="30"
+           Margin="5,2,5,2"
+           Style="{StaticResource Optimizer_Button}">
+      <Image Source="{StaticResource Text_Image}"
+             Stretch="Uniform"/>
    </Button>
 
 </StackPanel>

EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -83,7 +83,7 @@ Public Class FreeContourManagerVM
                NotifyPropertyChanged(NameOf(TextAngle_Visibility))
             Case FreeContourTypes.TWO
                ' chiedo conferma
-               If MessageBox.Show(EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+               If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
                   m_SelType = FreeContourTypes.TWO
                   NotifyPropertyChanged(NameOf(SelType))
                   Return
@@ -301,7 +301,6 @@ Public Class FreeContourManagerVM
       Map.refPartListVM.SetBTLPartListIsEnabled(False)
       Map.refPParameterListVM.SetPParameterListIsEnabled(False)
       Map.refShowBeamPanelVM.SetShowSolid_IsEnabled(False)
-      Map.refShowBeamPanelVM.SetShowAll_IsEnabled(False)
       'resetto tutte le variabili
       SelPart = Nothing
       SelFeature = Nothing
@@ -423,7 +422,7 @@ Public Class FreeContourManagerVM
       Dim frFace As New Frame3d
       EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
       Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
-      frFrame.ToGlob( frFace)
+      frFrame.ToGlob(frFace)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)
       Map.refSceneHostVM.MainScene.CPlaneView()
@@ -539,7 +538,8 @@ Public Class FreeContourManagerVM
       Map.refPartListVM.SetBTLPartListIsEnabled(True)
       Map.refPParameterListVM.SetPParameterListIsEnabled(True)
       Map.refShowBeamPanelVM.SetShowSolid_IsEnabled(True)
-      Map.refShowBeamPanelVM.SetShowAll_IsEnabled(True)
+      ' riabilito assemblato
+      Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True
       ' reimposto vista normale per pezzo
       Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml

@@ -21,12 +21,19 @@
       <OPTIMIZER:ProjectParametersV Margin="0,10,0,0"/>
 
       <StackPanel Grid.Row="1"
-                  Style="{StaticResource GeneralParametersStrategy_StackPanel}">
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Margin="10">
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
-                 Style="{StaticResource SaveStrategy_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
-                   Style="{StaticResource BTLDataWnd_Image}"/>
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Height="40"
+                 Width="40"
+                 Margin="5,0,0,0"
+                 Style="{StaticResource Optimizer_Button}">
+            <Image Source="{StaticResource Ok_Image}"
+                   Stretch="Uniform"/>
          </Button>
       </StackPanel>
    </Grid>

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml.vb

@@ -1,6 +1,4 @@
-Imports System.Windows.Forms
-
-Public Class GeneralParametersStrategyV
+Public Class GeneralParametersStrategyV
 
 #Region "FIELDS & PROPERTIES"