Modifiche per comunicazione tra ViewerOptimizer e Supervisor

Correzioni e migliorie
This commit is contained in:
Emmanuele Sassi
2021-07-29 16:17:37 +02:00
parent 4e7017041d
commit b4e8d68c62
25 changed files with 263 additions and 245 deletions
@@ -3,98 +3,21 @@ Imports EgtBEAMWALL.Core
Imports EgtUILib
Public Class ProdFileVM
Inherits ProjectFileVM
Public ReadOnly Property ProdFileM As ProdFileM
Get
Return m_ProjectFileM
End Get
End Property
Public ReadOnly Property nProjIdList As List(Of Integer)
Get
Return ProdFileM.nProjIdList
End Get
End Property
Public Overrides ReadOnly Property nProdId As Integer
Get
Return ProdFileM.nProdId
End Get
End Property
Friend Overrides ReadOnly Property sProdDirPath As String
Get
Dim sPath As String = String.Empty
If IsNothing(ProdFileM.nProdId) OrElse ProdFileM.nProdId = 0 Then Return String.Empty
Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000")
End Get
End Property
Friend Overrides ReadOnly Property sProdPath As String
Get
Dim sPath As String = String.Empty
If IsNothing(ProdFileM.nProdId) OrElse ProdFileM.nProdId = 0 Then Return String.Empty
Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
End Get
End Property
Public Overrides Property bIsNew As Boolean
Get
Return ProdFileM.bIsNew
End Get
Set(value As Boolean)
ProdFileM.bIsNew = value
End Set
End Property
Public ReadOnly Property sName As String
Get
Return ProdFileM.sName
End Get
End Property
Private m_sBTLFileName As String
Public ReadOnly Property sBTLFileName As String
Get
Return m_sBTLFileName
End Get
End Property
Inherits Core.ProdFileVM
#Region "CONSTRUCTORS"
Sub New(ProdFileM As ProdFileM)
m_ProjectFileM = ProdFileM
MyBase.New(ProdFileM)
' aggiungo nome btl
Dim sBTLFileName As String = ""
For Each CurrProj In nProjIdList
Dim TempProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(CurrProj)
If Not IsNothing(TempProj) Then m_sBTLFileName& = TempProj.sListName
If Not IsNothing(TempProj) Then sBTLFileName &= TempProj.sListName
Next
SetBTLFileName(sBTLFileName)
End Sub
'Sub New(nProjectType As ProjectType, ProjectFileName As String)
' m_nProjectType = nProjectType
' If m_nProjectType = ProjectType.PROJ Then
' Dim DataFromFileName As String() = ProjectFileName.Split(FILENAMESEPARATOR)
' If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
' Integer.TryParse(DataFromFileName(0), m_nProjId)
' End If
' If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
' Integer.TryParse(DataFromFileName(1), m_nProdId)
' Else
' m_nProdId = 0
' End If
' If Not String.IsNullOrEmpty(DataFromFileName(2)) Then
' m_BTLFileName = DataFromFileName(2)
' End If
' ElseIf m_nProjectType = ProjectType.PROD Then
' Integer.TryParse(ProjectFileName, m_nProdId)
' End If
'End Sub
'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
' MyBase.New(nProjectType, nProjId, nProdId, sBTLFileName)
'End Sub
#End Region ' CONSTRUCTORS
Friend Function GetProjPath(nProjId As Integer)