diff --git a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb index 60c01a53..a3df49ff 100644 --- a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb +++ b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb @@ -454,6 +454,13 @@ Public Class BTLFeatureM Param.nSelValue = nParamValue End If Next + ' Se Variant + If IsVariant() AndAlso ParamList.Count() > 0 AndAlso ParamList(0).bIsP Then + Dim nCode As Integer = 0 + If Integer.TryParse( m_sDES, nCode) AndAlso nCode > 0 Then + ParamList(0).dValue = nCode + End If + End If ' Se necessario ricalcolo, lo eseguo If Not IsFreeContour() And bToRecalc Then ' Disabilito segnalazione modificato @@ -532,6 +539,8 @@ Public Class BTLFeatureM Dim sPar As String = String.Empty Dim vParQ() As String = {} CalcParamArray(vPar, sPar, vParQ) + ' sistemazioni per feature Variant + If nNewPRC = 900 Then sNewDesc = vNewParP(3).ToString ' recupero eventuali percorsi originali della feature Dim nCrvId As Integer = GDB_ID.NULL Dim nCrv2Id As Integer = GDB_ID.NULL @@ -598,6 +607,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 diff --git a/EgtBEAMWALL.Core/Constants/ConstGen.vb b/EgtBEAMWALL.Core/Constants/ConstGen.vb index ced9eb40..ae545074 100644 --- a/EgtBEAMWALL.Core/Constants/ConstGen.vb +++ b/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" @@ -50,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 @@ -70,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 diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb index 0ad9a85d..eddcfd10 100644 --- a/EgtBEAMWALL.Core/Constants/ConstIni.vb +++ b/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" diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb index 67c1f7bc..7a138b18 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb +++ b/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, 2611, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2611, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2701, 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()) diff --git a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb index 484420da..719554e8 100644 --- a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb +++ b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb @@ -60,6 +60,10 @@ Public Class MySceneHostVM EgtSetCurrentContext(MainScene.GetCtx()) ' inizializzo gestore travi e pareti EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR) + ' Imposto direttorio ausiliario per import/gestione BTL + Dim sBtlAuxDir As String = String.Empty + 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 diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb index c7980a36..710da202 100644 --- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb +++ b/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 = vPar(3).ToString ' 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 diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index 9d401133..7350f4d3 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/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, 2611, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2611, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2701, 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()) diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index af732f11..67052299 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -30,7 +30,7 @@ Imports System.Windows #End If - + @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb index 5e6049b5..94217e02 100644 --- a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb @@ -67,6 +67,10 @@ Public Class MySceneHostVM EgtSetCurrentContext(MainScene.GetCtx()) ' inizializzo gestore travi e pareti EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR) + ' Imposto direttorio ausiliario per import/gestione BTL + Dim sBtlAuxDir As String = String.Empty + 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 diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll index d50839b8..5d4787e1 100644 Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll index 1736a6f4..b95c7b10 100644 Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ