From 8fe9728eb53a28cd2f975945dbf80be1eb7d1ebf Mon Sep 17 00:00:00 2001
From: NicolaP <nicola.pievani@egalware.com>
Date: Tue, 17 Jan 2023 16:00:22 +0100
Subject: [PATCH] Riportata changeconfig nella cartella Config

---
 OptionsWindow/OptionModule.vb     |  2 +-
 OptionsWindow/OptionsV.xaml       |  2 +-
 OptionsWindow/OptionsViewModel.vb | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index 9ff52da..ef1fa48 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -1071,7 +1071,7 @@ Friend Module OptionModule
 
    Public Sub GetCurrentMachineInMTable()
       ' aggiorno il file Config.ini dell'EgtCAM5
-      EgtLuaExecFile(IniFile.m_sLuaLibsDir & "\ChangeConfig.lua")
+      EgtLuaExecFile(IniFile.m_sConfigDir & "\ChangeConfig.lua")
       ' assegno variabili
       Dim sDir As String = IniFile.m_sDoorsDirPath.Replace("\", "/")
       EgtLuaSetGlobStringVar("CCD.NewBaseDir", sDir)
diff --git a/OptionsWindow/OptionsV.xaml b/OptionsWindow/OptionsV.xaml
index 8e9c719..0cf9596 100644
--- a/OptionsWindow/OptionsV.xaml
+++ b/OptionsWindow/OptionsV.xaml
@@ -286,7 +286,7 @@
                             <TextBlock Text="{Binding BaseDir}"  Grid.Row="1" Grid.Column="2"  Margin="2,10,5,5"
                                 Style="{StaticResource DoorParamsTxBl}"/>
                             <Button Content="{Binding ChangeConfigMsg}"  Grid.Row="1" Grid.Column="3" 
-                                Command="{Binding BrowseCommand}" Margin="5"
+                                Command="{Binding BrowseCommand}" Margin="5" MaxHeight="28"
                                 CommandParameter="ConfigDir"/>
                         </Grid>
                     </GroupBox>
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index e685220..7bf6037 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -122,7 +122,7 @@ Public Class OptionsVM
 
    Public ReadOnly Property EnableConfig As Boolean
       Get
-         If GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) > 4 And File.Exists(IniFile.m_sLuaLibsDir & "\ChangeConfig.lua") Then
+         If GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) > 4 And File.Exists(IniFile.m_sConfigDir & "\ChangeConfig.lua") Then
             Return True
          Else
             Return False
@@ -2068,7 +2068,7 @@ Public Class OptionsVM
 
       If m_IsChangedConfig AndAlso EnableConfig AndAlso m_OrigBaseDir <> IniFile.m_sDoorsDirPath AndAlso m_OrigMTable <> OptionModule.m_SelectedMTable.Name Then
          ' aggiorno il file Config.ini dell'EgtCAM5
-         EgtLuaExecFile(IniFile.m_sLuaLibsDir & "\ChangeConfig.lua")
+         EgtLuaExecFile(IniFile.m_sConfigDir & "\ChangeConfig.lua")
          ' assegno variabili
          EgtLuaSetGlobStringVar("CCD.NewBaseDir", IniFile.m_sDoorsDirPath)
          EgtLuaSetGlobStringVar("CCD.NewMTable", OptionModule.m_SelectedMTable.Name)
@@ -2082,6 +2082,18 @@ Public Class OptionsVM
          Map.refMainWindowVM.CloseApplication()
          Process.Start(Application.ResourceAssembly.Location)
          'End If
+      ElseIf m_IsChangedConfig AndAlso m_OrigMTable <> OptionModule.m_SelectedMTable.Name Then
+         ' aggiorno il file Config.ini dell'EgtCAM5
+         EgtLuaExecFile(IniFile.m_sConfigDir & "\ChangeConfig.lua")
+         ' assegno variabili
+         EgtLuaSetGlobStringVar("CCD.NewBaseDir", IniFile.m_sDoorsDirPath)
+         EgtLuaSetGlobStringVar("CCD.NewMTable", OptionModule.m_SelectedMTable.Name)
+         ' eseguo la funzione che esegue la scrittura delle variabili
+         EgtLuaCallFunction("CCD.ChangeConfigDirectory")
+         Dim sVal As String = ""
+         EgtLuaGetGlobStringVar("CCD.NewMachineName", sVal)
+         OptionModule.m_CurrentMachine = sVal
+         EgtLuaResetGlobVar("CCD")
       End If
 
    End Sub