- correzioni del merge

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -341,7 +341,7 @@ Public Class BTLFeatureM
          .m_nSelGRP = nGRP,
          .m_nSelSIDE = nSIDE,
          .m_nPriority = 0,
-         .m_bDO = True
+         .m_bDO = True,
          .nSelVARIANT = 0
       }
       ' crea parametri per questa feature da file ini

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"
@@ -59,7 +59,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
@@ -81,7 +81,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

@@ -43,7 +43,6 @@ Public Module ConstIni
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
    Public Const K_BTLAUXDIR As String = "BtlAuxDir"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
-   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
 
    Public Const K_SUPERVISORMACH As String = "SupervisorMach"
    Public Const K_PASSWORD As String = "Password"

EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb

@@ -603,7 +603,7 @@ Public Class ProdManagerVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub GoToSupervisor()
-      If IsNothing(m_CurrProd) Then Return
+      If IsNothing(CurrProd) Then Return
       ' verifico se modalita' supervisore attiva
       If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
          ' apro supervisore

EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb

@@ -72,10 +72,6 @@ Public Class MySceneHostVM
          EgtSetBtlAuxDir(sBtlAuxDir)
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
-         ' imposto direttorio BtlAux per geometrie Variant
-         Dim sBtlAuxDir As String = ""
-         GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
-         EgtSetBtlAuxDir(sBtlAuxDir)
          ' inizializzo gestore lavorazioni
          EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
          ' Seleziono la macchina impostata nel file ini