From c9f47e23f25f7642f38ccf51608f26ee5574756e Mon Sep 17 00:00:00 2001
From: RenzoL <renzo.lanza@egalware.com>
Date: Fri, 25 Jun 2021 12:04:27 +0200
Subject: [PATCH 1/2] Aggiunta gestione file MRU (per Visualizzatore e
 Ottimizzatore)

---
 .../Constants/ConstIni.vb                     |  3 +
 .../OpenProjectFileDialogVM.vb                |  4 +
 .../ProdManager/ProdManagerV.xaml             | 12 +++
 .../ProdManager/ProdManagerVM.vb              | 79 ++++++++++++++++---
 .../ProjManager/ProjManagerV.xaml             | 13 +++
 .../ProjManager/ProjManagerVM.vb              | 51 ++++++++++++
 .../ProjectManager/ProdFileVM.vb              |  2 +
 .../ProjectManager/ProjFileVM.vb              |  2 +
 .../SceneHost/MySceneHostVM.vb                | 39 ++++++++-
 9 files changed, 191 insertions(+), 14 deletions(-)

diff --git a/EgtBEAMWALL.ViewerOptimizer/Constants/ConstIni.vb b/EgtBEAMWALL.ViewerOptimizer/Constants/ConstIni.vb
index f8a35fde..f62aeddd 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Constants/ConstIni.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Constants/ConstIni.vb
@@ -113,4 +113,7 @@ Module ConstIni
    Public Const K_BEAMWALLBASEDIR As String = "BaseDir"
    Public Const K_BEAMWALLBUTTON As String = "Button"
 
+   Public Const S_MRUPROJFILES As String = "MruProjFiles"
+   Public Const S_MRUPRODFILES As String = "MruProdFiles"
+
 End Module
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index b20d6b86..478b33dc 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -284,6 +284,8 @@ Public Class OpenProjectFileDialogVM
             MessageBox.Show(EgtMsg(61873), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
             Return
          End If
+         Map.refProjManagerVM.m_MruFiles.Remove(SelProject.sProjPath)
+         Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
          ' cancello progetto
          DbControllers.m_ProjController.DeleteProj(SelProject.nProjId)
          ' aggiorno lista progetti
@@ -304,6 +306,8 @@ Public Class OpenProjectFileDialogVM
             MessageBox.Show(EgtMsg(61874), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
             Return
          End If
+         Map.refProdManagerVM.m_MruFiles.Remove(SelProject.sProdPath)
+         Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
          ' cancello progetto
          DbControllers.m_ProdController.DeleteProd(SelProject.nProdId)
          ' riporto prod in proj
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
index 600271a4..8f136061 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerV.xaml
@@ -12,6 +12,18 @@
            ContextMenuService.Placement="Bottom"
            Tag="{Binding}"
            Style="{StaticResource ToolBar_Button}">
+      <Button.ContextMenu>
+         <ContextMenu ItemsSource="{Binding MruFileNames}">
+             <ContextMenu.Resources>
+                 <Style TargetType="{x:Type MenuItem}">
+                     <Setter Property="Command"
+                             Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
+                     <Setter Property="CommandParameter" Value="{Binding}" />
+                 </Style>
+             </ContextMenu.Resources>
+         </ContextMenu>
+      </Button.ContextMenu>
+
       <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding SaveCommand}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index 978600d1..ea3b0635 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -29,8 +29,25 @@ Public Class ProdManagerVM
       End Get
    End Property
 
+   Friend m_MruFiles As New MruList
+   Public ReadOnly Property MruFileNames As ObservableCollection(Of String)
+      Get
+         Dim IdAndBTLFileNames As New ObservableCollection(Of String)
+         For Each FileName In m_MruFiles.FileNames
+            Dim PdId As Integer = 0
+            Dim sPdId As String = Path.GetFileNameWithoutExtension(DirectCast(FileName, String).Replace("__", "_"))
+            Integer.TryParse(sPdId, PdId)
+            Dim PdFileM = DbControllers.m_ProdController.FindCoreByProdId(PdId)
+            Dim PdFileVM = New ProdFileVM(PdFileM)
+            IdAndBTLFileNames.Add(sPdId & " | " & PdFileVM.sBTLFileName)
+         Next
+         Return IdAndBTLFileNames
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdOpen As ICommand
+   Private m_cmdOpenMruFile As ICommand
    Private m_cmdSave As ICommand
    Private m_cmdGoToProj As ICommand
 
@@ -69,6 +86,8 @@ Public Class ProdManagerVM
       Map.SetRefProdManagerVM(Me)
       ' Leggo ultimo indice di progetto
       m_nLastProdId = GetMainPrivateProfileInt(S_GENERAL, K_PRODSINDEX, 1)
+      ' Impostazioni MruLists
+      m_MruFiles.Init(S_MRUPRODFILES, 8)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -124,23 +143,26 @@ Public Class ProdManagerVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Open()
-      OpenProject()
-   End Sub
-
-   Friend Sub OpenProject()
       ' verifico se progetto modificato, e chiedo se salvare
       If Not ProdFileVM.VerifyProjectModification(CurrProd) Then Return
+      OpenProject(Nothing)
+   End Sub
+
+   Friend Sub OpenProject(TempCurrProd As ProdFileVM)
       Dim sFilePath As String = ""
       ' se la string è vuota
-      Dim TempCurrProd As ProdFileVM
       Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
-      ' apro dialogo di scelta file
-      OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-      Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-      Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
-      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-      sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
-      TempCurrProd = OpenProjectFileDialogVM.SelProject
+      If IsNothing(TempCurrProd) Then
+         ' apro dialogo di scelta file
+         OpenProjectFileDialogVM = New OpenProjectFileDialogVM
+         Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
+         If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+         sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
+         TempCurrProd = OpenProjectFileDialogVM.SelProject
+      Else
+         sFilePath = If(Not IsNothing(TempCurrProd.sProdPath), TempCurrProd.sProdPath, "")
+      End If
       If File.Exists(sFilePath) Then
          If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
             m_CurrProd = TempCurrProd
@@ -155,10 +177,42 @@ Public Class ProdManagerVM
       End If
       ' aggiorno titolo
       Map.refMainWindowVM.UpdateTitle()
+      NotifyPropertyChanged(NameOf(MruFileNames))
    End Sub
 
 #End Region ' OpenCommand
 
+#Region "OpenMruFileCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property OpenMruFileCommand As ICommand
+      Get
+         If m_cmdOpenMruFile Is Nothing Then
+            m_cmdOpenMruFile = New Command(AddressOf OpenMruFile)
+         End If
+         Return m_cmdOpenMruFile
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Public Sub OpenMruFile(ByVal param As Object)
+      ' verifico se progetto modificato, e chiedo se salvare
+      If Not ProdFileVM.VerifyProjectModification(CurrProd) Then Return
+      ' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
+      Dim PdId As Integer = 0
+      Dim arrStrPdId As String() = DirectCast(param, String).Split("|")
+      Integer.TryParse(arrStrPdId(0), PdId)
+      Dim PdFileM = DbControllers.m_ProdController.FindCoreByProdId(PdId)
+      Dim PdFileVM = New ProdFileVM(PdFileM)
+      OpenProject(PdFileVM)
+   End Sub
+
+#End Region ' OpenMruFileCommand
+
 #Region "SaveCommand"
 
    ''' <summary>
@@ -194,6 +248,7 @@ Public Class ProdManagerVM
          ' DbControllers.m_ProdController.Reset(CurrProd.nProjId)
          m_CurrProd.bIsNew = False
       End If
+      NotifyPropertyChanged(NameOf(MruFileNames))
    End Sub
 
 #End Region ' SaveCommand
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
index df83ba3e..64b002ee 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
@@ -14,7 +14,20 @@
    </Button>
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
+           ContextMenuService.Placement="Bottom" 
+           Tag="{Binding}"
            Style="{StaticResource ToolBar_Button}">
+      <Button.ContextMenu>
+         <ContextMenu ItemsSource="{Binding MruFileNames}">
+            <ContextMenu.Resources>
+               <Style TargetType="{x:Type MenuItem}">
+                  <Setter Property="Command"
+                          Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
+                  <Setter Property="CommandParameter" Value="{Binding}" />
+               </Style>
+            </ContextMenu.Resources>
+         </ContextMenu>
+      </Button.ContextMenu>
       <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding SaveCommand}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 3a1275cf..5768730b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -57,6 +57,21 @@ Public Class ProjManagerVM
       End Get
    End Property
 
+   Friend m_MruFiles As New MruList
+   Public ReadOnly Property MruFileNames As ObservableCollection(Of String)
+      Get
+         Dim IdAndBTLFileNames As New ObservableCollection(Of String)
+         For Each FileName In m_MruFiles.FileNames
+            Dim PjId As Integer = 0
+            Dim sPjId As String = Path.GetFileNameWithoutExtension(DirectCast(FileName, String).Replace("__", "_"))
+            Integer.TryParse(sPjId, PjId)
+            Dim PjFileM = DbControllers.m_ProjController.FindByProjIdConv(PjId)
+            IdAndBTLFileNames.Add(sPjId & " | " & PjFileM.sBTLFileName)
+         Next
+         Return IdAndBTLFileNames
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdNew As ICommand
    Private m_cmdOpen As ICommand
@@ -136,6 +151,8 @@ Public Class ProjManagerVM
       Map.SetRefProjManagerVM(Me)
       ' Leggo ultimo indice di progetto
       m_nLastProjId = GetMainPrivateProfileInt(S_GENERAL, K_PROJSINDEX, 1)
+      ' Impostazioni MruLists
+      m_MruFiles.Init(S_MRUPROJFILES, 8)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -261,6 +278,7 @@ Public Class ProjManagerVM
          MessageBox.Show(EgtMsg(61876))
       End If
       Map.refMainWindowVM.UpdateTitle()
+      NotifyPropertyChanged(NameOf(MruFileNames))
    End Sub
 
 #End Region ' New
@@ -314,10 +332,42 @@ Public Class ProjManagerVM
       End If
       ' aggiorno titolo
       Map.refMainWindowVM.UpdateTitle()
+      NotifyPropertyChanged(NameOf(MruFileNames))
    End Sub
 
 #End Region ' OpenCommand
 
+#Region "OpenMruFileCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property OpenMruFileCommand As ICommand
+      Get
+         If m_cmdOpenMruFile Is Nothing Then
+            m_cmdOpenMruFile = New Command(AddressOf OpenMruFile)
+         End If
+         Return m_cmdOpenMruFile
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Public Sub OpenMruFile(ByVal param As Object)
+      ' verifico se progetto modificato, e chiedo se salvare
+      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      ' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
+      Dim PjId As Integer = 0
+      Dim arrStrPjId As String() = DirectCast(param, String).Split("|")
+      Integer.TryParse(arrStrPjId(0), PjId)
+      Dim PjFileM = DbControllers.m_ProjController.FindByProjIdConv(PjId)
+      Dim PjFileVM = New ProjFileVM(PjFileM)
+      OpenProject(PjFileVM)
+   End Sub
+
+#End Region ' OpenMruFileCommand
+
 #Region "SaveCommand"
 
    ''' <summary>
@@ -349,6 +399,7 @@ Public Class ProjManagerVM
       End If
       ' aggiorno titolo
       Map.refMainWindowVM.UpdateTitle()
+      NotifyPropertyChanged(NameOf(MruFileNames))
    End Sub
 
 #End Region ' SaveCommand
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb
index 2aa748a4..8cd02f01 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProdFileVM.vb
@@ -214,6 +214,8 @@ Public Class ProdFileVM
                If CurrProject.bIsNew Then
                   ' lo elimino
                   Directory.Delete(sProjectDirPath, True)
+                  Map.refProdManagerVM.m_MruFiles.Remove(CurrProject.sProdPath)
+                  Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
                   DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId)
                   If CurrProject.nProdId = Map.refProjManagerVM.CurrProj.nProdId Then
                      ' reset prod in path proj
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjFileVM.vb
index 4d2e1cab..32798f73 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjFileVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjFileVM.vb
@@ -230,6 +230,8 @@ Public Class ProjFileVM
                   If Directory.Exists(sProjectDirPath) Then
                      Directory.Delete(sProjectDirPath, True)
                   End If
+                  Map.refProjManagerVM.m_MruFiles.Remove(CurrProject.sProjPath)
+                  Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
                   DbControllers.m_ProjController.DeleteProj(CurrProject.nProjId)
                   Map.refProjManagerVM.CurrProj = Nothing
                   EgtResetModified()
diff --git a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
index 61bed16a..56794ee4 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
@@ -482,11 +482,11 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean)
+      Dim ProjectType As ProjectType = If(Map.refMainMenuVM.SelPage = Pages.VIEW, ProjectType.PROJ, ProjectType.PROD)
+      Dim ProjId As Integer = If(ProjectType = ProjectType.PROJ, Map.refProjManagerVM.nLoadingProjId, 0)
       ' Procedo a seconda del risultato
       If bOk Then
          ' leggo struttura BTL
-         Dim ProjectType As ProjectType = If(Map.refMainMenuVM.SelPage = Pages.VIEW, ProjectType.PROJ, ProjectType.PROD)
-         Dim ProjId As Integer = If(ProjectType = ProjectType.PROJ, Map.refProjManagerVM.nLoadingProjId, 0)
          Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId))
          If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
             Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
@@ -495,7 +495,23 @@ Public Class MySceneHostVM
             Map.refShowBeamPanelVM.ShowAll()
          End If
          WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
+         If ProjectType = ProjectType.PROJ Then
+            Dim PjFileVM As ProjFileVM
+            If Not IsNothing(ProjId) AndAlso ProjId <> 0 Then
+               PjFileVM = New ProjFileVM(DbControllers.m_ProjController.FindByProjIdConv(ProjId))
+               If Not IsNothing(PjFileVM.ProjFileM) AndAlso Not IsNothing(PjFileVM.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Add(PjFileVM.sProjPath)
+            End If
+         End If
+         If ProjectType = ProjectType.PROD Then Map.refProdManagerVM.m_MruFiles.Add(sFile)
       Else
+         If ProjectType = ProjectType.PROJ Then
+            Dim PjFileVM As ProjFileVM
+            If Not IsNothing(ProjId) AndAlso ProjId <> 0 Then
+               PjFileVM = New ProjFileVM(DbControllers.m_ProjController.FindByProjIdConv(ProjId))
+               If Not IsNothing(PjFileVM.ProjFileM) AndAlso Not IsNothing(PjFileVM.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Remove(PjFileVM.sProjPath)
+            End If
+         End If
+         If ProjectType = ProjectType.PROD Then Map.refProdManagerVM.m_MruFiles.Remove(sFile)
          Dim sMsg As String = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
          MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
          Map.refProjManagerVM.NewProject()
@@ -510,12 +526,31 @@ Public Class MySceneHostVM
    End Sub
 
    Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean)
+      Dim ProjectType As ProjectType = If(Map.refMainMenuVM.SelPage = Pages.VIEW, ProjectType.PROJ, ProjectType.PROD)
+      Dim ProjId As Integer = If(ProjectType = ProjectType.PROJ, Map.refProjManagerVM.nLoadingProjId, 0)
       ' Se salvataggio non riuscito, esco subito
       If Not bOk Then
+         If ProjectType = ProjectType.PROJ Then
+            Dim PjFileVM As ProjFileVM
+            If Not IsNothing(ProjId) AndAlso ProjId <> 0 Then
+               PjFileVM = New ProjFileVM(DbControllers.m_ProjController.FindByProjIdConv(ProjId))
+               If Not IsNothing(PjFileVM.ProjFileM) AndAlso Not IsNothing(PjFileVM.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Remove(PjFileVM.sProjPath)
+            End If
+         End If
+         If ProjectType = ProjectType.PROD Then Map.refProdManagerVM.m_MruFiles.Remove(sFile)
          Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
          MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
          Return
       End If
+      ' Inserisco nome in MRU
+      If ProjectType = ProjectType.PROJ Then
+         Dim PjFileVM As ProjFileVM
+         If Not IsNothing(ProjId) AndAlso ProjId <> 0 Then
+            PjFileVM = New ProjFileVM(DbControllers.m_ProjController.FindByProjIdConv(ProjId))
+            If Not IsNothing(PjFileVM.ProjFileM) AndAlso Not IsNothing(PjFileVM.sProjPath) Then Map.refProjManagerVM.m_MruFiles.Add(PjFileVM.sProjPath)
+         End If
+      End If
+      If ProjectType = ProjectType.PROD Then Map.refProdManagerVM.m_MruFiles.Add(sFile)
       ' Salvo nome ultimo file
       WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
    End Sub

From 1fb7699382a7fe431bdacd11adb31c6ee1b56c53 Mon Sep 17 00:00:00 2001
From: RenzoL <renzo.lanza@egalware.com>
Date: Fri, 25 Jun 2021 12:31:59 +0200
Subject: [PATCH 2/2] Aggiunta apertura ultimo progetto aperto all'avvio

---
 EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index db975ba9..475e3ae7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
@@ -117,6 +117,16 @@ Public Class MainWindowVM
          'Else
          '   Map.refProjectManagerVM.NewCmd()
       End If
+      ' setto il primo file dalla lista degli MRU come progetto corrente da aprire
+      Dim sLastProjectPath As String = String.Empty
+      GetMainPrivateProfileString(S_MRUPROJFILES, K_FILE & "1", String.Empty, sLastProjectPath)
+      If Not String.IsNullOrWhiteSpace(sLastProjectPath) AndAlso File.Exists(sLastProjectPath) Then
+         ' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
+         Dim PjId As Integer = 0
+         Dim sPjId As String = Path.GetFileNameWithoutExtension(sLastProjectPath)
+         Integer.TryParse(sPjId, PjId)
+         Map.refProjManagerVM.SetCurrProj(PjId)
+      End If
       ' apro in modalita' VIEW
       Map.refMainMenuVM.SelPage = Pages.VIEW