Modifiche per comunicazione tra ViewerOptimizer e Supervisor

Correzioni e migliorie

EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjFileVM.vb

@@ -3,121 +3,18 @@ Imports EgtBEAMWALL.Core
 Imports EgtUILib
 
 Public Class ProjFileVM
-   Inherits ProjectFileVM
-
-   Public ReadOnly Property ProjFileM As ProjFileM
-      Get
-         Return m_ProjectFileM
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property nProjId As Integer
-      Get
-         Return ProjFileM.nProjId
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property nProdId As Integer
-      Get
-         Return ProjFileM.nProdId
-      End Get
-   End Property
-
-   Friend Overrides ReadOnly Property sProjDirPath As String
-      Get
-         If IsNothing(ProjFileM.nProjId) OrElse ProjFileM.nProjId = 0 Then Return String.Empty
-         Return refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000")
-      End Get
-   End Property
-   Friend Overrides ReadOnly Property sProjPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProjFileM.nProjId) OrElse ProjFileM.nProjId = 0 Then Return String.Empty
-         sPath = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & ".nge"
-         Return sPath
-      End Get
-   End Property
-
-   Friend Overrides ReadOnly Property sProdDirPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProjFileM.nProdId) OrElse ProjFileM.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(ProjFileM.nProdId) OrElse ProjFileM.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 ProjFileM.bIsNew
-      End Get
-      Set(value As Boolean)
-         ProjFileM.bIsNew = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sBTLFileName As String
-      Get
-         Return ProjFileM.sBTLFileName
-      End Get
-   End Property
-
-   Public ReadOnly Property sListName As String
-      Get
-         Return ProjFileM.sListName
-      End Get
-   End Property
-
-   Public ReadOnly Property dtExportDate As DateTime
-      Get
-         Return ProjFileM.dtExportDate
-      End Get
-   End Property
+   Inherits Core.ProjFileVM
 
 #Region "CONSTRUCTORS"
 
    Sub New(ProjectFileM As ProjFileM)
-      m_ProjectFileM = ProjectFileM
+      MyBase.New(ProjectFileM)
    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
 
 #Region "METHODS"
 
-   Public Sub SetBTLFileName(BTLFileName As String)
-      ProjFileM.sBTLFileName = BTLFileName
-   End Sub
-
    ' funzione che restituisce le parti di nome file
    Friend Shared Function VerifyProjectFile(nProjectType As ProjectType, ProjectFileName As String, ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sBTLFileName As String) As Boolean
       If nProjectType = ProjectType.PROJ Then