diff --git a/EgtBEAMWALL.Core/BTL Model/BTLStructureM.vb b/EgtBEAMWALL.Core/BTL Model/BTLStructureM.vb index 9c61a020..05f63145 100644 --- a/EgtBEAMWALL.Core/BTL Model/BTLStructureM.vb +++ b/EgtBEAMWALL.Core/BTL Model/BTLStructureM.vb @@ -437,6 +437,10 @@ Public Class BTLStructureM Return nMaxPDN + 1 End Function + Public Sub UpdateBTLInfoLayer() + m_nBTLInfoId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO) + End Sub + #End Region ' METHODS End Class diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb index a24266bd..1b9f0233 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb @@ -70,20 +70,17 @@ Public Class MainWindowVM NotifyPropertyChanged(NameOf(Title)) End Sub Public Sub UpdateTitle() + m_Title = "" Select Case Map.refMainMenuVM.SelPage Case Pages.VIEW - If IsNothing(Map.refProjManagerVM.CurrProj) Then - ElseIf Map.refProjManagerVM.CurrProj.bIsNew Then - m_Title = "New - " & Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") - Else - m_Title = Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.sBTLFileName + If Not IsNothing(Map.refProjManagerVM.CurrProj) Then + If Map.refProjManagerVM.CurrProj.bIsNew Then m_Title = "New - " + m_Title &= Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.sBTLFileName End If Case Pages.MACHINING - If IsNothing(Map.refProdManagerVM.CurrProd) Then - ElseIf Map.refProdManagerVM.CurrProd.bIsNew Then - m_Title = "New" & Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") - Else - m_Title = Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") + If Not IsNothing(Map.refProdManagerVM.CurrProd) Then + If Map.refProdManagerVM.CurrProd.bIsNew Then m_Title = "New - " + m_Title &= Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") & " - " & Map.refProdManagerVM.CurrProd.sBTLFileName End If Case Pages.CONFIG m_Title = "Configuration Page" diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 8023de9e..0d86e057 100644 --- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -179,6 +179,7 @@ Public Class OpenProjectFileDialogVM ProjectColumns.Add("colCRTDATE") ElseIf ProjectType = ProjectType.PROD Then ProjectColumns.Add("colPRODID") + ProjectColumns.Add("colBTLNAME") ProjectColumns.Add("colCRTDATE") End If End Sub diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb index ae152932..b7cb1cc3 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb @@ -96,9 +96,9 @@ Public Class ProdManagerVM End Function Public Function SetCurrProd(nProdId As Integer) As Boolean - Dim Currprod As ProdModel = DbControllers.m_ProdController.FindByProdId(nProdId) - If IsNothing(Currprod) Then Return False - Map.refProdManagerVM.CurrProd = New ProdFileVM(ProdFileM.CreateProdFileM(Currprod.ProdId, New List(Of Integer), Date.Now(), "")) + Dim CurrProdM As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(nProdId) + If IsNothing(CurrProdM) Then Return False + Map.refProdManagerVM.CurrProd = New ProdFileVM(CurrProdM) Return True End Function diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb index 98365113..c48ca84c 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb @@ -223,6 +223,10 @@ Public Class ProjManagerVM InitNewProject(nProjId, sProjDir) SetCurrProj(nProjId) Dim sProjFileName As String = sProjDir & "\" & nProjId.ToString("0000") & ".nge" + ' creo gruppo BTLinfo + Dim nBTLInfoId As Integer = EgtCreateGroup(GDB_ID.ROOT) + EgtSetName(nBTLInfoId, BTLINFO) + Map.refProjectVM.BTLStructureVM.BTLStructureM.UpdateBTLInfoLayer() ' salvo il progetto EgtSaveFile(sProjFileName, NGE.CMPTEXT) Else diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb index 4278d9eb..2aa748a4 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb @@ -53,10 +53,22 @@ Public Class ProdFileVM End Get End Property + Private m_sBTLFileName As String + Public ReadOnly Property sBTLFileName As String + Get + Return m_sBTLFileName + End Get + End Property + #Region "CONSTRUCTORS" Sub New(ProdFileM As ProdFileM) m_ProjectFileM = ProdFileM + ' aggiungo nome btl + For Each CurrProj In nProjIdList + Dim TempProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(CurrProj) + If Not IsNothing(TempProj) Then m_sBTLFileName& = TempProj.sListName + Next End Sub 'Sub New(nProjectType As ProjectType, ProjectFileName As String)