Merge remote-tracking branch 'origin/feature/ReportConfigWnd' into feature/ReportConfigWnd

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -97,6 +97,7 @@ Public Module ConstIni
    Public Const S_IMPORT As String = "Import"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
+   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
 
    'Public Const S_MACH As String = "Mach"

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -1354,9 +1354,10 @@ Public Class LeftPanelVM
             Dim sPar As String = String.Empty
             Dim vParQ() As String = Nothing
             NewFeat.CalcParamArray(vPar, sPar, vParQ)
+            If NewFeat.nPRC = 900 Then NewFeat.sDES = "2"
             ' 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/SceneHost/MySceneHostVM.vb

@@ -65,6 +65,10 @@ Public Class MySceneHostVM
          EgtSetCurrentContext(MainScene.GetCtx())
          ' 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