From 7799f029532e7c66c4e57593b57e4145e52205bf Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 6 Aug 2018 12:36:13 +0000 Subject: [PATCH] EgtDOORCreator 1.9h2 : - apre l'ultimo file in lettura, - correzione del riposizionamento degli hardware nel passaggio da un'anta a due ante. --- Assembly/Assembly.vb | 1 + MainWindow/MainWindowVM.vb | 18 +++++++++++++++--- My Project/AssemblyInfo.vb | 4 ++-- OptionsWindow/OptionModule.vb | 2 +- ProjectManager/ProjectManagerVM.vb | 23 ++++++++++++++++++++--- 5 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Assembly/Assembly.vb b/Assembly/Assembly.vb index 0b9f80b..1ddfd58 100644 --- a/Assembly/Assembly.vb +++ b/Assembly/Assembly.vb @@ -1674,6 +1674,7 @@ Public Class Assembly SetVarAssembly() ReloadAllCompoDoor1() ReverseDoor() + UpDateAllCompo() TopBottomWidth() SwingJamb() HeightDoor() diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 9d79aea..6409935 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -226,9 +226,21 @@ Public Class MainWindowVM End Select End If End Select - ' scrivo il nome dell'ultimo file aperto - If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso - Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then + '' scrivo il nome dell'ultimo file aperto + 'If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso + ' Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then + ' WriteMainPrivateProfileString(S_LAUNCHERWINDOW, K_LASTPROJECT, Map.refAssemblyManagerVM.CurrProject.Name) + 'End If + + If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso + Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then + If File.Exists(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then + WriteMainPrivateProfileString(S_LAUNCHERWINDOW, K_LASTPROJECT, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) + Else + WriteMainPrivateProfileString(S_LAUNCHERWINDOW, K_LASTPROJECT, Map.refAssemblyManagerVM.CurrProject.Name) + End If + ElseIf Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso + Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then WriteMainPrivateProfileString(S_LAUNCHERWINDOW, K_LASTPROJECT, Map.refAssemblyManagerVM.CurrProject.Name) End If EgtExit() diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index e541e80..bb06124 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -72,5 +72,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 317b519..85b312c 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -183,7 +183,7 @@ Friend Module OptionModule If GetMainPrivateProfileString(S_DOORS, K_MYPROJECTDIR, "", sMyProjectDir) <> 0 Then ' se non esiste il direttorio If Not Directory.Exists(sMyProjectDir) Then - ' manntego l'accesso a quello di default + ' mantengo l'accesso a quello di default EgtOutLog("Warning : " & sMyProjectDir & " does not exist") ' controllo che il direttorio che era stato passato di default esista If Not Directory.Exists(IniFile.m_MyProjectDir) Then diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb index 1764e7e..29c0f51 100644 --- a/ProjectManager/ProjectManagerVM.vb +++ b/ProjectManager/ProjectManagerVM.vb @@ -243,7 +243,7 @@ Public Class ProjectManagerVM If Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then FolderBrowserDialog.SelectedPath = Map.refAssemblyManagerVM.CurrProject.Name ElseIf Not String.IsNullOrEmpty(OptionModule.m_sLastProject) Then - FolderBrowserDialog.SelectedPath = OptionModule.m_sLastProject + FolderBrowserDialog.SelectedPath = Path.GetDirectoryName(OptionModule.m_sLastProject) Else FolderBrowserDialog.SelectedPath = IniFile.m_MyProjectDir End If @@ -379,7 +379,13 @@ Public Class ProjectManagerVM Dim CurrProject As Project = Map.refAssemblyManagerVM.CurrProject ' carico il percorso dell'ultimo progetto salvato (sul file Config.ini) If IsNothing(CurrProject.Name) Then - CurrProject.Name = OptionModule.m_sLastProject + If File.Exists(OptionModule.m_sLastProject) Then + CurrProject.Name = Path.GetDirectoryName(OptionModule.m_sLastProject) + ElseIf Path.HasExtension(OptionModule.m_sLastProject) AndAlso Directory.Exists(Path.GetDirectoryName(OptionModule.m_sLastProject)) Then + CurrProject.Name = Path.GetDirectoryName(OptionModule.m_sLastProject) + ElseIf Not Path.HasExtension(OptionModule.m_sLastProject) AndAlso Directory.Exists(OptionModule.m_sLastProject) Then + CurrProject.Name = OptionModule.m_sLastProject + End If End If ' ripulisco la lista di porte @@ -414,7 +420,18 @@ Public Class ProjectManagerVM End If Next End If - CurrProject.SelAssemblyName = CurrProject.AssemblyList(0) + + If String.IsNullOrEmpty(CurrName) AndAlso File.Exists(OptionModule.m_sLastProject) Then + For Each ItemFile In CurrProject.AssemblyList + If ItemFile.Name = OptionModule.m_sLastProject Then + CurrProject.SelAssemblyName = ItemFile + Exit For + End If + Next + Else + CurrProject.SelAssemblyName = CurrProject.AssemblyList(0) + End If + Else Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected End If