From d2b8779397b6df2a7f39d6d2090233b0a31c2f7c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 17 Aug 2018 08:29:04 +0000 Subject: [PATCH] TestEIn 1.9h2 : - ricompilazione per allineamento. --- Controller.vb | 2 +- EgtInterface.vb | 94 +++++++++++++++++++++++--------------- My Project/AssemblyInfo.vb | 4 +- Utilities.vb | 2 +- 4 files changed, 62 insertions(+), 40 deletions(-) diff --git a/Controller.vb b/Controller.vb index f1936cc..239b29d 100644 --- a/Controller.vb +++ b/Controller.vb @@ -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 diff --git a/EgtInterface.vb b/EgtInterface.vb index 0103700..1c4185b 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -9648,6 +9648,20 @@ End Function End Function ' Simulation + + Private Function EgtSimInit_32() As Boolean + End Function + + 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 + Private Function EgtSimStart_32(bFirst As Boolean) As Boolean End Function @@ -9690,6 +9704,34 @@ End Function End If End Function + + Private Function EgtSimSetStep_32(dStep As Double) As Boolean + End Function + + 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 + + + Private Function EgtSimSetUiStatus_32(nUiStatus As Integer) As Boolean + End Function + + 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 + 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 - - Private Function EgtSimSetStep_32(dStep As Double) As Boolean + + Private Function EgtSimExit_32() As Boolean End Function - - Private Function EgtSimSetStep_64(dStep As Double) As Boolean + + 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 - - - Private Function EgtSimSetUiStatus_32(nUiStatus As Integer) As Boolean - End Function - - 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 - - - Private Function EgtSimStop_32() As Boolean - End Function - - 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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index a0cb648..f55cd77 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + + diff --git a/Utilities.vb b/Utilities.vb index bebe383..b21dc93 100644 --- a/Utilities.vb +++ b/Utilities.vb @@ -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()