- Ulteriori modifiche a paginazione e filtri nuova finestra apri

- rimosso ProdItem da  ViewerOptimizer

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Globalization
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
@@ -132,16 +131,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Protected m_VARIANTList As New ObservableCollection(Of Integer)()
-   Public Property VARIANTList As ObservableCollection(Of Integer)
-      Get
-         Return m_VARIANTList
-      End Get
-      Set(value As ObservableCollection(Of Integer))
-         m_VARIANTList = value
-      End Set
-   End Property
-
    Protected m_sDES As String = String.Empty
    Public Property sDES As String
       Get
@@ -152,16 +141,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Public Overridable Property nSelVARIANT As Integer
-      Get
-         Dim nDes As Integer = 0
-         Return If(Integer.TryParse(m_sDES, nDes), nDes, 0)
-      End Get
-      Set(value As Integer)
-         m_sDES = value.ToString()
-      End Set
-   End Property
-
    Protected m_frFRAME As New Frame3d
    Public Property frFRAME As Frame3d
       Get
@@ -265,7 +244,6 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
-      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
@@ -280,7 +258,7 @@ Public Class BTLFeatureM
       EgtGetInfo(nFeatureId, BTL_FTR_GRP, NewBTLFeature.m_nSelGRP)
       EgtGetInfo(nFeatureId, BTL_FTR_PRC, NewBTLFeature.m_nPRC)
       EgtGetInfo(nFeatureId, BTL_FTR_SIDE, NewBTLFeature.m_nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPriority)
+      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPRIORITY)
       Dim nDO As Integer = 1
       If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
          NewBTLFeature.m_bDO = (nDO <> 0)
@@ -344,22 +322,11 @@ Public Class BTLFeatureM
       NewBTLFeature.m_nSelSIDE = nSIDE
       NewBTLFeature.m_nPriority = 0
       NewBTLFeature.m_bDO = True
-      NewBTLFeature.nSelVARIANT = 0
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
    End Function
 
-   Private Sub CreateVariantList()
-      Dim sMaxIndex As String = ""
-      Dim nMaxIndex As Integer = 0
-      EgtUILib.GetPrivateProfileString([VARIANT], K_MAXINDEX, "", sMaxIndex, m_sBTLIniFile)
-      Integer.TryParse(sMaxIndex, nMaxIndex)
-      For Index As Integer = 0 To nMaxIndex
-         m_VARIANTList.Add(Index)
-      Next
-   End Sub
-
 #End Region    ' CONSTRUCTOR
 
 #Region "METHODS"
@@ -395,21 +362,15 @@ Public Class BTLFeatureM
       Dim TempList As New List(Of BTLParamM)
       Dim NewBTLParam As BTLParamM = Nothing
       ' leggo tutti i P della feature
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, True, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, True, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
-      If TempList.Count <= 0 Then
-         While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, 0, True, ParamIndex, Me, NewBTLParam)
-            TempList.Add(NewBTLParam)
-            ParamIndex += 1
-         End While
-      End If
       NewBTLFeature.PBTLParamMList = TempList
       ' leggo tutti i Q della feature
       ParamIndex = 1
       TempList = New List(Of BTLParamM)
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, False, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, False, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
@@ -584,7 +545,7 @@ Public Class BTLFeatureM
          For Each QPar In QBTLParamMList
             If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
          Next
-         EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nPriority)
+         EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
          EgtDuploSetModified(ParentPart.nPartId)
@@ -637,11 +598,6 @@ Public Class BTLFeatureM
       Return True
    End Function
 
-   ' funzione che restituisce se la feature è un Variant
-   Public Function IsVariant() As Boolean
-      Return m_nPRC = 900
-   End Function
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -587,7 +587,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploInRawCount(m_nPartId, INPROD)
+         EgtDuploCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -64,15 +64,6 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
-   Public Overridable Property nSelVARIANT As Integer
-      Get
-         Return m_BTLFeatureM.nSelVARIANT
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nSelVARIANT = value
-      End Set
-   End Property
-
    Public ReadOnly Property sName As String
       Get
          Return m_BTLFeatureM.sName

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -593,13 +593,4 @@ Public Class ProcessResult
       m_nTIME = TIME
    End Sub
 
-   Public Sub ResetTypeFeature()
-      m_Type = ProcessResultTypes.PART
-      m_nTASKID = 0
-   End Sub
-   Public Sub ResetTypePart()
-      m_Type = ProcessResultTypes.BAR
-      m_nCUTID = 0
-   End Sub
-
 End Class

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -201,14 +201,12 @@
    Public Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
 
    Public Const PROCESSINGS As String = "Processings"
-   Public Const [VARIANT] As String = "Variant"
    Public Const OUTLINE As String = "Outline"
    Public Const BTL_FTR_GRP As String = "GRP"
    Public Const BTL_FTR_PRC As String = "PRC"
    Public Const BTL_FTR_DO As String = "DO"
    Public Const BTL_FTR_SIDE As String = "SIDE"
    Public Const BTL_FTR_PRIORITY As String = "PRIORITY"
-   Public Const BTL_FTR_VARIANT As String = "VARIANT"
    Public Const BTL_FTR_NAME As String = "NAME"
    Public Const BTL_FTR_DES As String = "DES"
    Public Const BTL_FTR_PRID As String = "PRID"

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -23,5 +23,8 @@
    Public Const COL_USAGE As String = "colUSAGE"
    Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_ARCHIVED As String = "colARCHIVED"
+   Public Const COL_PROJID As String = "colPROJID"
+   Public Const COL_PRODID As String = "colPRODID"
+   Public Const COL_CREATEDATE As String = "colCRTDATE"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -14,9 +14,9 @@
 Public Module ConstGen
 
    ' File con direttorio radice dei dati
-   'Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
-   'Public Const S_DATA As String = "Data"
-   'Public Const K_DATAROOT As String = "DataRoot"
+   Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
+   Public Const S_DATA As String = "Data"
+   Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
@@ -24,7 +24,6 @@ Public Module ConstGen
    Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
-   Public Const K_MAXINDEX As String = "MaxIndex"
 
    ' Pagine del programma
    Public Enum Pages As Integer
@@ -51,7 +50,7 @@ Public Module ConstGen
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
-   'Public Const CONF_DIR As String = "Config"
+   Public Const CONF_DIR As String = "Config"
    ' Sottodirettorio delle risorse
    Public Const RES_DIR As String = "Resources"
    ' Sottodirettorio temporaneo
@@ -71,7 +70,7 @@ Public Module ConstGen
    ' Sottodirettorio di default per il salvataggio con nome
    Public Const SAVE_DFL_NAMEDIR As String = "MyProjects"
    ' Sottodirettorio di default per le macchine
-   'Public Const MACHINES_DFL_DIR As String = "Machines"
+   Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
    ' Nome file Lua con le funzioni di attrezzaggio

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -98,7 +98,6 @@ Public Module ConstIni
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
-   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
 
    'Public Const S_MACH As String = "Mach"
    'Public Const K_MACHINESDIR As String = "MachinesDir"
@@ -169,7 +168,4 @@ Public Module ConstIni
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const S_SPECIAL As String = "Special"
-   Public Const K_SPECIALENABLE As String = "SpecialEnable"
-
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -116,6 +116,7 @@
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
+    <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -186,13 +186,7 @@ Public Class MyMachGroupPanelM
                While nOutlineId <> GDB_ID.NULL
                   ' verifico che sia feature
                   If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-                     Dim nCurrPrId As Integer = GDB_ID.NULL
-                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
-                        If nCurrPrId < nPRId Then
-                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                           nPRId += 1
-                        End If
-                        nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
+                     If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
                         nOutlineId = EgtGetNext(nOutlineId)
                         Continue While
                      Else
@@ -231,14 +225,7 @@ Public Class MyMachGroupPanelM
                         Dim nPRC As Integer
                         If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
                            nPRId = 0
-                           If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
-                              If nPRId < nGlobPRId Then
-                                 EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                                 nPRId = nGlobPRId
-                                 nGlobPRId += 1
-                              End If
-                              nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
-                           Else
+                           If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
                               EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
                               nPRId = nGlobPRId
                               nGlobPRId += 1

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -571,13 +571,7 @@ Public MustInherit Class PartVM
    Public Sub CalcGlobalUpdate()
       m_PartM.nCALC_GlobalState = nCALC_State
       For Each Feature In FeatureVMList
-         If Not Feature.bDO Then
-            If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_PartM.nCALC_GlobalState Then
-               m_PartM.nCALC_GlobalState = Feature.nState
-               m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
-            End If
-            Continue For
-         End If
+         If Not Feature.bDO Then Continue For
          If Feature.nState > m_PartM.nCALC_GlobalState Then
             m_PartM.nCALC_GlobalState = Feature.nState
             m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.1.1")>
-<Assembly: AssemblyFileVersion("2.7.1.1")>
+<Assembly: AssemblyVersion("2.5.8.1")>
+<Assembly: AssemblyFileVersion("2.5.8.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -68,6 +68,7 @@
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
@@ -80,6 +81,17 @@
                                       Visibility="{Binding SearchText_Visibility}"/>
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
+                  <TextBlock Text="Page index"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <Button Content="&lt;"
+                          Command="{Binding PrevPage_Command}" />
+                  <TextBlock Text="{Binding nPageIndex}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <Button Content="&gt;"
+                          Command="{Binding NextPage_Command}" />
+               </StackPanel>
+               <StackPanel Grid.Column="3" 
+                           Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
                              Style="{StaticResource OptionTextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
@@ -92,7 +104,7 @@
 
       <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
                                Grid.Row="1"
-                               ItemsSource="{Binding ProjectList}" 
+                               ItemsSource="{Binding PageList}" 
                                SelectedItem="{Binding SelProject}"
                                CanUserAddRows="False"
                                AutoGenerateColumns="False"
@@ -104,10 +116,12 @@
                                Margin="5"
                                RowDetailsVisibilityMode="Visible"
                                CellEditEnding="MainDataGrid_CellEditEnding"
-                               BindingColumns="{Binding ProdColumns}">
+                               BindingColumns="{Binding ProdColumns}"
+                               Sorting="MainDataGrid_Sorting">
          <DataGrid.Resources>
             <!-- ProdId -->
-            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+            <DataGridTextColumn x:Key="colPRODID"
+                                Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
                      <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
@@ -115,7 +129,8 @@
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
             <!--Name-->
-            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+            <DataGridTextColumn x:Key="colNAME" 
+                                Binding="{Binding sName}">
                <DataGridTextColumn.Header>
                   <Grid>
                      <Grid.ColumnDefinitions>
@@ -134,19 +149,23 @@
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Creation date -->
-            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+            <DataGridTextColumn x:Key="colCRTDATE" 
+                                Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Machine -->
-            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+            <DataGridTextColumn x:Key="colMACHINE" 
+                                Binding="{Binding sMachine}" 
+                                CanUserSort="False">
                <DataGridTextColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Archived -->
-            <DataGridTemplateColumn x:Key="colARCHIVED">
+            <DataGridTemplateColumn x:Key="colARCHIVED"
+                                    CanUserSort="False">
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -83,4 +83,182 @@ Public Class NewOpenProjectFileDialogV
       'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
-End Class
+   Private Sub MainDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs)
+      ' aggiorno direziona colonna
+      Dim column As DataGridColumn = e.Column
+      column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
+      '' ricalcolo colonne sort
+      'Dim datagrid As DataGrid = sender
+      'ProdItemComparer.RefreshColumns()
+      '' lancio sort custom
+      'm_OpenProjFileDialogVM.RefreshProdItemSort()
+      m_OpenProjFileDialogVM.SortPageList()
+      m_OpenProjFileDialogVM.UpdatePageList()
+      e.Handled = True
+
+
+   End Sub
+
+End Class
+
+Friend Class ProdItemComparer
+   Implements IComparer
+
+   Private Shared DataGrid As DataGrid
+   Friend Shared Sub SetDataGrid(value As DataGrid)
+      DataGrid = value
+   End Sub
+
+   Private Shared m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
+   Friend Shared Sub SetOpenProjFileDialogVM(value As NewOpenProjectFileDialogVM)
+      m_OpenProjFileDialogVM = value
+   End Sub
+
+   Private Shared m_ColumnList As New List(Of DataGridColumn)
+   Private Shared m_EgtColumnList As New List(Of EgtDataGridColumn)
+
+   Friend Shared Sub RefreshColumns()
+      m_ColumnList.Clear()
+      m_EgtColumnList.Clear()
+      For Each col In DataGrid.Columns
+         If Not IsNothing(col.SortDirection) Then
+            m_ColumnList.Add(col)
+            m_EgtColumnList.Add(m_OpenProjFileDialogVM.ProdColumns(col.DisplayIndex))
+         End If
+      Next
+      '   Map.refRawPartListVM.SetRawPartListSorted(m_ColumnList.Count > 0)
+   End Sub
+
+
+   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+      '   Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+      '   Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+      '   Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+      '   Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+      '   Dim bFirstInQueue As Boolean = First.bToBeProduced
+      '   Dim bSecondInQueue As Boolean = Second.bToBeProduced
+      '   ' verifico se gia' prodotti
+      '   If bFirstProduced AndAlso bSecondProduced Then
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   ElseIf bFirstProduced Then
+      '      Return -1
+      '   ElseIf bSecondProduced Then
+      '      Return 1
+      '   ElseIf bFirstInQueue AndAlso bSecondInQueue Then
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   ElseIf bFirstInQueue Then
+      '      Return -1
+      '   ElseIf bSecondInQueue Then
+      '      Return 1
+      '   Else
+      '      ' verifico ordine per colonne
+      '      Dim ColumnIndex = 0
+      '      While ColumnIndex <= m_EgtColumnList.Count - 1
+      '         Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
+      '         Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
+      '         If nCheck <> 0 Then
+      '            Return nCheck
+      '         End If
+      '         ColumnIndex += 1
+      '      End While
+      '      ' se non trovo colonne, metto in ordine indice di produzione
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   End If
+   End Function
+
+   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
+      Select Case Column.Name
+         Case COL_NAME
+            If First.nName > Second.nName Then
+               Return 1 * nDirection
+            ElseIf First.nName < Second.nName Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_STARTCUT
+            If First.Id > Second.Id Then
+               Return 1 * nDirection
+            ElseIf First.Id < Second.Id Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_W
+            If First.dW > Second.dW Then
+               Return 1 * nDirection
+            ElseIf First.dW < Second.dW Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_H
+            If First.dH > Second.dH Then
+               Return 1 * nDirection
+            ElseIf First.dH < Second.dH Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_L
+            If First.dL > Second.dL Then
+               Return 1 * nDirection
+            ElseIf First.dL < Second.dL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_POSZ
+               'If First.posz > Second.dL Then
+               '   Return 1 * nDirection
+               'ElseIf First.dL < Second.dL Then
+               '   Return -1 * nDirection
+               'Else
+               '   Return 0
+               'End If
+         Case COL_MATERIAL
+            If First.sMATERIAL > Second.sMATERIAL Then
+               Return 1 * nDirection
+            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_USAGE
+            If First.dUsage > Second.dUsage Then
+               Return 1 * nDirection
+            ElseIf First.dUsage < Second.dUsage Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_WASTE
+            If First.dWaste > Second.dWaste Then
+               Return 1 * nDirection
+            ElseIf First.dWaste < Second.dWaste Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+      End Select
+   End Function
+
+End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -19,7 +19,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       EXPORTDATE = 1
    End Enum
 
-   Private Enum FilterTypes As Integer
+   Protected Enum FilterTypes As Integer
       NULL = 0
       ID = 1
       BTLFILENAME = 2
@@ -36,9 +36,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    End Enum
 
    Public Enum RowQuantities As Integer
-      FIFTY = 0
-      HUNDRED = 1
-      HUNDREDANDFIFTY = 2
+      TEN = 0
+      TWENTY = 1
+      THIRTY = 2
    End Enum
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
@@ -67,6 +67,27 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
+   Private m_colProjId_Name As EgtDataGridColumn
+   Public ReadOnly Property colProjId_Name As EgtDataGridColumn
+      Get
+         Return m_colProjId_Name
+      End Get
+   End Property
+
+   Private m_colProdId_Name As EgtDataGridColumn
+   Public ReadOnly Property colProdId_Name As EgtDataGridColumn
+      Get
+         Return m_colProdId_Name
+      End Get
+   End Property
+
+   Private m_colCreateDate_Name As EgtDataGridColumn
+   Public ReadOnly Property colCreateDate_Name As EgtDataGridColumn
+      Get
+         Return m_colCreateDate_Name
+      End Get
+   End Property
+
    Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -106,7 +127,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
-   Public m_ProjectList_View As CollectionView = Nothing
+   Private m_ProjectList_View As CollectionView = Nothing
+   Public ReadOnly Property ProjectList_View As CollectionView
+      Get
+         Return m_ProjectList_View
+      End Get
+   End Property
+
    Protected m_ProjectList As New ObservableCollection(Of ProdItem)
    Public ReadOnly Property ProjectList As ObservableCollection(Of ProdItem)
       Get
@@ -185,7 +212,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Integer)
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -227,7 +255,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          NotifyPropertyChanged(NameOf(Date_Visibility))
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -242,7 +271,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -257,7 +287,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -275,7 +306,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
-   Private m_SelRowQuantity As RowQuantities
+   Protected m_SelRowQuantity As RowQuantities
    Public Property SelRowQuantity As Integer
       Get
          Return m_SelRowQuantity
@@ -283,7 +314,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Integer)
          m_SelRowQuantity = value
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -308,7 +340,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          If Not IsNothing(SearchDate) Then SearchDate.Clear()
          ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
          m_SelFilterType = m_FilterTypeList(0)
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
          ' ora setto il valore scelto come Tipo Filtro
          m_SelFilterType = value
          Select Case m_SelFilterType.Id
@@ -332,7 +365,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
       Set(value As String)
          m_SearchText = value
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -390,9 +424,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.Visible = value
+            RefreshProjectList()
          End If
       End Set
    End Property
@@ -419,6 +453,30 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       NotifyPropertyChanged(NameOf(bDelete_IsEnabled))
    End Sub
 
+   Private m_PageList_View As ListCollectionView = Nothing
+   Public ReadOnly Property PageList_View As ListCollectionView
+      Get
+         Return m_PageList_View
+      End Get
+   End Property
+   Protected m_PageList As New ObservableCollection(Of ProdItem)
+   Public Property PageList As ObservableCollection(Of ProdItem)
+      Get
+         Return m_PageList
+      End Get
+      Set(value As ObservableCollection(Of ProdItem))
+         m_PageList = value
+      End Set
+   End Property
+
+   Private m_nPageIndex As Integer = 1
+   Public ReadOnly Property nPageIndex As Integer
+      Get
+         Return m_nPageIndex
+      End Get
+   End Property
+
+
    Protected m_ChangeOpenedProjectOnCancel As Boolean = False
 
 #Region "Messages"
@@ -545,6 +603,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    Private m_cmdDelete As ICommand
    Private m_cmdArchive As ICommand
    Private m_cmdCancel As ICommand
+   Private m_cmdPrevPage As ICommand
+   Private m_cmdNextPage As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -555,6 +615,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       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_colProjId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PROJID)
+      m_colProdId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PRODID)
+      m_colCreateDate_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_CREATEDATE)
       ' leggo valori per filtri
       m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
       Select Case m_SelDayType
@@ -589,6 +652,29 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
    End Sub
 
+
+   Private m_ProdItemComparer As ProdItemComparer
+   Friend ReadOnly Property ProdItemComparer As ProdItemComparer
+      Get
+         Return m_ProdItemComparer
+      End Get
+   End Property
+
+   Friend Sub SetPageListView()
+      m_PageList_View = CollectionViewSource.GetDefaultView(m_PageList)
+      m_ProdItemComparer = New ProdItemComparer
+      m_PageList_View.CustomSort = m_ProdItemComparer
+      NotifyPropertyChanged(NameOf(PageList_View))
+   End Sub
+
+   Friend Sub RefreshProdItemSort()
+      m_PageList_View.CustomSort = m_ProdItemComparer
+   End Sub
+
+   Friend Sub SortPageList()
+      ' m_ProjectList = New ObservableCollection(Of ProdItem)(m_ProjectList.OrderBy(Of Integer)(Function(x) If(String.IsNullOrWhiteSpace(x.sProdId), 0, CInt(x.sProdId))))
+   End Sub
+
    Protected Sub LoadColumns()
       'If ProjectType = ProjectType.PROJ Then
       ' carico le colonne della datagrid
@@ -650,17 +736,69 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Return AllFilesInDir.Any(Function(x) Path.GetExtension(x).ToLower() = ".nge")
    End Function
 
-   Protected Function ProjectFilter(Proj As Object) As Boolean
-      Dim bProjectOk As Boolean = True
-      'If TypeOf Proj Is ProjFileVM Then
-      Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
-      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-         (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).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.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+   'Protected Function ProjectFilter(Proj As Object) As Boolean
+   '   Dim bProjectOk As Boolean = True
+   '   'If TypeOf Proj Is ProjFileVM Then
+   '   Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
+   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+   '      (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).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.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+   '      (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+   '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+   '   'ElseIf TypeOf Proj Is ProdFileVM 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
+   '   Return bProjectOk
+   'End Function
+
+   Public Overridable Function UpdatePageList() As Boolean
+      Dim FilteredList As IEnumerable(Of ProdItem) = m_ProjectList.Where(Function(x)
+                                                                            If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso
+                                                                               ((m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                               (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                               (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso x.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then Return False
+                                                                            Return True
+                                                                         End Function)
+      Dim nPageRowQty As Integer = 0
+      Select Case m_SelRowQuantity
+         Case RowQuantities.TEN
+            nPageRowQty = 10
+         Case RowQuantities.TWENTY
+            nPageRowQty = 20
+         Case RowQuantities.THIRTY
+            nPageRowQty = 30
+      End Select
+      Dim nStart = nPageIndex * nPageRowQty
+      If (nPageIndex - 1) * nPageRowQty + 1 > FilteredList.Count() Then
+         Return False
+      End If
+      '   FilteredList = FilteredList.OrderBy(Of ProdItem)()
+      ' m_PageList = New ObservableCollection(Of ProdItem)(FilteredList.Skip((nPageIndex - 1) * nPageRowQty + 1).Take(nPageIndex * nPageRowQty).Select(Function(x) x))
+      m_PageList.Clear()
+      For Index = (nPageIndex - 1) * nPageRowQty + 1 To nPageIndex * nPageRowQty
+         m_PageList.Add(FilteredList(Index))
+      Next
+      NotifyPropertyChanged(NameOf(PageList))
+      Return True
+
+      'Dim bProjectOk As Boolean = True
+      ''If TypeOf Proj Is ProjFileVM Then
+      'Dim CurrProj As ProdItem = DirectCast(PROJ, ProdItem)
+      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+      '   (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).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.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       'ElseIf TypeOf Proj Is ProdFileVM Then
       '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
       '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
@@ -670,6 +808,15 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       '      (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
+      ' Return bProjectOk
+   End Function
+
+   Protected Function ProjectFilter(CurrProj As ProdItem) As Boolean
+      Dim bProjectOk As Boolean = True
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.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
 
@@ -775,98 +922,61 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 #End Region ' Cancel
 
+#Region "PrevPage"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property PrevPage_Command As ICommand
+      Get
+         If m_cmdPrevPage Is Nothing Then
+            m_cmdPrevPage = New Command(AddressOf PrevPage)
+         End If
+         Return m_cmdPrevPage
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub PrevPage()
+      If m_nPageIndex > 1 Then
+         m_nPageIndex -= 1
+      End If
+      UpdatePageList()
+      NotifyPropertyChanged(NameOf(nPageIndex))
+   End Sub
+
+#End Region ' PrevPage
+
+#Region "NextPage"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property NextPage_Command As ICommand
+      Get
+         If m_cmdNextPage Is Nothing Then
+            m_cmdNextPage = New Command(AddressOf NextPage)
+         End If
+         Return m_cmdNextPage
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub NextPage()
+      m_nPageIndex += 1
+      If Not UpdatePageList() Then
+         m_nPageIndex -= 1
+      End If
+      NotifyPropertyChanged(NameOf(nPageIndex))
+   End Sub
+
+#End Region ' NextPage
+
 #End Region    ' Commands
 
 End Class
 
-Public Class ProdItem
-   Inherits VMBase
-
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-   Public ReadOnly Property ProdFileVM As ProdFileVM
-      Get
-         Return m_ProdFileVM
-      End Get
-   End Property
-
-   Private m_ProjFileList As New List(Of ProjectFileVM)
-   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-      Get
-         Return m_ProjFileList
-      End Get
-   End Property
-
-   Public ReadOnly Property sProdId As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-      End Get
-   End Property
-
-   Public Overridable Property sName As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-      End Get
-      Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            m_ProdFileVM.sName = value
-         End If
-      End Set
-   End Property
-
-   Public ReadOnly Property dtCreateDate As Date
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-      End Get
-   End Property
-   Public ReadOnly Property sCreateDate As String
-      Get
-         Return dtCreateDate.ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property sMachine As String
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.sMachine
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).sMachine
-         Else Return ""
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsArchived As Boolean
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.bIsArchived
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).bIsArchived
-         Else
-            Return True
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property Archived_Visibility As Visibility
-      Get
-         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList.Add(ProjFileVM)
-   End Sub
-
-   Sub New(ProjFileVM As ProjFileVM)
-      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-   End Sub
-
-   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList = ProjFileVMList
-   End Sub
-
-End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

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

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

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

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

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

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -126,7 +126,7 @@ Public Module BTLIniFile
    End Function
 
    ' funzione che ottiene il parametro P/Q usando m_nBTLBWType del modulo
-   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IpVariant As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
+   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
       Dim sBTLParam As String = String.Empty
       Dim sBWQParam As String = String.Empty
       If m_nBTLBWType = BWType.BEAM Then
@@ -134,7 +134,7 @@ Public Module BTLIniFile
       ElseIf m_nBTLBWType = BWType.WALL Then
          sBWQParam = "W"
       End If
-      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & If(IpPRC = 900 AndAlso IpVariant > 0, IpPRC & "." & IpVariant, IpPRC), If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
+      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
          Dim sBTLParamParams() As String = sBTLParam.Split(","c)
          ' verifico numero minimo di parametri
          If sBTLParamParams.Count >= 6 Then

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

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

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

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

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

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

EgtBEAMWALL.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-2023 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("2.5.8.1")]
+[assembly: AssemblyFileVersion("2.5.8.1")]

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -16,6 +16,31 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <IncrementalBuild>true</IncrementalBuild>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <IncrementalBuild>false</IncrementalBuild>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -28,6 +53,29 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -54,6 +102,27 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml.vb

@@ -219,7 +219,6 @@ Friend Class MyComparer
                Return 0
             End If
       End Select
-      Return 0
    End Function
 
 End Class

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -437,10 +437,6 @@ Public Class LeftPanelVM
                                                          New OPState("Reset", OPStates.End),
                                                          New OPState("Unspecified", OPStates.Unspecified)
          }
-         Case Else
-            m_OPStateList = New List(Of OPState) From {
-                                                         New OPState("Unspecified", OPStates.Unspecified)
-         }
       End Select
       ' seleziono in partenza unspecified
       Dim UnspecifiedState As OPState = m_OPStateList.FirstOrDefault(Function(x) x.Id = OPStates.Unspecified)

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -317,7 +317,6 @@ Public Class MyMachGroupVM
          ' segno pezzo da produrre
          MachGroup.m_bToBeProduced = True
          MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
-         Map.refSupervisorMachGroupPanelVM.MachGroupVMList_View.Refresh()
 
          ' sposto MachGroup in lista come ultimo dei pronti da produrre
          Dim OldIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(MachGroup)

EgtBEAMWALL.Supervisor/MachGroupPanel/SupervisorMachGroupPanelVM.vb

@@ -46,6 +46,7 @@ Public Class SupervisorMachGroupPanelVM
 #End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
+
    Private m_MachGroupVMListComparer As MyComparer
    Friend ReadOnly Property MachGroupVMListComparer As MyComparer
       Get

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -248,8 +248,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End if
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Supervisor")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.1.2")>
-<Assembly: AssemblyFileVersion("2.7.1.2")>
+<Assembly: AssemblyVersion("2.5.8.1")>
+<Assembly: AssemblyFileVersion("2.5.8.1")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

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

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -58,10 +58,6 @@ Public Class MySceneHostVM
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
          EgtSetCurrentContext(MainScene.GetCtx())
-         ' Imposto direttorio ausiliario per import/gestione BTL
-         Dim sBtlAuxDir As String = String.Empty
-         GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
-         EgtSetBtlAuxDir(sBtlAuxDir)
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -95,7 +95,9 @@ Public Class SupervisorManagerVM
 
 
 #End Region ' ToolTip
+
 #End Region    ' Fields & Properties
+
 #Region "CONSTRUCTOR"
 
    Sub New()

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -221,13 +221,6 @@ Public Class PRC
       End Get
    End Property
 
-   Private m_nVARIANT As Integer = 0
-   Public ReadOnly Property nVARIANT As Integer
-      Get
-         Return m_nVARIANT
-      End Get
-   End Property
-
    ' Nome
    Private m_sName As String
    Public ReadOnly Property sName As String

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -1,14 +1,9 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
-Imports System.Globalization
-Imports System.IO
-Imports System.Text.RegularExpressions
-Imports System.Windows.Interop
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports Mysqlx.XDevAPI.Common
 
 Public Class BTLFeatureVM
    Inherits Core.BTLFeatureVM
@@ -83,14 +78,14 @@ Public Class BTLFeatureVM
                If EgtGetInfo(nFeatureId, "AUXID", sAuxId) Then
                   ' verifico se ha uno o due percorsi
                   Dim sAuxIdSplit() As String = sAuxId.Split(","c)
-                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
+                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
                      Dim nAuxId As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(0), nAuxId) Then
                         EgtTransform(nFeatureId + nAuxId, frOld, GDB_RT.GLOB)
                         EgtTransform(nFeatureId + nAuxId, frNew, GDB_RT.GLOB)
                      End If
                   End If
-                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
+                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
                      Dim nAux2Id As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(1), nAux2Id) Then
                         EgtTransform(nFeatureId + nAux2Id, frOld, GDB_RT.GLOB)
@@ -119,67 +114,6 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
-   Public Property VARIANTList As ObservableCollection(Of Integer)
-      Get
-         Return m_BTLFeatureM.VARIANTList
-      End Get
-      Set(value As ObservableCollection(Of Integer))
-         m_BTLFeatureM.VARIANTList = value
-      End Set
-   End Property
-
-   Public Overrides Property nSelVARIANT As Integer
-      Get
-         Return m_BTLFeatureM.nSelVARIANT
-      End Get
-      Set(value As Integer)
-         If value <> m_BTLFeatureM.nSelVARIANT Then
-            m_BTLFeatureM.nSelVARIANT = value
-            Dim vPar As Double() = Nothing
-            Dim sPar As String = Nothing
-            Dim vParQ As String() = Nothing
-            CreateFeatureVariant(value, vPar, sPar, vParQ)
-            If IsNothing(vPar) Then
-               m_BTLFeatureM.nSelVARIANT = 0
-               CreateFeatureVariant(value, vPar, sPar, vParQ)
-            End If
-            m_BTLFeatureM.nSelVARIANT = value
-            Dim bOK As Boolean = m_BTLFeatureM.UpdateParams(nSelGRP, m_BTLFeatureM.nPRC, nSelSIDE, sDES, m_BTLFeatureM.nPRID,
-                                                            m_BTLFeatureM.frFRAME, vPar, sPar, vParQ)
-            If bOK Then
-               EgtDuploSetModified(m_BTLPartM.nPartId)
-               ' seleziono feature in disegno
-               SelGeomFeature()
-               ' rendo non calcolata questa feature
-               ResetCalcFeature()
-            End If
-            NotifyPropertyChanged(NameOf(nSelVARIANT))
-            NotifyPropertyChanged(NameOf(PBTLParamVMList))
-            NotifyPropertyChanged(NameOf(QBTLParamVMList))
-            EgtDraw()
-         End If
-      End Set
-   End Property
-
-   Private Sub CreateFeatureVariant(value As Integer, ByRef vPar() As Double, ByRef sPar As String, ByRef vParQ() As String)
-      ' crea parametri per questa feature da file ini
-      m_BTLFeatureM.CreateFeatureParams(m_BTLFeatureM)
-      m_BTLFeatureM.SetDefaultValues()
-      CreatePBTLParamVMList()
-      CreateQBTLParamVMList()
-      ' aggiorno la feature con nuovo valore
-      vPar = Nothing
-      sPar = Nothing
-      vParQ = Nothing
-      m_BTLFeatureM.CalcParamArray(vPar, sPar, vParQ)
-      ' imposto path disegno da mostrare in BottomPanel
-      If value > 0 AndAlso File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png") Then
-         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png")
-      Else
-         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png")
-      End If
-   End Sub
-
    Public Property sPriority As String
       Get
          Return m_BTLFeatureM.nPriority.ToString()
@@ -252,11 +186,7 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property sDrawPath As String
       Get
-         If nPRC = 900 AndAlso nSelVARIANT > 0 Then
-            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png"
-         Else
-            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
-         End If
+         Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
       End Get
    End Property
 
@@ -397,7 +327,7 @@ Public Class BTLFeatureVM
       AddHandler m_QBTLParamVMList.CollectionChanged, AddressOf OnQBTLParamVMListChanged
    End Sub
 
-   ' funzione che aggiorna lo stato, la rotazione e gli errori dopo calcolo
+   ' funzione che aggiorna lo stato e gli errori dopo calcolo
    Friend Sub CalcFeatureUpdate(ERR As Integer, ROT As Integer, MSG As String)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
@@ -424,32 +354,6 @@ Public Class BTLFeatureVM
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub
 
-   ' funzione che resetta gli errori del calcolo
-   Friend Sub ResetFeatureError()
-      Dim ERR As Integer = 0
-      Dim MSG As String = ""
-      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
-      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
-      m_BTLFeatureM.nCALC_ERR = ERR
-      m_BTLFeatureM.sCALC_MSG = MSG
-      Select Case ERR
-         Case 0
-            m_BTLFeatureM.nState = CalcStates.OK
-         Case 22
-            m_BTLFeatureM.nState = CalcStates.COLLISION
-         Case 17, 19
-            m_BTLFeatureM.nState = CalcStates.WARNING
-         Case < 0
-            m_BTLFeatureM.nState = CalcStates.INFO
-         Case > 0
-            m_BTLFeatureM.nState = CalcStates.ERROR_
-      End Select
-      NotifyPropertyChanged(NameOf(Calc_Background))
-      NotifyPropertyChanged(NameOf(sCALC_MSG))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-   End Sub
-
    Friend Sub ResetCalcFeature()
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_ERR, ITG_PROJ_ERR))
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_MSG, ITG_PROJ_MSG))

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -213,9 +213,11 @@ Public Class BTLParamVM
          Dim bFound As Boolean = False
          If Not value Then
             ' Cerco il parametro Q direttamente nel file ini
+            Dim GRPType As Integer = Me.m_BTLFeatureM.nSelGRP
+            Dim PRC As Integer = Me.m_BTLFeatureM.nPRC
             Dim ParamIndex As String = 1
             Dim NewBTLParam As BTLParamM = Nothing
-            While BTLIniFile.GetBeamPrivateProfileParam(Me.m_BTLFeatureM.nSelGRP, Me.m_BTLFeatureM.nPRC, Me.m_BTLFeatureM.nSelVARIANT, False, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, False, ParamIndex, Nothing, NewBTLParam)
                Dim QBTLParam As BTLParamVM = New BTLParamVM(NewBTLParam)
                If QBTLParam.sName = Me.sName Then
                   Me.sValue = QBTLParam.sDefault

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -5,7 +5,6 @@ Imports EgtBEAMWALL.Core
 Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports System.Windows.Threading
-Imports System.Security.Cryptography
 
 Public Class BTLPartVM
    Inherits VMBase
@@ -94,14 +93,10 @@ Public Class BTLPartVM
                   Dim LSTValues() As String = sSwapItem.Split(","c)
                   If Not IsNothing(LSTValues(LSTValues.Count - 1)) AndAlso Integer.TryParse(LSTValues(LSTValues.Count - 1), nSwapItem) AndAlso nSwapItem > 0 Then
                      Dim nMachgroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nSwapItem)))
-                     If nMachgroupId = GDB_ID.NULL Then
-                        EgtOutLog("Trovato Duplo Ghost")
-                     Else
-                        Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
-                        If MachGroupModel.State > ItemState.ND Then
-                           bDuploInProduction = True
-                           Exit For
-                        End If
+                     Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
+                     If MachGroupModel.State > ItemState.ND Then
+                        bDuploInProduction = True
+                        Exit For
                      End If
                   End If
                Next
@@ -1536,30 +1531,13 @@ Public Class BTLPartVM
                ' aggiorno stato abilitazione del bottone modifica free contour
                Map.refFeatureManagerVM.SetEditIsEnabled()
                Map.refFeatureManagerVM.NotifyPropertyChanged(NameOf(Map.refFeatureManagerVM.Priority_Visibility))
-               ' Controlo se nPRC è 900 rendo visibile combobox Variant
-               If m_SelBTLFeatureVM.nPRC = 900 Then
-                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible)
-                  Dim nVariant As Integer = 0
-                  If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
-                     m_SelBTLFeatureVM.nSelVARIANT = nVariant
-                  End If
-                  If m_SelBTLFeatureVM.nSelVARIANT > 0 AndAlso
-                     System.IO.File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png") Then
-                     ' imposto path disegno da mostrare in BottomPanel
-                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png")
-                  Else
-                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
-                  End If
-               Else
-                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
-               End If
-               Else
-                  EgtDeselectAll()
-               End If
-               Map.refLeftPanelVM.FeatureSelectionChanged()
+            Else
+               EgtDeselectAll()
             End If
-            EgtDraw()
-            NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+            Map.refLeftPanelVM.FeatureSelectionChanged()
+         End If
+         EgtDraw()
+         NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
       End Set
    End Property
 
@@ -1742,14 +1720,8 @@ Public Class BTLPartVM
       m_BTLPartM.nFeaturesGlobalState = CalcStates.NOTCALCULATED
       If nState > CalcStates.NOTCALCULATED Then
          For Each Feature In BTLFeatureVMList
-            If Not Feature.bDO And Not bFeatureFirst Then
-               If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_BTLPartM.nGlobalState Then
-                  m_BTLPartM.nGlobalState = Feature.nState
-                  m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR
-               Else
-                  Continue For
-               End If
-            End If
+            If Not Feature.bDO And Not bFeatureFirst Then Continue For
+
             If ((Feature.nState = CalcStates.NOTCALCULATED And nState < CalcStates.WARNING) Or Not Feature.bDO) And bFeatureFirst Then
                m_BTLPartM.nGlobalState = Feature.nState
                m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -398,8 +398,7 @@ Public Class BTLStructureVM
          End If
       End If
 
-      If Not IsNothing(SelBTLPart) Then SelBTLParts.AddToList(SelBTLPart)
-
+      SelBTLParts.AddToList(SelBTLPart)
       If bByOptim Then
          m_bOnlySelectItem = False
       End If

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -355,7 +355,7 @@ Public Class CALCPanelVM
                ' Resetto feature in collisione
                For Each Feature In BTLPart.m_BTLFeatureVMList
                   If Feature.nState = CalcStates.COLLISION Then
-                     Feature.ResetFeatureError()
+                     Feature.CalcFeatureUpdate(0, 0, "")
                   End If
                Next
             Else
@@ -366,7 +366,7 @@ Public Class CALCPanelVM
                   ' Resetto feature in collisione
                   For Each Feature As BTLFeatureVM In Part.FeatureVMList
                      If Feature.nState = CalcStates.COLLISION Then
-                        Feature.ResetFeatureError()
+                        Feature.CalcFeatureUpdate(0, 0, "")
                      End If
                   Next
                Next
@@ -387,15 +387,15 @@ Public Class CALCPanelVM
                         ' aggiorno nuovo pezzo
                         CurrBTLPartVM = GetBTLPartVMFromBTLPartId(Line.nCUTID)
                         If IsNothing(CurrBTLPartVM) Then
-                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(BTLPartVM).")
+                           Continue For
                         End If
                      Else
                         ' aggiorno nuovo pezzo
                         CurrPartVM = GetPartVMFromPartId(Line.nCUTID)
                         If IsNothing(CurrPartVM) Then
-                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(PartVM).")
+                           Continue For
                         End If
                      End If
                   End If
@@ -422,14 +422,14 @@ Public Class CALCPanelVM
                   If nProgramPage = ProjectType.PROJ Then
                      CurrBTLFeatureVM = GetBTLFeatureVMFromBTLPartId(CurrBTLPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
-                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in BTLPartVM " & CurrBTLPartVM.nPartId)
+                        Continue For
                      End If
                   Else
                      CurrBTLFeatureVM = GetFeatureVMFromPartId(CurrPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
-                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in PartVM " & CurrPartVM.nPartId)
+                        Continue For
                      End If
                   End If
                Else

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CalcPanelV.xaml

@@ -47,7 +47,6 @@
            Visibility="{Binding ChooseMachineBtn_Visibility}">
       <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
    </Button>
-
    <Grid Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -30,7 +30,7 @@ Public Class ChangeParameterWndVM
             Dim ParamIndex As Integer = 1
             Dim NewBTLParam As BTLParamM = Nothing
             ' leggo tutti i P della feature
-            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, m_SelPRC.nVARIANT, True, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, True, ParamIndex, Nothing, NewBTLParam)
                m_ParamList.Add(New Parameters(NewBTLParam))
                ParamIndex += 1
             End While

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -9,8 +9,6 @@ Imports Ionic.Zip
 Imports Org.BouncyCastle.Bcpg
 Imports Microsoft.VisualBasic.ApplicationServices
 Imports Renci.SshNet.Security
-Imports Google.Protobuf.WellKnownTypes
-Imports System.Globalization
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -962,7 +960,7 @@ Public Class ConfigurationPageVM
       ParamIndex = 1
       TempList = New List(Of QBTLParamVM)
       If IsP Then
-         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, 0, IsP, ParamIndex, Nothing, NewBTLParam)
+         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam)
             TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
             ParamIndex += 1
          End While

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -16,6 +16,31 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <IncrementalBuild>true</IncrementalBuild>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <IncrementalBuild>false</IncrementalBuild>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -28,6 +53,29 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -57,6 +105,27 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
+    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
+    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -269,10 +338,6 @@
       <DependentUpon>SetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="SetUp\SetUpVM.vb" />
-    <Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
-      <DependentUpon>SpecialPanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SpecialPanel\SpecialPanelVM.vb" />
     <Compile Include="StatisticsTimePanel\StatisticsTimePanelV.xaml.vb">
       <DependentUpon>StatisticsTimePanelV.xaml</DependentUpon>
     </Compile>
@@ -479,10 +544,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SpecialPanel\SpecialPanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="StatisticsTimePanel\StatisticsTimePanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerV.xaml

@@ -32,12 +32,6 @@
                           Width="45"/>
    <TextBlock Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
               Style="{StaticResource OptionTextBlock}"/>
-   <ComboBox ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
-             SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
-             IsEnabled="{Binding FeatureManager_IsEnabled}"
-             Visibility="{Binding Variant_Visibility}"
-             Style="{StaticResource FeatureComboBox}"/>
-
    <Button Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerVM.vb

@@ -1,5 +1,4 @@
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class FeatureManagerVM
@@ -17,18 +16,6 @@ Public Class FeatureManagerVM
       End Set
    End Property
 
-
-   Private m_Variant_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property Variant_Visibility As Visibility
-      Get
-         Return m_Variant_Visibility
-      End Get
-   End Property
-   Public Sub SetVariant_Visibility(value As Visibility)
-      m_Variant_Visibility = value
-      NotifyPropertyChanged(NameOf(Variant_Visibility))
-   End Sub
-
    Public ReadOnly Property Edit_IsEnabled As Boolean
       Get
          Return m_FeatureManager_IsEnabled AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso
@@ -110,6 +97,7 @@ Public Class FeatureManagerVM
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
 
+
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -427,7 +427,7 @@ Public Class FreeContourManagerVM
       ' posiziono la griglia sul riferimento del contorno libero
       Dim frFace As New Frame3d
       EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
-      Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
+      Dim frFrame As Frame3d = SelFeature.BTLFeatureM.frFRAME
       frFrame.ToGlob( frFace)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml

@@ -24,7 +24,7 @@
          <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
                                  MinWidth="28">
             <DataGridCheckBoxColumn.Header>
-               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}" HorizontalAlignment="Center"/>
+               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}"/>
             </DataGridCheckBoxColumn.Header>
          </DataGridCheckBoxColumn>
          <!--Validità feature-->

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -1356,7 +1356,7 @@ Public Class LeftPanelVM
             NewFeat.CalcParamArray(vPar, sPar, vParQ)
             ' aggiorno la feature con nuovo valore
             EgtBeamSetPart(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, NewFeat.sDES,
+            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, "",
                                               Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
                                               New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
             bMacroFlag = False

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -172,17 +172,13 @@ Public Class MyMachGroupPanelVM
                   ' elimino pezzo copia
                   EgtRemovePartFromRawPart(nDuploId)
                   EgtErase(nDuploId)
-                  ' recupero gruppo di lavorazione e trave dell'interfaccia
+                  '' recupero gruppo di lavorazione e trave dell'interfaccia
                   Dim BeamMachGroup As MyMachGroupVM = MachGroupVMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
                   If Not IsNothing(BeamMachGroup) Then
                      Dim Beam As PartVM = BeamMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
                      EgtSetCurrMachGroup(BeamMachGroup.Id)
                      Beam.DeletePart()
                   End If
-                  ' reset necessario per poter ottenere nMachGroupId corretto
-                  EgtResetCurrMachGroup()
-                  ' aggiorno dati utilizzo barra
-                  BeamMachGroup.UpdateUsage()
                Next
                ' aggiorno quantita' in prod
                Dim BTLPart As BTLPartVM = CALCPanelVM.GetBTLPartVMFromBTLPartId(nPartId)

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -120,10 +120,6 @@ Public Class MyMachGroupVM
                               EgtMovePartInRawPart(Part.nPartId, New Vector3d(dValue - MyMachGroupM.dL, 0, 0))
                            Next
                         End If
-                        ' ripristino eventuale PosZ
-                        If MyMachGroupM.dPosZ >= 0 Then
-                           EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
-                        End If
                         EgtSetInfo(Id, MGR_RPT_PANELLEN, dValue)
                         EgtDraw()
                         MyMachGroupM.dL = dValue
@@ -195,10 +191,6 @@ Public Class MyMachGroupVM
                            EgtMovePartInRawPart(Part.nPartId, New Vector3d(0, dValue - MyMachGroupM.dW, 0))
                         Next
                      End If
-                     ' ripristino eventuale PosZ
-                     If MyMachGroupM.dPosZ >= 0 Then
-                        EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
-                     End If
                      EgtSetInfo(Id, MGR_RPT_PANELWIDTH, dValue)
                      EgtDraw()
                      MyMachGroupM.dW = dValue
@@ -534,7 +526,7 @@ Public Class MyMachGroupVM
          nRawId = EgtGetFirstRawPart()
       End While
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
-      Return ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False)
+      Return ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) 
    End Function
 
    Friend Sub MoveBeam(Beam As PartVM, MoveDirection As MoveDirections)
@@ -907,14 +899,14 @@ Class CopyPart
          Return m_BTLPart
       End Get
    End Property
-   Private m_sPosX As String
-   Public ReadOnly Property sPosX As String
+   Private m_sPosX As Double
+   Public ReadOnly Property sPosX As Double
       Get
          Return m_sPosX
       End Get
    End Property
-   Private m_sPosY As String
-   Public ReadOnly Property sPosY As String
+   Private m_sPosY As Double
+   Public ReadOnly Property sPosY As Double
       Get
          Return m_sPosY
       End Get
@@ -932,7 +924,7 @@ Class CopyPart
       End Get
    End Property
 
-   Sub New(BTLPart As BTLPartVM, sPosX As String, sPosY As String, dRot As Double, nFlip As Integer)
+   Sub New(BTLPart As BTLPartVM, sPosX As Double, sPosY As Double, dRot As Double, nFlip As Integer)
       m_BTLPart = BTLPart
       m_sPosX = sPosX
       m_sPosY = sPosY

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -157,13 +157,6 @@ Public Class MainWindowM
       End Get
    End Property
 
-   Private m_bSpecialPanel As Boolean = False
-   Friend ReadOnly Property bSpecialPanel As Boolean
-      Get
-         Return m_bSpecialPanel
-      End Get
-   End Property
-
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -242,8 +235,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -285,8 +278,6 @@ Public Class MainWindowM
       EgtSetUiUnits(GetMainPrivateProfileInt(S_SCENE, K_MMUNITS, 1) <> 0)
       ' Leggo e imposto livello utilizzatore
       m_nUserLevel = Math.Min(m_nKeyLevel, GetMainPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
-      ' Recupero flag SpecialPanel
-      m_bSpecialPanel = GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) = 1
       ' Imposto dir font Nfe e font default
       Dim sNfeDir As String = String.Empty
       GetMainPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)

EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.ViewerOptimizer")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.1.2")>
-<Assembly: AssemblyFileVersion("2.7.1.2")>
+<Assembly: AssemblyVersion("2.5.8.1")>
+<Assembly: AssemblyFileVersion("2.5.8.1")>

EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -22,6 +22,7 @@ Public Class NewOpenProjectFileDialogVM
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
+      ProdItem.m_delUpdateNameInDb = AddressOf DbControllers.m_ProdController.UpdateDescription
 
       NotifyPropertyChanged(NameOf(FilterTypeList))
       m_SelFilterType = m_FilterTypeList(0)
@@ -33,8 +34,9 @@ Public Class NewOpenProjectFileDialogVM
          SetFixedProjectList(True)
          NotifyPropertyChanged(NameOf(ProjectList))
       End If
-      m_ProjectList_View = CollectionViewSource.GetDefaultView(m_ProjectList)
-      m_ProjectList_View.Filter = AddressOf ProjectFilter
+      'm_ProjectList_View = CollectionViewSource.GetDefaultView(m_ProjectList)
+      'm_ProjectList_View.Filter = AddressOf ProjectFilter
+      UpdatePageList()
    End Function
 
    Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
@@ -44,19 +46,19 @@ Public Class NewOpenProjectFileDialogVM
       Dim dtEnd As DateTime
       Dim nRowQuantity As Integer = 20
       Select Case SelRowQuantity
-         Case RowQuantities.FIFTY
-            nRowQuantity = 50
-         Case RowQuantities.HUNDRED
-            nRowQuantity = 100
-         Case RowQuantities.HUNDREDANDFIFTY
-            nRowQuantity = 150
+         Case RowQuantities.TEN
+            nRowQuantity = 10
+         Case RowQuantities.TWENTY
+            nRowQuantity = 20
+         Case RowQuantities.THIRTY
+            nRowQuantity = 30
       End Select
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
-            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30.5)
+            dtEnd = DateTime.Today.AddDays(1)
+            dtStart = dtEnd.AddMonths(-1)
          Case DayTypes.LAST3MONTHS
-            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtEnd = DateTime.Today.AddDays(1)
             dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
@@ -70,31 +72,48 @@ Public Class NewOpenProjectFileDialogVM
       End Select
       ' leggo da db
       If m_ProjectType = ProjectType.PROJ Then
-         Dim DbProjList As New List(Of ProjFileM)
-         If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
-            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
-         Else
-            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
-         End If
-         For Each Project In DbProjList
-            If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
-            ' verifico se ha prod
-            If Not IsNothing(Project.nProdId) And Project.nProdId > 0 Then
-               ' verifico se prod e' gia' stato creato
-               Dim SameProdItem As ProdItem = m_ProjectList.FirstOrDefault(Function(x) Not IsNothing(x.ProdFileVM) AndAlso Not IsNothing(x.ProdFileVM.nProdId) AndAlso x.ProdFileVM.nProdId = Project.nProdId)
-               If Not IsNothing(SameProdItem) Then
-                  SameProdItem.ProjFileList.Add(New ProjFileVM(Project))
-               Else
-                  ' recupero Prod
-                  Dim NewDbProd As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(Project.nProdId)
-                  If Not IsNothing(NewDbProd) Then
-                     m_ProjectList.Add(New ProdItem(New ProdFileVM(NewDbProd), New ProjFileVM(Project)))
-                  End If
-               End If
-            Else
-               m_ProjectList.Add(New ProdItem(New ProjFileVM(Project)))
-            End If
-         Next
+         'Dim DbProjList As New List(Of ProjFileM)
+         'If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
+         '   DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, 100000, True, bViewArchived)
+         '   'DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
+         'Else
+         '   DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
+         'End If
+         'For Each Project In DbProjList
+         '   If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
+         '   ' verifico se ha prod
+         '   If Not IsNothing(Project.nProdId) And Project.nProdId > 0 Then
+         '      ' verifico se prod e' gia' stato creato
+         '      Dim SameProdItem As ProdItem = m_ProjectList.FirstOrDefault(Function(x) Not IsNothing(x.ProdFileVM) AndAlso Not IsNothing(x.ProdFileVM.nProdId) AndAlso x.ProdFileVM.nProdId = Project.nProdId)
+         '      If Not IsNothing(SameProdItem) Then
+         '         SameProdItem.ProjFileList.Add(New ProjFileVM(Project))
+         '      Else
+         '         ' recupero Prod
+         '         Dim NewDbProd As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(Project.nProdId)
+         '         If Not IsNothing(NewDbProd) Then
+         '            m_ProjectList.Add(New ProdItem(New ProdFileVM(NewDbProd), New ProjFileVM(Project)))
+         '         End If
+         '      End If
+         '   Else
+         '      m_ProjectList.Add(New ProdItem(New ProjFileVM(Project)))
+         '   End If
+         'Next
+         m_ProjectList = New ObservableCollection(Of Core.ProdItem)(DbControllers.m_ProdController.GetLastDescFull(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived))
+         'Dim sMachine As String = ""
+         'Dim sBtlFileName As String = ""
+         'Dim sListName As String = ""
+         'Dim bIsCreationDate As Boolean = True
+         'If SelFilterType.Id = FilterTypes.ID Then
+         '   '  sMachine = SearchText
+         'ElseIf SelFilterType.Id = FilterTypes.BTLFILENAME Then
+         '   sBtlFileName = SearchText
+         'ElseIf SelFilterType.Id = FilterTypes.LISTNAME Then
+         '   sListName = SearchText
+         'ElseIf SelFilterType.Id = FilterTypes.MACHINE Then
+         '   sMachine = SearchText
+         'End If
+         'm_ProjectList = New ObservableCollection(Of Core.ProdItem)(DbControllers.m_ProdController.GetLastDescFull(dtStart, dtEnd, bIsCreationDate, nRowQuantity * 3, True, sMachine, sBtlFileName, sListName, bViewArchived))
+         NotifyPropertyChanged(NameOf(ProjectList))
       ElseIf m_ProjectType = ProjectType.PROD Then
          Dim DbProdList As New List(Of ProdFileM)
          DbProdList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
@@ -135,6 +154,59 @@ Public Class NewOpenProjectFileDialogVM
       End If
    End Sub
 
+   Public Overrides Function UpdatePageList() As Boolean
+      Dim FilteredList As IEnumerable(Of Core.ProdItem) = m_ProjectList.Where(Function(x)
+                                                                                 If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso
+                                                                                    ((m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                                    (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                                    (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso x.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then Return False
+                                                                                 Return True
+                                                                              End Function)
+      Dim nPageRowQty As Integer = 0
+      Select Case m_SelRowQuantity
+         Case RowQuantities.TEN
+            nPageRowQty = 10
+         Case RowQuantities.TWENTY
+            nPageRowQty = 20
+         Case RowQuantities.THIRTY
+            nPageRowQty = 30
+      End Select
+      Dim nStart = (nPageIndex - 1) * nPageRowQty
+      Dim nEnd = Math.Min((nPageIndex * nPageRowQty), FilteredList.Count())
+      If nStart > FilteredList.Count() Then
+         Return False
+      End If
+      '   FilteredList = FilteredList.OrderBy(Of ProdItem)()
+      m_PageList = New ObservableCollection(Of ProdItem)(FilteredList.Skip(nStart).Take(nPageRowQty).Select(Function(x) x))
+      'm_PageList.Clear()
+      'For Index = nStart To nEnd
+      '   m_PageList.Add(FilteredList(Index))
+      'Next
+      NotifyPropertyChanged(NameOf(PageList))
+      Return True
+
+      'Dim bProjectOk As Boolean = True
+      ''If TypeOf Proj Is ProjFileVM Then
+      'Dim CurrProj As ProdItem = DirectCast(PROJ, ProdItem)
+      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+      '   (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).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.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+      'ElseIf TypeOf Proj Is ProdFileVM 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
+      ' Return bProjectOk
+   End Function
+
    Public Overrides Sub Archive()
       If IsNothing(SelProject) Then Return
       If Not IsNothing(SelProject.ProdFileVM) Then
@@ -250,33 +322,3 @@ Public Class NewOpenProjectFileDialogVM
 #End Region    ' METHODS
 
 End Class
-
-Public Class ProdItem
-   Inherits Core.ProdItem
-
-   Public Overrides Property sName As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-      End Get
-      Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            DbControllers.m_ProdController.UpdateDescription(m_ProdFileVM.nProdId, value)
-            m_ProdFileVM.sName = value
-            m_delIsModifiedSetUp(False)
-         End If
-      End Set
-   End Property
-
-   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-      MyBase.New(ProdFileVM, ProjFileVM)
-   End Sub
-
-   Sub New(ProjFileVM As ProjFileVM)
-      MyBase.New(ProjFileVM)
-   End Sub
-
-   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-      MyBase.New(ProdFileVM, ProjFileVMList)
-   End Sub
-
-End Class

EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -12,6 +12,7 @@ Public Class OpenProjectFileDialogVM
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
+      m_GoToProd = GoToProd
       ' carico colonne
       LoadColumns(ProjectType)
       NotifyPropertyChanged(NameOf(FilterTypeList))
@@ -19,7 +20,7 @@ Public Class OpenProjectFileDialogVM
       ' carico lista progetti
       If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
          SetFixedProjectList(False)
-         RefreshProjectList(GoToProd)
+         RefreshProjectList()
       Else
          SetFixedProjectList(True)
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
@@ -29,7 +30,7 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
-   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+   Public Overrides Sub RefreshProjectList()
       m_ProjectList.Clear()
       ' calcolo periodo e righe
       Dim dtStart As DateTime
@@ -66,30 +67,15 @@ Public Class OpenProjectFileDialogVM
          Else
             DbProjectList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, False)
          End If
-         For Each Project In DbProjectList
-            ' recupero path per verificare esista
-            If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
-            Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge"
-            If File.Exists(sPath) Then
-               m_ProjectList.Add(New ProjFileVM(Project))
-            Else
-               ' CheckMe impostata come cancellazione FISICA dal DB...
-               DbControllers.m_ProjController.DeleteProj(Project.nProjId, False)
-               EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000"))
-            End If
-         Next
-      ElseIf m_ProjectType = ProjectType.PROD Then
-         Dim DbProjectList As New List(Of ProdFileM)
-         DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True)
-         If GoToProd Then
+         If m_GoToProd Then
             For Each Project In DbProjectList
                ' recupero path per verificare esista
                If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
-               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge"
                If Project.sMachine = Map.refProjManagerVM.CurrProj.sMachine AndAlso
                   Project.nType = Map.refProjManagerVM.CurrProj.nType Then
                   If File.Exists(sPath) Then
-                     m_ProjectList.Add(New ProdFileVM(Project))
+                     m_ProjectList.Add(New ProjFileVM(Project))
                   Else
                      DbControllers.m_ProdController.DeleteProd(Project.nProdId, True)
                      EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
@@ -99,16 +85,31 @@ Public Class OpenProjectFileDialogVM
          Else
             For Each Project In DbProjectList
                ' recupero path per verificare esista
-               If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
-               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge"
                If File.Exists(sPath) Then
-                  m_ProjectList.Add(New ProdFileVM(Project))
+                  m_ProjectList.Add(New ProjFileVM(Project))
                Else
-                  DbControllers.m_ProdController.DeleteProd(Project.nProdId, True)
-                  EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+                  ' CheckMe impostata come cancellazione FISICA dal DB...
+                  DbControllers.m_ProjController.DeleteProj(Project.nProjId, False)
+                  EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000"))
                End If
             Next
          End If
+      ElseIf m_ProjectType = ProjectType.PROD Then
+         Dim DbProjectList As New List(Of ProdFileM)
+         DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True)
+         For Each Project In DbProjectList
+            ' recupero path per verificare esista
+            If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
+            Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+            If File.Exists(sPath) Then
+               m_ProjectList.Add(New ProdFileVM(Project))
+            Else
+               DbControllers.m_ProdController.DeleteProd(Project.nProdId, True)
+               EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+            End If
+         Next
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb

@@ -438,7 +438,7 @@ Public Class ProjManagerVM
             Dim OpenFile As New NewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM)
             Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROJ)
             If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-            Dim TempProd As ProdItem = OpenProdFileDialogVM.SelProject
+            Dim TempProd As Core.ProdItem = OpenProdFileDialogVM.SelProject
             If TempProd.ProjFileList.Count > 1 Then
                ' apro dialogo di scelta Proj
                Dim OpenProjFileDialogVM As OpenProjectFileDialogVM = Nothing

EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml

@@ -52,8 +52,6 @@
             <EgtBEAMWALL:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
             <EgtBEAMWALL:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
             <EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
-            <EgtBEAMWALL:SpecialPanelV DataContext="{StaticResource SpecialPanelVM}"
-                                       Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
             <EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
                                              Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
          </WrapPanel>

EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb

@@ -3,7 +3,6 @@ Imports EgtBEAMWALL.Core
 Imports EgtWPFLib5
 Imports EgtUILib
 Imports System.Collections.ObjectModel
-Imports EgtBEAMWALL.DataLayer.Controllers
 
 Public Class ProjectVM
    Inherits VMBase
@@ -12,12 +11,6 @@ Public Class ProjectVM
 
    Private m_Calc_Timer As New DispatcherTimer
 
-   Friend Event OnPreControllerExec(sFilePath As String)
-   Friend Event OnPostControllerExec()
-
-   ' Flag per non salvare Script appena eseguito in elenco MruScript
-   Private m_bScriptInMru As Boolean = True
-
    Private Property m_GridDims As New ObservableCollection(Of GridDimension)
    Public Property GridDims As ObservableCollection(Of GridDimension)
       Get
@@ -196,13 +189,6 @@ Public Class ProjectVM
       NotifyPropertyChanged("FreeContourManager_Visibility")
    End Sub
 
-   Public ReadOnly Property SpecialPanel_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-
    Friend Sub NotifyAllPanelVisibility()
       NotifyPropertyChanged("LeftPanel_Visibility")
       NotifyPropertyChanged("TopPanel_Visibility")

EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb

@@ -59,16 +59,10 @@ Public Class MySceneHostVM
          PostInitializeScene()
          ' Imposto stato gestione mouse diretto della scena a nessuno
          MainScene.SetStatusNull()
-         ' Imposto focus pulsante su false 
-         MainScene.SetFocusOnMove(False)
          ' Recupero e imposto handle finestra principale
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
          EgtSetCurrentContext(MainScene.GetCtx())
-         ' Imposto direttorio ausiliario per import/gestione BTL
-         Dim sBtlAuxDir As String = String.Empty
-         GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
-         EgtSetBtlAuxDir(sBtlAuxDir)
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelV.xaml

@@ -1,24 +0,0 @@
-<EgtFloating:EgtFloatingPanel x:Class="SpecialPanelV"
-                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
-
-   <ItemsControl ItemsSource="{Binding ButtonList}">
-      <ItemsControl.ItemsPanel>
-         <ItemsPanelTemplate>
-            <StackPanel Orientation="Horizontal"/>
-         </ItemsPanelTemplate>
-      </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
-            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}" 
-                    Visibility="{Binding Btn_Visibility}" IsEnabled="{Binding Btn_IsEnabled}">
-               <Image Source="{Binding ImagePath}"/>
-            </Button>
-         </DataTemplate>
-      </ItemsControl.ItemTemplate>
-   </ItemsControl>
-   
-</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb

@@ -1,202 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL.Core
-
-Public Class SpecialPanelVM
-
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
-      Get
-         Return m_ButtonList
-      End Get
-   End Property
-
-   Sub New()
-      ' Creo riferimento a questa classe in Map
-      Map.SetRefSpecialPanelVM(Me)
-      ' se attivo, inizializzo i bottoni leggendoli da file ini
-      If Map.refMainWindowVM.MainWindowM.bSpecialPanel Then
-         Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonItem = Nothing
-         While GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)
-            m_ButtonList.Add(CurrBtn)
-            BtnIndex += 1
-         End While
-      End If
-   End Sub
-
-#Region "METHODS"
-
-   Public Function SetSpecialPanelButtonsVisibility(IsMachMode As Boolean) As Boolean
-      Dim bSpecialPanel_Visible As Boolean = False
-      For Each BtnItem In m_ButtonList
-         ' verifico il valore di nDrawMachOrBoth del bottone e IsMachMode per rendere visibile o meno il bottone in ButtonList
-         Select Case BtnItem.nDrawMachOrBoth
-            Case 0 ' bottone nascosto
-               BtnItem.m_Btn_Visibility = Visibility.Collapsed
-            Case 1 ' bottone visibile solo in Draw
-               BtnItem.m_Btn_Visibility = If(Not IsMachMode, Visibility.Visible, Visibility.Collapsed)
-            Case 2 ' bottone visibile solo in Machining
-               BtnItem.m_Btn_Visibility = If(IsMachMode, Visibility.Visible, Visibility.Collapsed)
-            Case 3 ' bottone visibile sia in Draw che in Machining
-               BtnItem.m_Btn_Visibility = Visibility.Visible
-         End Select
-         ' se anche uno solo è visibile anche lo SpecialPanel dovrà esserlo
-         If BtnItem.Btn_Visibility = Visibility.Visible Then bSpecialPanel_Visible = True
-         'BtnItem.OnPropertyChanged(NameOf(BtnItem.Btn_Visibility))
-         BtnItem.NotifyPropertyChanged(NameOf(BtnItem.Btn_Visibility))
-      Next
-      Return bSpecialPanel_Visible
-   End Function
-
-   Friend Sub SpecialPanelIsEnabled(SpecialPanelBtn_IsEnabled As Boolean)
-      For Each BtnItem In m_ButtonList
-         BtnItem.m_Btn_IsEnabled = SpecialPanelBtn_IsEnabled
-         'BtnItem.OnPropertyChanged(NameOf(BtnItem.Btn_IsEnabled))
-         BtnItem.NotifyPropertyChanged(NameOf(BtnItem.Btn_IsEnabled))
-      Next
-   End Sub
-
-   Public Function GetPrivateProfileButton(sSection As String, sKey As String, sBaseDir As String, ByRef ReadButtonItem As ButtonItem) As Boolean
-      ReadButtonItem = Nothing
-      Dim sVal As String = String.Empty
-      GetMainPrivateProfileString(sSection, sKey, "", sVal)
-      If String.IsNullOrWhiteSpace(sVal) Then Return False
-      Dim sItems() As String = sVal.Split(","c)
-      If sItems.Count() >= 1 Then
-         Dim sLuaPath As String = sItems(0)
-         Dim sImagePath As String = If(sItems.Count() >= 2, sItems(1), "")
-         Dim sToolTip As String = If(sItems.Count() >= 3, sItems(2), "")
-         Dim sDrawMachOrBoth As String = If(sItems.Count() >= 4 AndAlso Not String.IsNullOrWhiteSpace(sItems(3)), sItems(3), "1")
-         If Not String.IsNullOrWhiteSpace(sBaseDir) And Not String.IsNullOrWhiteSpace(sLuaPath) Then
-            If sLuaPath.Contains(".lua") Then sLuaPath = sBaseDir & "\" & sLuaPath
-            If Not String.IsNullOrWhiteSpace(sImagePath) Then sImagePath = sBaseDir & "\" & sImagePath
-         End If
-         ReadButtonItem = New ButtonItem(sSection, sLuaPath, sImagePath, sToolTip, sDrawMachOrBoth)
-         Return True
-      End If
-      Return False
-   End Function
-
-#End Region    ' Methods
-
-End Class
-
-Public Class ButtonItem
-   Inherits VMBase
-
-   Friend Shared WithEvents m_ProjectVM As ProjectVM
-   Private Shared m_sCurrBarName As String
-
-   Private m_sBarName As String
-   Private m_sImagePath As String
-   Public ReadOnly Property ImagePath As String
-      Get
-         Return m_sImagePath
-      End Get
-   End Property
-   Private m_sLuaCmdPath As String
-   Private m_sToolTip As String
-   Public ReadOnly Property ToolTip As String
-      Get
-         Return m_sToolTip
-      End Get
-   End Property
-   Private m_nDrawMachOrBoth As Integer
-   Public ReadOnly Property nDrawMachOrBoth As Integer
-      Get
-         Return m_nDrawMachOrBoth
-      End Get
-   End Property
-   Friend m_Btn_Visibility As Visibility
-   Public ReadOnly Property Btn_Visibility As Visibility
-      Get
-         Return m_Btn_Visibility
-      End Get
-   End Property
-
-   Friend m_Btn_IsEnabled As Boolean = True
-   Public ReadOnly Property Btn_IsEnabled As Boolean
-      Get
-         Return m_Btn_IsEnabled
-      End Get
-   End Property
-
-   ' Definizione comandi
-   Private m_cmdLuaExec As ICommand
-
-   Sub New( sBarName As String, sLuaCmdPath As String, sImagePath As String, sToolTip As String, sDrawMachOrBoth As String)
-      m_sBarName = sBarName
-      If File.Exists(sImagePath) Then
-         ' per lasciare libere le immagini le copio (potrebbe fallire perchè bloccate da altro eseguibile)
-         Dim sNewPath As String = Path.Combine(Map.refMainWindowVM.MainWindowM.sResourcesRoot, sBarName & "_" & Path.GetFileName(sImagePath))
-         Try
-            File.Copy( sImagePath, sNewPath, True)
-         Catch ex As Exception
-         End Try
-         m_sImagePath = sNewPath
-      Else
-         m_sImagePath = Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\" & sImagePath
-      End If
-      m_sLuaCmdPath = sLuaCmdPath
-      m_sToolTip = sToolTip
-      If Not Integer.TryParse(sDrawMachOrBoth, m_nDrawMachOrBoth) Then m_nDrawMachOrBoth = 0
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "LuaExecCommand"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property LuaExecCommand As ICommand
-      Get
-         If m_cmdLuaExec Is Nothing Then
-            m_cmdLuaExec = New Command(AddressOf LuaExec)
-         End If
-         Return m_cmdLuaExec
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Sub LuaExec(ByVal param As Object)
-      If String.IsNullOrWhiteSpace(m_sLuaCmdPath) Then Return
-      If Not File.Exists(m_sLuaCmdPath) Then Return
-      If Not Path.GetExtension(m_sLuaCmdPath).ToLower = ".lua" Then Return
-      ' Abilito eventi se comando lua termina con Beam\Process.lua
-      m_sCurrBarName = m_sBarName
-      Dim bRaiseEvent As Boolean = ( m_sBarName = "Beam"  OrElse m_sBarName = "Wall")
-      ' eseguo file Lua
-      EgtBEAMWALL.ViewerOptimizer.LuaExec.ExecScript(m_sLuaCmdPath, bRaiseEvent)
-      m_sCurrBarName = Nothing
-   End Sub
-
-   'Private Shared Sub OnPreControllerExec(sFilePath As String) Handles m_ProjectVM.OnPreControllerExec
-   '   If m_sCurrBarName = "Beam" Then
-   '      EgtLuaCreateGlobTable("BEAM")
-   '      EgtLuaSetGlobStringVar("BEAM.BASEDIR", IniFile.m_sBeamDirPath)
-   '      If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 then EgtLuaSetGlobBoolVar("BEAM.BW", true)
-   '   ElseIf m_sCurrBarName = "Wall" Then
-   '      EgtLuaCreateGlobTable("WALL")
-   '      EgtLuaSetGlobStringVar("WALL.BASEDIR", IniFile.m_sWallDirPath)
-   '      If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 then EgtLuaSetGlobBoolVar("WALL.BW", true)
-   '   End If
-   'End Sub
-
-   'Private Shared Sub OnPostControllerExec() Handles m_ProjectVM.OnPostControllerExec
-   '   If m_sCurrBarName = "Beam" Then
-   '      EgtLuaResetGlobVar("BEAM")
-   '   ElseIf m_sCurrBarName = "Wall" Then
-   '      EgtLuaResetGlobVar("WALL")
-   '   End If
-   'End Sub
-
-#End Region ' LuaExecCommand
-
-#End Region    ' Commands
-
-End Class

EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb

@@ -68,8 +68,6 @@ Public Module DbControllers
          DataLayer.DbConfig.CheckMigrateDb()
          DataLayer.DbConfig.CheckUser(sUser, sPwd, m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
          DataLayer.DbConfig.CheckViews(sUser, sPwd)
-         ' riattivare il dump per il backup
-         'DataLayer.DbConfig.DumpDB("C:\Program Files\MariaDB 10.5\bin\mysqldump", "c:\Temp\Pippo.sql")
          If m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
             ' imposto cartella condivisa
             GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataDir, sSharedFolder)

EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml

@@ -51,7 +51,6 @@
    <OmagOFFICE:MachiningTabVM x:Key="MachiningTabVM"/>
    <OmagOFFICE:SimulTabVM x:Key="SimulTabVM"/>-->
    <EgtBEAMWALL:MyMachGroupPanelVM x:Key="MachGroupPanelVM"/>
-   <EgtBEAMWALL:SpecialPanelVM x:Key="SpecialPanelVM"/>
 
    <!--Colori predefiniti-->
    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
@@ -311,13 +310,6 @@
       </Style.Triggers>
    </Style>
 
-
-   <Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
-   </Style>
-
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBlock -->

EgtBEAMWALL.ViewerOptimizer/Utility/LuaExec.vb

@@ -1,5 +1,4 @@
 Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.DataLayer.Controllers
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -204,17 +203,4 @@ Module LuaExec
       Return bOk
    End Function
 
-   ' Special Panel
-   Friend Sub ExecScript(sFilePath As String, Optional bRaiseEvent As Boolean = False)
-      EgtLuaExecFile(sFilePath)
-
-      'Dim bMachiningMode As Boolean = EgtGetCurrMachGroup() <> GDB_ID.NULL
-      'If Not bMachiningMode And EgtGetCurrLayer() = GDB_ID.NULL Then
-      '   Dim nCurrPart As Integer = EgtGetCurrPart()
-      '   If nCurrPart = GDB_ID.NULL Or Not EgtSetCurrPartLayer(nCurrPart, EgtGetFirstLayer(nCurrPart, True)) Then
-      '      EgtResetCurrPartLayer()
-      '   End If
-      'End If
-   End Sub
-
 End Module

EgtBEAMWALL.ViewerOptimizer/Utility/Map.vb

@@ -34,7 +34,6 @@ Module Map
    Private m_refFeatureManagerVM As FeatureManagerVM
    Private m_refAddSectionXMaterialWndVM As AddSectionXMaterialWndVM
    Private m_refStatisticsTimePanelVM As StatisticsTimePanelVM
-   Private m_refSpecialPanelVM As SpecialPanelVM
    'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
    'Private m_refRawPartTabVM As RawPartTabVM
    'Private m_refNestingTabVM As NestingTabVM
@@ -242,12 +241,6 @@ Module Map
       End Get
    End Property
 
-   Public ReadOnly Property refSpecialPanelVM As SpecialPanelVM
-      Get
-         Return m_refSpecialPanelVM
-      End Get
-   End Property
-
    'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
    '   Get
    '      Return m_refOpenProjectFileDialogVM
@@ -460,12 +453,6 @@ Module Map
       Return Not IsNothing(m_refStatisticsTimePanelVM)
    End Function
 
-   Friend Function SetRefSpecialPanelVM(SpecialPanelVM As SpecialPanelVM) As Boolean
-      m_refSpecialPanelVM = SpecialPanelVM
-      Return Not IsNothing(m_refSpecialPanelVM)
-   End Function
-
-
    'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
    '   m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
    '   Return Not IsNothing(m_refOpenProjectFileDialogVM)
@@ -539,7 +526,7 @@ Module Map
              Not IsNothing(m_refStatisticsVM) AndAlso Not IsNothing(m_refPParameterListVM) AndAlso
              Not IsNothing(m_refQParameterListVM) AndAlso Not IsNothing(m_refFeatureManagerVM) AndAlso
              Not IsNothing(m_refAddSectionXMaterialWndVM) AndAlso Not IsNothing(m_refStatisticsTimePanelVM) AndAlso
-             Not IsNothing(m_refSpecialPanelVM) AndAlso LibMap.EndInit()
+             LibMap.EndInit()
    End Function
 
 #End Region    ' Init

EgtBEAMWALL.sln

@@ -13,33 +13,58 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgtBEAMWALL.Core", "EgtBEAM
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		RemoteDebug|x64 = RemoteDebug|x64
 		RemoteDebug|x86 = RemoteDebug|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x64.ActiveCfg = Debug|x64
+		{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x64.Build.0 = Debug|x64
 		{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x86.ActiveCfg = Debug|x86
 		{57291955-F9C4-4466-8D53-476D43BA3659}.Debug|x86.Build.0 = Debug|x86
+		{57291955-F9C4-4466-8D53-476D43BA3659}.Release|x64.ActiveCfg = Release|x64
+		{57291955-F9C4-4466-8D53-476D43BA3659}.Release|x64.Build.0 = Release|x64
 		{57291955-F9C4-4466-8D53-476D43BA3659}.Release|x86.ActiveCfg = Release|x86
 		{57291955-F9C4-4466-8D53-476D43BA3659}.Release|x86.Build.0 = Release|x86
+		{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x64.ActiveCfg = RemoteDebug|x64
+		{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x64.Build.0 = RemoteDebug|x64
 		{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x86.ActiveCfg = RemoteDebug|x86
 		{57291955-F9C4-4466-8D53-476D43BA3659}.RemoteDebug|x86.Build.0 = RemoteDebug|x86
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x64.ActiveCfg = Debug|x64
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x64.Build.0 = Debug|x64
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x86.ActiveCfg = Debug|x86
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Debug|x86.Build.0 = Debug|x86
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x64.ActiveCfg = Release|x64
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x64.Build.0 = Release|x64
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x86.ActiveCfg = Release|x86
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.Release|x86.Build.0 = Release|x86
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x64.ActiveCfg = RemoteDebug|x64
+		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x64.Build.0 = RemoteDebug|x64
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x86.ActiveCfg = RemoteDebug|x86
 		{B71DA327-38C8-4305-BBA1-34F3F3F32405}.RemoteDebug|x86.Build.0 = RemoteDebug|x86
+		{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x64.Build.0 = Debug|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.Debug|x86.Build.0 = Debug|Any CPU
+		{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x64.ActiveCfg = Release|Any CPU
+		{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x64.Build.0 = Release|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x86.ActiveCfg = Release|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.Release|x86.Build.0 = Release|Any CPU
+		{24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x64.ActiveCfg = Release|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x86.ActiveCfg = Release|Any CPU
 		{24D7760E-662A-47E4-B729-B70126C24A31}.RemoteDebug|x86.Build.0 = Release|Any CPU
+		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Debug|x86.Build.0 = Debug|Any CPU
+		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x64.ActiveCfg = Release|Any CPU
+		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x64.Build.0 = Release|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x86.ActiveCfg = Release|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.Release|x86.Build.0 = Release|Any CPU
+		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x64.ActiveCfg = Release|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x86.ActiveCfg = Release|Any CPU
 		{F22835A1-83D8-4334-91BB-BAAEB9CF59B1}.RemoteDebug|x86.Build.0 = Release|Any CPU
 	EndGlobalSection