EgtCAM5 1.8j6 :
- per default in lavorazione si carica solo la tavola - non si salvano più in MRU i comandi lua dei bottoni Special.
This commit is contained in:
@@ -193,6 +193,7 @@ Class Application
|
||||
Friend Const INSERTPROJECT As String = "InsertProject"
|
||||
Friend Const IMPORTPROJECT As String = "ImportProject"
|
||||
Friend Const EXPORTPROJECT As String = "ExportProject"
|
||||
Friend Const PREEXECSCRIPT As String = "PreExecScript"
|
||||
Friend Const EXECSCRIPT As String = "ExecScript"
|
||||
Friend Const SETDRAWISENABLED As String = "SetDrawIsEnabled"
|
||||
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.8.10.5")>
|
||||
<Assembly: AssemblyFileVersion("1.8.10.5")>
|
||||
<Assembly: AssemblyVersion("1.8.10.6")>
|
||||
<Assembly: AssemblyFileVersion("1.8.10.6")>
|
||||
|
||||
@@ -50,6 +50,7 @@ Namespace EgtCAM5
|
||||
''' Execute the Exec. This method is invoked by the ExecCommand.
|
||||
''' </summary>
|
||||
Public Sub Exec(ByVal param As Object)
|
||||
Application.Msn.NotifyColleagues(Application.PREEXECSCRIPT, True)
|
||||
Application.Msn.NotifyColleagues(Application.EXECSCRIPT, String.Empty)
|
||||
End Sub
|
||||
|
||||
@@ -73,6 +74,7 @@ Namespace EgtCAM5
|
||||
''' Execute the Open. This method is invoked by the OpenCommand.
|
||||
''' </summary>
|
||||
Public Shared Sub OpenMruScript(ByVal param As Object)
|
||||
Application.Msn.NotifyColleagues(Application.PREEXECSCRIPT, True)
|
||||
Application.Msn.NotifyColleagues(Application.EXECSCRIPT, DirectCast(param, String).Replace("__", "_"))
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -46,6 +46,9 @@ Namespace EgtCAM5
|
||||
' Definizione comandi
|
||||
Private m_cmdLoaded As ICommand
|
||||
|
||||
' Flag per non salvare Script appena eseguito in elenco MruScript
|
||||
Private m_bScriptInMru As Boolean = True
|
||||
|
||||
#End Region
|
||||
|
||||
#Region "EGTUILIB FIELDS"
|
||||
@@ -260,7 +263,7 @@ Namespace EgtCAM5
|
||||
IniFile.m_bMachiningGroup = (GetPrivateProfileInt(S_MACH, K_MACHININGGROUP, 0) <> 0)
|
||||
Application.Msn.NotifyColleagues(Application.DRAWMODE_ISCHECKED)
|
||||
' lettura flag visualizzazione solo tavola in definizione lavorazioni
|
||||
IniFile.m_bShowOnlyTable = (GetPrivateProfileInt(S_MACH, K_SHOWONLYTABLE, 0) <> 0)
|
||||
IniFile.m_bShowOnlyTable = (GetPrivateProfileInt(S_MACH, K_SHOWONLYTABLE, 1) <> 0)
|
||||
' ObjTree non selezionato
|
||||
Application.Msn.NotifyColleagues(Application.UPDATEOBJTREEOLDID, GDB_ID.NULL)
|
||||
' nascondo input box
|
||||
@@ -470,6 +473,9 @@ Namespace EgtCAM5
|
||||
Application.Msn.Register(Application.EXPORTPROJECT, Sub()
|
||||
m_Controller.ExportProject(Path.ChangeExtension(m_Controller.GetCurrFile(), "dxf"))
|
||||
End Sub)
|
||||
Application.Msn.Register(Application.PREEXECSCRIPT, Sub(bScriptInMru As Boolean)
|
||||
m_bScriptInMru = bScriptInMru
|
||||
End Sub)
|
||||
Application.Msn.Register(Application.EXECSCRIPT, Sub(sFilePath As String)
|
||||
If String.IsNullOrEmpty(sFilePath) Then
|
||||
Dim sDir As String = String.Empty
|
||||
@@ -1293,9 +1299,9 @@ Namespace EgtCAM5
|
||||
' Salvo path dello script in lista recenti
|
||||
WritePrivateProfileString(S_GENERAL, K_LASTLUADIR, Path.GetDirectoryName(sFile))
|
||||
If bOk Then
|
||||
IniFile.m_MruScripts.Add(sFile)
|
||||
If m_bScriptInMru Then IniFile.m_MruScripts.Add(sFile)
|
||||
Else
|
||||
IniFile.m_MruScripts.Remove(sFile)
|
||||
If m_bScriptInMru Then IniFile.m_MruScripts.Remove(sFile)
|
||||
MessageBox.Show(sError, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error
|
||||
End If
|
||||
' Disabilito progress e bottone stop
|
||||
|
||||
@@ -77,6 +77,7 @@ Public Class ButtonItem
|
||||
If Not File.Exists(m_sLuaCmdPath) Then Return
|
||||
If Not Path.GetExtension(m_sLuaCmdPath).ToLower = ".lua" Then Return
|
||||
' eseguo file Lua
|
||||
Application.Msn.NotifyColleagues(Application.PREEXECSCRIPT, False)
|
||||
Application.Msn.NotifyColleagues(Application.EXECSCRIPT, m_sLuaCmdPath)
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user