TestEIn 1.9h2 :

- ricompilazione per allineamento.
This commit is contained in:
Dario Sassi
2018-08-17 08:29:04 +00:00
parent be6ad64065
commit d2b8779397
4 changed files with 62 additions and 40 deletions
+1 -1
View File
@@ -449,7 +449,7 @@ Public Class Controller
"|Images (*.png;*.jpg;*.jpeg;*.bmp)|*.png;*.jpg;*.jpeg;*.bmp" &
"|Cms file format (*.hed;*.ent;*.ens)|*.hed;*.ent;*.ens" &
"|All Files (*.*)|*.*",
.FilterIndex = 7,
.FilterIndex = 8,
.InitialDirectory = sDir
}
If OpenFileDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then
+58 -36
View File
@@ -9648,6 +9648,20 @@ End Function
End Function
' Simulation
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimInit"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimInit_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimInit"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimInit_64() As Boolean
End Function
Public Function EgtSimInit() As Boolean
If IntPtr.Size = 4 Then
Return EgtSimInit_32()
Else
Return EgtSimInit_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStart"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimStart_32(bFirst As Boolean) As Boolean
End Function
@@ -9690,6 +9704,34 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetStep_32(dStep As Double) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetStep_64(dStep As Double) As Boolean
End Function
Public Function EgtSimSetStep(dStep As Double) As Boolean
If IntPtr.Size = 4 Then
Return EgtSimSetStep_32(dStep)
Else
Return EgtSimSetStep_64(dStep)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetUiStatus"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetUiStatus_32(nUiStatus As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetUiStatus"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetUiStatus_64(nUiStatus As Integer) As Boolean
End Function
Public Function EgtSimSetUiStatus(nUiStatus As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtSimSetUiStatus_32(nUiStatus)
Else
Return EgtSimSetUiStatus_64(nUiStatus)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimGetAxisInfoPos"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimGetAxisInfoPos_32(nInd As Integer, ByRef psName As IntPtr, ByRef psToken As IntPtr,
ByRef bLinear As Boolean, ByRef dVal As Double) As Boolean
@@ -9780,45 +9822,17 @@ End Function
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetStep_32(dStep As Double) As Boolean
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimExit"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimExit_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetStep"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetStep_64(dStep As Double) As Boolean
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimExit"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimExit_64() As Boolean
End Function
Public Function EgtSimSetStep(dStep As Double) As Boolean
Public Function EgtSimExit() As Boolean
If IntPtr.Size = 4 Then
Return EgtSimSetStep_32(dStep)
Return EgtSimExit_32()
Else
Return EgtSimSetStep_64(dStep)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetUiStatus"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetUiStatus_32(nUiStatus As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimSetUiStatus"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimSetUiStatus_64(nUiStatus As Integer) As Boolean
End Function
Public Function EgtSimSetUiStatus(nUiStatus As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtSimSetUiStatus_32(nUiStatus)
Else
Return EgtSimSetUiStatus_64(nUiStatus)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStop"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimStop_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSimStop"), SuppressUnmanagedCodeSecurity()>
Private Function EgtSimStop_64() As Boolean
End Function
Public Function EgtSimStop() As Boolean
If IntPtr.Size = 4 Then
Return EgtSimStop_32()
Else
Return EgtSimStop_64()
Return EgtSimExit_64()
End If
End Function
@@ -12494,7 +12508,7 @@ Public Enum MCH_PTM As Integer
BEFORE = -1
AFTER = 1
End Enum
'Costanti : stato movimento di simulazione
'Costanti : risultato del movimento di simulazione
Public Enum MCH_SIM As Integer
OK = 0
END_STEP = 1
@@ -12503,6 +12517,14 @@ Public Enum MCH_SIM As Integer
DIR_ERR = 4
ERR = 5
End Enum
'Costanti : stato di simulazione
Public Enum MCH_SIM_ST As Integer
UI_NULL = 0
UI_STOP = 1
UI_PLAY = 2
UI_STEP = 3
UI_PAUSE = 4
End Enum
'Costanti : stato visualizzazione macchina
Public Enum MCH_LOOK As Integer
TAB = 0
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.9.7.1")>
<Assembly: AssemblyFileVersion("1.9.7.1")>
<Assembly: AssemblyVersion("1.9.8.2")>
<Assembly: AssemblyFileVersion("1.9.8.2")>
+1 -1
View File
@@ -14,7 +14,7 @@
Module Utilities
' Verifica se il file è in uso
Public Function FileInUse(ByVal sFile As String) As Boolean
Public Function FileInUse(sFile As String) As Boolean
If System.IO.File.Exists(sFile) Then
Try
Dim F As Short = FreeFile()