diff --git a/EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb b/EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb index a8321fae..e71af3d4 100644 --- a/EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb +++ b/EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb @@ -413,7 +413,7 @@ Public Class BTLStructureM NewBTLStructure.m_SelRECESS = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLStructure.ocRECESS), NewBTLStructure.ocRECESS) EgtGetInfo(NewBTLStructure.m_nBTLInfoId, BTL_GEN_USERATTRIBUTE, NewBTLStructure.m_sUSERATTRIBUTE) ' setto il tipo di progetto (Beam o Wall) nel file ini del BTL - BTLIniFile.m_nBTLBWType = NewBTLStructure.m_nPROJTYPE + If NewBTLStructure.m_nPROJTYPE <> BWType.NULL Then BTLIniFile.m_nBTLBWType = NewBTLStructure.m_nPROJTYPE ' recupero i part NewBTLStructure.m_BTLPartMList = LoadParts(ProjId) 'Dim nPartId As Integer = EgtGetFirstPart() diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb index 1c6a87d7..64f76061 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb @@ -339,9 +339,9 @@ Public Class ProjManagerVM SectionXMaterial.SetType(nType) ManageView.UpdateBWType(nType) ' imposto flag secondo tipo di progetto (travi o pareti) - Dim sBTLFlag As String = If( nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) + Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) - EgtBeamSetFlag( nFlag) + EgtBeamSetFlag(nFlag) DbControllers.m_ProjController.UpdateInfo(nProjId, "Hand made", "", Date.MinValue, nType, Map.refMachinePanelVM.SelectedMachine.Name) SetCurrProj(nProjId) End If @@ -403,9 +403,9 @@ Public Class ProjManagerVM SectionXMaterial.SetType(TempCurrProj.nType) ManageView.UpdateBWType(TempCurrProj.nType) ' imposto flag secondo tipo di progetto (travi o pareti) - Dim sBTLFlag As String = If( TempCurrProj.nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) + Dim sBTLFlag As String = If(TempCurrProj.nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) - EgtBeamSetFlag( nFlag) + EgtBeamSetFlag(nFlag) ' se la macchina del progetto in apertura non รจ tra le macchine disponibili lo segnalo e apro un progetto vuoto If IsNothing(Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProjManagerVM.TempCurrProj.sMachine)) Then ' rimuovo il file in apertura dalla lista degli MRU @@ -585,6 +585,8 @@ Public Class ProjManagerVM Dim sProjDir As String = "" InitNewProject(nProjId, sProjDir, nType, Machine) SetCurrProj(nProjId) + ' imposto il tipo di parametri Q da utilizzare + BTLIniFile.m_nBTLBWType = nType ' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel Map.refCALCPanelVM.LoadMachineList() ' imposto ProjId di caricamento @@ -610,9 +612,9 @@ Public Class ProjManagerVM SectionXMaterial.SetType(nType) ManageView.UpdateBWType(nType) ' imposto flag secondo tipo di progetto (travi o pareti) - Dim sBTLFlag As String = If( nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) + Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) - EgtBeamSetFlag( nFlag) + EgtBeamSetFlag(nFlag) Else EgtOutLog("Errore nell'importazione BTL") End If @@ -964,7 +966,7 @@ Public Class ProjManagerVM SectionXMaterial.SetType(nType) ManageView.UpdateBWType(nType) ' imposto flag secondo tipo di progetto (travi o pareti) - Dim sBTLFlag As String = If( nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) + Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG) Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR) EgtBeamSetFlag( nFlag) Map.refProjectVM.SetOptimizePanel_Visibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL)