EgtCAM5 2.7l1 :

- piccoli aggiustamenti a ExecuteWindow.

BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -13,7 +13,7 @@ Public Class BeamMachiningsWindowV
       m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

CurrSetUp/CurrSetUpV.xaml.vb

@@ -11,7 +11,7 @@
       m_CurrSetUpVM = CurrSetUpVM
    End Sub
 
-   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
+   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
    '   Me.DialogResult = bDialogResult
    'End Sub
 

ExecuteWindow/ExecuteWindowV.xaml

@@ -6,7 +6,7 @@
                             Title="Execute Window" 
                             Height="500" Width="400"
                             IsResizable="True"
-                            IsMinimizable="True" 
+                            IsMinimizable="False" 
                             WindowStartupLocation="CenterOwner" 
                             ShowInTaskbar="False"
                             TitleBarHeight="32"

ExecuteWindow/ExecuteWindowV.xaml.vb

@@ -19,7 +19,7 @@
 
 #End Region    ' Constructor
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ExecuteWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ExecuteWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

ExecuteWindow/ExecuteWindowVM.vb

@@ -8,9 +8,9 @@ Public Class ExecuteWindowVM
 #Region "FIELDS & PROPERTIES"
 
    ' Evento per chiusura finestra
-   Public Event m_CloseWindow(bDialogResult As Boolean)
+   Friend Event OnCloseWindow(bDialogResult As Boolean)
 
-   Private ReadOnly scriptFilePath As String = IO.Path.Combine(IniFile.m_sTempDir, $"tmpLua.lua")
+   Private ReadOnly sScriptFilePath As String = Path.Combine(IniFile.m_sTempDir, "ImmExec" & IniFile.m_nInstance.ToString() & ".tua")
 
    Private m_sScriptText As String
    Public Property sScriptText As String
@@ -27,7 +27,7 @@ Public Class ExecuteWindowVM
       NotifyPropertyChanged(NameOf(sScriptText))
    End Sub
 
-   Private m_bReload_IsEnable As Boolean = File.Exists(scriptFilePath)
+   Private m_bReload_IsEnable As Boolean = File.Exists(sScriptFilePath)
    Public ReadOnly Property bReload_IsEnable As Boolean
       Get
          Return m_bReload_IsEnable
@@ -91,12 +91,19 @@ Public Class ExecuteWindowVM
    End Property
 
    Public Sub Ok()
+      ' Verifico ci sia del testo
+      If String.IsNullOrWhiteSpace(m_sScriptText) Then Return
       ' Salva il file script
-      SaveScript(scriptFilePath, m_sScriptText)
+      SaveScript(sScriptFilePath, m_sScriptText)
       ' Esegue il file script
-      EgtLuaExecFile(scriptFilePath)
+      EgtLuaExecFile(sScriptFilePath)
+      ' Aggiorna visualizzazione
+      EgtDraw()
+      ' Aggiorna interfaccia
+      If Not IsNothing(Map.refManageLayerExpanderVM) Then Map.refManageLayerExpanderVM.LoadObjTree()
+      UpdateUI()
       ' Chiudo finestra
-      RaiseEvent m_CloseWindow(True)
+      RaiseEvent OnCloseWindow(True)
    End Sub
 
 #End Region    ' Ok_Command
@@ -113,8 +120,8 @@ Public Class ExecuteWindowVM
    End Property
 
    Public Sub Reload()
-      If File.Exists(scriptFilePath) Then
-         SetScriptFile(ReadScript(scriptFilePath))
+      If File.Exists(sScriptFilePath) Then
+         SetScriptFile(ReadScript(sScriptFilePath))
       End If
    End Sub
 

MainWindow/MainWindowVM.vb

@@ -385,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2711, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2711, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2712, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2712, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate

My Project/AssemblyInfo.vb

@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.11.3")>
-<Assembly: AssemblyFileVersion("2.7.11.3")>
+<Assembly: AssemblyVersion("2.7.12.1")>
+<Assembly: AssemblyFileVersion("2.7.12.1")>
 

SetUpDb/SetUpDbV.xaml.vb

@@ -11,7 +11,7 @@
       m_SetUpDbVM = SetUpDbVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

SetUpDb/SetUpDbVM.vb

@@ -10,7 +10,7 @@ Public Class SetUpDbVM
 
    Private Const SETUP_FILEEXTENSION As String = ".stu"
 
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
+   Friend Event OnCloseWindow(bDialogResult As Boolean)
 
    Private m_SetUpList As New ObservableCollection(Of String)
    Public ReadOnly Property SetUpList As ObservableCollection(Of String)
@@ -263,7 +263,7 @@ Public Class SetUpDbVM
                Return
          End Select
       End If
-      RaiseEvent m_CloseWindow(True)
+      RaiseEvent OnCloseWindow(True)
    End Sub
 
 #End Region    ' Close