Merge branch 'DataLayer' into develop

- BtlName
- ListName
- Machine
- tipo data

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/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/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"

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -7,9 +7,6 @@
 
    Public Const K_NCTYPE As String = "NCType"
    Public Const K_CONNECTIONSTRING As String = "ConnectionString"
-   Public Const K_SUPERVISOR As String = "Supervisor"
-   Public Const K_SAVECNCPATH As String = "SaveCncPath"
-   Public Const K_SAVEEXT As String = "SaveExt"
 
    Public Const S_CHANNELS As String = "Channels"
 

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.4.1")>
-<Assembly: AssemblyFileVersion("2.7.4.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -779,94 +779,3 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 End Class
 
-Public Class ProdItem
-   Inherits VMBase
-
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-   Public ReadOnly Property ProdFileVM As ProdFileVM
-      Get
-         Return m_ProdFileVM
-      End Get
-   End Property
-
-   Private m_ProjFileList As New List(Of ProjectFileVM)
-   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-      Get
-         Return m_ProjFileList
-      End Get
-   End Property
-
-   Public ReadOnly Property sProdId As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-      End Get
-   End Property
-
-   Public Overridable Property sName As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-      End Get
-      Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            m_ProdFileVM.sName = value
-         End If
-      End Set
-   End Property
-
-   Public ReadOnly Property dtCreateDate As Date
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-      End Get
-   End Property
-   Public ReadOnly Property sCreateDate As String
-      Get
-         Return dtCreateDate.ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property sMachine As String
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.sMachine
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).sMachine
-         Else Return ""
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsArchived As Boolean
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.bIsArchived
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).bIsArchived
-         Else
-            Return True
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property Archived_Visibility As Visibility
-      Get
-         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList.Add(ProjFileVM)
-   End Sub
-
-   Sub New(ProjFileVM As ProjFileVM)
-      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-   End Sub
-
-   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList = ProjFileVMList
-   End Sub
-
-End Class

EgtBEAMWALL.Core/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,116 @@
+
+Imports EgtWPFLib5
+Imports System.Windows
+
+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
+
+
+   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/App.config

@@ -13,7 +13,7 @@
       </providers>
    </entityFramework>
    <connectionStrings>
-      <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=Egalware_24068!;Persist Security Info=True;database=EgtBwDb_000470;SslMode=none" providerName="MySql.Data.MySqlClient" />
+      <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=steamware_password;Persist Security Info=True;database=EgtBwDb_000470;SslMode=none" providerName="MySql.Data.MySqlClient" />
    </connectionStrings>
    <runtime>
       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

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/DatabaseContext.cs

@@ -80,6 +80,21 @@ namespace EgtBEAMWALL.DataLayer
         /// </summary>
         public DbSet<StatusMapModel> StatusMapList { get; set; }
 
+        /// <summary>
+        /// Wharehouse materials management
+        /// </summary>
+        public DbSet<MaterialModel> MaterialsList { get; set; }
+
+        /// <summary>
+        /// Wharehouse items management
+        /// </summary>
+        public DbSet<RawItemModel> RawItemList { get; set; }
+
+        /// <summary>
+        /// Alias management
+        /// </summary>
+        public DbSet<AliasModel> AliasList { get; set; }
+
         #endregion Public Properties
 
         #region Public Methods

EgtBEAMWALL.DataLayer/DatabaseModels/AliasModel.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EgtBEAMWALL.DataLayer.DatabaseModels
+{
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
+    [Table("AliasList")]
+    public class AliasModel
+    {
+        /// <summary>
+        /// Famiglia di sinonimi
+        /// </summary>
+        [Column("Family", Order = 1), Key]
+        public string Family { get; set; } = "";
+
+        /// <summary>
+        /// Codice originale (da trasformare)
+        /// </summary>
+        [Column("ValueOriginal", Order = 2), Key]
+        public string ValueOriginal { get; set; } = "";
+
+        /// <summary>
+        /// Codice Alias <inheritdoccui viene convertito/>
+        /// </summary>
+        public string ValueAlias { get; set; } = "";
+    }
+}

EgtBEAMWALL.DataLayer/DatabaseModels/MaterialModel.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EgtBEAMWALL.DataLayer.DatabaseModels
+{
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
+    [Table("MaterialsList")]
+    public partial class MaterialModel
+    {
+        /// <summary>
+        /// Init classe
+        /// </summary>
+        public MaterialModel()
+        {
+            RawItemList = new HashSet<RawItemModel>();
+        }
+
+        /// <summary>
+        /// Primary Key AUTO
+        /// </summary>
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int MatId { get; set; }
+
+        /// <summary>
+        /// Codice materiale (Identificativo esterno del magazzino in sync)
+        /// </summary>
+        public int MatExtId { get; set; } = 0;
+
+        /// <summary>
+        /// Codice Materiale
+        /// </summary>
+        public string MatCode { get; set; } = "";
+
+        /// <summary>
+        /// Descrizione Materiale
+        /// </summary>
+        public string MatDesc { get; set; } = "";
+
+        /// <summary>
+        /// Lenght/Lunghezza in mm
+        /// </summary>
+        public decimal LMm { get; set; } = 0;
+        /// <summary>
+        /// Width/Larghezza in mm
+        /// </summary>
+        public decimal WMm { get; set; } = 0;
+        /// <summary>
+        /// Height (Thikness/Spessore) in mm
+        /// </summary>
+        public decimal HMm { get; set; } = 0;
+
+        /// <summary>
+        /// ID dell'ultimo articolo (variante) usato per il materiale
+        /// </summary>
+        public int RawItemIdLast { get; set; } = 0;
+
+#if false
+        /// <summary>
+        /// Lenght/Lunghezza in inch
+        /// </summary>
+        [NotMapped]
+        public decimal LIn
+        {
+            get => Math.Round(LMm / (decimal)25.4, 3);
+        }
+        /// <summary>
+        /// Width/Larghezza in inch
+        /// </summary>
+        [NotMapped]
+        public decimal WIn
+        {
+            get => Math.Round(WMm / (decimal)25.4, 3);
+        }
+        /// <summary>
+        /// Height/Altezza (Thikness/Spessore) in inch
+        /// </summary>
+        [NotMapped]
+        public decimal HIn
+        {
+            get => Math.Round(HMm / (decimal)25.4, 3);
+        }
+
+        /// <summary>
+        /// Codice materiale x QR/Datamatrix
+        /// </summary>
+        [NotMapped]
+        public string MatDtmx
+        {
+            get => $"MT{MatExtId:00000000}";
+        } 
+#endif
+
+        public virtual ICollection<RawItemModel> RawItemList { get; set; }
+    }
+}

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
@@ -19,6 +17,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
+        public ProdModel()
+        {
+            ProjListNav = new HashSet<ProjModel>();
+        }
+
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -98,6 +101,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/DatabaseModels/RawItemModel.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EgtBEAMWALL.DataLayer.DatabaseModels
+{
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
+    //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))]
+    [Table("RawItemList")]
+    public partial class RawItemModel
+    {
+        /// <summary>
+        /// Primary Key AUTO
+        /// </summary>
+        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int RawItemId { get; set; }
+
+        /// <summary>
+        /// ForeignKey Materiale
+        /// </summary>
+        public int MatId { get; set; } = 0;
+
+        /// <summary>
+        /// Qty available on wharehouse
+        /// </summary>
+        public int QtyAvail { get; set; } = 0;
+
+        /// <summary>
+        /// Check if is a Remnant
+        /// </summary>
+        public bool IsActive { get; set; } = false;
+
+        /// <summary>
+        /// Item's Lenght
+        /// </summary>
+        public decimal LMm { get; set; } = 0;
+
+        /// <summary>
+        /// Item's Width
+        /// </summary>
+        public decimal WMm { get; set; } = 0;
+
+        /// <summary>
+        /// Item's Height (Thikness/Spessore) in mm
+        /// </summary>
+        public decimal HMm { get; set; } = 0;
+
+        /// <summary>
+        /// Note (optional)
+        /// </summary>
+        public string Note { get; set; } = "";
+
+#if false
+        [NotMapped]
+        public decimal LIn
+        {
+            get => Math.Round(LMm / (decimal)25.4, 3);
+        }
+        [NotMapped]
+        public decimal WIn
+        {
+            get => Math.Round(WMm / (decimal)25.4, 3);
+        }
+        [NotMapped]
+        public decimal HIn
+        {
+            get => Math.Round(HMm / (decimal)25.4, 3);
+        }
+
+        [NotMapped]
+        public decimal Area
+        {
+            get => LMm * WMm;
+        } 
+
+        [NotMapped]
+        public string ItemDtmx
+        {
+            get
+            {
+                string answ = $"MT99999999-{LMm * 1000:00000000}";
+                if (MaterialNav != null)
+                {
+                    answ = $"MT{MaterialNav.MatExtId:00000000}-{LMm * 1000:00000000}";
+                }
+                return answ;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Navigation property to Material
+        /// </summary>
+        [ForeignKey("MatId")]
+        public virtual MaterialModel MaterialNav { get; set; }
+
+    }
+}

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -33,9 +33,9 @@ namespace EgtBEAMWALL.DataLayer
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
+        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;)
         /// </summary>
-        public static string CONNECTION_STRING { get; set; } = "";
+        public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!";
 
         #endregion Public Properties
 

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -126,6 +126,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminContext.cs" />
+    <Compile Include="DatabaseModels\AliasModel.cs" />
+    <Compile Include="DatabaseModels\MaterialModel.cs" />
+    <Compile Include="DatabaseModels\RawItemModel.cs" />
     <Compile Include="DatabaseModels\UserPrivModel.cs" />
     <Compile Include="DbConfig.cs" />
     <Compile Include="Controllers\LogMachineController.cs" />
@@ -187,6 +190,10 @@
     <Compile Include="Migrations\202308250853396_AddProjArchivedField.designer.cs">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.cs" />
+    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.designer.cs">
+      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
@@ -235,6 +242,9 @@
     <EmbeddedResource Include="Migrations\202308250853396_AddProjArchivedField.resx">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.resx">
+      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

EgtBEAMWALL.DataLayer/Migrations/202401181534084_AddAliasMaterialRawItemsModel.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
+    public sealed partial class AddAliasMaterialRawItemsModel : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddAliasMaterialRawItemsModel));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202401181534084_AddAliasMaterialRawItemsModel"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202401181534084_AddAliasMaterialRawItemsModel.cs

@@ -0,0 +1,63 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddAliasMaterialRawItemsModel : DbMigration
+    {
+        public override void Up()
+        {
+            CreateTable(
+                "dbo.AliasList",
+                c => new
+                    {
+                        Family = c.String(nullable: false, maxLength: 128, storeType: "nvarchar"),
+                        ValueOriginal = c.String(nullable: false, maxLength: 128, storeType: "nvarchar"),
+                        ValueAlias = c.String(unicode: false),
+                    })
+                .PrimaryKey(t => new { t.Family, t.ValueOriginal });
+            
+            CreateTable(
+                "dbo.MaterialsList",
+                c => new
+                    {
+                        MatId = c.Int(nullable: false, identity: true),
+                        MatExtId = c.Int(nullable: false),
+                        MatCode = c.String(unicode: false),
+                        MatDesc = c.String(unicode: false),
+                        LMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        WMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        HMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        RawItemIdLast = c.Int(nullable: false),
+                    })
+                .PrimaryKey(t => t.MatId);
+            
+            CreateTable(
+                "dbo.RawItemList",
+                c => new
+                    {
+                        RawItemId = c.Int(nullable: false, identity: true),
+                        MatId = c.Int(nullable: false),
+                        QtyAvail = c.Int(nullable: false),
+                        IsActive = c.Boolean(nullable: false),
+                        LMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        WMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        HMm = c.Decimal(nullable: false, precision: 18, scale: 2),
+                        Note = c.String(unicode: false),
+                    })
+                .PrimaryKey(t => t.RawItemId)
+                .ForeignKey("dbo.MaterialsList", t => t.MatId, cascadeDelete: true)
+                .Index(t => t.MatId);
+            
+        }
+        
+        public override void Down()
+        {
+            DropForeignKey("dbo.RawItemList", "MatId", "dbo.MaterialsList");
+            DropIndex("dbo.RawItemList", new[] { "MatId" });
+            DropTable("dbo.RawItemList");
+            DropTable("dbo.MaterialsList");
+            DropTable("dbo.AliasList");
+        }
+    }
+}

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.4.1")]
-[assembly: AssemblyFileVersion("2.7.4.1")]
+[assembly: AssemblyVersion("2.5.12.2")]
+[assembly: AssemblyFileVersion("2.5.12.2")]

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/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, 2704, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2704, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 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.4.1")>
-<Assembly: AssemblyFileVersion("2.7.4.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

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,12 +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)
-         If Not EgtSetBtlAuxDir(sBtlAuxDir) Then
-            EgtOutLog("Missing BtlAuxDir path! Will be impossible to load Variant!")
-         End If
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

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
@@ -1536,30 +1535,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 +1724,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/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/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>

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

@@ -928,15 +928,8 @@ Public Class LeftPanelVM
          Case MCH_CR.BR
             dPosX = WallMachGroup.dL - PartToAdd.dL - dPosX
       End Select
-      ' calcolo box del pezzo e del suo layer box per compensare la  eventuale differenza
-      Dim b3Part As New BBox3d
-      EgtGetBBoxGlob(nPartDuploId, GDB_BB.STANDARD, b3Part)
-      Dim b3Box As New BBox3d
-      Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartDuploId, "Box")
-      EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-      Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
       ' aggiungo il pezzo al grezzo
-      If EgtAddPartToRawPart(nPartDuploId, New Point3d(dPosX - vtDeltaBox.x, dPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), WallMachGroup.MyMachGroupM.nRawPartId) Then
+      If EgtAddPartToRawPart(nPartDuploId, New Point3d(dPosX, dPosY, 0), WallMachGroup.MyMachGroupM.nRawPartId) Then
          EgtSetInfo(nPartDuploId, MGR_PRT_POSX, dPosX)
          EgtSetInfo(nPartDuploId, MGR_PRT_POSY, dPosY)
          EgtSetInfo(nPartDuploId, MGR_PRT_ROT, PartToAdd.nROTATED)
@@ -1363,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/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/MachGroupPanel/PartVM.vb

@@ -213,7 +213,7 @@ Public Class PartVM
             ' calcolo distanza tra i box
             Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
             ' reinserisco il pezzo nel grezzo
-            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
             ' lo riseleziono
             EgtSelectObj(nPartId)
             ' resetto validazione del pezzo

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -242,8 +242,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2704, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2704, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 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())

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.4.1")>
-<Assembly: AssemblyFileVersion("2.7.4.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

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/ProdManager/ProdManagerVM.vb

@@ -611,32 +611,27 @@ Public Class ProdManagerVM
    ''' </summary>
    Friend Sub GoToSupervisor()
       If IsNothing(m_CurrProd) Then Return
-      ' verifico se modalita' supervisore attiva
-      If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
-         ' apro supervisore
-         Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
-         ' recupero processo del supervisore
-         Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
-         If localProc.Length > 0 Then
-            For Each p As Process In localProc
-               ' porto in primo piano il Supervisor
-               BringWindowToFront(p.MainWindowHandle)
-               Exit For
-            Next
-         Else
-            Dim sSupervisorPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sSupervisorName & ".exe"
-            Try
-               Process.Start(sSupervisorPath, "1 " & CurrProd.nProdId)
-            Catch ex As Exception
-               EgtOutLog("Error: impossible starting supervisor from path " & sSupervisorPath)
-            End Try
-         End If
-         ' mando richiesta di apertura progetto in supervisore
-         'Dim x = DbControllers.m_StatusMapController.GetProd
-         DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refProdManagerVM.CurrProd.nProdId, Map.refProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInSupervisorRequest, "")
+      ' apro supervisore
+      Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il Supervisor
+            BringWindowToFront(p.MainWindowHandle)
+            Exit For
+         Next
       Else
-         MessageBox.Show("Supervisor is not available for this machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         Dim sSupervisorPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sSupervisorName & ".exe"
+         Try
+            Process.Start(sSupervisorPath, "1 " & CurrProd.nProdId)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting supervisor from path " & sSupervisorPath)
+         End Try
       End If
+      ' mando richiesta di apertura progetto in supervisore
+      'Dim x = DbControllers.m_StatusMapController.GetProd
+      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refProdManagerVM.CurrProd.nProdId, Map.refProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInSupervisorRequest, "")
    End Sub
 
 #End Region ' GoToSupervisor

EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb

@@ -1484,13 +1484,7 @@ Public Class ProjManagerVM
       ' creo cartella temporanea di estrazione in Temp
       Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
       If Directory.Exists(sProjectimportDir) Then
-         Try
-            Directory.Delete(sProjectimportDir, True)
-         Catch ex As Exception
-            EgtOutLog("Delete old import project failed!")
-            MessageBox.Show("Importazione Fallita!", "Errore", MessageBoxButton.OK, MessageBoxImage.Error)
-            Return
-         End Try
+         Directory.Delete(sProjectimportDir, True)
       End If
       Directory.CreateDirectory(sProjectimportDir)
       Try

EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb

@@ -65,12 +65,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)
-         If Not EgtSetBtlAuxDir(sBtlAuxDir) Then
-            EgtOutLog("Missing BtlAuxDir path! Will be impossible to load Variant!")
-         End If
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelVM.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -241,32 +240,8 @@ Public Class TopPanelVM
          Map.refCALCPanelVM.Verify()
          Return
       End If
-      ' verifico se modalita' supervisore attiva
-      If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
-         If Not Produce(Map.refMachGroupPanelVM.SelectedMachGroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-            MessageBox.Show(ErrorMsg)
-         End If
-      Else
-         ' altrimenti lo copio se path disponibile
-         If Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.OK Or Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.INFO Then
-            Dim sSaveCncPath As String = ""
-            GetPrivateProfileString(S_GENERAL, K_SAVECNCPATH, "", sSaveCncPath, CurrentMachine.sMachIniFile)
-            Dim sSaveExt As String = ""
-            GetPrivateProfileString(S_GENERAL, K_SAVEEXT, "", sSaveExt, CurrentMachine.sMachIniFile)
-            If String.IsNullOrWhiteSpace(sSaveExt) Then
-               sSaveExt = ".cnc"
-            ElseIf sSaveExt(0) <> "." Then
-               sSaveExt = "." & sSaveExt
-            End If
-            Try
-               Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & ".cnc"
-               Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & sSaveExt
-               File.Copy(sMachGroupFilePath, sNewPath, True)
-               MessageBox.Show(String.Format("File copied! You can find it at {0}", {sNewPath}), "Info", MessageBoxButton.OK, MessageBoxImage.Information)
-            Catch ex As Exception
-               MessageBox.Show(String.Format("Copy to {0} folder failed!", {sSaveCncPath}), "Error", MessageBoxButton.OK, MessageBoxImage.Error)
-            End Try
-         End If
+      If Not Produce(Map.refMachGroupPanelVM.SelectedMachGroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
+         MessageBox.Show(ErrorMsg)
       End If
    End Sub
 
@@ -331,43 +306,12 @@ Public Class TopPanelVM
       End If
       If Map.refMachGroupPanelVM.MachGroupVMList.Count > 0 Then
          Dim MachgroupErrorList As New List(Of MachGroupVM)
-         Dim sErrorMessage As String = ""
-         Dim bErrorMessage As Boolean = False
          For Each Machgroup In Map.refMachGroupPanelVM.MachGroupVMList
-            ' verifico se modalita' supervisore attiva
-            If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
-               Dim ErrorMsg As String = ""
-               If Not Produce(Machgroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-                  MachgroupErrorList.Add(Machgroup)
-               End If
-            Else
-               ' altrimenti lo copio se path disponibile
-               If Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.OK Or Map.refMachGroupPanelVM.SelectedMachGroup.nGlobalState = CalcStates.INFO Then
-                  Dim sSaveCncPath As String = ""
-                  GetPrivateProfileString(S_GENERAL, K_SAVECNCPATH, "", sSaveCncPath, CurrentMachine.sMachIniFile)
-                  Dim sSaveExt As String = ""
-                  GetPrivateProfileString(S_GENERAL, K_SAVEEXT, "", sSaveExt, CurrentMachine.sMachIniFile)
-                  If String.IsNullOrWhiteSpace(sSaveExt) Then
-                     sSaveExt = ".cnc"
-                  ElseIf sSaveExt(0) <> "." Then
-                     sSaveExt = "." & sSaveExt
-                  End If
-                  If String.IsNullOrWhiteSpace(sSaveCncPath) OrElse Not Directory.Exists(sSaveCncPath) Then Return
-                  Try
-                     Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Machgroup.Name.ToString() & ".cnc"
-                     Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Machgroup.Name.ToString() & sSaveExt
-                     File.Copy(sMachGroupFilePath, sNewPath, True)
-                     sErrorMessage &= String.Format("File copied! You can find it at {0}", {sNewPath}) & Environment.NewLine
-                  Catch ex As Exception
-                     sErrorMessage &= String.Format("Copy to {0} folder failed!", {sSaveCncPath}) & Environment.NewLine
-                  End Try
-               End If
+            Dim ErrorMsg As String = ""
+            If Not Produce(Machgroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
+               MachgroupErrorList.Add(Machgroup)
             End If
          Next
-         If Not String.IsNullOrWhiteSpace(sErrorMessage) Then
-            sErrorMessage = "Results for all the parts generated:" & Environment.NewLine & sErrorMessage
-            MessageBox.Show(sErrorMessage, If(bErrorMessage, "Error", "Info"), MessageBoxButton.OK, MessageBoxImage.Information)
-         End If
          If MachgroupErrorList.Count > 0 Then
             Dim sMachGroups As String = ""
             For Each MachGroup In MachgroupErrorList

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