- Aggiunto messaggio se cartella Variant non trovata.

- Aggiornati controlli versione a 2.7d1

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Globalization
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
@@ -131,6 +132,16 @@ 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
@@ -141,6 +152,16 @@ 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
@@ -244,6 +265,7 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
+      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
@@ -258,7 +280,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)
@@ -322,11 +344,22 @@ 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"
@@ -362,15 +395,21 @@ 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, True, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, 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, False, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, False, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
@@ -545,7 +584,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)
@@ -598,6 +637,11 @@ 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,6 +64,15 @@ 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/Constants/ConstBeam.vb

@@ -201,12 +201,14 @@
    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,6 +24,7 @@ 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
@@ -50,7 +51,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
@@ -70,7 +71,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,6 +98,7 @@ 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,6 +7,9 @@
 
    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/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-2024 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 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.6.10.1")>
-<Assembly: AssemblyFileVersion("2.6.10.1")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

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, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
+   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
       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) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
+      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
          Dim sBTLParamParams() As String = sBTLParam.Split(","c)
          ' verifico numero minimo di parametri
          If sBTLParamParams.Count >= 6 Then

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-2024 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2025 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.6.10.1")]
-[assembly: AssemblyFileVersion("2.6.10.1")]
+[assembly: AssemblyVersion("2.7.4.1")]
+[assembly: AssemblyFileVersion("2.7.4.1")]

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, 2610, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2610, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2704, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2704, 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-2024 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 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.6.10.1")>
-<Assembly: AssemblyFileVersion("2.6.10.1")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -58,6 +58,12 @@ 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,6 +221,13 @@ 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,10 +1,14 @@
 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
@@ -115,6 +119,67 @@ 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()
@@ -187,7 +252,11 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property sDrawPath As String
       Get
-         Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
+         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
       End Get
    End Property
 

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -213,11 +213,9 @@ 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(GRPType, PRC, False, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(Me.m_BTLFeatureM.nSelGRP, Me.m_BTLFeatureM.nPRC, Me.m_BTLFeatureM.nSelVARIANT, 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,6 +5,7 @@ Imports EgtBEAMWALL.Core
 Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports System.Windows.Threading
+Imports System.Security.Cryptography
 
 Public Class BTLPartVM
    Inherits VMBase
@@ -1535,13 +1536,30 @@ Public Class BTLPartVM
                ' aggiorno stato abilitazione del bottone modifica free contour
                Map.refFeatureManagerVM.SetEditIsEnabled()
                Map.refFeatureManagerVM.NotifyPropertyChanged(NameOf(Map.refFeatureManagerVM.Priority_Visibility))
-            Else
-               EgtDeselectAll()
+               ' 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()
             End If
-            Map.refLeftPanelVM.FeatureSelectionChanged()
-         End If
-         EgtDraw()
-         NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+            EgtDraw()
+            NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
       End Set
    End Property
 

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, True, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, m_SelPRC.nVARIANT, True, ParamIndex, Nothing, NewBTLParam)
                m_ParamList.Add(New Parameters(NewBTLParam))
                ParamIndex += 1
             End While

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -9,6 +9,8 @@ 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
@@ -960,7 +962,7 @@ Public Class ConfigurationPageVM
       ParamIndex = 1
       TempList = New List(Of QBTLParamVM)
       If IsP Then
-         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam)
+         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, 0, IsP, ParamIndex, Nothing, NewBTLParam)
             TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
             ParamIndex += 1
          End While

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerV.xaml

@@ -32,6 +32,12 @@
                           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,4 +1,5 @@
-Imports EgtUILib
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class FeatureManagerVM
@@ -16,6 +17,18 @@ 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
@@ -97,7 +110,6 @@ Public Class FeatureManagerVM
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
 
-
 #End Region    ' METHODS
 
 End Class

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}}}"/>
+               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}" HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
          </DataGridCheckBoxColumn>
          <!--Validità feature-->

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -928,8 +928,15 @@ 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, dPosY, 0), WallMachGroup.MyMachGroupM.nRawPartId) Then
+      If EgtAddPartToRawPart(nPartDuploId, New Point3d(dPosX - vtDeltaBox.x, dPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), WallMachGroup.MyMachGroupM.nRawPartId) Then
          EgtSetInfo(nPartDuploId, MGR_PRT_POSX, dPosX)
          EgtSetInfo(nPartDuploId, MGR_PRT_POSY, dPosY)
          EgtSetInfo(nPartDuploId, MGR_PRT_ROT, PartToAdd.nROTATED)
@@ -1356,7 +1363,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, "",
+            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, NewFeat.sDES,
                                               Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
                                               New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
             bMacroFlag = False

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), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), 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, 2610, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2610, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2704, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2704, 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-2024 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 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.6.10.1")>
-<Assembly: AssemblyFileVersion("2.6.10.1")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb

@@ -611,27 +611,32 @@ Public Class ProdManagerVM
    ''' </summary>
    Friend Sub GoToSupervisor()
       If IsNothing(m_CurrProd) Then Return
-      ' 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
+      ' 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, "")
       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
+         MessageBox.Show("Supervisor is not available for this machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
       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,7 +1484,13 @@ Public Class ProjManagerVM
       ' creo cartella temporanea di estrazione in Temp
       Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
       If Directory.Exists(sProjectimportDir) Then
-         Directory.Delete(sProjectimportDir, True)
+         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
       End If
       Directory.CreateDirectory(sProjectimportDir)
       Try

EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb

@@ -65,6 +65,12 @@ 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,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -240,8 +241,32 @@ Public Class TopPanelVM
          Map.refCALCPanelVM.Verify()
          Return
       End If
-      If Not Produce(Map.refMachGroupPanelVM.SelectedMachGroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-         MessageBox.Show(ErrorMsg)
+      ' 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
       End If
    End Sub
 
@@ -306,12 +331,43 @@ 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
-            Dim ErrorMsg As String = ""
-            If Not Produce(Machgroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-               MachgroupErrorList.Add(Machgroup)
+            ' 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
             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